From: Andy Bavier <acb@cs.princeton.edu>
Date: Fri, 17 Jun 2011 19:09:41 +0000 (-0400)
Subject: Fix bugs in remove_slivers
X-Git-Tag: sfa-1.0-26~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a2b82ebfba8d09f9e968d9295abb8038a999ece8

Fix bugs in remove_slivers

SFA-49
---

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: