git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes for latest sfa
[sface.git]
/
sface
/
sfidata.py
diff --git
a/sface/sfidata.py
b/sface/sfidata.py
index
a70cb47
..
41b904f
100644
(file)
--- a/
sface/sfidata.py
+++ b/
sface/sfidata.py
@@
-57,7
+57,7
@@
class SfaceRSpec(RSpec):
return self.version.merge_node(source_node_tag, network, no_dupes)
# sfav1.add_slivers isn't working for us...
return self.version.merge_node(source_node_tag, network, no_dupes)
# sfav1.add_slivers isn't working for us...
- def add_slivers(self, slivers, network=None, sliver_urn=None, no_dupes=False):
+ def add_slivers
_xxx
(self, slivers, network=None, sliver_urn=None, no_dupes=False):
# add slice name to network tag
network_tags = self.xml.xpath('//network')
if network_tags:
# add slice name to network tag
network_tags = self.xml.xpath('//network')
if network_tags:
@@
-73,10
+73,6
@@
class SfaceRSpec(RSpec):
for tag in sliver['tags']:
etree.SubElement(sliver_elem, tag['tagname']).text = value=tag['value']
for tag in sliver['tags']:
etree.SubElement(sliver_elem, tag['tagname']).text = value=tag['value']
- # these should be moved to SFAv1, etc.
- def get_node_boot_state(self, node, network):
- return self.get_node_element(node, network).attrib.get("boot_state","")
-
def get_node_sliver_type(self, node, network):
node = self.get_node_element(node, network)
if node is None:
def get_node_sliver_type(self, node, network):
node = self.get_node_element(node, network)
if node is None:
@@
-161,7
+157,7
@@
class SfiData:
xml = open(rspec_file).read()
rspec = SfaceRSpec(rspec=xml) #rspec = parse_rspec(xml)
xml = open(rspec_file).read()
rspec = SfaceRSpec(rspec=xml) #rspec = parse_rspec(xml)
- self.purgeNonSliceResources(rspec)
+
#
self.purgeNonSliceResources(rspec)
return rspec
return None
return rspec
return None