openstack/python-novaclient
Code Issues Proposed changes

Removed the bodies again

Browse Source
This commit is contained in:
Matt Dietz 2011-08-05 13:23:34 -05:00
parent ae1b0521f0
commit 4a4e9a60e8
6 changed files with 26 additions and 30 deletions

19
novaclient/v1_0/servers.py

@ -414,42 +414,37 @@ class ServerManager(local_base.BootingManagerWithFind):
""" """
Pause the server. Pause the server.
""" """
self.api.client.post('/servers/%s/pause' % base.getid(server), body={}) self.api.client.post('/servers/%s/pause' % base.getid(server))
def unpause(self, server): def unpause(self, server):
""" """
Unpause the server. Unpause the server.
""" """
self.api.client.post('/servers/%s/unpause' % base.getid(server), self.api.client.post('/servers/%s/unpause' % base.getid(server))
body={})
def suspend(self, server): def suspend(self, server):
""" """
Suspend the server. Suspend the server.
""" """
self.api.client.post('/servers/%s/suspend' % base.getid(server), self.api.client.post('/servers/%s/suspend' % base.getid(server))
body={})
def resume(self, server): def resume(self, server):
""" """
Resume the server. Resume the server.
""" """
self.api.client.post('/servers/%s/resume' % base.getid(server), self.api.client.post('/servers/%s/resume' % base.getid(server))
body={})
def rescue(self, server): def rescue(self, server):
""" """
Rescue the server. Rescue the server.
""" """
self.api.client.post('/servers/%s/rescue' % base.getid(server), self.api.client.post('/servers/%s/rescue' % base.getid(server))
body={})
def unrescue(self, server): def unrescue(self, server):
""" """
Unrescue the server. Unrescue the server.
""" """
self.api.client.post('/servers/%s/unrescue' % base.getid(server), self.api.client.post('/servers/%s/unrescue' % base.getid(server))
body={})
def diagnostics(self, server): def diagnostics(self, server):
"""Retrieve server diagnostics.""" """Retrieve server diagnostics."""
@ -483,7 +478,7 @@ class ServerManager(local_base.BootingManagerWithFind):
:param server: The :class:`Server` (or its ID). :param server: The :class:`Server` (or its ID).
""" """
self._action('migrate', server) self.api.client.post('/servers/%s/migrate' % base.getid(server))
def _action(self, action, server, info=None): def _action(self, action, server, info=None):
""" """

19
novaclient/v1_1/servers.py

@ -243,42 +243,37 @@ class ServerManager(local_base.BootingManagerWithFind):
""" """
Pause the server. Pause the server.
""" """
self.api.client.post('/servers/%s/pause' % base.getid(server), body={}) self.api.client.post('/servers/%s/pause' % base.getid(server))
def unpause(self, server): def unpause(self, server):
""" """
Unpause the server. Unpause the server.
""" """
self.api.client.post('/servers/%s/unpause' % base.getid(server), self.api.client.post('/servers/%s/unpause' % base.getid(server))
body={})
def suspend(self, server): def suspend(self, server):
""" """
Suspend the server. Suspend the server.
""" """
self.api.client.post('/servers/%s/suspend' % base.getid(server), self.api.client.post('/servers/%s/suspend' % base.getid(server))
body={})
def resume(self, server): def resume(self, server):
""" """
Resume the server. Resume the server.
""" """
self.api.client.post('/servers/%s/resume' % base.getid(server), self.api.client.post('/servers/%s/resume' % base.getid(server))
body={})
def rescue(self, server): def rescue(self, server):
""" """
Rescue the server. Rescue the server.
""" """
self.api.client.post('/servers/%s/rescue' % base.getid(server), self.api.client.post('/servers/%s/rescue' % base.getid(server))
body={})
def unrescue(self, server): def unrescue(self, server):
""" """
Unrescue the server. Unrescue the server.
""" """
self.api.client.post('/servers/%s/unrescue' % base.getid(server), self.api.client.post('/servers/%s/unrescue' % base.getid(server))
body={})
def diagnostics(self, server): def diagnostics(self, server):
"""Retrieve server diagnostics.""" """Retrieve server diagnostics."""
@ -378,7 +373,7 @@ class ServerManager(local_base.BootingManagerWithFind):
:param server: The :class:`Server` (or its ID). :param server: The :class:`Server` (or its ID).
""" """
self._action('migrate', server) self.api.client.post('/servers/%s/migrate' % base.getid(server))
def resize(self, server, flavor): def resize(self, server, flavor):
""" """

