X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2SliverType.py;h=9a5e1d71c88575d787a69b36cade26cf36e1adb5;hb=04a3f20dc71bf8b3f96b1e3172623aa346a638a7;hp=55091f518e7d377971bab439b78c9a080f3d2dc1;hpb=04255538dbacfa52a45e8439b9c9ea590a82dc47;p=sfa.git

diff --git a/sfa/rspecs/elements/versions/pgv2SliverType.py b/sfa/rspecs/elements/versions/pgv2SliverType.py
index 55091f51..9a5e1d71 100644
--- a/sfa/rspecs/elements/versions/pgv2SliverType.py
+++ b/sfa/rspecs/elements/versions/pgv2SliverType.py
@@ -1,52 +1,83 @@
 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
+
+from sfa.util.sfalogging import logger
+
 
 class PGv2SliverType:
 
     @staticmethod
     def add_slivers(xml, slivers):
         if not slivers:
-            return 
+            return
         if not isinstance(slivers, list):
             slivers = [slivers]
-        for sliver in slivers: 
+        for sliver in slivers:
             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_images')
+            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)      
-            PGv2SliverType.add_sliver_attributes(sliver_elem, sliver.get('tags', []))
-    
+                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):
-        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'])
+    def add_sliver_attributes(xml, tags):
+        if tags is None:
+            return
+        for tag in tags:
+            tagname = tag['tagname'] if 'tagname' in tag else tag['name']
+            if tagname == 'flack_info':
+                attrib_elem = xml.add_element(
+                    '{%s}info' % self.namespaces['flack'])
+                try:
                     attrib_dict = eval(tag['value'])
                     for (key, value) in attrib_dict.items():
-                        attrib_elem.set(key, value)                
+                        attrib_elem.set(key, value)
+                except Exception as e:
+                    logger.warning(
+                        "Could not parse dictionary in flack tag -- {}".format(e))
+            elif tagname == 'initscript':
+                xml.add_element('{%s}initscript' % xml.namespaces['planetlab'],
+                                name=tag['value'])
+            else:
+                xml.add_element('{%s}attribute' % (xml.namespaces['planetlab']),
+                                name=tagname,
+                                value=tag['value'],
+                                scope=tag.get('scope', 'unknown'),
+                                )
+
     @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 = []
         for sliver_elem in sliver_elems:
-            sliver = Sliver(sliver_elem.attrib,sliver_elem)
-            if 'component_id' in xml.attrib:     
+            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['images'] = PGv2DiskImage.get_images(sliver_elem)
+            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={}):
-        return []             
+    def get_sliver_attributes(xml, filter=None):
+        if filter is None:
+            filter = {}
+        return []