diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-07 10:23:48 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-07 10:23:48 -0600 |
| commit | eaa5b5994891eee0280b750dff221a4b54932eb9 (patch) | |
| tree | 806a0911d288421933003ca22c8ee81ee9a38662 /nova/api | |
| parent | b024dcf6f0c1e5a2735e84d21d6edef5ff38d1cf (diff) | |
| download | nova-eaa5b5994891eee0280b750dff221a4b54932eb9.tar.gz nova-eaa5b5994891eee0280b750dff221a4b54932eb9.tar.xz nova-eaa5b5994891eee0280b750dff221a4b54932eb9.zip | |
getting ready to push for merge prop
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/servers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index a426a721d..280e2349e 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -104,7 +104,7 @@ class Controller(wsgi.Controller): def show(self, req, id): """ Returns server details by server id """ try: - instance = self.compute_api.get_instance( + instance = self.compute_api.get( req.environ['nova.context'], id) return _translate_detail_keys(instance) except exception.NotFound: @@ -158,7 +158,7 @@ class Controller(wsgi.Controller): try: # The ID passed in is actually the internal_id of the # instance, not the value of the id column in the DB. - instance = self.compute_api.get_instance(ctxt, id) + instance = self.compute_api.get(ctxt, id) self.compute_api.update(ctxt, instance.id, **update_dict) except exception.NotFound: return faults.Fault(exc.HTTPNotFound()) |