5
tests/v1_0/fakes.py

@ -26,7 +26,7 @@ class FakeHTTPClient(base_client.HTTPClient):
# Check that certain things are called correctly # Check that certain things are called correctly
if method in ['GET', 'DELETE']: if method in ['GET', 'DELETE']:
assert 'body' not in kwargs assert 'body' not in kwargs
elif method in ['PUT', 'POST']: elif method == 'PUT':
assert 'body' in kwargs assert 'body' in kwargs
# Call the method # Call the method
@ -159,6 +159,9 @@ class FakeHTTPClient(base_client.HTTPClient):
for pfile in body['server']['personality']: for pfile in body['server']['personality']:
fakes.assert_has_keys(pfile, required=['path', 'contents']) fakes.assert_has_keys(pfile, required=['path', 'contents'])
return (202, self.get_servers_1234()[1]) return (202, self.get_servers_1234()[1])
def post_servers_1234_migrate(self, *args, **kwargs):
return (202, None)
def get_servers_1234(self, **kw): def get_servers_1234(self, **kw):
r = {'server': self.get_servers_detail()[1]['servers'][0]} r = {'server': self.get_servers_detail()[1]['servers'][0]}

4
tests/v1_0/test_servers.py

@ -150,9 +150,9 @@ class ServersTest(utils.TestCase):
def test_migrate_server(self): def test_migrate_server(self):
s = cs.servers.get(1234) s = cs.servers.get(1234)
s.migrate() s.migrate()
cs.assert_called('POST', '/servers/1234/action') cs.assert_called('POST', '/servers/1234/migrate')
cs.servers.migrate(s) cs.servers.migrate(s)
cs.assert_called('POST', '/servers/1234/action') cs.assert_called('POST', '/servers/1234/migrate')
def test_add_fixed_ip(self): def test_add_fixed_ip(self):
s = cs.servers.get(1234) s = cs.servers.get(1234)

5
tests/v1_1/fakes.py

@ -27,7 +27,7 @@ class FakeHTTPClient(base_client.HTTPClient):
# Check that certain things are called correctly # Check that certain things are called correctly
if method in ['GET', 'DELETE']: if method in ['GET', 'DELETE']:
assert 'body' not in kwargs assert 'body' not in kwargs
elif method in ['PUT', 'POST']: elif method == 'PUT':
assert 'body' in kwargs assert 'body' in kwargs
# Call the method # Call the method
@ -192,6 +192,9 @@ class FakeHTTPClient(base_client.HTTPClient):
fakes.assert_has_keys(pfile, required=['path', 'contents']) fakes.assert_has_keys(pfile, required=['path', 'contents'])
return (202, self.get_servers_1234()[1]) return (202, self.get_servers_1234()[1])
def post_servers_1234_migrate(self, *args, **kwargs):
return (202, None)
def get_servers_1234(self, **kw): def get_servers_1234(self, **kw):
r = {'server': self.get_servers_detail()[1]['servers'][0]} r = {'server': self.get_servers_detail()[1]['servers'][0]}
return (200, r) return (200, r)

4
tests/v1_1/test_servers.py

@ -116,9 +116,9 @@ class ServersTest(utils.TestCase):
def test_migrate_server(self): def test_migrate_server(self):
s = cs.servers.get(1234) s = cs.servers.get(1234)
s.migrate() s.migrate()
cs.assert_called('POST', '/servers/1234/action') cs.assert_called('POST', '/servers/1234/migrate')
cs.servers.migrate(s) cs.servers.migrate(s)
cs.assert_called('POST', '/servers/1234/action') cs.assert_called('POST', '/servers/1234/migrate')
def test_add_fixed_ip(self): def test_add_fixed_ip(self):
s = cs.servers.get(1234) s = cs.servers.get(1234)