diff --git a/novaclient/v1_1/servers.py b/novaclient/v1_1/servers.py index 59bc602e8..7eab00175 100644 --- a/novaclient/v1_1/servers.py +++ b/novaclient/v1_1/servers.py @@ -475,7 +475,7 @@ class ServerManager(local_base.BootingManagerWithFind): :param server: The :class:`Server` (or its ID). """ - self.api.client.post('/servers/%s/migrate' % base.getid(server)) + self._action('migrate', server) def resize(self, server, flavor, **kwargs): """ diff --git a/tests/v1_1/fakes.py b/tests/v1_1/fakes.py index a17748d06..20a1a324a 100644 --- a/tests/v1_1/fakes.py +++ b/tests/v1_1/fakes.py @@ -210,9 +210,6 @@ class FakeHTTPClient(base_client.HTTPClient): fakes.assert_has_keys(pfile, required=['path', 'contents']) return (202, self.get_servers_1234()[1]) - def post_servers_1234_migrate(self, *args, **kwargs): - return (202, None) - def get_servers_1234(self, **kw): r = {'server': self.get_servers_detail()[1]['servers'][0]} return (200, r) diff --git a/tests/v1_1/test_servers.py b/tests/v1_1/test_servers.py index f5ca8c01d..116e1a201 100644 --- a/tests/v1_1/test_servers.py +++ b/tests/v1_1/test_servers.py @@ -145,9 +145,9 @@ class ServersTest(utils.TestCase): def test_migrate_server(self): s = cs.servers.get(1234) s.migrate() - cs.assert_called('POST', '/servers/1234/migrate') + cs.assert_called('POST', '/servers/1234/action') cs.servers.migrate(s) - cs.assert_called('POST', '/servers/1234/migrate') + cs.assert_called('POST', '/servers/1234/action') def test_add_fixed_ip(self): s = cs.servers.get(1234)