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)
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():
attrib_elem.set(key, value)
@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 = []
return slivers
@staticmethod
- def get_sliver_attributes(xml, filter={}):
+ def get_sliver_attributes(xml, filter=None):
+ if filter is None: filter={}
return []