X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Felements%2Fversions%2Fpgv2SliverType.py;h=1f3ec0c7dee3ac0c15a51a6f109786721e75ff60;hb=1cc8e9613cab8b5b22478de369f259e591c54e6d;hp=3c0e25840793c574210f7d9cc19dc0090088069d;hpb=6e46a2373bcda1c1793d18936cc40fb39beb149a;p=sfa.git diff --git a/sfa/rspecs/elements/versions/pgv2SliverType.py b/sfa/rspecs/elements/versions/pgv2SliverType.py index 3c0e2584..1f3ec0c7 100644 --- a/sfa/rspecs/elements/versions/pgv2SliverType.py +++ b/sfa/rspecs/elements/versions/pgv2SliverType.py @@ -15,8 +15,11 @@ 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']) + 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) @@ -31,7 +34,7 @@ class PGv2SliverType: for attribute in attributes: if attribute['name'] == 'initscript': xml.add_element('{%s}initscript' % xml.namespaces['planetlab'], name=attribute['value']) - elif tag['tagname'] == 'flack_info': + 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():