← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/api/openstack/extensions.py

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short, Chuck Short, Soren Hansen
  • Date: 2011-04-08 10:49:10 UTC
  • mfrom: (1.1.15 upstream)
  • Revision ID: james.westby@ubuntu.com-20110408104910-syd12xtg27bdqbun
Tags: 2011.2~gamma1-0ubuntu1
[Chuck Short]
* New upstream release.
* debian/nova-doc.docs: Adjust directory to the right docs path.

[Soren Hansen]
* Refresh nova-manage-flags patch.
* Adjust call to ajaxterm to work with the packaged ajaxterm instead
  of the one we ship in the tarball.
* Remove all traces of the adminclient package. It moved to its own
  tarball. There are no known consumers, so this should not be a
  problem.
* Remove build-dependency on python-suds again.
* setup.py now takes care of installing the CA code, so yank those
  bits from debian/nova-common.install.
* setup.py now places api-paste.ini correctly, so stop working around
  it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/extensions.py
28
28
from nova import flags
29
29
from nova import log as logging
30
30
from nova import wsgi
 
31
from nova.api.openstack import common
31
32
from nova.api.openstack import faults
32
33
 
33
34
 
115
116
        return response_exts
116
117
 
117
118
 
118
 
class ActionExtensionController(wsgi.Controller):
 
119
class ActionExtensionController(common.OpenstackController):
119
120
 
120
121
    def __init__(self, application):
121
122
 
136
137
        return res
137
138
 
138
139
 
139
 
class ResponseExtensionController(wsgi.Controller):
 
140
class ResponseExtensionController(common.OpenstackController):
140
141
 
141
142
    def __init__(self, application):
142
143
        self.application = application
155
156
                body = res.body
156
157
                headers = res.headers
157
158
            except AttributeError:
158
 
                body = self._serialize(res, content_type)
 
159
                default_xmlns = None
 
160
                body = self._serialize(res, content_type, default_xmlns)
159
161
                headers = {"Content-Type": content_type}
160
162
            res = webob.Response()
161
163
            res.body = body
163
165
        return res
164
166
 
165
167
 
166
 
class ExtensionController(wsgi.Controller):
 
168
class ExtensionController(common.OpenstackController):
167
169
 
168
170
    def __init__(self, extension_manager):
169
171
        self.extension_manager = extension_manager