git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b01b4e7
)
fix bug in add_defalut_sliver_attributes
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 24 Jun 2011 18:59:30 +0000
(14:59 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Fri, 24 Jun 2011 18:59:30 +0000
(14:59 -0400)
sfa/rspecs/sfa_rspec.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/sfa_rspec.py
b/sfa/rspecs/sfa_rspec.py
index
3b72dba
..
7f0cd36
100755
(executable)
--- a/
sfa/rspecs/sfa_rspec.py
+++ b/
sfa/rspecs/sfa_rspec.py
@@
-255,9
+255,13
@@
class SfaRSpec(RSpec):
defaults = self.xml.xpath("//network[@name='%s']/sliver_defaults" % network)
else:
defaults = self.xml.xpath("//sliver_defaults" % network)
defaults = self.xml.xpath("//network[@name='%s']/sliver_defaults" % network)
else:
defaults = self.xml.xpath("//sliver_defaults" % network)
- if
defaults is None
:
+ if
not defaults
:
network_tag = self.xml.xpath("//network[@name='%s']" % network)
network_tag = self.xml.xpath("//network[@name='%s']" % network)
+ if isinstance(network_tag, list):
+ network_tag = network_tag[0]
defaults = self.add_element('sliver_defaults', attrs={}, parent=network_tag)
defaults = self.add_element('sliver_defaults', attrs={}, parent=network_tag)
+ elif isinstance(defaults, list):
+ defaults = defaults[0]
self.add_attribute(defaults, name, value)
def add_sliver_attribute(self, hostname, name, value, network=None):
self.add_attribute(defaults, name, value)
def add_sliver_attribute(self, hostname, name, value, network=None):