diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-03-22 10:37:56 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-03-22 10:37:56 -0700 |
| commit | 2a38aa7583be37ece6c42ba9307c2db0232dbed3 (patch) | |
| tree | 2be03067fd71edb2aa1144553a1a0a361fe29462 | |
| parent | 65482f5d9513c3dda64171d0460001e299be9673 (diff) | |
| download | nova-2a38aa7583be37ece6c42ba9307c2db0232dbed3.tar.gz nova-2a38aa7583be37ece6c42ba9307c2db0232dbed3.tar.xz nova-2a38aa7583be37ece6c42ba9307c2db0232dbed3.zip | |
Whoops
| -rw-r--r-- | nova/api/openstack/servers.py | 5 | ||||
| -rw-r--r-- | nova/scheduler/api.py | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index be423c572..199d89c6d 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -92,9 +92,10 @@ class Controller(wsgi.Controller): """ Returns server details by server id """ try: LOG.debug(_("***SHOW")) - instance = self.compute_api.get(req.environ['nova.context'], id) - builder = servers_views.get_view_builder(req) + instance = self.compute_api.routing_get( + req.environ['nova.context'], id) LOG.debug(_("***SHOW OUT %s" % instance)) + builder = servers_views.get_view_builder(req) return builder.build(instance, is_detail=True) except exception.NotFound: return faults.Fault(exc.HTTPNotFound()) diff --git a/nova/scheduler/api.py b/nova/scheduler/api.py index 4f189fe37..bd64f9b9b 100644 --- a/nova/scheduler/api.py +++ b/nova/scheduler/api.py @@ -149,8 +149,10 @@ class reroute_compute(object): def __call__(self, f): def wrapped_f(*args, **kwargs): + LOG.debug(_("IN DECORATOR ...")) collection, context, item_id = \ self.get_collection_context_and_id(args, kwargs) + LOG.debug(_("IN DECORATOR 2...")) try: # Call the original function ... return f(*args, **kwargs) @@ -166,6 +168,7 @@ class reroute_compute(object): raise # Ask the children to provide an answer ... + LOG.debug(_("Asking child zones ...")) result = self._call_child_zones(zones, wrap_novaclient_function(_issue_novaclient_command, collection, self.method_name, item_id)) |