From: Mohamed Larabi Date: Thu, 1 Aug 2013 12:31:52 +0000 (+0200) Subject: Fix default slivers mgt in sfav1 rspecs X-Git-Tag: sfa-2.1-27~35^2~2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3e75aa1c69d87a3295cd75bc6f68e80106597227;p=sfa.git Fix default slivers mgt in sfav1 rspecs --- diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py index bb19df3d..09826f05 100644 --- a/sfa/planetlab/plaggregate.py +++ b/sfa/planetlab/plaggregate.py @@ -330,7 +330,7 @@ class PlAggregate: default_sliver_attribs = default_sliver.get('tags', []) for attrib in default_sliver_attribs: logger.info("adding default sliver attribute xrn=%s attrib=%s"%(slice_xrn,attrib)) - rspec.version.add_default_sliver_attribute(attrib['tagname'], attrib['value']) + rspec.version.add_default_sliver_attribute(attrib['tagname'], attrib['value'], self.driver.hrn) if not options.get('list_leases') or options.get('list_leases') and options['list_leases'] != 'resources': leases = self.get_leases(slice_xrn, slice) diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index fd2e0313..d0e76064 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -145,10 +145,15 @@ class SFAv1(RSpecVersion): if network: network_tag = self.xml.xpath("//network[@name='%s']" % network) else: - network_tag = self.xml.xpath("//network") - if isinstance(network_tag, list): + network_tag = self.xml.xpath("//network") + if len(network_tag) > 0: network_tag = network_tag[0] + elif network: + network_tag = self.add_network(network) + else: + network_tag = self.xml defaults = network_tag.add_element('sliver_defaults') + elif isinstance(defaults, list): defaults = defaults[0] SFAv1Sliver.add_sliver_attribute(defaults, name, value)