X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fsfav1Sliver.py;h=a9d17e2c44f0796452c189758fc51b1257daed87;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=207a4a7834b1e2ce406e9b006ad919395ec86c0d;hpb=080e7f90e2c66067aea94c96c4de68fc998e009b;p=sfa.git

diff --git a/sfa/rspecs/elements/versions/sfav1Sliver.py b/sfa/rspecs/elements/versions/sfav1Sliver.py
index 207a4a78..a9d17e2c 100644
--- a/sfa/rspecs/elements/versions/sfav1Sliver.py
+++ b/sfa/rspecs/elements/versions/sfav1Sliver.py
@@ -1,9 +1,11 @@
 from sfa.util.xrn import Xrn
 from sfa.util.xml import XmlElement
+
 from sfa.rspecs.elements.element import Element
 from sfa.rspecs.elements.sliver import Sliver
 from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
 
+
 class SFAv1Sliver:
 
     @staticmethod
@@ -17,40 +19,37 @@ class SFAv1Sliver:
             tags = sliver.get('tags', [])
             if tags:
                 for tag in tags:
-                    SFAv1Sliver.add_sliver_attribute(sliver_elem, tag['tagname'], tag['value'])
-            if sliver.get('sliver_id'):
-                sliver_id_leaf = Xrn(sliver.get('sliver_id')).get_leaf()
-                sliver_id_parts = sliver_id_leaf.split(':')
-                name = sliver_id_parts[0]
-                sliver_elem.set('name', name)
+                    SFAv1Sliver.add_sliver_attribute(
+                        sliver_elem, tag['tagname'], tag['value'])
 
     @staticmethod
     def add_sliver_attribute(xml, name, value):
         elem = xml.add_element(name)
         elem.set_text(value)
-    
+
     @staticmethod
     def get_sliver_attributes(xml):
         attribs = []
         for elem in xml.iterchildren():
             if elem.tag not in Sliver.fields:
                 xml_element = XmlElement(elem, xml.namespaces)
-                instance = Element(xml_element)
+                instance = Element(fields=xml_element, element=elem)
                 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'] = SFAv1Sliver.get_sliver_attributes(sliver_elem)
             slivers.append(sliver)
-        return slivers           
-
+        return slivers