X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fsfidata.py;fp=sface%2Fsfidata.py;h=41b904f7c949873e830a9ea3b18e4f3f8428d112;hp=a70cb4714182e520513fe34e7f60eaeb9973bcbc;hb=e9ec3baedf4607aefd6f034647ec745ab5ea4ee3;hpb=e01f0099bc259d2ec061084f49c31edc12fc62a8 diff --git a/sface/sfidata.py b/sface/sfidata.py index a70cb47..41b904f 100644 --- 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... - 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: @@ -73,10 +73,6 @@ class SfaceRSpec(RSpec): 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: @@ -161,7 +157,7 @@ class SfiData: xml = open(rspec_file).read() rspec = SfaceRSpec(rspec=xml) #rspec = parse_rspec(xml) - self.purgeNonSliceResources(rspec) + #self.purgeNonSliceResources(rspec) return rspec return None