Skip to content

Commit

Permalink
Merge "Use XMLDictSerializer for resource extensions."
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed Nov 22, 2011
2 parents b6ae26b + b74dee5 commit b300964
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions nova/api/openstack/v2/extensions.py
Expand Up @@ -276,7 +276,7 @@ def __init__(self, application, ext_mgr=None):
mapper = nova.api.openstack.v2.ProjectMapper()

serializer = wsgi.ResponseSerializer(
{'application/xml': ExtensionsXMLSerializer()})
{'application/xml': wsgi.XMLDictSerializer()})
# extended resources
for resource in ext_mgr.get_resources():
LOG.debug(_('Extended resource: %s'),
Expand Down Expand Up @@ -371,8 +371,11 @@ def register(self, ext):
def get_resources(self):
"""Returns a list of ResourceExtension objects."""
resources = []
serializer = wsgi.ResponseSerializer(
{'application/xml': ExtensionsXMLSerializer()})
resources.append(ResourceExtension('extensions',
ExtensionsResource(self)))
ExtensionsResource(self),
serializer=serializer))
for ext in self.extensions.values():
try:
resources.extend(ext.get_resources())
Expand Down

0 comments on commit b300964

Please sign in to comment.