replaced Element.get_elements() with XmlNode.get_instance(). replaced Element.add_ele...

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

diff --git a/sfa/rspecs/elements/versions/pgv2SliverType.py b/sfa/rspecs/elements/versions/pgv2SliverType.py
index 70878ff..4271d21 100644 (file)
--- a/sfa/rspecs/elements/versions/pgv2SliverType.py
+++ b/sfa/rspecs/elements/versions/pgv2SliverType.py
@@ -4,23 +4,37 @@ from sfa.rspecs.elements.sliver import Sliver
 class PGv2SliverType:
 
     @staticmethod
-    def add_slivers(xml, sliver):
+    def add_slivers(xml, slivers):
+        if not slivers:
+            return 
         if not isinstance(slivers, list):
             slivers = [slivers]
         for sliver in slivers: 
-            sliver_elem = Element.add(xml, 'sliver_type', sliver, ['type', 'client_id'])
-            for tag in sliver.get('tags', []):
-                if tag['name'] == 'initscript':
-                    sliver_elem.add_element('{%s}initscript' % xml.namespaces['planetlab'], name=tag['value'])
-                    
+            sliver_elem = xml.add_instance('sliver_type', sliver, ['type', 'client_id'])
+            PGv2SliverType.add_sliver_attributes(sliver_elem, sliver.get('pl_tags', []))
+    
+    @staticmethod
+    def add_sliver_attributes(xml, attributes):
+        for attribute in attributes:
+            if attribute['name'] == 'initscript':
+                xml.add_element('{%s}initscript' % xml.namespaces['planetlab'], name=attribute['value'])
+            elif tag['tagname'] == 'flack_info':
+                attrib_elem = xml.add_element('{%s}info' % self.namespaces['flack'])
+                attrib_dict = eval(tag['value'])
+                for (key, value) in attrib_dict.items():
+                    attrib_elem.set(key, value)                
     @staticmethod
     def get_slivers(xml, filter={}):
         xpath = './default:sliver_type | ./sliver_type'
         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']
             slivers.append(sliver)
-        return slivers            
+        return slivers
+
+    @staticmethod
+    def get_sliver_attributes(xml, filter={}):
+        return []