diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-12-06 15:14:41 -0500 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-12-06 15:14:41 -0500 |
| commit | 76fd35b62bf565fe626ca30c412178894d8e579c (patch) | |
| tree | 34c1555af7fb3aca1a8fe8e33aa2e90f94c21f6b | |
| parent | 98a0b2513489fc50e0687f75ef859293afff9a6f (diff) | |
Don't wrap HTTPAccepted in a fault. Correctly pass kwargs to update_instance.
| -rw-r--r-- | nova/api/openstack/servers.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index a9da14867..e7ab17d03 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -124,7 +124,7 @@ class Controller(wsgi.Controller): self.compute_api.delete_instance(ctxt, int(id)) except exception.NotFound: return faults.Fault(exc.HTTPNotFound()) - return faults.Fault(exc.HTTPAccepted()) + return exc.HTTPAccepted() def create(self, req): """ Creates a new server for a given user """ @@ -165,7 +165,7 @@ class Controller(wsgi.Controller): if 'name' in inst_dict['server']: update_dict['display_name'] = inst_dict['server']['name'] - self.compute_api.update_instance(ctxt, instance['id'], update_dict) + self.compute_api.update_instance(ctxt, instance['id'], **update_dict) return exc.HTTPNoContent() def action(self, req, id): @@ -184,3 +184,4 @@ class Controller(wsgi.Controller): # TODO(gundlach): pass reboot_type, support soft reboot in # virt driver self.compute_api.reboot(ctxt, id) + return exc.HTTPAccepted() |