openstack
/
senlin
Code Issues Proposed changes

Merge "Add 'server_create_image' operation for nova driver"

This commit is contained in:
Jenkins 2017-02-04 13:07:49 +00:00 committed by Gerrit Code Review
parent 1417105109 cde0407e79
commit 4a9c648593
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
senlin/drivers/openstack/nova_v2.py
View File

@ -136,6 +136,10 @@ class NovaClient(base.DriverBase):
return self.conn.compute.evacuate_server(
server, host=host, admin_pass=admin_pass, force=force)
@sdk.translate_exception
def server_create_image(self, server, name, metadata=None):
return self.conn.compute.create_server_image(server, name, metadata)
@sdk.translate_exception
def wait_for_server(self, server, status='ACTIVE', failures=['ERROR'],
interval=2, timeout=None):

10
senlin/tests/unit/drivers/test_nova_v2.py
View File

@ -292,6 +292,16 @@ class TestNovaV2(base.SenlinTestCase):
target.assert_called_once_with(server, host='HOST', admin_pass='PASS',
force='True')
def test_server_create_image(self):
d = nova_v2.NovaClient(self.conn_params)
server = mock.Mock()
target = d.conn.compute.create_server_image
res = d.server_create_image(server, 'snapshot', metadata='meta')
self.assertEqual(target.return_value, res)
target.assert_called_once_with(server, 'snapshot', 'meta')
def test_wait_for_server(self):
self.compute.find_server.return_value = 'foo'