openstack/python-novaclient
Code Issues Proposed changes

Fixed 1.0 and unit tests.

Browse Source
This commit is contained in:
Josh Kearney 2011-08-18 17:16:38 -05:00
parent fb72dff889
commit b8f5c91f86
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
novaclient/v1_0/servers.py
View File

@ -438,13 +438,13 @@ class ServerManager(local_base.BootingManagerWithFind):
"""
Rescue the server.
"""
self._action('rescue', server, None)
self.api.client.post('/servers/%s/rescue' % base.getid(server))
def unrescue(self, server):
"""
Unrescue the server.
"""
self._action('unrescue', server, None)
self.api.client.post('/servers/%s/unrescue' % base.getid(server))
def diagnostics(self, server):
"""Retrieve server diagnostics."""

10
tests/v1_0/fakes.py
View File

@ -164,6 +164,12 @@ class FakeHTTPClient(base_client.HTTPClient):
def post_servers_1234_migrate(self, *args, **kwargs):
return (202, None)
def post_servers_1234_rescue(self, *args, **kwargs):
return (202, None)
def post_servers_1234_unrescue(self, *args, **kwargs):
return (202, None)
def get_servers_1234(self, **kw):
r = {'server': self.get_servers_detail()[1]['servers'][0]}
return (200, r)
@ -230,10 +236,6 @@ class FakeHTTPClient(base_client.HTTPClient):
assert body[action] is None
elif action == 'migrate':
assert body[action] is None
elif action == 'rescue':
assert body[action] is None
elif action == 'unrescue':
assert body[action] is None
elif action == 'addFixedIp':
assert body[action].keys() == ['networkId']
elif action == 'removeFixedIp':

8
tests/v1_0/test_servers.py
View File

@ -170,13 +170,13 @@ class ServersTest(utils.TestCase):
def test_rescue(self):
s = cs.servers.get(1234)
s.rescue()
cs.assert_called('POST', '/servers/1234/action')
cs.assert_called('POST', '/servers/1234/rescue')
cs.servers.rescue(s)
cs.assert_called('POST', '/servers/1234/action')
cs.assert_called('POST', '/servers/1234/rescue')
def test_unrescue(self):
s = cs.servers.get(1234)
s.unrescue()
cs.assert_called('POST', '/servers/1234/action')
cs.assert_called('POST', '/servers/1234/unrescue')
cs.servers.unrescue(s)
cs.assert_called('POST', '/servers/1234/action')
cs.assert_called('POST', '/servers/1234/unrescue')