From a2b82ebfba8d09f9e968d9295abb8038a999ece8 Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Fri, 17 Jun 2011 15:09:41 -0400 Subject: [PATCH 1/1] Fix bugs in remove_slivers SFA-49 --- sfa/rspecs/sfa_rspec.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sfa/rspecs/sfa_rspec.py b/sfa/rspecs/sfa_rspec.py index 85d5fccf..bc122004 100755 --- 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): - 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) - sliver_elem = node.find('sliver') + sliver_elem = node_elem.find('sliver') 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: -- 2.43.0