diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-29 22:35:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-29 22:35:03 +0000 |
| commit | df53832c0a5dc3e8b7e38599254b5df8ebe1d882 (patch) | |
| tree | 72a6dcc5073d6f37469c4223329eb8410f129b90 /nova/api | |
| parent | 7104362abbee82b3d2adebdf5589f859c1b67279 (diff) | |
| parent | 2ba27f66cf14e1cb111ebc93d094c6e77c55245f (diff) | |
Merge "Fix CloudPipe extension XML serialization"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/cloudpipe.py | 14 |
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) |