X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2SliverType.py;h=3ad687f87e4f8a3663828046641925f61f8a9b81;hb=4a2337e7f70cef81a8de37829aa63fc941c4b96e;hp=7bbe31ba5b6257bc542761ea34ccb3be72389d0b;hpb=291b4157ee2c2a8be0c2564f97f7eb0e19830551;p=sfa.git

diff --git a/sfa/rspecs/elements/versions/pgv2SliverType.py b/sfa/rspecs/elements/versions/pgv2SliverType.py
index 7bbe31ba..3ad687f8 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:
 
@@ -13,22 +15,33 @@ class PGv2SliverType:
             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'])  
-            PGv2SliverType.add_sliver_attributes(sliver_elem, sliver.get('pl_tags', []))
+            attrs = ['client_id', 'cpus', 'memory', 'storage']
+            for attr in attrs:
+                if sliver.get(attr):
+                    sliver_elem.set(attr, sliver[attr])
+            
+            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 attribute['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={}):
+    def get_slivers(xml, filter=None):
+        if filter is None: filter={}
         xpath = './default:sliver_type | ./sliver_type'
         sliver_elems = xml.xpath(xpath)
         slivers = []
@@ -36,9 +49,14 @@ 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
 
     @staticmethod
-    def get_sliver_attributes(xml, filter={}):
+    def get_sliver_attributes(xml, filter=None):
+        if filter is None: filter={}
         return []