Ensure nova is compatible with WebOb 1.2+

Fixes bug 888371

Change-Id: I965c15f9f18b835b666c60b2ab1e6089c0fb4121
This commit is contained in:
Brian Lamar
2012-01-04 18:54:45 -05:00
parent e0680250c0
commit ccaf97a554
4 changed files with 6 additions and 5 deletions

View File

@@ -113,7 +113,7 @@ class FloatingIPDNSController(object):
names. if name is specified, query for ips.
Quoted domain (aka 'zone') specified as id."""
context = req.environ['nova.context']
params = req.str_GET
params = req.GET
floating_ip = params['ip'] if 'ip' in params else ""
name = params['name'] if 'name' in params else ""
zone = _unquote_zone(id)
@@ -193,7 +193,7 @@ class FloatingIPDNSController(object):
def delete(self, req, id):
"""Delete the entry identified by req and id. """
context = req.environ['nova.context']
params = req.str_GET
params = req.GET
name = params['name'] if 'name' in params else ""
zone = _unquote_zone(id)

View File

@@ -162,6 +162,7 @@ class RequestExtensionController(object):
pre_handler(req)
res = req.get_response(self.application)
res.environ = req.environ
# Don't call extensions if the main application returned an
# unsuccessful status

View File

@@ -113,11 +113,11 @@ class Controller(wsgi.Controller):
:retval a dict of key/value filters
"""
filters = {}
for param in req.str_params:
for param in req.params:
if param in SUPPORTED_FILTERS or param.startswith('property-'):
# map filter name or carry through if property-*
filter_name = SUPPORTED_FILTERS.get(param, param)
filters[filter_name] = req.str_params.get(param)
filters[filter_name] = req.params.get(param)
return filters
@wsgi.serializers(xml=ImageTemplate)

View File

@@ -136,7 +136,7 @@ class BaseRequestHandler(object):
return self.response
def get_argument(self, arg, default):
return self.request.str_params.get(arg, default)
return self.request.params.get(arg, default)
def set_header(self, header, value):
self.response.headers[header] = value