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 (from parent 1:
0a031de
)
Fix bugs in remove_slivers
author
Andy Bavier
<acb@cs.princeton.edu>
Fri, 17 Jun 2011 19:09:41 +0000
(15:09 -0400)
committer
Andy Bavier
<acb@cs.princeton.edu>
Fri, 17 Jun 2011 19:09:41 +0000
(15:09 -0400)
SFA-49
sfa/rspecs/sfa_rspec.py
patch
|
blob
|
history
diff --git
a/sfa/rspecs/sfa_rspec.py
b/sfa/rspecs/sfa_rspec.py
index
85d5fcc
..
bc12200
100755
(executable)
--- a/
sfa/rspecs/sfa_rspec.py
+++ b/
sfa/rspecs/sfa_rspec.py
@@
-235,13
+235,12
@@
class SfaRSpec(RSpec):
etree.SubElement(sliver_elem, tag['tagname'], value=tag['value'])
def remove_slivers(self, slivers, network=None, no_dupes=False):
etree.SubElement(sliver_elem, tag['tagname'], value=tag['value'])
def remove_slivers(self, slivers, network=None, no_dupes=False):
- if not isinstance(slivers, list):
- slivers = [slivers]
+ slivers = self._process_slivers(slivers)
for sliver in slivers:
node_elem = self.get_node_element(sliver['hostname'], network)
for sliver in slivers:
node_elem = self.get_node_element(sliver['hostname'], network)
- sliver_elem = node.find('sliver')
+ sliver_elem = node
_elem
.find('sliver')
if sliver_elem != None:
if sliver_elem != None:
- node_elem.remove(sliver
)
+ node_elem.remove(sliver
_elem)
def add_default_sliver_attribute(self, name, value, network=None):
if network:
def add_default_sliver_attribute(self, name, value, network=None):
if network: