From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 2 Aug 2011 00:10:25 +0000 (-0400)
Subject: strip whitespace from hostname before  in get_node_element()
X-Git-Tag: sfa-1.0-28~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fbf36eec6fa28411190a87decf5d317ef4551e84;p=sfa.git

strip whitespace from hostname before  in get_node_element()
---

diff --git a/sfa/rspecs/sfa_rspec.py b/sfa/rspecs/sfa_rspec.py
index 5d8ef071..a75c0be3 100755
--- a/sfa/rspecs/sfa_rspec.py
+++ b/sfa/rspecs/sfa_rspec.py
@@ -38,7 +38,7 @@ class SfaRSpec(RSpec):
         else:
             names = self.xml.xpath('//node/hostname')
         for name in names:
-            if name.text == hostname:
+            if str(name.text).strip() == hostname:
                 return name.getparent()
         return None
  
@@ -81,7 +81,7 @@ class SfaRSpec(RSpec):
         opts = []
         if elem is not None:
             for e in elem:
-                opts.append((e.tag, e.text))
+                opts.append((e.tag, str(e.text).strip()))
         return opts
 
     def get_default_sliver_attributes(self, network=None):
@@ -94,9 +94,13 @@ class SfaRSpec(RSpec):
         return self.attributes_list(defaults)
 
     def get_sliver_attributes(self, hostname, network=None):
+        attributes = [] 
         node = self.get_node_element(hostname, network)
-        sliver = node.find("sliver")
-        return self.attributes_list(sliver)
+        #sliver = node.find("sliver")
+        slivers = node.xpath('./sliver')
+        if isinstance(slivers, list) and slivers:
+            attributes = self.attributes_list(slivers[0])
+        return attributes
 
     def get_slice_attributes(self, network=None):
         slice_attributes = []