the big cleanup: remove unused code relating to openstack/nova

[sfa.git] / sfa / rspecs / elements / versions / nitosv1Sliver.py

diff --git a/sfa/rspecs/elements/versions/nitosv1Sliver.py b/sfa/rspecs/elements/versions/nitosv1Sliver.py
index 3fe074b..6ceb87f 100644 (file)
--- a/sfa/rspecs/elements/versions/nitosv1Sliver.py
+++ b/sfa/rspecs/elements/versions/nitosv1Sliver.py
@@ -5,7 +5,8 @@ from sfa.rspecs.elements.element import Element
 from sfa.rspecs.elements.sliver import Sliver
 from sfa.rspecs.elements.versions.nitosv1PLTag import NITOSv1PLTag
 
-from sfa.planetlab.plxrn import PlXrn
+#from sfa.planetlab.plxrn import PlXrn
+
 
 class NITOSv1Sliver:
 
@@ -20,16 +21,18 @@ class NITOSv1Sliver:
             tags = sliver.get('tags', [])
             if tags:
                 for tag in tags:
-                    NITOSv1Sliver.add_sliver_attribute(sliver_elem, tag['tagname'], tag['value'])
+                    NITOSv1Sliver.add_sliver_attribute(
+                        sliver_elem, tag['tagname'], tag['value'])
             if sliver.get('sliver_id'):
-                name = PlXrn(xrn=sliver.get('sliver_id')).pl_slicename()
+                name = Xrn(xrn=sliver.get('sliver_id')
+                           ).get_hrn().split('.')[-1]
                 sliver_elem.set('name', name)
 
     @staticmethod
     def add_sliver_attribute(xml, name, value):
         elem = xml.add_element(name)
         elem.set_text(value)
-    
+
     @staticmethod
     def get_sliver_attributes(xml):
         attribs = []
@@ -40,18 +43,19 @@ class NITOSv1Sliver:
                 instance['name'] = elem.tag
                 instance['value'] = elem.text
                 attribs.append(instance)
-        return attribs 
-                
+        return attribs
+
     @staticmethod
-    def get_slivers(xml, filter={}):
+    def get_slivers(xml, filter=None):
+        if filter is None:
+            filter = {}
         xpath = './default:sliver | ./sliver'
         sliver_elems = xml.xpath(xpath)
         slivers = []
         for sliver_elem in sliver_elems:
-            sliver = Sliver(sliver_elem.attrib,sliver_elem)
-            if 'component_id' in xml.attrib:     
+            sliver = Sliver(sliver_elem.attrib, sliver_elem)
+            if 'component_id' in xml.attrib:
                 sliver['component_id'] = xml.attrib['component_id']
             sliver['tags'] = NITOSv1Sliver.get_sliver_attributes(sliver_elem)
             slivers.append(sliver)
-        return slivers           
-
+        return slivers