diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2013-11-18 17:10:39 -0600 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2013-11-18 23:40:11 -0600 |
| commit | 200ed62054847336235288c7785424be416bed06 (patch) | |
| tree | ddc219b7b04e6c8261df2edb8bf7ed9f2ef63e9d /openstackclient/tests/compute | |
| parent | 6460f1eb359d37dc43bdbb7d3eacc6c3f5cd7ede (diff) | |
| download | python-openstackclient-200ed62054847336235288c7785424be416bed06.tar.gz | |
Add server image create command
Translation of 'nova image-create', with tests!
Change-Id: I8a833aeff6f291e4774063ed235876eb2ba9c13c
Diffstat (limited to 'openstackclient/tests/compute')
| -rw-r--r-- | openstackclient/tests/compute/v2/fakes.py | 13 | ||||
| -rw-r--r-- | openstackclient/tests/compute/v2/test_server.py | 91 |
2 files changed, 97 insertions, 7 deletions
diff --git a/openstackclient/tests/compute/v2/fakes.py b/openstackclient/tests/compute/v2/fakes.py index 8154449f..03ebd67c 100644 --- a/openstackclient/tests/compute/v2/fakes.py +++ b/openstackclient/tests/compute/v2/fakes.py @@ -16,16 +16,10 @@ import mock from openstackclient.tests import fakes +from openstackclient.tests.image.v2 import fakes as image_fakes from openstackclient.tests import utils -image_id = 'im1' - -IMAGE = { - 'id': image_id, -} - - server_id = 'serv1' server_name = 'waiter' @@ -53,3 +47,8 @@ class TestComputev2(utils.TestCommand): endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN, ) + + self.app.client_manager.image = image_fakes.FakeImagev2Client( + endpoint=fakes.AUTH_URL, + token=fakes.AUTH_TOKEN, + ) diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py index 7e68808e..4cd294cc 100644 --- a/openstackclient/tests/compute/v2/test_server.py +++ b/openstackclient/tests/compute/v2/test_server.py @@ -18,6 +18,7 @@ import copy from openstackclient.compute.v2 import server from openstackclient.tests.compute.v2 import fakes as compute_fakes from openstackclient.tests import fakes +from openstackclient.tests.image.v2 import fakes as image_fakes class TestServer(compute_fakes.TestComputev2): @@ -29,6 +30,10 @@ class TestServer(compute_fakes.TestComputev2): self.servers_mock = self.app.client_manager.compute.servers self.servers_mock.reset_mock() + # Get a shortcut to the ImageManager Mock + self.images_mock = self.app.client_manager.image.images + self.images_mock.reset_mock() + class TestServerDelete(TestServer): @@ -61,3 +66,89 @@ class TestServerDelete(TestServer): self.servers_mock.delete.assert_called_with( compute_fakes.server_id, ) + + +class TestServerImageCreate(TestServer): + + def setUp(self): + super(TestServerImageCreate, self).setUp() + + # This is the return value for utils.find_resource() + self.servers_mock.get.return_value = fakes.FakeResource( + None, + copy.deepcopy(compute_fakes.SERVER), + loaded=True, + ) + + self.servers_mock.create_image.return_value = fakes.FakeResource( + None, + copy.deepcopy(image_fakes.IMAGE), + loaded=True, + ) + + self.images_mock.get.return_value = fakes.FakeResource( + None, + copy.deepcopy(image_fakes.IMAGE), + loaded=True, + ) + + # Get the command object to test + self.cmd = server.CreateServerImage(self.app, None) + + def test_server_image_create_no_options(self): + arglist = [ + compute_fakes.server_id, + ] + verifylist = [ + ('server', compute_fakes.server_id), + ] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + # DisplayCommandBase.take_action() returns two tuples + columns, data = self.cmd.take_action(parsed_args) + + # ServerManager.create_image(server, image_name, metadata=) + self.servers_mock.create_image.assert_called_with( + self.servers_mock.get.return_value, + compute_fakes.server_name, + ) + + collist = ('id', 'is_public', 'name', 'owner') + self.assertEqual(columns, collist) + datalist = ( + image_fakes.image_id, + False, + image_fakes.image_name, + image_fakes.image_owner, + ) + self.assertEqual(data, datalist) + + def test_server_image_create_name(self): + arglist = [ + '--name', 'img-nam', + compute_fakes.server_id, + ] + verifylist = [ + ('name', 'img-nam'), + ('server', compute_fakes.server_id), + ] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + # DisplayCommandBase.take_action() returns two tuples + columns, data = self.cmd.take_action(parsed_args) + + # ServerManager.create_image(server, image_name, metadata=) + self.servers_mock.create_image.assert_called_with( + self.servers_mock.get.return_value, + 'img-nam', + ) + + collist = ('id', 'is_public', 'name', 'owner') + self.assertEqual(columns, collist) + datalist = ( + image_fakes.image_id, + False, + image_fakes.image_name, + image_fakes.image_owner, + ) + self.assertEqual(data, datalist) |
