Merge "Match create_image on server object and manager"

This commit is contained in:
Jenkins 2012-01-24 23:39:26 +00:00 committed by Gerrit Code Review
commit 632c608c5d
2 changed files with 11 additions and 1 deletions

View File

@ -182,7 +182,7 @@ class Server(base.Resource):
"""
self.manager.resize(self, flavor, **kwargs)
def create_image(self, image_name, metadata):
def create_image(self, image_name, metadata=None):
"""
Create an image based on this server.

View File

@ -255,3 +255,13 @@ class ServersTest(utils.TestCase):
cs.servers.get_vnc_console(s, 'fake')
cs.assert_called('POST', '/servers/1234/action')
def test_create_image(self):
s = cs.servers.get(1234)
s.create_image('123')
cs.assert_called('POST', '/servers/1234/action')
s.create_image('123', {})
cs.assert_called('POST', '/servers/1234/action')
cs.servers.create_image(s, '123')
cs.assert_called('POST', '/servers/1234/action')
cs.servers.create_image(s, '123', {})