diff options
| author | Eric Day <eday@oddments.org> | 2010-12-06 12:56:53 -0800 |
|---|---|---|
| committer | Eric Day <eday@oddments.org> | 2010-12-06 12:56:53 -0800 |
| commit | 90ddeb5a13fe8d1bea3d8a568bed011de72bfbf2 (patch) | |
| tree | 34c1555af7fb3aca1a8fe8e33aa2e90f94c21f6b | |
| parent | 98a0b2513489fc50e0687f75ef859293afff9a6f (diff) | |
| parent | 76fd35b62bf565fe626ca30c412178894d8e579c (diff) | |
| download | nova-90ddeb5a13fe8d1bea3d8a568bed011de72bfbf2.tar.gz nova-90ddeb5a13fe8d1bea3d8a568bed011de72bfbf2.tar.xz nova-90ddeb5a13fe8d1bea3d8a568bed011de72bfbf2.zip | |
Merged gundlach's fixes.
| -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() |