Skip to content

Commit

Permalink
Fix bad api call, 'migrate' is an action.
Browse files Browse the repository at this point in the history
'migrate' was not called the way it is defined in the Nova api now.

Fix bug 907547

Change-Id: I6f304809281e676c22f83492f9d0bb85e9528314
  • Loading branch information
fcharlier committed Jan 17, 2012
1 parent a2508aa commit 4b9621c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion novaclient/v1_1/servers.py
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ def migrate(self, server):
: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):
"""
Expand Down
3 changes: 0 additions & 3 deletions tests/v1_1/fakes.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,6 @@ def post_servers(self, body, **kw):
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)
Expand Down
4 changes: 2 additions & 2 deletions tests/v1_1/test_servers.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ def test_revert_resized_server(self):
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)
Expand Down

0 comments on commit 4b9621c

Please sign in to comment.