diff options
| author | Eric Day <eday@oddments.org> | 2010-12-06 13:29:52 -0800 |
|---|---|---|
| committer | Eric Day <eday@oddments.org> | 2010-12-06 13:29:52 -0800 |
| commit | 12f46626c4dd8a41a23c109e784a296ec702dd9a (patch) | |
| tree | b40084b927bac60cee83302b8d73122d6515ef64 | |
| parent | 4203aa1060e5a97bed86d2e201c4c2443ef7e042 (diff) | |
| parent | 90ddeb5a13fe8d1bea3d8a568bed011de72bfbf2 (diff) | |
| download | nova-12f46626c4dd8a41a23c109e784a296ec702dd9a.tar.gz nova-12f46626c4dd8a41a23c109e784a296ec702dd9a.tar.xz nova-12f46626c4dd8a41a23c109e784a296ec702dd9a.zip | |
Fixed conflicts with gundlach's fixes.
| -rw-r--r-- | nova/api/openstack/servers.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index b644876b0..6f2f6fed9 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -115,7 +115,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 """ @@ -150,7 +150,8 @@ class Controller(wsgi.Controller): update_dict['display_name'] = inst_dict['server']['name'] try: - self.compute_api.update_instance(ctxt, instance['id'], update_dict) + self.compute_api.update_instance(ctxt, instance['id'], + **update_dict) except exception.NotFound: return faults.Fault(exc.HTTPNotFound()) return exc.HTTPNoContent() @@ -171,4 +172,4 @@ class Controller(wsgi.Controller): self.compute_api.reboot(ctxt, id) except: return faults.Fault(exc.HTTPUnprocessableEntity()) - return exc.HTTPNoContent() + return exc.HTTPAccepted() |