Merge branch 'master' into senslab2

[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 ffa4b41..55091f5 100644 (file)
--- a/sfa/rspecs/elements/versions/pgv2SliverType.py
+++ b/sfa/rspecs/elements/versions/pgv2SliverType.py
@@ -1,5 +1,6 @@
 from sfa.rspecs.elements.element import Element
 from sfa.rspecs.elements.sliver import Sliver
+from sfa.rspecs.elements.versions.pgv2DiskImage import PGv2DiskImage
 
 class PGv2SliverType:
 
@@ -14,7 +15,10 @@ class PGv2SliverType:
             if sliver.get('type'):
                 sliver_elem.set('name', sliver['type'])
             if sliver.get('client_id'):
-                sliver_elem.set('client_id', sliver['client_id'])  
+                sliver_elem.set('client_id', sliver['client_id'])
+            images = sliver.get('disk_images')
+            if images and isinstance(images, list):
+                PGv2DiskImage.add_images(sliver_elem, images)      
             PGv2SliverType.add_sliver_attributes(sliver_elem, sliver.get('tags', []))
     
     @staticmethod
@@ -39,6 +43,7 @@ class PGv2SliverType:
                 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)
             slivers.append(sliver)
         return slivers