refactored

[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 f12c977..addc4e4 100644 (file)
--- a/sfa/rspecs/elements/versions/sfav1Sliver.py
+++ b/sfa/rspecs/elements/versions/sfav1Sliver.py
@@ -1,18 +1,32 @@
-
-from lxml import etree
-
+from sfa.util.xrn import Xrn
+from sfa.rspecs.elements.element import Element
 from sfa.rspecs.elements.sliver import Sliver
+from sfa.rspecs.elements.versions.sfav1PLTag import SFAv1PLTag
 
-from sfa.util.xrn import Xrn
-from sfa.util.plxrn import PlXrn
 class SFAv1Sliver:
 
     @staticmethod
     def add_slivers(xml, slivers):
+        if not isinstance(slivers, list):
+            slivers = [slivers]
         for sliver in slivers:
-            sliver_elem = etree.SubElement(xml, 'sliver')
-            if sliver.get('component_id'):
-                name_full = Xrn(sliver.get('component_id')).get_leaf()
-                name = name_full.split(':')
+            sliver_elem = Element.add(xml, 'sliver', sliver, ['name'])
+            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)
-                     
+            SFAv1PLTag.add_pl_tags(sliver_elem, sliver.get('tags', []))
+                    
+    @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)
+            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())
+            slivers.append(sliver)
+        return slivers