From: Tony Mack Date: Tue, 21 Jun 2011 15:41:33 +0000 (-0400) Subject: fix NameError and SyntaxError X-Git-Tag: sfa-1.0-28~17 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3bffdaa25100b17f8bd64e7972788a849e3a96f3;p=sfa.git fix NameError and SyntaxError --- diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py index fb98a9dd..801144a9 100755 --- a/sfa/rspecs/pg_rspec.py +++ b/sfa/rspecs/pg_rspec.py @@ -142,7 +142,7 @@ class PGRSpec(RSpec): node.set('sliver_id', sliver_urn) etree.SubElement(node, 'sliver_type', name='plab-vnode') - def add_default_sliver_attribute(self, name, value, network=Name): + def add_default_sliver_attribute(self, name, value, network=None): pass def add_interfaces(self, interfaces, no_dupes=False): diff --git a/sfa/rspecs/sfa_rspec.py b/sfa/rspecs/sfa_rspec.py index 10d068a0..3f856182 100755 --- a/sfa/rspecs/sfa_rspec.py +++ b/sfa/rspecs/sfa_rspec.py @@ -253,7 +253,7 @@ class SfaRSpec(RSpec): defaults = self.xml.xpath("//sliver_defaults" % network) if defaults is None: network_tag = self.xml.xpath("//network[@name='%s']" % network) - defaults = self.add_element('sliver_defaults', attrs={}, network_tag) + defaults = self.add_element('sliver_defaults', attrs={}, parent=network_tag) self.add_attribute(defaults, name, value) def add_sliver_attribute(self, hostname, name, value, network=None):