X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2SliverType.py;h=3c0e25840793c574210f7d9cc19dc0090088069d;hb=1db1a879ffde8991aa95dd80142d555551655e88;hp=4271d211ee4515136acb22baaf56aea1a3c80741;hpb=81ec6a0c9ab0e8907af3a8d59fcb6f941aca400b;p=sfa.git

diff --git a/sfa/rspecs/elements/versions/pgv2SliverType.py b/sfa/rspecs/elements/versions/pgv2SliverType.py
index 4271d211..3c0e2584 100644
--- a/sfa/rspecs/elements/versions/pgv2SliverType.py
+++ b/sfa/rspecs/elements/versions/pgv2SliverType.py
@@ -1,5 +1,7 @@
 from sfa.rspecs.elements.element import Element
 from sfa.rspecs.elements.sliver import Sliver
+from sfa.rspecs.elements.versions.pgv2DiskImage import PGv2DiskImage
+from sfa.rspecs.elements.versions.plosv1FWRule import PLOSv1FWRule
 
 class PGv2SliverType:
 
@@ -10,19 +12,30 @@ class PGv2SliverType:
         if not isinstance(slivers, list):
             slivers = [slivers]
         for sliver in slivers: 
-            sliver_elem = xml.add_instance('sliver_type', sliver, ['type', 'client_id'])
-            PGv2SliverType.add_sliver_attributes(sliver_elem, sliver.get('pl_tags', []))
+            sliver_elem = xml.add_element('sliver_type')
+            if sliver.get('type'):
+                sliver_elem.set('name', sliver['type'])
+            if sliver.get('client_id'):
+                sliver_elem.set('client_id', sliver['client_id'])
+            images = sliver.get('disk_image')
+            if images and isinstance(images, list):
+                PGv2DiskImage.add_images(sliver_elem, images)      
+            fw_rules = sliver.get('fw_rules')
+            if fw_rules and isinstance(fw_rules, list):
+                PLOSv1FWRule.add_rules(sliver_elem, fw_rules)
+            PGv2SliverType.add_sliver_attributes(sliver_elem, sliver.get('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)                
+        if 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'
@@ -32,6 +45,10 @@ class PGv2SliverType:
             sliver = Sliver(sliver_elem.attrib,sliver_elem)
             if 'component_id' in xml.attrib:     
                 sliver['component_id'] = xml.attrib['component_id']
+            if 'name' in sliver_elem.attrib:
+                sliver['type'] = sliver_elem.attrib['name']
+            sliver['disk_image'] = PGv2DiskImage.get_images(sliver_elem)
+            sliver['fw_rules'] = PLOSv1FWRule.get_rules(sliver_elem)
             slivers.append(sliver)
         return slivers