summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/cloudpipe.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py
index f38a1b12a..48b641348 100644
--- a/nova/api/openstack/compute/contrib/cloudpipe.py
+++ b/nova/api/openstack/compute/contrib/cloudpipe.py
@@ -37,15 +37,21 @@ authorize = extensions.extension_authorizer('compute', 'cloudpipe')
class CloudpipeTemplate(xmlutil.TemplateBuilder):
def construct(self):
- return xmlutil.MasterTemplate(xmlutil.make_flat_dict('cloudpipe'), 1)
+ root = xmlutil.TemplateElement('cloudpipe')
+ elem = xmlutil.SubTemplateElement(root, 'instance_id',
+ selector='instance_id')
+ elem.text = str
+ return xmlutil.MasterTemplate(root, 1)
class CloudpipesTemplate(xmlutil.TemplateBuilder):
def construct(self):
root = xmlutil.TemplateElement('cloudpipes')
- elem = xmlutil.make_flat_dict('cloudpipe', selector='cloudpipes',
- subselector='cloudpipe')
- root.append(elem)
+ elem1 = xmlutil.SubTemplateElement(root, 'cloudpipe',
+ selector='cloudpipes')
+ elem2 = xmlutil.SubTemplateElement(elem1, xmlutil.Selector(0),
+ selector=xmlutil.get_items)
+ elem2.text = 1
return xmlutil.MasterTemplate(root, 1)