fix bugs when adding and removing sliver attributes

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

diff --git a/sfa/rspecs/elements/versions/sfav1Sliver.py b/sfa/rspecs/elements/versions/sfav1Sliver.py
index 3d07165..f037533 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1Sliver.py
+++ b/sfa/rspecs/elements/versions/sfav1Sliver.py
@@ -1,4 +1,6 @@
 from sfa.util.xrn import Xrn
+from sfa.util.plxrn import PlXrn
+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
@@ -7,26 +9,47 @@ class SFAv1Sliver:
 
     @staticmethod
     def add_slivers(xml, slivers):
+        if not slivers:
+            return
         if not isinstance(slivers, list):
             slivers = [slivers]
         for sliver in slivers:
-            sliver_elem = Element.add_elements(xml, 'sliver', sliver, ['name'])[0]
+            sliver_elem = xml.add_instance('sliver', sliver, ['name'])
+            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]
+                name = PlXrn(xrn=sliver.get('sliver_id')).pl_slicename()
                 sliver_elem.set('name', name)
-            SFAv1PLTag.add_pl_tags(sliver_elem, sliver.get('tags', []))
-                    
+
+    @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(fields=xml_element, element=elem)
+                instance['name'] = elem.tag
+                instance['value'] = elem.text
+                attribs.append(instance)
+        return attribs 
+                
     @staticmethod
     def get_slivers(xml, filter={}):
         xpath = './default:sliver | ./sliver'
         sliver_elems = xml.xpath(xpath)
         slivers = []
         for sliver_elem in sliver_elems:
-            sliver = Sliver(sliver_elem.attrib,sliver_elm)
+            sliver = Sliver(sliver_elem.attrib,sliver_elem)
             if 'component_id' in xml.attrib:     
                 sliver['component_id'] = xml.attrib['component_id']
-            sliver['tags'] = SFAv1PLTag.get_pl_tags(sliver_elem, ignore=Sliver.fields.keys())
+            sliver['tags'] = SFAv1Sliver.get_sliver_attributes(sliver_elem)
             slivers.append(sliver)
-        return slivers            
+        return slivers           
+