git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix add_slivers()
[sfa.git]
/
sfa
/
rspecs
/
versions
/
sfav1.py
diff --git
a/sfa/rspecs/versions/sfav1.py
b/sfa/rspecs/versions/sfav1.py
index
9de83aa
..
7cd8a14
100644
(file)
--- a/
sfa/rspecs/versions/sfav1.py
+++ b/
sfa/rspecs/versions/sfav1.py
@@
-1,3
+1,5
@@
+from lxml import etree
+from sfa.util.xrn import hrn_to_urn, urn_to_hrn
from sfa.rspecs.rspec_version import BaseVersion
from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements
from sfa.rspecs.rspec_version import BaseVersion
from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements
@@
-254,9
+256,11
@@
class SFAv1(BaseVersion):
if network_tags:
network_tag = network_tags[0]
network_tag.set('slice', urn_to_hrn(sliver_urn)[0])
if network_tags:
network_tag = network_tags[0]
network_tag.set('slice', urn_to_hrn(sliver_urn)[0])
- slivers = self._process_slivers(slivers)
+
nodes_with_slivers = self.get_nodes_with_slivers(network)
for sliver in slivers:
nodes_with_slivers = self.get_nodes_with_slivers(network)
for sliver in slivers:
+ if isinstance(sliver, basestring):
+ sliver = {'hostname': sliver}
if sliver['hostname'] in nodes_with_slivers:
continue
node_elem = self.get_node_element(sliver['hostname'], network)
if sliver['hostname'] in nodes_with_slivers:
continue
node_elem = self.get_node_element(sliver['hostname'], network)