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)
fw_rules = sliver.get('fw_rules')
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():
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