openstack/python-novaclient
Code Issues Proposed changes

Merge "Update hosts API action calls (startup etc.)"

Browse Source
This commit is contained in:
Jenkins 2013-01-15 19:53:12 +00:00 committed by Gerrit Code Review
commit 0295fca1a2
4 changed files with 11 additions and 22 deletions

5
novaclient/v1_1/hosts.py

@ -58,8 +58,9 @@ class HostManager(base.ManagerWithFind):
def host_action(self, host, action): def host_action(self, host, action):
"""Performs an action on a host.""" """Performs an action on a host."""
url = "/os-hosts/%s/%s" % (host, action) body = {action: None}
return self._create(url, None, "host") url = '/os-hosts/%s/action' % host
return self.api.client.post(url, body=body)
def list_all(self, zone=None): def list_all(self, zone=None):
url = '/os-hosts' url = '/os-hosts'

13
tests/v1_1/fakes.py

@ -1155,17 +1155,8 @@ class FakeHTTPClient(base_client.HTTPClient):
'status': 'enabled', 'status': 'enabled',
'maintenance_mode': 'on_maintenance'}}) 'maintenance_mode': 'on_maintenance'}})
def post_os_hosts_sample_host_startup(self, **kw): def post_os_hosts_sample_host_action(self, **kw):
return (200, {}, {'host': {'host_name': 'sample_host', return (202, {}, None)
'power_action': 'startup'}})
def post_os_hosts_sample_host_reboot(self, **kw):
return (200, {}, {'host': {'host_name': 'sample_host',
'power_action': 'reboot'}})
def post_os_hosts_sample_host_shutdown(self, **kw):
return (200, {}, {'host': {'host_name': 'sample_host',
'power_action': 'shutdown'}})
def put_os_hosts_sample_host(self, body, **kw): def put_os_hosts_sample_host(self, body, **kw):
result = {'host_name': 'dummy'} result = {'host_name': 'dummy'}

9
tests/v1_1/test_hosts.py

@ -50,17 +50,14 @@ class HostsTest(utils.TestCase):
def test_host_startup(self): def test_host_startup(self):
host = cs.hosts.get('sample_host')[0] host = cs.hosts.get('sample_host')[0]
result = host.startup() result = host.startup()
cs.assert_called('POST', '/os-hosts/sample_host/startup') cs.assert_called('POST', '/os-hosts/sample_host/action', {'startup': None})
self.assertTrue(isinstance(result, hosts.Host))
def test_host_reboot(self): def test_host_reboot(self):
host = cs.hosts.get('sample_host')[0] host = cs.hosts.get('sample_host')[0]
result = host.reboot() result = host.reboot()
cs.assert_called('POST', '/os-hosts/sample_host/reboot') cs.assert_called('POST', '/os-hosts/sample_host/action', {'reboot': None})
self.assertTrue(isinstance(result, hosts.Host))
def test_host_shutdown(self): def test_host_shutdown(self):
host = cs.hosts.get('sample_host')[0] host = cs.hosts.get('sample_host')[0]
result = host.shutdown() result = host.shutdown()
cs.assert_called('POST', '/os-hosts/sample_host/shutdown') cs.assert_called('POST', '/os-hosts/sample_host/action', {'shutdown': None})
self.assertTrue(isinstance(result, hosts.Host))

6
tests/v1_1/test_shell.py

@ -642,15 +642,15 @@ class ShellTest(utils.TestCase):
def test_host_startup(self): def test_host_startup(self):
self.run_command('host-action sample-host --action startup') self.run_command('host-action sample-host --action startup')
self.assert_called('POST', '/os-hosts/sample-host/startup') self.assert_called('POST', '/os-hosts/sample-host/action', {'startup': None})
def test_host_shutdown(self): def test_host_shutdown(self):
self.run_command('host-action sample-host --action shutdown') self.run_command('host-action sample-host --action shutdown')
self.assert_called('POST', '/os-hosts/sample-host/shutdown') self.assert_called('POST', '/os-hosts/sample-host/action', {'shutdown': None})
def test_host_reboot(self): def test_host_reboot(self):
self.run_command('host-action sample-host --action reboot') self.run_command('host-action sample-host --action reboot')
self.assert_called('POST', '/os-hosts/sample-host/reboot') self.assert_called('POST', '/os-hosts/sample-host/action', {'reboot': None})
def test_coverage_start(self): def test_coverage_start(self):
self.run_command('coverage-start') self.run_command('coverage-start')