From 6fb6ac6bdf75e505cc0f3d65621ecae1937702b2 Mon Sep 17 00:00:00 2001 From: Giampaolo Lauria Date: Thu, 7 Feb 2013 21:11:50 -0500 Subject: Fixed FlavorAccess serializer Fixed flavor_access template Renamed remaining serializers Fixed serializer tests Fixes bug 1115880 Change-Id: I28913f1466ff6d1f7933c292ba617be2899c09a7 --- nova/api/openstack/compute/contrib/flavor_access.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/contrib/flavor_access.py b/nova/api/openstack/compute/contrib/flavor_access.py index 1c5006576..744fea13b 100644 --- a/nova/api/openstack/compute/contrib/flavor_access.py +++ b/nova/api/openstack/compute/contrib/flavor_access.py @@ -39,7 +39,7 @@ def make_flavor_access(elem): elem.set('tenant_id') -class FlavorextradatumTemplate(xmlutil.TemplateBuilder): +class FlavorTemplate(xmlutil.TemplateBuilder): def construct(self): root = xmlutil.TemplateElement('flavor', selector='flavor') make_flavor(root) @@ -48,7 +48,7 @@ class FlavorextradatumTemplate(xmlutil.TemplateBuilder): return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace}) -class FlavorextradataTemplate(xmlutil.TemplateBuilder): +class FlavorsTemplate(xmlutil.TemplateBuilder): def construct(self): root = xmlutil.TemplateElement('flavors') elem = xmlutil.SubTemplateElement(root, 'flavor', selector='flavors') @@ -60,11 +60,7 @@ class FlavorextradataTemplate(xmlutil.TemplateBuilder): class FlavorAccessTemplate(xmlutil.TemplateBuilder): def construct(self): - def wrapped(obj, do_raise=False): - # wrap bare list in dict - return dict(flavor_access=obj) - - root = xmlutil.TemplateElement('flavor_access', selector=wrapped) + root = xmlutil.TemplateElement('flavor_access') elem = xmlutil.SubTemplateElement(root, 'access', selector='flavor_access') make_flavor_access(elem) @@ -138,7 +134,7 @@ class FlavorActionController(wsgi.Controller): context = req.environ['nova.context'] if authorize(context): # Attach our slave template to the response object - resp_obj.attach(xml=FlavorextradatumTemplate()) + resp_obj.attach(xml=FlavorTemplate()) db_flavor = req.get_db_flavor(id) self._extend_flavor(resp_obj.obj['flavor'], db_flavor) @@ -148,7 +144,7 @@ class FlavorActionController(wsgi.Controller): context = req.environ['nova.context'] if authorize(context): # Attach our slave template to the response object - resp_obj.attach(xml=FlavorextradataTemplate()) + resp_obj.attach(xml=FlavorsTemplate()) flavors = list(resp_obj.obj['flavors']) for flavor_rval in flavors: @@ -160,7 +156,7 @@ class FlavorActionController(wsgi.Controller): context = req.environ['nova.context'] if authorize(context): # Attach our slave template to the response object - resp_obj.attach(xml=FlavorextradatumTemplate()) + resp_obj.attach(xml=FlavorTemplate()) db_flavor = req.get_db_flavor(resp_obj.obj['flavor']['id']) -- cgit