diff options
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/zone_redirect.py | 8 | ||||
| -rw-r--r-- | nova/db/api.py | 2 | ||||
| -rw-r--r-- | nova/scheduler/api.py | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/nova/api/zone_redirect.py b/nova/api/zone_redirect.py index 4fe255c99..7ebae1401 100644 --- a/nova/api/zone_redirect.py +++ b/nova/api/zone_redirect.py @@ -48,7 +48,7 @@ class RequestForwarder(api.ChildZoneHelper): self.resource = resource self.method = method self.body = body - + def process(self, client, zone): api_url = zone.api_url LOG.debug(_("Zone redirect to: %(api_url)s, " % locals())) @@ -89,12 +89,12 @@ class ZoneRedirectMiddleware(wsgi.Middleware): return req.get_response(self.application) except exception.ZoneRouteException as e: if not e.zones: - exc = webob.exc.HTTPInternalServerError(explanation= - _("No zones to reroute to.")) + exc = webob.exc.HTTPInternalServerError(explanation=_( + "No zones to reroute to.")) return faults.Fault(exc) # Todo(sandy): This only works for OpenStack API currently. - # Needs to be broken out into a driver. + # Needs to be broken out into a driver. scheme, netloc, path, query, frag = \ urlparse.urlsplit(req.path_qs) query = urlparse.parse_qsl(query) diff --git a/nova/db/api.py b/nova/db/api.py index d56d6f404..fba76bc2c 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -95,7 +95,7 @@ def reroute_if_not_found(key_args_index=None): LOG.debug(_("Instance %(key)s not found locally: '%(e)s'" % locals())) - # Throw a reroute Exception for the middleware to pick up. + # Throw a reroute Exception for the middleware to pick up. LOG.debug("Firing ZoneRouteException") zones = zone_get_all(context) raise exception.ZoneRouteException(zones, e) diff --git a/nova/scheduler/api.py b/nova/scheduler/api.py index 2da2dabfe..804dade6b 100644 --- a/nova/scheduler/api.py +++ b/nova/scheduler/api.py @@ -77,7 +77,7 @@ class API(object): args=dict(service_name=service_name, host=host, capabilities=capabilities)) return rpc.fanout_cast(context, 'scheduler', kwargs) - + def _wrap_method(function, self): """Wrap method to supply 'self'.""" @@ -92,7 +92,7 @@ def _process(self, zone): zone.api_url) nova.authenticate() return self.process(nova, zone) - + class ChildZoneHelper(object): """Delegate a call to a set of Child Zones and wait for their @@ -104,9 +104,9 @@ class ChildZoneHelper(object): derived classes process() method as the worker. Returns a list of HTTP Responses. 1 per child.""" self.green_pool = greenpool.GreenPool() - return [ result for result in self.green_pool.imap( + return [result for result in self.green_pool.imap( _wrap_method(_process, self), zone_list)] - + def process(self, client, zone): """Worker Method. Derived class must override.""" pass |