diff options
| -rw-r--r-- | nova/api/openstack/servers.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_servers.py | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 070b89a60..002b47edb 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -163,7 +163,7 @@ class Controller(object): 'resize': self._action_resize, 'confirmResize': self._action_confirm_resize, 'revertResize': self._action_revert_resize, - 'rebuild': self._action_rebuild,} + 'rebuild': self._action_rebuild, 'createImage': self._action_create_image, } diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index 485ace911..75d1b28c2 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -2328,6 +2328,7 @@ class ServersTest(test.TestCase): """ req = self.webreq('/1/migrate', 'POST') + FLAGS.allow_admin_api = True self.resize_called = False def resize_mock(*args): @@ -2339,6 +2340,14 @@ class ServersTest(test.TestCase): self.assertEqual(res.status_int, 202) self.assertEqual(self.resize_called, True) + def test_migrate_server_no_admin_api_fails(self): + req = self.webreq('/1/migrate', 'POST') + + FLAGS.allow_admin_api = False + + res = req.get_response(fakes.wsgi_app()) + self.assertEqual(res.status_int, 404) + def test_shutdown_status(self): new_server = return_server_with_power_state(power_state.SHUTDOWN) self.stubs.Set(nova.db.api, 'instance_get', new_server) |