X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2SliverType.py;h=dfad2cc51e853b75f204a43dab176125f6743560;hb=4a9e6751f9f396f463932133b9d62fc925a99ef6;hp=b8ca2d11f37555f0470c391be760fecbb7ed86f7;hpb=4ef76bd85ea24906c4ebb580c896fe1084d6ba88;p=sfa.git

diff --git a/sfa/rspecs/elements/versions/pgv2SliverType.py b/sfa/rspecs/elements/versions/pgv2SliverType.py
index b8ca2d11..dfad2cc5 100644
--- a/sfa/rspecs/elements/versions/pgv2SliverType.py
+++ b/sfa/rspecs/elements/versions/pgv2SliverType.py
@@ -5,15 +5,16 @@ 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'])
@@ -21,15 +22,16 @@ class PGv2SliverType:
             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)      
+                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', []))
-    
+            PGv2SliverType.add_sliver_attributes(
+                sliver_elem, sliver.get('tags', []))
+
     @staticmethod
     def add_sliver_attributes(xml, tags):
         if tags is None:
@@ -37,32 +39,35 @@ class PGv2SliverType:
         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'])
+                attrib_elem = xml.add_element(
+                    '{%s}info' % self.namespaces['flack'])
                 try:
                     attrib_dict = eval(tag['value'])
-                    for (key, value) in attrib_dict.items():
+                    for (key, value) in list(attrib_dict.items()):
                         attrib_elem.set(key, value)
                 except Exception as e:
-                    logger.warning("Could not parse dictionary in flack tag -- {}".format(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'),
-                )
-                        
+                                name=tagname,
+                                value=tag['value'],
+                                scope=tag.get('scope', 'unknown'),
+                                )
+
     @staticmethod
     def get_slivers(xml, filter=None):
-        if filter is None: filter={}
+        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']
@@ -73,5 +78,6 @@ class PGv2SliverType:
 
     @staticmethod
     def get_sliver_attributes(xml, filter=None):
-        if filter is None: filter={}
-        return []             
+        if filter is None:
+            filter = {}
+        return []