diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-22 03:32:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-22 03:32:32 +0000 |
| commit | 6b3e1b09b28a10e69480cd84d3a1109350cacfa4 (patch) | |
| tree | 34d1ac0211644dbe46e72da14ce53ad038349ae2 /nova/api | |
| parent | c4ff7ef07c50deccf3cb7877ecab2245724f3091 (diff) | |
| parent | 47da3250da90bb960b310dc85f60e850979fe3fe (diff) | |
| download | nova-6b3e1b09b28a10e69480cd84d3a1109350cacfa4.tar.gz nova-6b3e1b09b28a10e69480cd84d3a1109350cacfa4.tar.xz nova-6b3e1b09b28a10e69480cd84d3a1109350cacfa4.zip | |
Merge "Alter output format of volume types resources"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/volumetypes.py | 6 | ||||
| -rw-r--r-- | nova/api/openstack/volume/types.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nova/api/openstack/compute/contrib/volumetypes.py b/nova/api/openstack/compute/contrib/volumetypes.py index af68b3adb..d0d0575fd 100644 --- a/nova/api/openstack/compute/contrib/volumetypes.py +++ b/nova/api/openstack/compute/contrib/volumetypes.py @@ -47,8 +47,8 @@ class VolumeTypeTemplate(xmlutil.TemplateBuilder): class VolumeTypesTemplate(xmlutil.TemplateBuilder): def construct(self): root = xmlutil.TemplateElement('volume_types') - sel = lambda obj, do_raise=False: obj.values() - elem = xmlutil.SubTemplateElement(root, 'volume_type', selector=sel) + elem = xmlutil.SubTemplateElement(root, 'volume_type', + selector='volume_types') make_voltype(elem) return xmlutil.MasterTemplate(root, 1) @@ -61,7 +61,7 @@ class VolumeTypesController(object): """ Returns the list of volume types """ context = req.environ['nova.context'] authorize(context) - return volume_types.get_all_types(context) + return {'volume_types': volume_types.get_all_types(context).values()} @wsgi.serializers(xml=VolumeTypeTemplate) def create(self, req, body): diff --git a/nova/api/openstack/volume/types.py b/nova/api/openstack/volume/types.py index 97fb52497..80875e06f 100644 --- a/nova/api/openstack/volume/types.py +++ b/nova/api/openstack/volume/types.py @@ -42,8 +42,8 @@ class VolumeTypeTemplate(xmlutil.TemplateBuilder): class VolumeTypesTemplate(xmlutil.TemplateBuilder): def construct(self): root = xmlutil.TemplateElement('volume_types') - sel = lambda obj, do_raise=False: obj.values() - elem = xmlutil.SubTemplateElement(root, 'volume_type', selector=sel) + elem = xmlutil.SubTemplateElement(root, 'volume_type', + selector='volume_types') make_voltype(elem) return xmlutil.MasterTemplate(root, 1) @@ -55,7 +55,7 @@ class VolumeTypesController(object): def index(self, req): """ Returns the list of volume types """ context = req.environ['nova.context'] - return volume_types.get_all_types(context) + return {'volume_types': volume_types.get_all_types(context).values()} @wsgi.serializers(xml=VolumeTypeTemplate) def show(self, req, id): |