From dc68be6b7b81e46cb85f4a643667b3c6a30b58da Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 1 Apr 2025 10:44:02 +0100 Subject: [PATCH] tests: Rename 'compute_sdk_client' -> 'compute_client' Resolve a TODO. Achieved using: sed -i 's/self.compute_sdk_client/self.compute_client/' \ $(ag -w self.compute_sdk_client -l) Change-Id: I76798058b9dee9fc7ef01ff8656543fbb1266d43 Signed-off-by: Stephen Finucane --- .../tests/unit/api/test_compute_v2.py | 154 +-- .../unit/common/test_availability_zone.py | 20 +- .../tests/unit/common/test_extension.py | 12 +- .../tests/unit/common/test_limits.py | 2 +- .../tests/unit/common/test_quota.py | 50 +- .../tests/unit/compute/v2/fakes.py | 8 +- .../tests/unit/compute/v2/test_agent.py | 32 +- .../tests/unit/compute/v2/test_aggregate.py | 116 +- .../tests/unit/compute/v2/test_console.py | 32 +- .../tests/unit/compute/v2/test_flavor.py | 142 +-- .../tests/unit/compute/v2/test_host.py | 16 +- .../tests/unit/compute/v2/test_hypervisor.py | 52 +- .../unit/compute/v2/test_hypervisor_stats.py | 4 +- .../tests/unit/compute/v2/test_keypair.py | 48 +- .../tests/unit/compute/v2/test_server.py | 1080 ++++++++--------- .../unit/compute/v2/test_server_backup.py | 12 +- .../unit/compute/v2/test_server_event.py | 34 +- .../unit/compute/v2/test_server_group.py | 56 +- .../unit/compute/v2/test_server_image.py | 14 +- .../unit/compute/v2/test_server_migration.py | 74 +- .../unit/compute/v2/test_server_volume.py | 24 +- .../tests/unit/compute/v2/test_service.py | 84 +- .../tests/unit/compute/v2/test_usage.py | 10 +- .../network/v2/test_floating_ip_compute.py | 22 +- .../v2/test_floating_ip_pool_compute.py | 2 +- .../unit/network/v2/test_network_compute.py | 22 +- .../tests/unit/network/v2/test_port.py | 4 +- .../network/v2/test_security_group_compute.py | 30 +- .../v2/test_security_group_rule_compute.py | 28 +- openstackclient/tests/unit/volume/v3/fakes.py | 4 +- .../unit/volume/v3/test_volume_attachment.py | 6 +- 31 files changed, 1040 insertions(+), 1154 deletions(-) diff --git a/openstackclient/tests/unit/api/test_compute_v2.py b/openstackclient/tests/unit/api/test_compute_v2.py index cae8db9a7c..a609025b22 100644 --- a/openstackclient/tests/unit/api/test_compute_v2.py +++ b/openstackclient/tests/unit/api/test_compute_v2.py @@ -29,7 +29,7 @@ class TestSecurityGroup(utils.TestCase): def setUp(self): super().setUp() - self.compute_sdk_client = mock.Mock(_proxy.Proxy) + self.compute_client = mock.Mock(_proxy.Proxy) def test_create_security_group(self): sg_name = 'name-' + uuid.uuid4().hex @@ -43,15 +43,13 @@ class TestSecurityGroup(utils.TestCase): 'rules': [], } } - self.compute_sdk_client.post.return_value = fakes.FakeResponse( - data=data - ) + self.compute_client.post.return_value = fakes.FakeResponse(data=data) result = compute.create_security_group( - self.compute_sdk_client, sg_name, sg_description + self.compute_client, sg_name, sg_description ) - self.compute_sdk_client.post.assert_called_once_with( + self.compute_client.post.assert_called_once_with( '/os-security-groups', data={'name': sg_name, 'description': sg_description}, microversion='2.1', @@ -70,13 +68,11 @@ class TestSecurityGroup(utils.TestCase): } ], } - self.compute_sdk_client.get.return_value = fakes.FakeResponse( - data=data - ) + self.compute_client.get.return_value = fakes.FakeResponse(data=data) - result = compute.list_security_groups(self.compute_sdk_client) + result = compute.list_security_groups(self.compute_client) - self.compute_sdk_client.get.assert_called_once_with( + self.compute_client.get.assert_called_once_with( '/os-security-groups', microversion='2.1' ) self.assertEqual(data['security_groups'], result) @@ -93,13 +89,13 @@ class TestSecurityGroup(utils.TestCase): 'rules': [], } } - self.compute_sdk_client.get.side_effect = [ + self.compute_client.get.side_effect = [ fakes.FakeResponse(data=data), ] - result = compute.find_security_group(self.compute_sdk_client, sg_id) + result = compute.find_security_group(self.compute_client, sg_id) - self.compute_sdk_client.get.assert_has_calls( + self.compute_client.get.assert_has_calls( [ mock.call(f'/os-security-groups/{sg_id}', microversion='2.1'), ] @@ -120,14 +116,14 @@ class TestSecurityGroup(utils.TestCase): } ], } - self.compute_sdk_client.get.side_effect = [ + self.compute_client.get.side_effect = [ fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND), fakes.FakeResponse(data=data), ] - result = compute.find_security_group(self.compute_sdk_client, sg_name) + result = compute.find_security_group(self.compute_client, sg_name) - self.compute_sdk_client.get.assert_has_calls( + self.compute_client.get.assert_has_calls( [ mock.call( f'/os-security-groups/{sg_name}', microversion='2.1' @@ -139,14 +135,14 @@ class TestSecurityGroup(utils.TestCase): def test_find_security_group_not_found(self): data = {'security_groups': []} - self.compute_sdk_client.get.side_effect = [ + self.compute_client.get.side_effect = [ fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND), fakes.FakeResponse(data=data), ] self.assertRaises( osc_lib_exceptions.NotFound, compute.find_security_group, - self.compute_sdk_client, + self.compute_client, 'invalid-sg', ) @@ -170,7 +166,7 @@ class TestSecurityGroup(utils.TestCase): }, ], } - self.compute_sdk_client.get.side_effect = [ + self.compute_client.get.side_effect = [ fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND), fakes.FakeResponse(data=data), ] @@ -178,7 +174,7 @@ class TestSecurityGroup(utils.TestCase): self.assertRaises( osc_lib_exceptions.NotFound, compute.find_security_group, - self.compute_sdk_client, + self.compute_client, sg_name, ) @@ -195,15 +191,13 @@ class TestSecurityGroup(utils.TestCase): 'rules': [], } } - self.compute_sdk_client.put.return_value = fakes.FakeResponse( - data=data - ) + self.compute_client.put.return_value = fakes.FakeResponse(data=data) result = compute.update_security_group( - self.compute_sdk_client, sg_id, sg_name, sg_description + self.compute_client, sg_id, sg_name, sg_description ) - self.compute_sdk_client.put.assert_called_once_with( + self.compute_client.put.assert_called_once_with( f'/os-security-groups/{sg_id}', data={'name': sg_name, 'description': sg_description}, microversion='2.1', @@ -212,13 +206,13 @@ class TestSecurityGroup(utils.TestCase): def test_delete_security_group(self): sg_id = uuid.uuid4().hex - self.compute_sdk_client.delete.return_value = fakes.FakeResponse( + self.compute_client.delete.return_value = fakes.FakeResponse( status_code=http.HTTPStatus.NO_CONTENT ) - result = compute.delete_security_group(self.compute_sdk_client, sg_id) + result = compute.delete_security_group(self.compute_client, sg_id) - self.compute_sdk_client.delete.assert_called_once_with( + self.compute_client.delete.assert_called_once_with( f'/os-security-groups/{sg_id}', microversion='2.1', ) @@ -229,7 +223,7 @@ class TestSecurityGroupRule(utils.TestCase): def setUp(self): super().setUp() - self.compute_sdk_client = mock.Mock(_proxy.Proxy) + self.compute_client = mock.Mock(_proxy.Proxy) def test_create_security_group_rule(self): sg_id = uuid.uuid4().hex @@ -242,12 +236,10 @@ class TestSecurityGroupRule(utils.TestCase): 'cidr': '10.0.0.0/24', } } - self.compute_sdk_client.post.return_value = fakes.FakeResponse( - data=data - ) + self.compute_client.post.return_value = fakes.FakeResponse(data=data) result = compute.create_security_group_rule( - self.compute_sdk_client, + self.compute_client, security_group_id=sg_id, ip_protocol='tcp', from_port=22, @@ -256,7 +248,7 @@ class TestSecurityGroupRule(utils.TestCase): remote_group=None, ) - self.compute_sdk_client.post.assert_called_once_with( + self.compute_client.post.assert_called_once_with( '/os-security-group-rules', data={ 'parent_group_id': sg_id, @@ -272,15 +264,13 @@ class TestSecurityGroupRule(utils.TestCase): def test_delete_security_group_rule(self): sg_id = uuid.uuid4().hex - self.compute_sdk_client.delete.return_value = fakes.FakeResponse( + self.compute_client.delete.return_value = fakes.FakeResponse( status_code=http.HTTPStatus.NO_CONTENT ) - result = compute.delete_security_group_rule( - self.compute_sdk_client, sg_id - ) + result = compute.delete_security_group_rule(self.compute_client, sg_id) - self.compute_sdk_client.delete.assert_called_once_with( + self.compute_client.delete.assert_called_once_with( f'/os-security-group-rules/{sg_id}', microversion='2.1', ) @@ -291,7 +281,7 @@ class TestNetwork(utils.TestCase): def setUp(self): super().setUp() - self.compute_sdk_client = mock.Mock(_proxy.Proxy) + self.compute_client = mock.Mock(_proxy.Proxy) def test_create_network(self): net_name = 'name-' + uuid.uuid4().hex @@ -305,18 +295,16 @@ class TestNetwork(utils.TestCase): # other fields omitted for brevity } } - self.compute_sdk_client.post.return_value = fakes.FakeResponse( - data=data - ) + self.compute_client.post.return_value = fakes.FakeResponse(data=data) result = compute.create_network( - self.compute_sdk_client, + self.compute_client, name=net_name, subnet=net_subnet, share_subnet=True, ) - self.compute_sdk_client.post.assert_called_once_with( + self.compute_client.post.assert_called_once_with( '/os-networks', data={ 'label': net_name, @@ -337,13 +325,11 @@ class TestNetwork(utils.TestCase): } ], } - self.compute_sdk_client.get.return_value = fakes.FakeResponse( - data=data - ) + self.compute_client.get.return_value = fakes.FakeResponse(data=data) - result = compute.list_networks(self.compute_sdk_client) + result = compute.list_networks(self.compute_client) - self.compute_sdk_client.get.assert_called_once_with( + self.compute_client.get.assert_called_once_with( '/os-networks', microversion='2.1' ) self.assertEqual(data['networks'], result) @@ -358,13 +344,13 @@ class TestNetwork(utils.TestCase): # other fields omitted for brevity } } - self.compute_sdk_client.get.side_effect = [ + self.compute_client.get.side_effect = [ fakes.FakeResponse(data=data), ] - result = compute.find_network(self.compute_sdk_client, net_id) + result = compute.find_network(self.compute_client, net_id) - self.compute_sdk_client.get.assert_has_calls( + self.compute_client.get.assert_has_calls( [ mock.call(f'/os-networks/{net_id}', microversion='2.1'), ] @@ -383,14 +369,14 @@ class TestNetwork(utils.TestCase): } ], } - self.compute_sdk_client.get.side_effect = [ + self.compute_client.get.side_effect = [ fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND), fakes.FakeResponse(data=data), ] - result = compute.find_network(self.compute_sdk_client, net_name) + result = compute.find_network(self.compute_client, net_name) - self.compute_sdk_client.get.assert_has_calls( + self.compute_client.get.assert_has_calls( [ mock.call(f'/os-networks/{net_name}', microversion='2.1'), mock.call('/os-networks', microversion='2.1'), @@ -400,14 +386,14 @@ class TestNetwork(utils.TestCase): def test_find_network_not_found(self): data = {'networks': []} - self.compute_sdk_client.get.side_effect = [ + self.compute_client.get.side_effect = [ fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND), fakes.FakeResponse(data=data), ] self.assertRaises( osc_lib_exceptions.NotFound, compute.find_network, - self.compute_sdk_client, + self.compute_client, 'invalid-net', ) @@ -427,7 +413,7 @@ class TestNetwork(utils.TestCase): }, ], } - self.compute_sdk_client.get.side_effect = [ + self.compute_client.get.side_effect = [ fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND), fakes.FakeResponse(data=data), ] @@ -435,19 +421,19 @@ class TestNetwork(utils.TestCase): self.assertRaises( osc_lib_exceptions.NotFound, compute.find_network, - self.compute_sdk_client, + self.compute_client, net_name, ) def test_delete_network(self): net_id = uuid.uuid4().hex - self.compute_sdk_client.delete.return_value = fakes.FakeResponse( + self.compute_client.delete.return_value = fakes.FakeResponse( status_code=http.HTTPStatus.NO_CONTENT ) - result = compute.delete_network(self.compute_sdk_client, net_id) + result = compute.delete_network(self.compute_client, net_id) - self.compute_sdk_client.delete.assert_called_once_with( + self.compute_client.delete.assert_called_once_with( f'/os-networks/{net_id}', microversion='2.1' ) self.assertIsNone(result) @@ -457,7 +443,7 @@ class TestFloatingIP(utils.TestCase): def setUp(self): super().setUp() - self.compute_sdk_client = mock.Mock(_proxy.Proxy) + self.compute_client = mock.Mock(_proxy.Proxy) def test_create_floating_ip(self): network = 'network-' + uuid.uuid4().hex @@ -470,15 +456,13 @@ class TestFloatingIP(utils.TestCase): 'pool': network, } } - self.compute_sdk_client.post.return_value = fakes.FakeResponse( - data=data - ) + self.compute_client.post.return_value = fakes.FakeResponse(data=data) result = compute.create_floating_ip( - self.compute_sdk_client, network=network + self.compute_client, network=network ) - self.compute_sdk_client.post.assert_called_once_with( + self.compute_client.post.assert_called_once_with( '/os-floating-ips', data={'pool': network}, microversion='2.1' ) self.assertEqual(data['floating_ip'], result) @@ -495,13 +479,11 @@ class TestFloatingIP(utils.TestCase): } ], } - self.compute_sdk_client.get.return_value = fakes.FakeResponse( - data=data - ) + self.compute_client.get.return_value = fakes.FakeResponse(data=data) - result = compute.list_floating_ips(self.compute_sdk_client) + result = compute.list_floating_ips(self.compute_client) - self.compute_sdk_client.get.assert_called_once_with( + self.compute_client.get.assert_called_once_with( '/os-floating-ips', microversion='2.1' ) self.assertEqual(data['floating_ips'], result) @@ -517,26 +499,26 @@ class TestFloatingIP(utils.TestCase): 'pool': f'network-{uuid.uuid4().hex}', } } - self.compute_sdk_client.get.side_effect = [ + self.compute_client.get.side_effect = [ fakes.FakeResponse(data=data), ] - result = compute.get_floating_ip(self.compute_sdk_client, fip_id) + result = compute.get_floating_ip(self.compute_client, fip_id) - self.compute_sdk_client.get.assert_called_once_with( + self.compute_client.get.assert_called_once_with( f'/os-floating-ips/{fip_id}', microversion='2.1' ) self.assertEqual(data['floating_ip'], result) def test_delete_floating_ip(self): fip_id = uuid.uuid4().hex - self.compute_sdk_client.delete.return_value = fakes.FakeResponse( + self.compute_client.delete.return_value = fakes.FakeResponse( status_code=http.HTTPStatus.NO_CONTENT ) - result = compute.delete_floating_ip(self.compute_sdk_client, fip_id) + result = compute.delete_floating_ip(self.compute_client, fip_id) - self.compute_sdk_client.delete.assert_called_once_with( + self.compute_client.delete.assert_called_once_with( f'/os-floating-ips/{fip_id}', microversion='2.1' ) self.assertIsNone(result) @@ -546,7 +528,7 @@ class TestFloatingIPPool(utils.TestCase): def setUp(self): super().setUp() - self.compute_sdk_client = mock.Mock(_proxy.Proxy) + self.compute_client = mock.Mock(_proxy.Proxy) def test_list_floating_ip_pools(self): data = { @@ -556,13 +538,11 @@ class TestFloatingIPPool(utils.TestCase): } ], } - self.compute_sdk_client.get.return_value = fakes.FakeResponse( - data=data - ) + self.compute_client.get.return_value = fakes.FakeResponse(data=data) - result = compute.list_floating_ip_pools(self.compute_sdk_client) + result = compute.list_floating_ip_pools(self.compute_client) - self.compute_sdk_client.get.assert_called_once_with( + self.compute_client.get.assert_called_once_with( '/os-floating-ip-pools', microversion='2.1' ) self.assertEqual(data['floating_ip_pools'], result) diff --git a/openstackclient/tests/unit/common/test_availability_zone.py b/openstackclient/tests/unit/common/test_availability_zone.py index 0965c01ce4..d1383b5409 100644 --- a/openstackclient/tests/unit/common/test_availability_zone.py +++ b/openstackclient/tests/unit/common/test_availability_zone.py @@ -99,9 +99,7 @@ class TestAvailabilityZoneList( def setUp(self): super().setUp() - self.compute_sdk_client.availability_zones.return_value = ( - self.compute_azs - ) + self.compute_client.availability_zones.return_value = self.compute_azs self.volume_sdk_client.availability_zones.return_value = ( self.volume_azs ) @@ -120,9 +118,7 @@ class TestAvailabilityZoneList( # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.availability_zones.assert_called_with( - details=True - ) + self.compute_client.availability_zones.assert_called_with(details=True) self.volume_sdk_client.availability_zones.assert_called_with() self.network_client.availability_zones.assert_called_with() @@ -150,9 +146,7 @@ class TestAvailabilityZoneList( # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.availability_zones.assert_called_with( - details=True - ) + self.compute_client.availability_zones.assert_called_with(details=True) self.volume_sdk_client.availability_zones.assert_called_with() self.network_client.availability_zones.assert_called_with() @@ -186,9 +180,7 @@ class TestAvailabilityZoneList( # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.availability_zones.assert_called_with( - details=True - ) + self.compute_client.availability_zones.assert_called_with(details=True) self.volume_sdk_client.availability_zones.assert_not_called() self.network_client.availability_zones.assert_not_called() @@ -212,7 +204,7 @@ class TestAvailabilityZoneList( # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.availability_zones.assert_not_called() + self.compute_client.availability_zones.assert_not_called() self.volume_sdk_client.availability_zones.assert_called_with() self.network_client.availability_zones.assert_not_called() @@ -236,7 +228,7 @@ class TestAvailabilityZoneList( # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.availability_zones.assert_not_called() + self.compute_client.availability_zones.assert_not_called() self.volume_sdk_client.availability_zones.assert_not_called() self.network_client.availability_zones.assert_called_with() diff --git a/openstackclient/tests/unit/common/test_extension.py b/openstackclient/tests/unit/common/test_extension.py index b22365899e..53d9d65d9b 100644 --- a/openstackclient/tests/unit/common/test_extension.py +++ b/openstackclient/tests/unit/common/test_extension.py @@ -52,9 +52,7 @@ class TestExtensionList(TestExtension): self.identity_client.extensions.list.return_value = [ self.identity_extension ] - self.compute_sdk_client.extensions.return_value = [ - self.compute_extension - ] + self.compute_client.extensions.return_value = [self.compute_extension] self.volume_sdk_client.extensions.return_value = [ self.volume_extension ] @@ -106,7 +104,7 @@ class TestExtensionList(TestExtension): ) self._test_extension_list_helper(arglist, verifylist, datalist) self.identity_client.extensions.list.assert_called_with() - self.compute_sdk_client.extensions.assert_called_with() + self.compute_client.extensions.assert_called_with() self.volume_sdk_client.extensions.assert_called_with() self.network_client.extensions.assert_called_with() @@ -153,7 +151,7 @@ class TestExtensionList(TestExtension): ) self._test_extension_list_helper(arglist, verifylist, datalist, True) self.identity_client.extensions.list.assert_called_with() - self.compute_sdk_client.extensions.assert_called_with() + self.compute_client.extensions.assert_called_with() self.volume_sdk_client.extensions.assert_called_with() self.network_client.extensions.assert_called_with() @@ -230,7 +228,7 @@ class TestExtensionList(TestExtension): ), ) self._test_extension_list_helper(arglist, verifylist, datalist) - self.compute_sdk_client.extensions.assert_called_with() + self.compute_client.extensions.assert_called_with() def test_extension_list_compute_and_network(self): arglist = [ @@ -254,7 +252,7 @@ class TestExtensionList(TestExtension): ), ) self._test_extension_list_helper(arglist, verifylist, datalist) - self.compute_sdk_client.extensions.assert_called_with() + self.compute_client.extensions.assert_called_with() self.network_client.extensions.assert_called_with() def test_extension_list_volume(self): diff --git a/openstackclient/tests/unit/common/test_limits.py b/openstackclient/tests/unit/common/test_limits.py index b7309ab7c6..a375a2ae5a 100644 --- a/openstackclient/tests/unit/common/test_limits.py +++ b/openstackclient/tests/unit/common/test_limits.py @@ -68,7 +68,7 @@ class TestComputeLimits(compute_fakes.TestComputev2): ('DELETE', '*', 100, 100, 'MINUTE', '2011-12-15T22:42:45Z'), ] - self.compute_sdk_client.get_limits.return_value = self.fake_limits + self.compute_client.get_limits.return_value = self.fake_limits def test_compute_show_absolute(self): arglist = ['--absolute'] diff --git a/openstackclient/tests/unit/common/test_quota.py b/openstackclient/tests/unit/common/test_quota.py index fd18b0619f..53df4da848 100644 --- a/openstackclient/tests/unit/common/test_quota.py +++ b/openstackclient/tests/unit/common/test_quota.py @@ -98,7 +98,7 @@ class TestQuotaList(TestQuota): _compute_quota_set.QuotaSet ) # the defaults are global hence use of return_value here - self.compute_sdk_client.get_quota_set_defaults.return_value = ( + self.compute_client.get_quota_set_defaults.return_value = ( self.default_compute_quotas ) self.compute_reference_data = ( @@ -164,7 +164,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute(self): # Two projects with non-default quotas - self.compute_sdk_client.get_quota_set.side_effect = self.compute_quotas + self.compute_client.get_quota_set.side_effect = self.compute_quotas arglist = [ '--compute', @@ -183,7 +183,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute_default(self): # One of the projects is at defaults - self.compute_sdk_client.get_quota_set.side_effect = [ + self.compute_client.get_quota_set.side_effect = [ self.compute_quotas[0], self.default_compute_quotas, ] @@ -205,7 +205,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute_project_not_found(self): # Make one of the projects disappear - self.compute_sdk_client.get_quota_set.side_effect = [ + self.compute_client.get_quota_set.side_effect = [ self.compute_quotas[0], sdk_exceptions.NotFoundException("NotFound"), ] @@ -227,7 +227,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute_project_inaccessible(self): # Make one of the projects inaccessible - self.compute_sdk_client.get_quota_set.side_effect = [ + self.compute_client.get_quota_set.side_effect = [ self.compute_quotas[0], sdk_exceptions.ForbiddenException("Forbidden"), ] @@ -249,7 +249,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute_server_error(self): # Make the server "break" - self.compute_sdk_client.get_quota_set.side_effect = ( + self.compute_client.get_quota_set.side_effect = ( sdk_exceptions.HttpException("Not implemented?") ) @@ -470,7 +470,7 @@ class TestQuotaSet(TestQuota): 'server_group_members': servgroup_members_num, } - self.compute_sdk_client.update_quota_set.assert_called_once_with( + self.compute_client.update_quota_set.assert_called_once_with( self.projects[0].id, **kwargs ) self.assertIsNone(result) @@ -744,7 +744,7 @@ class TestQuotaSet(TestQuota): 'volumes': volumes, } - self.compute_sdk_client.update_quota_class_set.assert_called_with( + self.compute_client.update_quota_class_set.assert_called_with( self.projects[0].name, **kwargs_compute ) self.volume_sdk_client.update_quota_class_set.assert_called_with( @@ -842,7 +842,7 @@ class TestQuotaSet(TestQuota): 'volumes': volumes, } - self.compute_sdk_client.update_quota_class_set.assert_called_with( + self.compute_client.update_quota_class_set.assert_called_with( 'default', **kwargs_compute ) self.volume_sdk_client.update_quota_class_set.assert_called_with( @@ -899,7 +899,7 @@ class TestQuotaSet(TestQuota): 'subnet': subnet, 'force': True, } - self.compute_sdk_client.update_quota_set.assert_called_once_with( + self.compute_client.update_quota_set.assert_called_once_with( self.projects[0].id, **kwargs_compute ) self.volume_sdk_client.update_quota_set.assert_called_once_with( @@ -942,7 +942,7 @@ class TestQuotaSet(TestQuota): 'subnet': 10, 'check_limit': True, } - self.compute_sdk_client.update_quota_set.assert_called_once_with( + self.compute_client.update_quota_set.assert_called_once_with( self.projects[0].id, **kwargs_compute ) self.volume_sdk_client.update_quota_set.assert_called_once_with( @@ -977,13 +977,13 @@ class TestQuotaShow(TestQuota): self.identity_sdk_client.find_project.return_value = self.projects[0] - self.compute_sdk_client.get_quota_set.return_value = ( + self.compute_client.get_quota_set.return_value = ( sdk_fakes.generate_fake_resource(_compute_quota_set.QuotaSet) ) self.default_compute_quotas = sdk_fakes.generate_fake_resource( _compute_quota_set.QuotaSet ) - self.compute_sdk_client.get_quota_set_defaults.return_value = ( + self.compute_client.get_quota_set_defaults.return_value = ( self.default_compute_quotas ) @@ -1027,7 +1027,7 @@ class TestQuotaShow(TestQuota): self.cmd.take_action(parsed_args) - self.compute_sdk_client.get_quota_set.assert_called_once_with( + self.compute_client.get_quota_set.assert_called_once_with( self.projects[0].id, usage=False, ) @@ -1054,7 +1054,7 @@ class TestQuotaShow(TestQuota): self.cmd.take_action(parsed_args) - self.compute_sdk_client.get_quota_set.assert_called_once_with( + self.compute_client.get_quota_set.assert_called_once_with( self.projects[0].id, usage=False, ) @@ -1074,7 +1074,7 @@ class TestQuotaShow(TestQuota): self.cmd.take_action(parsed_args) - self.compute_sdk_client.get_quota_set.assert_not_called() + self.compute_client.get_quota_set.assert_not_called() self.volume_sdk_client.get_quota_set.assert_called_once_with( self.projects[0].id, usage=False, @@ -1094,7 +1094,7 @@ class TestQuotaShow(TestQuota): self.cmd.take_action(parsed_args) - self.compute_sdk_client.get_quota_set.assert_not_called() + self.compute_client.get_quota_set.assert_not_called() self.volume_sdk_client.get_quota_set.assert_not_called() self.network_client.get_quota.assert_called_once_with( self.projects[0].id, @@ -1115,7 +1115,7 @@ class TestQuotaShow(TestQuota): self.cmd.take_action(parsed_args) - self.compute_sdk_client.get_quota_set_defaults.assert_called_once_with( + self.compute_client.get_quota_set_defaults.assert_called_once_with( self.projects[0].id, ) self.volume_sdk_client.get_quota_set_defaults.assert_called_once_with( @@ -1139,7 +1139,7 @@ class TestQuotaShow(TestQuota): self.cmd.take_action(parsed_args) - self.compute_sdk_client.get_quota_set.assert_called_once_with( + self.compute_client.get_quota_set.assert_called_once_with( self.projects[0].id, usage=True, ) @@ -1161,7 +1161,7 @@ class TestQuotaShow(TestQuota): self.cmd.take_action(parsed_args) - self.compute_sdk_client.get_quota_set.assert_called_once_with( + self.compute_client.get_quota_set.assert_called_once_with( self.projects[1].id, usage=False ) self.volume_sdk_client.get_quota_set.assert_called_once_with( @@ -1181,7 +1181,7 @@ class TestQuotaDelete(TestQuota): self.identity_sdk_client.find_project.return_value = self.projects[0] - self.compute_sdk_client.revert_quota_set.return_value = None + self.compute_client.revert_quota_set.return_value = None self.volume_sdk_client.revert_quota_set.return_value = None self.network_client.delete_quota.return_value = None @@ -1205,7 +1205,7 @@ class TestQuotaDelete(TestQuota): self.identity_sdk_client.find_project.assert_called_once_with( self.projects[0].id, ignore_missing=False ) - self.compute_sdk_client.revert_quota_set.assert_called_once_with( + self.compute_client.revert_quota_set.assert_called_once_with( self.projects[0].id, ) self.volume_sdk_client.revert_quota_set.assert_called_once_with( @@ -1234,7 +1234,7 @@ class TestQuotaDelete(TestQuota): self.identity_sdk_client.find_project.assert_called_once_with( self.projects[0].id, ignore_missing=False ) - self.compute_sdk_client.revert_quota_set.assert_called_once_with( + self.compute_client.revert_quota_set.assert_called_once_with( self.projects[0].id, ) self.volume_sdk_client.revert_quota_set.assert_not_called() @@ -1259,7 +1259,7 @@ class TestQuotaDelete(TestQuota): self.identity_sdk_client.find_project.assert_called_once_with( self.projects[0].id, ignore_missing=False ) - self.compute_sdk_client.revert_quota_set.assert_not_called() + self.compute_client.revert_quota_set.assert_not_called() self.volume_sdk_client.revert_quota_set.assert_called_once_with( self.projects[0].id, ) @@ -1284,7 +1284,7 @@ class TestQuotaDelete(TestQuota): self.identity_sdk_client.find_project.assert_called_once_with( self.projects[0].id, ignore_missing=False ) - self.compute_sdk_client.revert_quota_set.assert_not_called() + self.compute_client.revert_quota_set.assert_not_called() self.volume_sdk_client.revert_quota_set.assert_not_called() self.network_client.delete_quota.assert_called_once_with( self.projects[0].id, diff --git a/openstackclient/tests/unit/compute/v2/fakes.py b/openstackclient/tests/unit/compute/v2/fakes.py index 670401b8de..1eff82d114 100644 --- a/openstackclient/tests/unit/compute/v2/fakes.py +++ b/openstackclient/tests/unit/compute/v2/fakes.py @@ -98,10 +98,8 @@ class FakeClientMixin: def setUp(self): super().setUp() - # TODO(stephenfin): Rename to 'compute_client' once all commands are - # migrated to SDK self.app.client_manager.compute = mock.Mock(_proxy.Proxy) - self.compute_sdk_client = self.app.client_manager.compute + self.compute_client = self.app.client_manager.compute self.set_compute_api_version() # default to the lowest def set_compute_api_version(self, version: str = '2.1'): @@ -113,8 +111,8 @@ class FakeClientMixin: """ assert re.match(r'2.\d+', version) - self.compute_sdk_client.default_microversion = version - self.compute_sdk_client.get_endpoint_data.return_value = ( + self.compute_client.default_microversion = version + self.compute_client.get_endpoint_data.return_value = ( discover.EndpointData( min_microversion='2.1', # nova has not bumped this yet max_microversion=version, diff --git a/openstackclient/tests/unit/compute/v2/test_agent.py b/openstackclient/tests/unit/compute/v2/test_agent.py index eb8c0774aa..f04ba1066e 100644 --- a/openstackclient/tests/unit/compute/v2/test_agent.py +++ b/openstackclient/tests/unit/compute/v2/test_agent.py @@ -61,7 +61,7 @@ class TestAgentCreate(compute_fakes.TestComputev2): self._agent['version'], ) - self.compute_sdk_client.post.return_value = fakes.FakeResponse( + self.compute_client.post.return_value = fakes.FakeResponse( data={'agent': self._agent} ) self.cmd = agent.CreateAgent(self.app, None) @@ -87,7 +87,7 @@ class TestAgentCreate(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.post.assert_called_with( + self.compute_client.post.assert_called_with( '/os-agents', json={ 'agent': { @@ -110,7 +110,7 @@ class TestAgentDelete(compute_fakes.TestComputev2): def setUp(self): super().setUp() - self.compute_sdk_client.delete.return_value = fakes.FakeResponse( + self.compute_client.delete.return_value = fakes.FakeResponse( status_code=http.HTTPStatus.NO_CONTENT ) @@ -125,7 +125,7 @@ class TestAgentDelete(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.delete.assert_called_once_with( + self.compute_client.delete.assert_called_once_with( '/os-agents/123', microversion='2.1', ) @@ -143,7 +143,7 @@ class TestAgentDelete(compute_fakes.TestComputev2): calls = [ mock.call(f'/os-agents/{x}', microversion='2.1') for x in arglist ] - self.compute_sdk_client.delete.assert_has_calls(calls) + self.compute_client.delete.assert_has_calls(calls) self.assertIsNone(result) def test_delete_multiple_agents_exception(self): @@ -154,7 +154,7 @@ class TestAgentDelete(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.compute_sdk_client.delete.side_effect = [ + self.compute_client.delete.side_effect = [ fakes.FakeResponse(status_code=http.HTTPStatus.NO_CONTENT), fakes.FakeResponse(status_code=http.HTTPStatus.NO_CONTENT), fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND), @@ -166,7 +166,7 @@ class TestAgentDelete(compute_fakes.TestComputev2): calls = [ mock.call(f'/os-agents/{x}', microversion='2.1') for x in arglist ] - self.compute_sdk_client.delete.assert_has_calls(calls) + self.compute_client.delete.assert_has_calls(calls) def test_agent_delete_no_input(self): arglist = [] @@ -208,7 +208,7 @@ class TestAgentList(compute_fakes.TestComputev2): for _agent in _agents ] - self.compute_sdk_client.get.return_value = fakes.FakeResponse( + self.compute_client.get.return_value = fakes.FakeResponse( data={'agents': _agents}, ) self.cmd = agent.ListAgent(self.app, None) @@ -222,7 +222,7 @@ class TestAgentList(compute_fakes.TestComputev2): self.assertEqual(self.columns, columns) self.assertEqual(self.data, list(data)) - self.compute_sdk_client.get.assert_called_once_with( + self.compute_client.get.assert_called_once_with( '/os-agents', microversion='2.1', ) @@ -241,7 +241,7 @@ class TestAgentList(compute_fakes.TestComputev2): self.assertEqual(self.columns, columns) self.assertEqual(self.data, list(data)) - self.compute_sdk_client.get.assert_called_once_with( + self.compute_client.get.assert_called_once_with( '/os-agents?hypervisor=hypervisor', microversion='2.1', ) @@ -252,10 +252,10 @@ class TestAgentSet(compute_fakes.TestComputev2): super().setUp() self.agent = _generate_fake_agent() - self.compute_sdk_client.get.return_value = fakes.FakeResponse( + self.compute_client.get.return_value = fakes.FakeResponse( data={'agents': [self.agent]}, ) - self.compute_sdk_client.put.return_value = fakes.FakeResponse() + self.compute_client.put.return_value = fakes.FakeResponse() self.cmd = agent.SetAgent(self.app, None) @@ -269,7 +269,7 @@ class TestAgentSet(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.put.assert_called_once_with( + self.compute_client.put.assert_called_once_with( f'/os-agents/{self.agent["agent_id"]}', json={ 'para': { @@ -297,7 +297,7 @@ class TestAgentSet(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.put.assert_called_once_with( + self.compute_client.put.assert_called_once_with( f'/os-agents/{self.agent["agent_id"]}', json={ 'para': { @@ -325,7 +325,7 @@ class TestAgentSet(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.put.assert_called_once_with( + self.compute_client.put.assert_called_once_with( f'/os-agents/{self.agent["agent_id"]}', json={ 'para': { @@ -353,7 +353,7 @@ class TestAgentSet(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.put.assert_called_once_with( + self.compute_client.put.assert_called_once_with( f'/os-agents/{self.agent["agent_id"]}', json={ 'para': { diff --git a/openstackclient/tests/unit/compute/v2/test_aggregate.py b/openstackclient/tests/unit/compute/v2/test_aggregate.py index f905d67e39..813cbb95fa 100644 --- a/openstackclient/tests/unit/compute/v2/test_aggregate.py +++ b/openstackclient/tests/unit/compute/v2/test_aggregate.py @@ -66,10 +66,8 @@ class TestAggregateAddHost(TestAggregate): def setUp(self): super().setUp() - self.compute_sdk_client.find_aggregate.return_value = self.fake_ag - self.compute_sdk_client.add_host_to_aggregate.return_value = ( - self.fake_ag - ) + self.compute_client.find_aggregate.return_value = self.fake_ag + self.compute_client.add_host_to_aggregate.return_value = self.fake_ag self.cmd = aggregate.AddAggregateHost(self.app, None) def test_aggregate_add_host(self): @@ -83,10 +81,10 @@ class TestAggregateAddHost(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.compute_sdk_client.add_host_to_aggregate.assert_called_once_with( + self.compute_client.add_host_to_aggregate.assert_called_once_with( self.fake_ag.id, parsed_args.host ) self.assertEqual(self.columns, columns) @@ -97,10 +95,8 @@ class TestAggregateCreate(TestAggregate): def setUp(self): super().setUp() - self.compute_sdk_client.create_aggregate.return_value = self.fake_ag - self.compute_sdk_client.set_aggregate_metadata.return_value = ( - self.fake_ag - ) + self.compute_client.create_aggregate.return_value = self.fake_ag + self.compute_client.set_aggregate_metadata.return_value = self.fake_ag self.cmd = aggregate.CreateAggregate(self.app, None) def test_aggregate_create(self): @@ -112,7 +108,7 @@ class TestAggregateCreate(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_aggregate.assert_called_once_with( + self.compute_client.create_aggregate.assert_called_once_with( name=parsed_args.name ) self.assertEqual(self.columns, columns) @@ -131,7 +127,7 @@ class TestAggregateCreate(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_aggregate.assert_called_once_with( + self.compute_client.create_aggregate.assert_called_once_with( name=parsed_args.name, availability_zone=parsed_args.zone ) self.assertEqual(self.columns, columns) @@ -151,10 +147,10 @@ class TestAggregateCreate(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_aggregate.assert_called_once_with( + self.compute_client.create_aggregate.assert_called_once_with( name=parsed_args.name ) - self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( + self.compute_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, parsed_args.properties ) self.assertEqual(self.columns, columns) @@ -169,7 +165,7 @@ class TestAggregateDelete(TestAggregate): sdk_fakes.generate_fake_resources(_aggregate.Aggregate, 2) ) - self.compute_sdk_client.find_aggregate = mock.Mock( + self.compute_client.find_aggregate = mock.Mock( side_effect=[self.fake_ags[0], self.fake_ags[1]] ) self.cmd = aggregate.DeleteAggregate(self.app, None) @@ -181,10 +177,10 @@ class TestAggregateDelete(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( self.fake_ags[0].id, ignore_missing=False ) - self.compute_sdk_client.delete_aggregate.assert_called_once_with( + self.compute_client.delete_aggregate.assert_called_once_with( self.fake_ags[0].id, ignore_missing=False ) @@ -202,8 +198,8 @@ class TestAggregateDelete(TestAggregate): calls = [] for a in self.fake_ags: calls.append(call(a.id, ignore_missing=False)) - self.compute_sdk_client.find_aggregate.assert_has_calls(calls) - self.compute_sdk_client.delete_aggregate.assert_has_calls(calls) + self.compute_client.find_aggregate.assert_has_calls(calls) + self.compute_client.delete_aggregate.assert_has_calls(calls) def test_delete_multiple_agggregates_with_exception(self): arglist = [ @@ -216,7 +212,7 @@ class TestAggregateDelete(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.compute_sdk_client.find_aggregate.side_effect = [ + self.compute_client.find_aggregate.side_effect = [ self.fake_ags[0], sdk_exceptions.NotFoundException, ] @@ -229,8 +225,8 @@ class TestAggregateDelete(TestAggregate): calls = [] for a in arglist: calls.append(call(a, ignore_missing=False)) - self.compute_sdk_client.find_aggregate.assert_has_calls(calls) - self.compute_sdk_client.delete_aggregate.assert_called_with( + self.compute_client.find_aggregate.assert_has_calls(calls) + self.compute_client.delete_aggregate.assert_called_with( self.fake_ags[0].id, ignore_missing=False ) @@ -239,7 +235,7 @@ class TestAggregateList(TestAggregate): def setUp(self): super().setUp() - self.compute_sdk_client.aggregates.return_value = [self.fake_ag] + self.compute_client.aggregates.return_value = [self.fake_ag] self.cmd = aggregate.ListAggregate(self.app, None) def test_aggregate_list(self): @@ -333,8 +329,8 @@ class TestAggregateRemoveHost(TestAggregate): def setUp(self): super().setUp() - self.compute_sdk_client.find_aggregate.return_value = self.fake_ag - self.compute_sdk_client.remove_host_from_aggregate.return_value = ( + self.compute_client.find_aggregate.return_value = self.fake_ag + self.compute_client.remove_host_from_aggregate.return_value = ( self.fake_ag ) self.cmd = aggregate.RemoveAggregateHost(self.app, None) @@ -350,10 +346,10 @@ class TestAggregateRemoveHost(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.compute_sdk_client.remove_host_from_aggregate.assert_called_once_with( + self.compute_client.remove_host_from_aggregate.assert_called_once_with( self.fake_ag.id, parsed_args.host ) self.assertEqual(self.columns, columns) @@ -364,7 +360,7 @@ class TestAggregateSet(TestAggregate): def setUp(self): super().setUp() - self.compute_sdk_client.find_aggregate.return_value = self.fake_ag + self.compute_client.find_aggregate.return_value = self.fake_ag self.cmd = aggregate.SetAggregate(self.app, None) def test_aggregate_set_no_option(self): @@ -377,11 +373,11 @@ class TestAggregateSet(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.assertNotCalled(self.compute_sdk_client.update_aggregate) - self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata) + self.assertNotCalled(self.compute_client.update_aggregate) + self.assertNotCalled(self.compute_client.set_aggregate_metadata) self.assertIsNone(result) def test_aggregate_set_with_name(self): @@ -397,13 +393,13 @@ class TestAggregateSet(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.compute_sdk_client.update_aggregate.assert_called_once_with( + self.compute_client.update_aggregate.assert_called_once_with( self.fake_ag.id, name=parsed_args.name ) - self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata) + self.assertNotCalled(self.compute_client.set_aggregate_metadata) self.assertIsNone(result) def test_aggregate_set_with_zone(self): @@ -419,13 +415,13 @@ class TestAggregateSet(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.compute_sdk_client.update_aggregate.assert_called_once_with( + self.compute_client.update_aggregate.assert_called_once_with( self.fake_ag.id, availability_zone=parsed_args.zone ) - self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata) + self.assertNotCalled(self.compute_client.set_aggregate_metadata) self.assertIsNone(result) def test_aggregate_set_with_property(self): @@ -443,11 +439,11 @@ class TestAggregateSet(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.assertNotCalled(self.compute_sdk_client.update_aggregate) - self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( + self.assertNotCalled(self.compute_client.update_aggregate) + self.compute_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, parsed_args.properties ) self.assertIsNone(result) @@ -466,11 +462,11 @@ class TestAggregateSet(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.assertNotCalled(self.compute_sdk_client.update_aggregate) - self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( + self.assertNotCalled(self.compute_client.update_aggregate) + self.compute_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, {'key1': None, 'key2': 'value2'} ) self.assertIsNone(result) @@ -486,11 +482,11 @@ class TestAggregateSet(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.assertNotCalled(self.compute_sdk_client.update_aggregate) - self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( + self.assertNotCalled(self.compute_client.update_aggregate) + self.compute_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, {'key1': None} ) self.assertIsNone(result) @@ -509,13 +505,13 @@ class TestAggregateSet(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.compute_sdk_client.update_aggregate.assert_called_once_with( + self.compute_client.update_aggregate.assert_called_once_with( self.fake_ag.id, availability_zone=parsed_args.zone ) - self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( + self.compute_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, {'key1': None} ) self.assertIsNone(result) @@ -538,7 +534,7 @@ class TestAggregateShow(TestAggregate): def setUp(self): super().setUp() - self.compute_sdk_client.find_aggregate.return_value = self.fake_ag + self.compute_client.find_aggregate.return_value = self.fake_ag self.cmd = aggregate.ShowAggregate(self.app, None) self.data = ( @@ -563,7 +559,7 @@ class TestAggregateShow(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) @@ -575,7 +571,7 @@ class TestAggregateUnset(TestAggregate): def setUp(self): super().setUp() - self.compute_sdk_client.find_aggregate.return_value = self.fake_ag + self.compute_client.find_aggregate.return_value = self.fake_ag self.cmd = aggregate.UnsetAggregate(self.app, None) def test_aggregate_unset(self): @@ -591,7 +587,7 @@ class TestAggregateUnset(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( + self.compute_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, {'unset_key': None} ) self.assertIsNone(result) @@ -611,7 +607,7 @@ class TestAggregateUnset(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( + self.compute_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, {'unset_key1': None, 'unset_key2': None} ) self.assertIsNone(result) @@ -626,7 +622,7 @@ class TestAggregateUnset(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata) + self.assertNotCalled(self.compute_client.set_aggregate_metadata) self.assertIsNone(result) @@ -636,7 +632,7 @@ class TestAggregateCacheImage(TestAggregate): def setUp(self): super().setUp() - self.compute_sdk_client.find_aggregate.return_value = self.fake_ag + self.compute_client.find_aggregate.return_value = self.fake_ag self.find_image_mock = mock.Mock(side_effect=self.images) self.app.client_manager.sdk_connection.image.find_image = ( self.find_image_mock @@ -667,10 +663,10 @@ class TestAggregateCacheImage(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.compute_sdk_client.aggregate_precache_images.assert_called_once_with( + self.compute_client.aggregate_precache_images.assert_called_once_with( self.fake_ag.id, [self.images[0].id] ) @@ -688,9 +684,9 @@ class TestAggregateCacheImage(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_aggregate.assert_called_once_with( + self.compute_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.compute_sdk_client.aggregate_precache_images.assert_called_once_with( + self.compute_client.aggregate_precache_images.assert_called_once_with( self.fake_ag.id, [self.images[0].id, self.images[1].id] ) diff --git a/openstackclient/tests/unit/compute/v2/test_console.py b/openstackclient/tests/unit/compute/v2/test_console.py index d4c6940b6a..bcff819932 100644 --- a/openstackclient/tests/unit/compute/v2/test_console.py +++ b/openstackclient/tests/unit/compute/v2/test_console.py @@ -28,7 +28,7 @@ class TestConsoleLog(compute_fakes.TestComputev2): super().setUp() self._server = sdk_fakes.generate_fake_resource(_server.Server) - self.compute_sdk_client.find_server.return_value = self._server + self.compute_client.find_server.return_value = self._server self.cmd = console.ShowConsoleLog(self.app, None) @@ -49,13 +49,13 @@ class TestConsoleLog(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) output = {'output': '1st line\n2nd line\n'} - self.compute_sdk_client.get_server_console_output.return_value = output + self.compute_client.get_server_console_output.return_value = output self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( name_or_id='fake_server', ignore_missing=False ) - self.compute_sdk_client.get_server_console_output.assert_called_with( + self.compute_client.get_server_console_output.assert_called_with( self._server.id, length=None ) stdout = self.app.stdout.content @@ -67,13 +67,13 @@ class TestConsoleLog(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) output = {'output': '1st line\n2nd line'} - self.compute_sdk_client.get_server_console_output.return_value = output + self.compute_client.get_server_console_output.return_value = output self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( name_or_id='fake_server', ignore_missing=False ) - self.compute_sdk_client.get_server_console_output.assert_called_with( + self.compute_client.get_server_console_output.assert_called_with( self._server.id, length=15 ) @@ -83,14 +83,14 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2): super().setUp() self._server = sdk_fakes.generate_fake_resource(_server.Server) - self.compute_sdk_client.find_server.return_value = self._server + self.compute_client.find_server.return_value = self._server fake_console_data = { 'url': 'http://localhost', 'protocol': 'fake_protocol', 'type': 'fake_type', } - self.compute_sdk_client.create_console = mock.Mock( + self.compute_client.create_console = mock.Mock( return_value=fake_console_data ) @@ -117,7 +117,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_console.assert_called_once_with( + self.compute_client.create_console.assert_called_once_with( self._server.id, console_type='novnc' ) self.assertEqual(self.columns, columns) @@ -134,7 +134,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_console.assert_called_once_with( + self.compute_client.create_console.assert_called_once_with( self._server.id, console_type='novnc' ) self.assertEqual(self.columns, columns) @@ -151,7 +151,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_console.assert_called_once_with( + self.compute_client.create_console.assert_called_once_with( self._server.id, console_type='xvpvnc' ) self.assertEqual(self.columns, columns) @@ -168,7 +168,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_console.assert_called_once_with( + self.compute_client.create_console.assert_called_once_with( self._server.id, console_type='spice-html5' ) self.assertEqual(self.columns, columns) @@ -185,7 +185,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_console.assert_called_once_with( + self.compute_client.create_console.assert_called_once_with( self._server.id, console_type='rdp-html5' ) self.assertEqual(self.columns, columns) @@ -202,7 +202,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_console.assert_called_once_with( + self.compute_client.create_console.assert_called_once_with( self._server.id, console_type='serial' ) self.assertEqual(self.columns, columns) @@ -219,7 +219,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_console.assert_called_once_with( + self.compute_client.create_console.assert_called_once_with( self._server.id, console_type='webmks' ) self.assertEqual(self.columns, columns) diff --git a/openstackclient/tests/unit/compute/v2/test_flavor.py b/openstackclient/tests/unit/compute/v2/test_flavor.py index 1a93b5fc83..4234fbbd5a 100644 --- a/openstackclient/tests/unit/compute/v2/test_flavor.py +++ b/openstackclient/tests/unit/compute/v2/test_flavor.py @@ -86,7 +86,7 @@ class TestFlavorCreate(TestFlavor): # Return a project self.projects_mock.get.return_value = self.project - self.compute_sdk_client.create_flavor.return_value = self.flavor + self.compute_client.create_flavor.return_value = self.flavor self.cmd = flavor.CreateFlavor(self.app, None) def test_flavor_create_default_options(self): @@ -109,7 +109,7 @@ class TestFlavorCreate(TestFlavor): } columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_flavor.assert_called_once_with( + self.compute_client.create_flavor.assert_called_once_with( **default_args ) @@ -180,17 +180,17 @@ class TestFlavorCreate(TestFlavor): # convert expected data tuple to list to be able to modify it cmp_data = list(self.data) cmp_data[7] = format_columns.DictColumn(props) - self.compute_sdk_client.create_flavor.return_value = create_flavor - self.compute_sdk_client.create_flavor_extra_specs.return_value = ( + self.compute_client.create_flavor.return_value = create_flavor + self.compute_client.create_flavor_extra_specs.return_value = ( expected_flavor ) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_flavor.assert_called_once_with(**args) - self.compute_sdk_client.create_flavor_extra_specs.assert_called_once_with( + self.compute_client.create_flavor.assert_called_once_with(**args) + self.compute_client.create_flavor_extra_specs.assert_called_once_with( create_flavor, props ) - self.compute_sdk_client.get_flavor_access.assert_not_called() + self.compute_client.get_flavor_access.assert_not_called() self.assertEqual(self.columns, columns) self.assertCountEqual(tuple(cmp_data), data) @@ -265,19 +265,19 @@ class TestFlavorCreate(TestFlavor): # convert expected data tuple to list to be able to modify it cmp_data = list(self.data_private) cmp_data[7] = format_columns.DictColumn(props) - self.compute_sdk_client.create_flavor.return_value = create_flavor - self.compute_sdk_client.create_flavor_extra_specs.return_value = ( + self.compute_client.create_flavor.return_value = create_flavor + self.compute_client.create_flavor_extra_specs.return_value = ( expected_flavor ) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_flavor.assert_called_once_with(**args) - self.compute_sdk_client.flavor_add_tenant_access.assert_called_with( + self.compute_client.create_flavor.assert_called_once_with(**args) + self.compute_client.flavor_add_tenant_access.assert_called_with( self.flavor.id, self.project.id, ) - self.compute_sdk_client.create_flavor_extra_specs.assert_called_with( + self.compute_client.create_flavor_extra_specs.assert_called_with( create_flavor, props ) self.assertEqual(self.columns, columns) @@ -362,7 +362,7 @@ class TestFlavorCreate(TestFlavor): 'description': 'fake description', } - self.compute_sdk_client.create_flavor.assert_called_once_with(**args) + self.compute_client.create_flavor.assert_called_once_with(**args) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data_private, data) @@ -400,7 +400,7 @@ class TestFlavorDelete(TestFlavor): def setUp(self): super().setUp() - self.compute_sdk_client.delete_flavor.return_value = None + self.compute_client.delete_flavor.return_value = None self.cmd = flavor.DeleteFlavor(self.app, None) @@ -411,14 +411,14 @@ class TestFlavorDelete(TestFlavor): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.compute_sdk_client.find_flavor.return_value = self.flavors[0] + self.compute_client.find_flavor.return_value = self.flavors[0] result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_called_with( + self.compute_client.find_flavor.assert_called_with( self.flavors[0].id, ignore_missing=False ) - self.compute_sdk_client.delete_flavor.assert_called_with( + self.compute_client.delete_flavor.assert_called_with( self.flavors[0].id ) self.assertIsNone(result) @@ -433,7 +433,7 @@ class TestFlavorDelete(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.compute_sdk_client.find_flavor.side_effect = self.flavors + self.compute_client.find_flavor.side_effect = self.flavors result = self.cmd.take_action(parsed_args) @@ -441,8 +441,8 @@ class TestFlavorDelete(TestFlavor): mock.call(i.id, ignore_missing=False) for i in self.flavors ] delete_calls = [mock.call(i.id) for i in self.flavors] - self.compute_sdk_client.find_flavor.assert_has_calls(find_calls) - self.compute_sdk_client.delete_flavor.assert_has_calls(delete_calls) + self.compute_client.find_flavor.assert_has_calls(find_calls) + self.compute_client.delete_flavor.assert_has_calls(delete_calls) self.assertIsNone(result) def test_multi_flavors_delete_with_exception(self): @@ -453,7 +453,7 @@ class TestFlavorDelete(TestFlavor): verifylist = [('flavor', [self.flavors[0].id, 'unexist_flavor'])] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.compute_sdk_client.find_flavor.side_effect = [ + self.compute_client.find_flavor.side_effect = [ self.flavors[0], sdk_exceptions.ResourceNotFound, ] @@ -469,8 +469,8 @@ class TestFlavorDelete(TestFlavor): mock.call('unexist_flavor', ignore_missing=False), ] delete_calls = [mock.call(self.flavors[0].id)] - self.compute_sdk_client.find_flavor.assert_has_calls(find_calls) - self.compute_sdk_client.delete_flavor.assert_has_calls(delete_calls) + self.compute_client.find_flavor.assert_has_calls(find_calls) + self.compute_client.delete_flavor.assert_has_calls(delete_calls) class TestFlavorList(TestFlavor): @@ -516,7 +516,7 @@ class TestFlavorList(TestFlavor): [], ] - self.compute_sdk_client.flavors = self.api_mock + self.compute_client.flavors = self.api_mock # Get the command object to test self.cmd = flavor.ListFlavor(self.app, None) @@ -541,8 +541,8 @@ class TestFlavorList(TestFlavor): 'is_public': True, } - self.compute_sdk_client.flavors.assert_called_with(**kwargs) - self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_client.flavors.assert_called_with(**kwargs) + self.compute_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -567,8 +567,8 @@ class TestFlavorList(TestFlavor): 'is_public': None, } - self.compute_sdk_client.flavors.assert_called_with(**kwargs) - self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_client.flavors.assert_called_with(**kwargs) + self.compute_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -593,8 +593,8 @@ class TestFlavorList(TestFlavor): 'is_public': False, } - self.compute_sdk_client.flavors.assert_called_with(**kwargs) - self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_client.flavors.assert_called_with(**kwargs) + self.compute_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -619,8 +619,8 @@ class TestFlavorList(TestFlavor): 'is_public': True, } - self.compute_sdk_client.flavors.assert_called_with(**kwargs) - self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_client.flavors.assert_called_with(**kwargs) + self.compute_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -645,8 +645,8 @@ class TestFlavorList(TestFlavor): 'is_public': True, } - self.compute_sdk_client.flavors.assert_called_with(**kwargs) - self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_client.flavors.assert_called_with(**kwargs) + self.compute_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns_long, columns) self.assertCountEqual(self.data_long, tuple(data)) @@ -678,8 +678,8 @@ class TestFlavorList(TestFlavor): [], ] - self.compute_sdk_client.flavors = self.api_mock - self.compute_sdk_client.fetch_flavor_extra_specs = mock.Mock( + self.compute_client.flavors = self.api_mock + self.compute_client.fetch_flavor_extra_specs = mock.Mock( return_value=None ) @@ -702,8 +702,8 @@ class TestFlavorList(TestFlavor): 'is_public': True, } - self.compute_sdk_client.flavors.assert_called_with(**kwargs) - self.compute_sdk_client.fetch_flavor_extra_specs.assert_called_once_with( + self.compute_client.flavors.assert_called_with(**kwargs) + self.compute_client.fetch_flavor_extra_specs.assert_called_once_with( flavor ) @@ -736,15 +736,15 @@ class TestFlavorList(TestFlavor): 'min_ram': 2048, } - self.compute_sdk_client.flavors.assert_called_with(**kwargs) - self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_client.flavors.assert_called_with(**kwargs) + self.compute_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) class TestFlavorSet(TestFlavor): - # Return value of self.compute_sdk_client.find_flavor(). + # Return value of self.compute_client.find_flavor(). flavor = compute_fakes.create_one_flavor( attrs={'os-flavor-access:is_public': False} ) @@ -753,7 +753,7 @@ class TestFlavorSet(TestFlavor): def setUp(self): super().setUp() - self.compute_sdk_client.find_flavor.return_value = self.flavor + self.compute_client.find_flavor.return_value = self.flavor # Return a project self.projects_mock.get.return_value = self.project self.cmd = flavor.SetFlavor(self.app, None) @@ -767,10 +767,10 @@ class TestFlavorSet(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_called_with( + self.compute_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) - self.compute_sdk_client.create_flavor_extra_specs.assert_called_with( + self.compute_client.create_flavor_extra_specs.assert_called_with( self.flavor.id, {'FOO': '"B A R"'} ) self.assertIsNone(result) @@ -781,10 +781,10 @@ class TestFlavorSet(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_called_with( + self.compute_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) - self.compute_sdk_client.delete_flavor_extra_specs_property.assert_called_with( + self.compute_client.delete_flavor_extra_specs_property.assert_called_with( self.flavor.id, 'property' ) self.assertIsNone(result) @@ -803,14 +803,14 @@ class TestFlavorSet(TestFlavor): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_called_with( + self.compute_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) - self.compute_sdk_client.flavor_add_tenant_access.assert_called_with( + self.compute_client.flavor_add_tenant_access.assert_called_with( self.flavor.id, self.project.id, ) - self.compute_sdk_client.create_flavor_extra_specs.assert_not_called() + self.compute_client.create_flavor_extra_specs.assert_not_called() self.assertIsNone(result) def test_flavor_set_no_project(self): @@ -847,7 +847,7 @@ class TestFlavorSet(TestFlavor): ) def test_flavor_set_with_unexist_flavor(self): - self.compute_sdk_client.find_flavor.side_effect = [ + self.compute_client.find_flavor.side_effect = [ sdk_exceptions.ResourceNotFound() ] @@ -876,10 +876,10 @@ class TestFlavorSet(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_called_with( + self.compute_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) - self.compute_sdk_client.flavor_add_tenant_access.assert_not_called() + self.compute_client.flavor_add_tenant_access.assert_not_called() self.assertIsNone(result) def test_flavor_set_description(self): @@ -897,7 +897,7 @@ class TestFlavorSet(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.update_flavor.assert_called_with( + self.compute_client.update_flavor.assert_called_with( flavor=self.flavor.id, description='description' ) self.assertIsNone(result) @@ -935,7 +935,7 @@ class TestFlavorSet(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.update_flavor.assert_called_with( + self.compute_client.update_flavor.assert_called_with( flavor=self.flavor.id, description='description' ) self.assertIsNone(result) @@ -960,7 +960,7 @@ class TestFlavorSet(TestFlavor): class TestFlavorShow(TestFlavor): - # Return value of self.compute_sdk_client.find_flavor(). + # Return value of self.compute_client.find_flavor(). flavor_access = compute_fakes.create_one_flavor_access() flavor = compute_fakes.create_one_flavor() @@ -1000,8 +1000,8 @@ class TestFlavorShow(TestFlavor): super().setUp() # Return value of _find_resource() - self.compute_sdk_client.find_flavor.return_value = self.flavor - self.compute_sdk_client.get_flavor_access.return_value = [ + self.compute_client.find_flavor.return_value = self.flavor + self.compute_client.get_flavor_access.return_value = [ self.flavor_access ] self.cmd = flavor.ShowFlavor(self.app, None) @@ -1040,7 +1040,7 @@ class TestFlavorShow(TestFlavor): 'os-flavor-access:is_public': False, } ) - self.compute_sdk_client.find_flavor.return_value = private_flavor + self.compute_client.find_flavor.return_value = private_flavor arglist = [ private_flavor.name, @@ -1069,7 +1069,7 @@ class TestFlavorShow(TestFlavor): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.get_flavor_access.assert_called_with( + self.compute_client.get_flavor_access.assert_called_with( flavor=private_flavor.id ) self.assertEqual(self.columns, columns) @@ -1077,7 +1077,7 @@ class TestFlavorShow(TestFlavor): class TestFlavorUnset(TestFlavor): - # Return value of self.compute_sdk_client.find_flavor(). + # Return value of self.compute_client.find_flavor(). flavor = compute_fakes.create_one_flavor( attrs={'os-flavor-access:is_public': False} ) @@ -1086,13 +1086,13 @@ class TestFlavorUnset(TestFlavor): def setUp(self): super().setUp() - self.compute_sdk_client.find_flavor.return_value = self.flavor + self.compute_client.find_flavor.return_value = self.flavor # Return a project self.projects_mock.get.return_value = self.project self.cmd = flavor.UnsetFlavor(self.app, None) self.mock_shortcut = ( - self.compute_sdk_client.delete_flavor_extra_specs_property + self.compute_client.delete_flavor_extra_specs_property ) def test_flavor_unset_property(self): @@ -1104,11 +1104,11 @@ class TestFlavorUnset(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_called_with( + self.compute_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) self.mock_shortcut.assert_called_with(self.flavor.id, 'property') - self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called() + self.compute_client.flavor_remove_tenant_access.assert_not_called() self.assertIsNone(result) def test_flavor_unset_properties(self): @@ -1126,7 +1126,7 @@ class TestFlavorUnset(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_called_with( + self.compute_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) calls = [ @@ -1141,7 +1141,7 @@ class TestFlavorUnset(TestFlavor): AssertionError, self.mock_shortcut.assert_has_calls, calls ) - self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called() + self.compute_client.flavor_remove_tenant_access.assert_not_called() def test_flavor_unset_project(self): arglist = [ @@ -1158,14 +1158,14 @@ class TestFlavorUnset(TestFlavor): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.find_flavor.assert_called_with( + self.compute_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) - self.compute_sdk_client.flavor_remove_tenant_access.assert_called_with( + self.compute_client.flavor_remove_tenant_access.assert_called_with( self.flavor.id, self.project.id, ) - self.compute_sdk_client.delete_flavor_extra_specs_property.assert_not_called() + self.compute_client.delete_flavor_extra_specs_property.assert_not_called() self.assertIsNone(result) def test_flavor_unset_no_project(self): @@ -1202,7 +1202,7 @@ class TestFlavorUnset(TestFlavor): ) def test_flavor_unset_with_unexist_flavor(self): - self.compute_sdk_client.find_flavor.side_effect = [ + self.compute_client.find_flavor.side_effect = [ sdk_exceptions.ResourceNotFound ] @@ -1232,4 +1232,4 @@ class TestFlavorUnset(TestFlavor): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called() + self.compute_client.flavor_remove_tenant_access.assert_not_called() diff --git a/openstackclient/tests/unit/compute/v2/test_host.py b/openstackclient/tests/unit/compute/v2/test_host.py index 1de8023115..8d38f8353b 100644 --- a/openstackclient/tests/unit/compute/v2/test_host.py +++ b/openstackclient/tests/unit/compute/v2/test_host.py @@ -72,7 +72,7 @@ class TestHostList(compute_fakes.TestComputev2): ) ] - self.compute_sdk_client.get.return_value = fakes.FakeResponse( + self.compute_client.get.return_value = fakes.FakeResponse( data={'hosts': [self._host]} ) self.cmd = host.ListHost(self.app, None) @@ -85,7 +85,7 @@ class TestHostList(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.get.assert_called_with( + self.compute_client.get.assert_called_with( '/os-hosts', microversion='2.1' ) self.assertEqual(self.columns, columns) @@ -104,7 +104,7 @@ class TestHostList(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.get.assert_called_with( + self.compute_client.get.assert_called_with( '/os-hosts', microversion='2.1' ) self.assertEqual(self.columns, columns) @@ -116,7 +116,7 @@ class TestHostSet(compute_fakes.TestComputev2): super().setUp() self._host = _generate_fake_host() - self.compute_sdk_client.put.return_value = fakes.FakeResponse() + self.compute_client.put.return_value = fakes.FakeResponse() self.cmd = host.SetHost(self.app, None) @@ -132,7 +132,7 @@ class TestHostSet(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.put.assert_not_called() + self.compute_client.put.assert_not_called() def test_host_set(self): arglist = [ @@ -150,7 +150,7 @@ class TestHostSet(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.put.assert_called_with( + self.compute_client.put.assert_called_with( f'/os-hosts/{self._host["host"]}', json={ 'maintenance_mode': 'disable', @@ -183,7 +183,7 @@ class TestHostShow(compute_fakes.TestComputev2): ) ] - self.compute_sdk_client.get.return_value = fakes.FakeResponse( + self.compute_client.get.return_value = fakes.FakeResponse( data={ 'host': [ { @@ -226,7 +226,7 @@ class TestHostShow(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.get.assert_called_with( + self.compute_client.get.assert_called_with( '/os-hosts/' + self._host['host_name'], microversion='2.1' ) self.assertEqual(self.columns, columns) diff --git a/openstackclient/tests/unit/compute/v2/test_hypervisor.py b/openstackclient/tests/unit/compute/v2/test_hypervisor.py index da6e7e56d4..4282982a27 100644 --- a/openstackclient/tests/unit/compute/v2/test_hypervisor.py +++ b/openstackclient/tests/unit/compute/v2/test_hypervisor.py @@ -32,9 +32,7 @@ class TestHypervisorList(compute_fakes.TestComputev2): self.hypervisors = list( sdk_fakes.generate_fake_resources(_hypervisor.Hypervisor, count=2) ) - self.compute_sdk_client.hypervisors.return_value = iter( - self.hypervisors - ) + self.compute_client.hypervisors.return_value = iter(self.hypervisors) self.columns = ( "ID", @@ -108,7 +106,7 @@ class TestHypervisorList(compute_fakes.TestComputev2): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.hypervisors.assert_called_with(details=True) + self.compute_client.hypervisors.assert_called_with(details=True) self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -123,9 +121,7 @@ class TestHypervisorList(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) # Fake the return value of search() - self.compute_sdk_client.hypervisors.return_value = [ - self.hypervisors[0] - ] + self.compute_client.hypervisors.return_value = [self.hypervisors[0]] self.data = ( ( @@ -142,7 +138,7 @@ class TestHypervisorList(compute_fakes.TestComputev2): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.hypervisors.assert_called_with( + self.compute_client.hypervisors.assert_called_with( hypervisor_hostname_pattern=self.hypervisors[0].name, details=True ) self.assertEqual(self.columns, columns) @@ -159,9 +155,7 @@ class TestHypervisorList(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) # Fake exception raised from search() - self.compute_sdk_client.hypervisors.side_effect = exceptions.NotFound( - None - ) + self.compute_client.hypervisors.side_effect = exceptions.NotFound(None) self.assertRaises( exceptions.NotFound, self.cmd.take_action, parsed_args @@ -205,7 +199,7 @@ class TestHypervisorList(compute_fakes.TestComputev2): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.hypervisors.assert_called_with(details=True) + self.compute_client.hypervisors.assert_called_with(details=True) self.assertEqual(self.columns_long, columns) self.assertEqual(self.data_long, tuple(data)) @@ -223,7 +217,7 @@ class TestHypervisorList(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.hypervisors.assert_called_with( + self.compute_client.hypervisors.assert_called_with( limit=1, details=True ) @@ -261,7 +255,7 @@ class TestHypervisorList(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.hypervisors.assert_called_with( + self.compute_client.hypervisors.assert_called_with( marker='test_hyp', details=True ) @@ -303,10 +297,10 @@ class TestHypervisorShow(compute_fakes.TestComputev2): cpu_info={"aaa": "aaa"}, ) - self.compute_sdk_client.find_hypervisor.return_value = self.hypervisor - self.compute_sdk_client.get_hypervisor.return_value = self.hypervisor + self.compute_client.find_hypervisor.return_value = self.hypervisor + self.compute_client.get_hypervisor.return_value = self.hypervisor - self.compute_sdk_client.aggregates.return_value = [] + self.compute_client.aggregates.return_value = [] uptime_info = { 'status': self.hypervisor.status, @@ -315,9 +309,7 @@ class TestHypervisorShow(compute_fakes.TestComputev2): 'hypervisor_hostname': self.hypervisor.name, 'uptime': uptime_string, } - self.compute_sdk_client.get_hypervisor_uptime.return_value = ( - uptime_info - ) + self.compute_client.get_hypervisor_uptime.return_value = uptime_info self.columns_v288 = ( 'aggregates', @@ -434,10 +426,10 @@ class TestHypervisorShow(compute_fakes.TestComputev2): self.assertEqual(self.columns_v288, columns) self.assertCountEqual(self.data_v288, data) - self.compute_sdk_client.find_hypervisor.assert_called_once_with( + self.compute_client.find_hypervisor.assert_called_once_with( self.hypervisor.name, ignore_missing=False, details=False ) - self.compute_sdk_client.get_hypervisor.assert_called_once_with( + self.compute_client.get_hypervisor.assert_called_once_with( self.hypervisor.id ) @@ -460,10 +452,10 @@ class TestHypervisorShow(compute_fakes.TestComputev2): self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) - self.compute_sdk_client.find_hypervisor.assert_called_once_with( + self.compute_client.find_hypervisor.assert_called_once_with( self.hypervisor.name, ignore_missing=False, details=False ) - self.compute_sdk_client.get_hypervisor.assert_called_once_with( + self.compute_client.get_hypervisor.assert_called_once_with( self.hypervisor.id ) @@ -473,7 +465,7 @@ class TestHypervisorShow(compute_fakes.TestComputev2): # before microversion 2.28, nova returned a stringified version of this # field self.hypervisor.cpu_info = json.dumps(self.hypervisor.cpu_info) - self.compute_sdk_client.find_hypervisor.return_value = self.hypervisor + self.compute_client.find_hypervisor.return_value = self.hypervisor arglist = [ self.hypervisor.name, @@ -491,10 +483,10 @@ class TestHypervisorShow(compute_fakes.TestComputev2): self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) - self.compute_sdk_client.find_hypervisor.assert_called_once_with( + self.compute_client.find_hypervisor.assert_called_once_with( self.hypervisor.name, ignore_missing=False, details=False ) - self.compute_sdk_client.get_hypervisor.assert_called_once_with( + self.compute_client.get_hypervisor.assert_called_once_with( self.hypervisor.id ) @@ -509,7 +501,7 @@ class TestHypervisorShow(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.compute_sdk_client.get_hypervisor_uptime.side_effect = ( + self.compute_client.get_hypervisor_uptime.side_effect = ( sdk_exceptions.HttpException(http_status=501) ) @@ -570,9 +562,9 @@ class TestHypervisorShow(compute_fakes.TestComputev2): self.assertEqual(expected_columns, columns) self.assertCountEqual(expected_data, data) - self.compute_sdk_client.find_hypervisor.assert_called_once_with( + self.compute_client.find_hypervisor.assert_called_once_with( self.hypervisor.name, ignore_missing=False, details=False ) - self.compute_sdk_client.get_hypervisor.assert_called_once_with( + self.compute_client.get_hypervisor.assert_called_once_with( self.hypervisor.id ) diff --git a/openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py b/openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py index 5a4e3c52f1..045efda2d2 100644 --- a/openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py +++ b/openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py @@ -23,7 +23,7 @@ class TestHypervisorStats(compute_fakes.TestComputev2): def setUp(self): super().setUp() - self.compute_sdk_client.get = mock.Mock() + self.compute_client.get = mock.Mock() # Not in fakes.py because hypervisor stats has been deprecated @@ -67,7 +67,7 @@ class TestHypervisorStatsShow(TestHypervisorStats): def setUp(self): super().setUp() - self.compute_sdk_client.get.return_value = fakes.FakeResponse( + self.compute_client.get.return_value = fakes.FakeResponse( data={'hypervisor_statistics': self._stats} ) diff --git a/openstackclient/tests/unit/compute/v2/test_keypair.py b/openstackclient/tests/unit/compute/v2/test_keypair.py index 0ce08b48c3..85a4547a63 100644 --- a/openstackclient/tests/unit/compute/v2/test_keypair.py +++ b/openstackclient/tests/unit/compute/v2/test_keypair.py @@ -66,7 +66,7 @@ class TestKeypairCreate(TestKeypair): # Get the command object to test self.cmd = keypair.CreateKeypair(self.app, None) - self.compute_sdk_client.create_keypair.return_value = self.keypair + self.compute_client.create_keypair.return_value = self.keypair @mock.patch.object( keypair, @@ -84,7 +84,7 @@ class TestKeypairCreate(TestKeypair): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_keypair.assert_called_with( + self.compute_client.create_keypair.assert_called_with( name=self.keypair.name, public_key=mock_generate.return_value.public_key, ) @@ -124,7 +124,7 @@ class TestKeypairCreate(TestKeypair): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_keypair.assert_called_with( + self.compute_client.create_keypair.assert_called_with( name=self.keypair.name, public_key=self.keypair.public_key, ) @@ -159,7 +159,7 @@ class TestKeypairCreate(TestKeypair): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_keypair.assert_called_with( + self.compute_client.create_keypair.assert_called_with( name=self.keypair.name, public_key=mock_generate.return_value.public_key, ) @@ -176,7 +176,7 @@ class TestKeypairCreate(TestKeypair): self.set_compute_api_version('2.2') for key_type in ['x509', 'ssh']: - self.compute_sdk_client.create_keypair.return_value = self.keypair + self.compute_client.create_keypair.return_value = self.keypair self.data = ( self.keypair.created_at, @@ -209,7 +209,7 @@ class TestKeypairCreate(TestKeypair): m_file.read.return_value = self.keypair.public_key columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_keypair.assert_called_with( + self.compute_client.create_keypair.assert_called_with( name=self.keypair.name, public_key=self.keypair.public_key, key_type=key_type, @@ -272,7 +272,7 @@ class TestKeypairCreate(TestKeypair): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_keypair.assert_called_with( + self.compute_client.create_keypair.assert_called_with( name=self.keypair.name, user_id=self._user.id, public_key=mock_generate.return_value.public_key, @@ -324,7 +324,7 @@ class TestKeypairDelete(TestKeypair): ret = self.cmd.take_action(parsed_args) self.assertIsNone(ret) - self.compute_sdk_client.delete_keypair.assert_called_with( + self.compute_client.delete_keypair.assert_called_with( self.keypairs[0].name, ignore_missing=False ) @@ -342,7 +342,7 @@ class TestKeypairDelete(TestKeypair): calls = [] for k in self.keypairs: calls.append(call(k.name, ignore_missing=False)) - self.compute_sdk_client.delete_keypair.assert_has_calls(calls) + self.compute_client.delete_keypair.assert_has_calls(calls) self.assertIsNone(result) def test_delete_multiple_keypairs_with_exception(self): @@ -356,7 +356,7 @@ class TestKeypairDelete(TestKeypair): parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.compute_sdk_client.delete_keypair.side_effect = [ + self.compute_client.delete_keypair.side_effect = [ None, exceptions.CommandError, ] @@ -369,7 +369,7 @@ class TestKeypairDelete(TestKeypair): calls = [] for k in arglist: calls.append(call(k, ignore_missing=False)) - self.compute_sdk_client.delete_keypair.assert_has_calls(calls) + self.compute_client.delete_keypair.assert_has_calls(calls) def test_keypair_delete_with_user(self): self.set_compute_api_version('2.10') @@ -384,7 +384,7 @@ class TestKeypairDelete(TestKeypair): ret = self.cmd.take_action(parsed_args) self.assertIsNone(ret) - self.compute_sdk_client.delete_keypair.assert_called_with( + self.compute_client.delete_keypair.assert_called_with( self.keypairs[0].name, user_id=self._user.id, ignore_missing=False, @@ -415,7 +415,7 @@ class TestKeypairList(TestKeypair): self.keypairs = list( sdk_fakes.generate_fake_resources(_keypair.Keypair, count=1) ) - self.compute_sdk_client.keypairs.return_value = iter(self.keypairs) + self.compute_client.keypairs.return_value = iter(self.keypairs) # Get the command object to test self.cmd = keypair.ListKeypair(self.app, None) @@ -435,7 +435,7 @@ class TestKeypairList(TestKeypair): # Set expected values - self.compute_sdk_client.keypairs.assert_called_with() + self.compute_client.keypairs.assert_called_with() self.assertEqual(('Name', 'Fingerprint'), columns) self.assertEqual( @@ -458,7 +458,7 @@ class TestKeypairList(TestKeypair): # Set expected values - self.compute_sdk_client.keypairs.assert_called_with() + self.compute_client.keypairs.assert_called_with() self.assertEqual(('Name', 'Fingerprint', 'Type'), columns) self.assertEqual( @@ -491,7 +491,7 @@ class TestKeypairList(TestKeypair): columns, data = self.cmd.take_action(parsed_args) users_mock.get.assert_called_with(self._user.name) - self.compute_sdk_client.keypairs.assert_called_with( + self.compute_client.keypairs.assert_called_with( user_id=self._user.id, ) @@ -545,7 +545,7 @@ class TestKeypairList(TestKeypair): projects_mock.get.assert_called_with(self._project.name) users_mock.list.assert_called_with(tenant_id=self._project.id) - self.compute_sdk_client.keypairs.assert_called_with( + self.compute_client.keypairs.assert_called_with( user_id=self._user.id, ) @@ -605,7 +605,7 @@ class TestKeypairList(TestKeypair): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.keypairs.assert_called_with(limit=1) + self.compute_client.keypairs.assert_called_with(limit=1) def test_keypair_list_with_limit_pre_v235(self): self.set_compute_api_version('2.34') @@ -641,7 +641,7 @@ class TestKeypairList(TestKeypair): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.keypairs.assert_called_with(marker='test_kp') + self.compute_client.keypairs.assert_called_with(marker='test_kp') def test_keypair_list_with_marker_pre_v235(self): self.set_compute_api_version('2.34') @@ -696,7 +696,7 @@ class TestKeypairShow(TestKeypair): def test_keypair_show(self): self.keypair = sdk_fakes.generate_fake_resource(_keypair.Keypair) - self.compute_sdk_client.find_keypair.return_value = self.keypair + self.compute_client.find_keypair.return_value = self.keypair self.data = ( self.keypair.created_at, @@ -715,7 +715,7 @@ class TestKeypairShow(TestKeypair): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_keypair.assert_called_with( + self.compute_client.find_keypair.assert_called_with( self.keypair.name, ignore_missing=False ) @@ -724,7 +724,7 @@ class TestKeypairShow(TestKeypair): def test_keypair_show_public(self): self.keypair = sdk_fakes.generate_fake_resource(_keypair.Keypair) - self.compute_sdk_client.find_keypair.return_value = self.keypair + self.compute_client.find_keypair.return_value = self.keypair arglist = ['--public-key', self.keypair.name] verifylist = [('public_key', True), ('name', self.keypair.name)] @@ -740,7 +740,7 @@ class TestKeypairShow(TestKeypair): self.set_compute_api_version('2.10') self.keypair = sdk_fakes.generate_fake_resource(_keypair.Keypair) - self.compute_sdk_client.find_keypair.return_value = self.keypair + self.compute_client.find_keypair.return_value = self.keypair self.data = ( self.keypair.created_at, @@ -767,7 +767,7 @@ class TestKeypairShow(TestKeypair): columns, data = self.cmd.take_action(parsed_args) self.users_mock.get.assert_called_with(self._user.name) - self.compute_sdk_client.find_keypair.assert_called_with( + self.compute_client.find_keypair.assert_called_with( self.keypair.name, ignore_missing=False, user_id=self._user.id, diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py index 2fa3aa7e17..39af6af7a2 100644 --- a/openstackclient/tests/unit/compute/v2/test_server.py +++ b/openstackclient/tests/unit/compute/v2/test_server.py @@ -76,7 +76,7 @@ class TestServer(compute_fakes.TestComputev2): ) # This is the return value for compute_client.find_server() - self.compute_sdk_client.find_server.side_effect = servers + self.compute_client.find_server.side_effect = servers return servers @@ -132,9 +132,7 @@ class TestServerAddFixedIP(TestServer): servers = self.setup_sdk_servers_mock(count=1) network = compute_fakes.create_one_network() interface = compute_fakes.create_one_server_interface() - self.compute_sdk_client.create_server_interface.return_value = ( - interface - ) + self.compute_client.create_server_interface.return_value = interface with mock.patch.object( self.app.client_manager, @@ -169,7 +167,7 @@ class TestServerAddFixedIP(TestServer): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, tuple(data)) - self.compute_sdk_client.create_server_interface.assert_called_once_with( + self.compute_client.create_server_interface.assert_called_once_with( servers[0].id, net_id=network['id'] ) @@ -179,9 +177,7 @@ class TestServerAddFixedIP(TestServer): servers = self.setup_sdk_servers_mock(count=1) network = compute_fakes.create_one_network() interface = compute_fakes.create_one_server_interface() - self.compute_sdk_client.create_server_interface.return_value = ( - interface - ) + self.compute_client.create_server_interface.return_value = interface with mock.patch.object( self.app.client_manager, @@ -222,7 +218,7 @@ class TestServerAddFixedIP(TestServer): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, tuple(data)) - self.compute_sdk_client.create_server_interface.assert_called_once_with( + self.compute_client.create_server_interface.assert_called_once_with( servers[0].id, net_id=network['id'], fixed_ips=[{'ip_address': '5.6.7.8'}], @@ -234,9 +230,7 @@ class TestServerAddFixedIP(TestServer): servers = self.setup_sdk_servers_mock(count=1) network = compute_fakes.create_one_network() interface = compute_fakes.create_one_server_interface() - self.compute_sdk_client.create_server_interface.return_value = ( - interface - ) + self.compute_client.create_server_interface.return_value = interface with mock.patch.object( self.app.client_manager, @@ -282,7 +276,7 @@ class TestServerAddFixedIP(TestServer): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, tuple(data)) - self.compute_sdk_client.create_server_interface.assert_called_once_with( + self.compute_client.create_server_interface.assert_called_once_with( servers[0].id, net_id=network['id'], fixed_ips=[{'ip_address': '5.6.7.8'}], @@ -295,9 +289,7 @@ class TestServerAddFixedIP(TestServer): servers = self.setup_sdk_servers_mock(count=1) network = compute_fakes.create_one_network() interface = compute_fakes.create_one_server_interface() - self.compute_sdk_client.create_server_interface.return_value = ( - interface - ) + self.compute_client.create_server_interface.return_value = interface with mock.patch.object( self.app.client_manager, @@ -343,7 +335,7 @@ class TestServerAddFixedIP(TestServer): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, tuple(data)) - self.compute_sdk_client.create_server_interface.assert_called_once_with( + self.compute_client.create_server_interface.assert_called_once_with( servers[0].id, net_id=network['id'], fixed_ips=[{'ip_address': '5.6.7.8'}], @@ -357,7 +349,7 @@ class TestServerAddFloatingIPCompute(compute_fakes.TestComputev2): self.app.client_manager.network_endpoint_enabled = False self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.cmd = server.AddFloatingIP(self.app, None) @@ -374,10 +366,10 @@ class TestServerAddFloatingIPCompute(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False ) - self.compute_sdk_client.add_floating_ip_to_server.assert_called_once_with( + self.compute_client.add_floating_ip_to_server.assert_called_once_with( self.server, '1.2.3.4', fixed_address=None ) @@ -397,10 +389,10 @@ class TestServerAddFloatingIPCompute(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False ) - self.compute_sdk_client.add_floating_ip_to_server.assert_called_once_with( + self.compute_client.add_floating_ip_to_server.assert_called_once_with( self.server, '1.2.3.4', fixed_address='5.6.7.8' ) @@ -413,7 +405,7 @@ class TestServerAddFloatingIPNetwork( super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.network_client.update_ip = mock.Mock(return_value=None) @@ -637,7 +629,7 @@ class TestServerAddPort(TestServer): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server_interface.assert_called_once_with( + self.compute_client.create_server_interface.assert_called_once_with( servers[0], port_id=port_id ) self.assertIsNone(result) @@ -674,7 +666,7 @@ class TestServerAddPort(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.create_server_interface.assert_called_once_with( + self.compute_client.create_server_interface.assert_called_once_with( servers[0], port_id='fake-port', tag='tag1' ) @@ -709,7 +701,7 @@ class TestServerVolume(TestServer): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.volume = volume_fakes.create_one_sdk_volume() self.volume_sdk_client.find_volume.return_value = self.volume @@ -722,7 +714,7 @@ class TestServerVolume(TestServer): attrs=attrs ) - self.compute_sdk_client.create_volume_attachment.return_value = ( + self.compute_client.create_volume_attachment.return_value = ( self.volume_attachment ) @@ -762,7 +754,7 @@ class TestServerAddVolume(TestServerVolume): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, data) - self.compute_sdk_client.create_volume_attachment.assert_called_once_with( + self.compute_client.create_volume_attachment.assert_called_once_with( self.server, volumeId=self.volume.id, device='/dev/sdb' ) @@ -799,7 +791,7 @@ class TestServerAddVolume(TestServerVolume): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, data) - self.compute_sdk_client.create_volume_attachment.assert_called_once_with( + self.compute_client.create_volume_attachment.assert_called_once_with( self.server, volumeId=self.volume.id, device='/dev/sdb', @@ -869,7 +861,7 @@ class TestServerAddVolume(TestServerVolume): columns, data = self.cmd.take_action(parsed_args) self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, data) - self.compute_sdk_client.create_volume_attachment.assert_called_once_with( + self.compute_client.create_volume_attachment.assert_called_once_with( self.server, volumeId=self.volume.id, device='/dev/sdb', @@ -918,7 +910,7 @@ class TestServerAddVolume(TestServerVolume): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, data) - self.compute_sdk_client.create_volume_attachment.assert_called_once_with( + self.compute_client.create_volume_attachment.assert_called_once_with( self.server, volumeId=self.volume.id, device='/dev/sdb', @@ -1031,7 +1023,7 @@ class TestServerRemoveVolume(TestServerVolume): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.delete_volume_attachment.assert_called_once_with( + self.compute_client.delete_volume_attachment.assert_called_once_with( self.volume, self.server, ignore_missing=False, @@ -1061,7 +1053,7 @@ class TestServerAddNetwork(TestServer): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server_interface.assert_called_once_with( + self.compute_client.create_server_interface.assert_called_once_with( servers[0], net_id=net_id ) self.assertIsNone(result) @@ -1099,7 +1091,7 @@ class TestServerAddNetwork(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.create_server_interface.assert_called_once_with( + self.compute_client.create_server_interface.assert_called_once_with( servers[0], net_id='fake-network', tag='tag1' ) @@ -1135,10 +1127,8 @@ class TestServerAddSecurityGroup(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.add_security_group_to_server.return_value = ( - None - ) + self.compute_client.find_server.return_value = self.server + self.compute_client.add_security_group_to_server.return_value = None # Get the command object to test self.cmd = server.AddServerSecurityGroup(self.app, None) @@ -1163,14 +1153,14 @@ class TestServerAddSecurityGroup(compute_fakes.TestComputev2): ) as mock_find_nova_net_sg: result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.add_security_group_to_server.assert_called_once_with( + self.compute_client.add_security_group_to_server.assert_called_once_with( self.server, {'name': 'fake_sg'} ) mock_find_nova_net_sg.assert_called_once_with( - self.compute_sdk_client, 'fake_sg' + self.compute_client, 'fake_sg' ) self.assertIsNone(result) @@ -1184,10 +1174,10 @@ class TestServerAddSecurityGroup(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.add_security_group_to_server.assert_called_once_with( + self.compute_client.add_security_group_to_server.assert_called_once_with( self.server, {'name': 'fake_sg'} ) self.assertIsNone(result) @@ -1297,7 +1287,7 @@ class TestServerCreate(TestServer): self.image_client.get_image.return_value = self.image self.flavor = compute_fakes.create_one_flavor() - self.compute_sdk_client.find_flavor.return_value = self.flavor + self.compute_client.find_flavor.return_value = self.flavor attrs = { 'addresses': {}, @@ -1307,8 +1297,8 @@ class TestServerCreate(TestServer): } self.server = compute_fakes.create_one_sdk_server(attrs=attrs) - self.compute_sdk_client.create_server.return_value = self.server - self.compute_sdk_client.get_server.return_value = self.server + self.compute_client.create_server.return_value = self.server + self.compute_client.get_server.return_value = self.server self.volume = volume_fakes.create_one_volume() self.snapshot = volume_fakes.create_one_snapshot() @@ -1350,13 +1340,13 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_has_calls( + self.compute_client.find_flavor.assert_has_calls( [mock.call(self.flavor.id, ignore_missing=False)] * 2 ) self.image_client.find_image.assert_called_once_with( self.image.id, ignore_missing=False ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -1380,7 +1370,7 @@ class TestServerCreate(TestServer): server_group = sdk_fakes.generate_fake_resource( _server_group.ServerGroup ) - self.compute_sdk_client.find_server_group.return_value = server_group + self.compute_client.find_server_group.return_value = server_group security_group = network_fakes.create_one_security_group() self.network_client.find_security_group.return_value = security_group @@ -1423,7 +1413,7 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_has_calls( + self.compute_client.find_flavor.assert_has_calls( [mock.call(self.flavor.id, ignore_missing=False)] * 2 ) self.network_client.find_security_group.assert_called_once_with( @@ -1432,10 +1422,10 @@ class TestServerCreate(TestServer): self.image_client.find_image.assert_called_once_with( self.image.id, ignore_missing=False ) - self.compute_sdk_client.find_server_group.assert_called_once_with( + self.compute_client.find_server_group.assert_called_once_with( server_group.id, ignore_missing=False ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -1525,8 +1515,8 @@ class TestServerCreate(TestServer): ) as mock_find: columns, data = self.cmd.take_action(parsed_args) - mock_find.assert_called_once_with(self.compute_sdk_client, sg_name) - self.compute_sdk_client.create_server.assert_called_once_with( + mock_find.assert_called_once_with(self.compute_client, sg_name) + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -1573,14 +1563,14 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_has_calls( + self.compute_client.find_flavor.assert_has_calls( [mock.call(self.flavor.id, ignore_missing=False)] * 2 ) self.network_client.find_security_group.assert_not_called() self.image_client.find_image.assert_called_once_with( self.image.id, ignore_missing=False ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -1702,7 +1692,7 @@ class TestServerCreate(TestServer): mock.call(port_port2.id, ignore_missing=False), ] ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -1778,7 +1768,7 @@ class TestServerCreate(TestServer): self.network_client.find_network.assert_called_once_with( network.id, ignore_missing=False ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -1839,7 +1829,7 @@ class TestServerCreate(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) self.network_client.find_network.assert_not_called() - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def _test_server_create_with_auto_network(self, arglist): # requires API microversion 2.37 or later @@ -1857,7 +1847,7 @@ class TestServerCreate(TestServer): columns, data = self.cmd.take_action(parsed_args) self.network_client.find_network.assert_not_called() - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -1937,7 +1927,7 @@ class TestServerCreate(TestServer): 'allocation', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_auto_network_default(self): """Tests creating a server without specifying --nic using 2.37.""" @@ -1963,7 +1953,7 @@ class TestServerCreate(TestServer): columns, data = self.cmd.take_action(parsed_args) self.network_client.find_network.assert_not_called() - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -2000,7 +1990,7 @@ class TestServerCreate(TestServer): columns, data = self.cmd.take_action(parsed_args) self.network_client.find_network.assert_not_called() - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -2080,7 +2070,7 @@ class TestServerCreate(TestServer): 'allocation', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_conflicting_network_options(self): arglist = [ @@ -2125,7 +2115,7 @@ class TestServerCreate(TestServer): 'other --nic, --network or --port value.', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_invalid_network_options(self): arglist = [ @@ -2148,7 +2138,7 @@ class TestServerCreate(TestServer): 'Invalid argument abcdefgh; argument must be of form ', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_invalid_network_key(self): arglist = [ @@ -2171,7 +2161,7 @@ class TestServerCreate(TestServer): 'Invalid argument abcdefgh=12324; argument must be of form ', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_empty_network_key_value(self): arglist = [ @@ -2194,7 +2184,7 @@ class TestServerCreate(TestServer): 'Invalid argument net-id=; argument must be of form ', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_only_network_key(self): arglist = [ @@ -2217,7 +2207,7 @@ class TestServerCreate(TestServer): 'Invalid argument net-id; argument must be of form ', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_network_in_nova_network(self): net_name = 'nova-net-net' @@ -2263,8 +2253,8 @@ class TestServerCreate(TestServer): ) as mock_find: columns, data = self.cmd.take_action(parsed_args) - mock_find.assert_called_once_with(self.compute_sdk_client, net_name) - self.compute_sdk_client.create_server.assert_called_once_with( + mock_find.assert_called_once_with(self.compute_client, net_name) + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -2307,7 +2297,7 @@ class TestServerCreate(TestServer): [], ) self.assertIn("either 'network' or 'port'", str(exc)) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_conflicting_fixed_ip_filters(self): arglist = [ @@ -2327,7 +2317,7 @@ class TestServerCreate(TestServer): [], ) self.assertIn("either 'v4-fixed-ip' or 'v6-fixed-ip'", str(exc)) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() @mock.patch.object(common_utils, 'wait_for_status', return_value=True) def test_server_create_with_wait_ok(self, mock_wait_for_status): @@ -2350,7 +2340,7 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -2368,7 +2358,7 @@ class TestServerCreate(TestServer): ], ) mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, callback=mock.ANY, ) @@ -2399,7 +2389,7 @@ class TestServerCreate(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -2417,7 +2407,7 @@ class TestServerCreate(TestServer): ], ) mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, callback=mock.ANY, ) @@ -2449,7 +2439,7 @@ class TestServerCreate(TestServer): columns, data = self.cmd.take_action(parsed_args) mock_file.assert_called_with('userdata.sh', 'rb') - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -2493,7 +2483,7 @@ class TestServerCreate(TestServer): self.volume_client.volumes.get.assert_called_once_with( self.volume.name ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id='', flavor_id=self.flavor.id, @@ -2535,7 +2525,7 @@ class TestServerCreate(TestServer): self.volume_client.volume_snapshots.get.assert_called_once_with( self.snapshot.name ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id='', flavor_id=self.flavor.id, @@ -2586,7 +2576,7 @@ class TestServerCreate(TestServer): # we don't do any validation of IDs when using the legacy option self.volume_client.volumes.get.assert_not_called() - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id='', flavor_id=self.flavor.id, @@ -2664,7 +2654,7 @@ class TestServerCreate(TestServer): # we don't do any validation of IDs when using the legacy option self.volume_client.volumes.get.assert_not_called() - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -2746,7 +2736,7 @@ class TestServerCreate(TestServer): # we don't do any validation of IDs when using the legacy option self.volume_client.volumes.get.assert_not_called() - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -2799,7 +2789,7 @@ class TestServerCreate(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) self.assertIn('The boot_index key of --block-device ', str(ex)) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_block_device_invalid_source_type(self): block_device = f'uuid={self.volume.name},source_type=foo' @@ -2817,7 +2807,7 @@ class TestServerCreate(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) self.assertIn('The source_type key of --block-device ', str(ex)) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_block_device_invalid_destination_type(self): block_device = f'uuid={self.volume.name},destination_type=foo' @@ -2835,7 +2825,7 @@ class TestServerCreate(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) self.assertIn('The destination_type key of --block-device ', str(ex)) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_block_device_invalid_shutdown(self): block_device = f'uuid={self.volume.name},delete_on_termination=foo' @@ -2855,7 +2845,7 @@ class TestServerCreate(TestServer): self.assertIn( 'The delete_on_termination key of --block-device ', str(ex) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_block_device_tag_pre_v242(self): self.set_compute_api_version('2.41') @@ -2877,7 +2867,7 @@ class TestServerCreate(TestServer): self.assertIn( '--os-compute-api-version 2.42 or greater is required', str(ex) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_block_device_volume_type_pre_v267(self): self.set_compute_api_version('2.66') @@ -2899,7 +2889,7 @@ class TestServerCreate(TestServer): self.assertIn( '--os-compute-api-version 2.67 or greater is required', str(ex) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_block_device_mapping(self): self.volume_client.volumes.get.return_value = self.volume @@ -2938,7 +2928,7 @@ class TestServerCreate(TestServer): self.volume_client.volumes.get.assert_called_once_with( self.volume.name ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -3002,7 +2992,7 @@ class TestServerCreate(TestServer): self.volume_client.volumes.get.assert_called_once_with( self.volume.name ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -3065,7 +3055,7 @@ class TestServerCreate(TestServer): self.volume_client.volumes.get.assert_called_once_with( self.volume.name ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -3130,7 +3120,7 @@ class TestServerCreate(TestServer): self.volume_client.volumes.get.assert_called_once_with( self.volume.name ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -3198,7 +3188,7 @@ class TestServerCreate(TestServer): self.volume_client.volume_snapshots.get.assert_called_once_with( self.snapshot.name ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -3273,7 +3263,7 @@ class TestServerCreate(TestServer): self.volume_client.volumes.get.assert_has_calls( [mock.call(self.volume.name)] * 2 ) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -3329,7 +3319,7 @@ class TestServerCreate(TestServer): self.assertIn( 'argument --block-device-mapping: Invalid argument ', str(exc) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() # block device mapping don't contain device name "=uuid:::true" arglist = [ @@ -3351,7 +3341,7 @@ class TestServerCreate(TestServer): self.assertIn( 'argument --block-device-mapping: Invalid argument ', str(exc) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_block_device_mapping_no_uuid(self): arglist = [ @@ -3373,7 +3363,7 @@ class TestServerCreate(TestServer): self.assertIn( 'argument --block-device-mapping: Invalid argument ', str(exc) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_volume_boot_from_volume_conflict(self): # Tests that specifying --volume and --boot-from-volume results in @@ -3406,7 +3396,7 @@ class TestServerCreate(TestServer): self.assertIn( '--volume is not allowed with --boot-from-volume', str(ex) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_boot_from_volume_no_image(self): # Test --boot-from-volume option without --image or @@ -3434,7 +3424,7 @@ class TestServerCreate(TestServer): 'to support --boot-from-volume option', str(ex), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_image_property(self): image = image_fakes.create_one_image({'hypervisor_type': 'qemu'}) @@ -3458,7 +3448,7 @@ class TestServerCreate(TestServer): columns, data = self.cmd.take_action(parsed_args) self.image_client.images.assert_called_once_with() - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=image.id, flavor_id=self.flavor.id, @@ -3508,7 +3498,7 @@ class TestServerCreate(TestServer): columns, data = self.cmd.take_action(parsed_args) self.image_client.images.assert_called_once_with() - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=image.id, flavor_id=self.flavor.id, @@ -3563,7 +3553,7 @@ class TestServerCreate(TestServer): 'No images match the property expected by --image-property', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_image_property_with_image_list(self): target_image = image_fakes.create_one_image( @@ -3596,7 +3586,7 @@ class TestServerCreate(TestServer): columns, data = self.cmd.take_action(parsed_args) self.image_client.images.assert_called_once_with() - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=target_image.id, flavor_id=self.flavor.id, @@ -3652,7 +3642,7 @@ class TestServerCreate(TestServer): '(--volume, --snapshot, --block-device) is required', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_swap(self): arglist = [ @@ -3674,7 +3664,7 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -3723,7 +3713,7 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -3770,7 +3760,7 @@ class TestServerCreate(TestServer): [], ) self.assertIn('Argument parse failed', str(exc)) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_ephemeral_invalid_key(self): arglist = [ @@ -3790,7 +3780,7 @@ class TestServerCreate(TestServer): [], ) self.assertIn('Argument parse failed', str(exc)) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_invalid_hint(self): # Not a key-value pair @@ -3811,7 +3801,7 @@ class TestServerCreate(TestServer): [], ) self.assertIn('Argument parse failed', str(exc)) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() # Empty key arglist = [ @@ -3831,7 +3821,7 @@ class TestServerCreate(TestServer): [], ) self.assertIn('Argument parse failed', str(exc)) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_description(self): # Description is supported for nova api version 2.19 or above @@ -3857,7 +3847,7 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -3904,7 +3894,7 @@ class TestServerCreate(TestServer): self.assertRaises( exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_tag(self): self.set_compute_api_version('2.52') @@ -3931,7 +3921,7 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -3982,7 +3972,7 @@ class TestServerCreate(TestServer): self.assertIn( '--os-compute-api-version 2.52 or greater is required', str(exc) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_host(self): # Explicit host is supported for nova api version 2.74 or above @@ -4008,7 +3998,7 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -4057,7 +4047,7 @@ class TestServerCreate(TestServer): self.assertIn( '--os-compute-api-version 2.74 or greater is required', str(exc) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_hypervisor_hostname(self): # Explicit hypervisor_hostname is supported for nova api version @@ -4084,7 +4074,7 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -4133,7 +4123,7 @@ class TestServerCreate(TestServer): self.assertIn( '--os-compute-api-version 2.74 or greater is required', str(exc) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_hostname(self): self.set_compute_api_version('2.90') @@ -4158,7 +4148,7 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -4206,7 +4196,7 @@ class TestServerCreate(TestServer): self.assertIn( '--os-compute-api-version 2.90 or greater is required', str(exc) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_trusted_image_cert(self): self.set_compute_api_version('2.63') @@ -4233,7 +4223,7 @@ class TestServerCreate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server.assert_called_once_with( + self.compute_client.create_server.assert_called_once_with( name=self.server.name, image_id=self.image.id, flavor_id=self.flavor.id, @@ -4283,7 +4273,7 @@ class TestServerCreate(TestServer): self.assertIn( '--os-compute-api-version 2.63 or greater is required', str(exc) ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_trusted_image_cert_from_volume(self): self.set_compute_api_version('2.63') @@ -4316,7 +4306,7 @@ class TestServerCreate(TestServer): 'directly from images', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_trusted_image_cert_from_snapshot(self): self.set_compute_api_version('2.63') @@ -4349,7 +4339,7 @@ class TestServerCreate(TestServer): 'directly from images', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() def test_server_create_with_trusted_image_cert_boot_from_volume(self): self.set_compute_api_version('2.63') @@ -4385,7 +4375,7 @@ class TestServerCreate(TestServer): 'directly from images', str(exc), ) - self.compute_sdk_client.create_server.assert_not_called() + self.compute_client.create_server.assert_not_called() class TestServerDelete(compute_fakes.TestComputev2): @@ -4393,8 +4383,8 @@ class TestServerDelete(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.delete_server.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.delete_server.return_value = None # Get the command object to test self.cmd = server.DeleteServer(self.app, None) @@ -4410,10 +4400,10 @@ class TestServerDelete(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, all_projects=False ) - self.compute_sdk_client.delete_server.assert_called_once_with( + self.compute_client.delete_server.assert_called_once_with( self.server, force=False ) self.assertIsNone(result) @@ -4430,18 +4420,18 @@ class TestServerDelete(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, all_projects=False ) - self.compute_sdk_client.delete_server.assert_called_once_with( + self.compute_client.delete_server.assert_called_once_with( self.server, force=True ) self.assertIsNone(result) def test_server_delete_multi_servers(self): servers = compute_fakes.create_sdk_servers(count=3) - self.compute_sdk_client.find_server.return_value = None - self.compute_sdk_client.find_server.side_effect = servers + self.compute_client.find_server.return_value = None + self.compute_client.find_server.side_effect = servers arglist = [] verifylist = [] @@ -4454,13 +4444,13 @@ class TestServerDelete(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_has_calls( + self.compute_client.find_server.assert_has_calls( [ mock.call(s.id, ignore_missing=False, all_projects=False) for s in servers ] ) - self.compute_sdk_client.delete_server.assert_has_calls( + self.compute_client.delete_server.assert_has_calls( [mock.call(s, force=False) for s in servers] ) self.assertIsNone(result) @@ -4478,10 +4468,10 @@ class TestServerDelete(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, all_projects=True ) - self.compute_sdk_client.delete_server.assert_called_once_with( + self.compute_client.delete_server.assert_called_once_with( self.server, force=False ) self.assertIsNone(result) @@ -4499,20 +4489,20 @@ class TestServerDelete(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, all_projects=False ) - self.compute_sdk_client.delete_server.assert_called_once_with( + self.compute_client.delete_server.assert_called_once_with( self.server, force=False ) - self.compute_sdk_client.wait_for_delete.assert_called_once_with( + self.compute_client.wait_for_delete.assert_called_once_with( self.server, callback=mock.ANY, ) self.assertIsNone(result) def test_server_delete_wait_fails(self): - self.compute_sdk_client.wait_for_delete.side_effect = ( + self.compute_client.wait_for_delete.side_effect = ( sdk_exceptions.ResourceTimeout() ) @@ -4530,13 +4520,13 @@ class TestServerDelete(compute_fakes.TestComputev2): exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, all_projects=False ) - self.compute_sdk_client.delete_server.assert_called_once_with( + self.compute_client.delete_server.assert_called_once_with( self.server, force=False ) - self.compute_sdk_client.wait_for_delete.assert_called_once_with( + self.compute_client.wait_for_delete.assert_called_once_with( self.server, callback=mock.ANY, ) @@ -4567,9 +4557,7 @@ class TestServerDumpCreate(TestServer): self.assertIsNone(result) for s in servers: - s.trigger_crash_dump.assert_called_once_with( - self.compute_sdk_client - ) + s.trigger_crash_dump.assert_called_once_with(self.compute_client) def test_server_dump_one_server(self): self.run_test_server_dump(1) @@ -4645,12 +4633,12 @@ class _TestServerList(TestServer): self.image_client.get_image.return_value = self.image self.flavor = compute_fakes.create_one_flavor() - self.compute_sdk_client.find_flavor.return_value = self.flavor + self.compute_client.find_flavor.return_value = self.flavor self.attrs['flavor'] = {'original_name': self.flavor.name} # The servers to be listed. self.servers = self.setup_sdk_servers_mock(3) - self.compute_sdk_client.servers.return_value = self.servers + self.compute_client.servers.return_value = self.servers # Get the command object to test self.cmd = server.ListServer(self.app, None) @@ -4669,7 +4657,7 @@ class TestServerList(_TestServerList): ] Flavor = collections.namedtuple('Flavor', 'id name') - self.compute_sdk_client.flavors.return_value = [ + self.compute_client.flavors.return_value = [ Flavor(id=s.flavor['id'], name=self.flavor.name) for s in self.servers ] @@ -4699,9 +4687,9 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_called() - self.compute_sdk_client.flavors.assert_called() + self.compute_client.flavors.assert_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4713,14 +4701,14 @@ class TestServerList(_TestServerList): ('deleted', False), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.compute_sdk_client.servers.return_value = [] + self.compute_client.servers.return_value = [] self.data = () columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_not_called() - self.compute_sdk_client.flavors.assert_not_called() + self.compute_client.flavors.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4755,12 +4743,12 @@ class TestServerList(_TestServerList): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) image_ids = {s.image['id'] for s in self.servers if s.image} self.image_client.images.assert_called_once_with( id=f'in:{",".join(image_ids)}', ) - self.compute_sdk_client.flavors.assert_called_once_with(is_public=None) + self.compute_client.flavors.assert_called_once_with(is_public=None) self.assertEqual(self.columns_long, columns) self.assertEqual(self.data, tuple(data)) @@ -4799,7 +4787,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertIn('Project ID', columns) self.assertIn('User ID', columns) self.assertIn('Created At', columns) @@ -4839,9 +4827,9 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_not_called() - self.compute_sdk_client.flavors.assert_not_called() + self.compute_client.flavors.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4870,9 +4858,9 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_not_called() - self.compute_sdk_client.flavors.assert_not_called() + self.compute_client.flavors.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4887,11 +4875,11 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_not_called() - self.compute_sdk_client.flavors.assert_not_called() + self.compute_client.flavors.assert_not_called() self.image_client.get_image.assert_called() - self.compute_sdk_client.find_flavor.assert_called() + self.compute_client.find_flavor.assert_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4908,9 +4896,9 @@ class TestServerList(_TestServerList): ) self.kwargs['image'] = self.image.id - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_not_called() - self.compute_sdk_client.flavors.assert_called_once() + self.compute_client.flavors.assert_called_once() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4922,14 +4910,14 @@ class TestServerList(_TestServerList): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_flavor.assert_has_calls( + self.compute_client.find_flavor.assert_has_calls( [mock.call(self.flavor.id, ignore_missing=False)] ) self.kwargs['flavor'] = self.flavor.id - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_called_once() - self.compute_sdk_client.flavors.assert_not_called() + self.compute_client.flavors.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4946,7 +4934,7 @@ class TestServerList(_TestServerList): self.kwargs['changes-since'] = '2016-03-04T06:27:59Z' self.kwargs['deleted'] = True - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4989,7 +4977,7 @@ class TestServerList(_TestServerList): self.kwargs['tags'] = 'tag1,tag2' - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -5032,7 +5020,7 @@ class TestServerList(_TestServerList): self.kwargs['not-tags'] = 'tag1,tag2' - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -5071,7 +5059,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['availability_zone'] = 'test-az' - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5088,7 +5076,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['key_name'] = 'test-key' - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5104,7 +5092,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['config_drive'] = True - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5120,7 +5108,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['config_drive'] = False - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5137,7 +5125,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['progress'] = '100' - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5168,7 +5156,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['vm_state'] = 'active' - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5185,7 +5173,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['task_state'] = 'deleting' - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5202,7 +5190,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['power_state'] = 1 - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5239,18 +5227,18 @@ class TestServerList(_TestServerList): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns_long, columns) self.assertEqual(tuple(self.data1), tuple(data)) # Next test with host_status in the data -- the column should be # present in this case. - self.compute_sdk_client.servers.reset_mock() + self.compute_client.servers.reset_mock() self.attrs['host_status'] = 'UP' servers = self.setup_sdk_servers_mock(3) - self.compute_sdk_client.servers.return_value = servers + self.compute_client.servers.return_value = servers # Make sure the returned image and flavor IDs match the servers. Image = collections.namedtuple('Image', 'id name') @@ -5287,7 +5275,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertEqual(columns_long, columns) self.assertEqual(tuple(self.data2), tuple(data)) @@ -5336,7 +5324,7 @@ class TestServerListV273(_TestServerList): # The servers to be listed. self.servers = self.setup_sdk_servers_mock(3) - self.compute_sdk_client.servers.return_value = self.servers + self.compute_client.servers.return_value = self.servers Image = collections.namedtuple('Image', 'id name') self.image_client.images.return_value = [ @@ -5348,7 +5336,7 @@ class TestServerListV273(_TestServerList): # The flavor information is embedded, so now reason for this to be # called - self.compute_sdk_client.flavors = mock.NonCallableMock() + self.compute_client.flavors = mock.NonCallableMock() self.data = tuple( ( @@ -5384,7 +5372,7 @@ class TestServerListV273(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['locked'] = True - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertCountEqual(self.columns, columns) self.assertCountEqual(self.data, tuple(data)) @@ -5399,7 +5387,7 @@ class TestServerListV273(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['locked'] = False - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertCountEqual(self.columns, columns) self.assertCountEqual(self.data, tuple(data)) @@ -5432,7 +5420,7 @@ class TestServerListV273(_TestServerList): self.kwargs['changes-before'] = '2016-03-05T06:27:59Z' self.kwargs['deleted'] = True - self.compute_sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_client.servers.assert_called_with(**self.kwargs) self.assertCountEqual(self.columns, columns) self.assertCountEqual(self.data, tuple(data)) @@ -5516,7 +5504,7 @@ class TestServerListV273(_TestServerList): class TestServerAction(compute_fakes.TestComputev2): def run_method_with_sdk_servers(self, method_name, server_count): servers = compute_fakes.create_sdk_servers(count=server_count) - self.compute_sdk_client.find_server.side_effect = servers + self.compute_client.find_server.side_effect = servers arglist = [s.id for s in servers] verifylist = [ @@ -5527,7 +5515,7 @@ class TestServerAction(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) calls = [mock.call(s.id) for s in servers] - method = getattr(self.compute_sdk_client, method_name) + method = getattr(self.compute_client, method_name) method.assert_has_calls(calls) self.assertIsNone(result) @@ -5549,8 +5537,8 @@ class TestServerLock(TestServerAction): self.set_compute_api_version('2.73') self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.lock_server.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.lock_server.return_value = None arglist = [ self.server.id, @@ -5565,11 +5553,11 @@ class TestServerLock(TestServerAction): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.id, ignore_missing=False, ) - self.compute_sdk_client.lock_server.assert_called_with( + self.compute_client.lock_server.assert_called_with( self.server.id, locked_reason="blah", ) @@ -5580,8 +5568,8 @@ class TestServerLock(TestServerAction): server_a = compute_fakes.create_one_sdk_server() server_b = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.side_effect = [server_a, server_b] - self.compute_sdk_client.lock_server.return_value = None + self.compute_client.find_server.side_effect = [server_a, server_b] + self.compute_client.lock_server.return_value = None arglist = [ server_a.id, server_b.id, @@ -5596,8 +5584,8 @@ class TestServerLock(TestServerAction): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.assertEqual(2, self.compute_sdk_client.find_server.call_count) - self.compute_sdk_client.lock_server.assert_has_calls( + self.assertEqual(2, self.compute_client.find_server.call_count) + self.compute_client.lock_server.assert_has_calls( [ mock.call(server_a.id, locked_reason="choo..choo"), mock.call(server_b.id, locked_reason="choo..choo"), @@ -5636,9 +5624,9 @@ class TestServerMigrate(TestServer): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.migrate_server.return_value = None - self.compute_sdk_client.live_migrate_server.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.migrate_server.return_value = None + self.compute_client.live_migrate_server.return_value = None # Get the command object to test self.cmd = server.MigrateServer(self.app, None) @@ -5657,13 +5645,13 @@ class TestServerMigrate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.migrate_server.assert_called_once_with( + self.compute_client.migrate_server.assert_called_once_with( self.server, ) - self.compute_sdk_client.live_migrate_server.assert_not_called() + self.compute_client.live_migrate_server.assert_not_called() self.assertIsNone(result) def test_server_migrate_with_host(self): @@ -5687,13 +5675,13 @@ class TestServerMigrate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.migrate_server.assert_called_once_with( + self.compute_client.migrate_server.assert_called_once_with( self.server, host='fakehost' ) - self.compute_sdk_client.live_migrate_server.assert_not_called() + self.compute_client.live_migrate_server.assert_not_called() self.assertIsNone(result) def test_server_migrate_with_block_migration(self): @@ -5713,11 +5701,11 @@ class TestServerMigrate(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.migrate_server.assert_not_called() - self.compute_sdk_client.live_migrate_server.assert_not_called() + self.compute_client.migrate_server.assert_not_called() + self.compute_client.live_migrate_server.assert_not_called() def test_server_migrate_with_disk_overcommit(self): arglist = [ @@ -5736,11 +5724,11 @@ class TestServerMigrate(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.migrate_server.assert_not_called() - self.compute_sdk_client.live_migrate_server.assert_not_called() + self.compute_client.migrate_server.assert_not_called() + self.compute_client.live_migrate_server.assert_not_called() def test_server_migrate_with_host_pre_v256(self): # Tests that --host is not allowed for a cold migration @@ -5772,11 +5760,11 @@ class TestServerMigrate(TestServer): str(ex), ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.migrate_server.assert_not_called() - self.compute_sdk_client.live_migrate_server.assert_not_called() + self.compute_client.migrate_server.assert_not_called() + self.compute_client.live_migrate_server.assert_not_called() def test_server_live_migrate(self): # Tests the --live-migration option without --host or --live. @@ -5795,16 +5783,16 @@ class TestServerMigrate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.live_migrate_server.assert_called_once_with( + self.compute_client.live_migrate_server.assert_called_once_with( self.server, block_migration=False, host=None, disk_overcommit=False, ) - self.compute_sdk_client.migrate_server.assert_not_called() + self.compute_client.migrate_server.assert_not_called() self.assertIsNone(result) def test_server_live_migrate_with_host(self): @@ -5828,17 +5816,17 @@ class TestServerMigrate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) # No disk_overcommit and block_migration defaults to auto with # microversion >= 2.25 - self.compute_sdk_client.live_migrate_server.assert_called_once_with( + self.compute_client.live_migrate_server.assert_called_once_with( self.server, block_migration='auto', host='fakehost', ) - self.compute_sdk_client.migrate_server.assert_not_called() + self.compute_client.migrate_server.assert_not_called() self.assertIsNone(result) def test_server_live_migrate_with_host_pre_v230(self): @@ -5871,11 +5859,11 @@ class TestServerMigrate(TestServer): str(ex), ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.migrate_server.assert_not_called() - self.compute_sdk_client.live_migrate_server.assert_not_called() + self.compute_client.migrate_server.assert_not_called() + self.compute_client.live_migrate_server.assert_not_called() def test_server_block_live_migrate(self): self.set_compute_api_version('2.24') @@ -5895,18 +5883,18 @@ class TestServerMigrate(TestServer): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) # No disk_overcommit and block_migration defaults to auto with # microversion >= 2.25 - self.compute_sdk_client.live_migrate_server.assert_called_once_with( + self.compute_client.live_migrate_server.assert_called_once_with( self.server, block_migration=True, disk_overcommit=False, host=None, ) - self.compute_sdk_client.migrate_server.assert_not_called() + self.compute_client.migrate_server.assert_not_called() self.assertIsNone(result) def test_server_live_migrate_with_disk_overcommit(self): @@ -5927,16 +5915,16 @@ class TestServerMigrate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.live_migrate_server.assert_called_once_with( + self.compute_client.live_migrate_server.assert_called_once_with( self.server, block_migration=False, disk_overcommit=True, host=None, ) - self.compute_sdk_client.migrate_server.assert_not_called() + self.compute_client.migrate_server.assert_not_called() self.assertIsNone(result) def test_server_live_migrate_with_disk_overcommit_post_v224(self): @@ -5958,16 +5946,16 @@ class TestServerMigrate(TestServer): with mock.patch.object(self.cmd.log, 'warning') as mock_warning: result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) # There should be no 'disk_over_commit' value present - self.compute_sdk_client.live_migrate_server.assert_called_once_with( + self.compute_client.live_migrate_server.assert_called_once_with( self.server, block_migration='auto', host=None, ) - self.compute_sdk_client.migrate_server.assert_not_called() + self.compute_client.migrate_server.assert_not_called() self.assertIsNone(result) # A warning should have been logged for using --disk-overcommit. @@ -5993,15 +5981,15 @@ class TestServerMigrate(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.migrate_server.assert_called_once_with( + self.compute_client.migrate_server.assert_called_once_with( self.server, ) - self.compute_sdk_client.live_migrate_server.assert_not_called() + self.compute_client.live_migrate_server.assert_not_called() mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, success_status=('active', 'verify_resize'), callback=mock.ANY, @@ -6026,15 +6014,15 @@ class TestServerMigrate(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.migrate_server.assert_called_once_with( + self.compute_client.migrate_server.assert_called_once_with( self.server, ) - self.compute_sdk_client.live_migrate_server.assert_not_called() + self.compute_client.live_migrate_server.assert_not_called() mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, success_status=('active', 'verify_resize'), callback=mock.ANY, @@ -6045,7 +6033,7 @@ class TestServerReboot(TestServer): def setUp(self): super().setUp() - self.compute_sdk_client.reboot_server.return_value = None + self.compute_client.reboot_server.return_value = None self.cmd = server.RebootServer(self.app, None) @@ -6064,7 +6052,7 @@ class TestServerReboot(TestServer): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.reboot_server.assert_called_once_with( + self.compute_client.reboot_server.assert_called_once_with( servers[0].id, 'SOFT', ) @@ -6086,7 +6074,7 @@ class TestServerReboot(TestServer): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.reboot_server.assert_called_once_with( + self.compute_client.reboot_server.assert_called_once_with( servers[0].id, 'HARD', ) @@ -6110,12 +6098,12 @@ class TestServerReboot(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.reboot_server.assert_called_once_with( + self.compute_client.reboot_server.assert_called_once_with( servers[0].id, 'SOFT', ) mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, servers[0].id, callback=mock.ANY, ) @@ -6144,12 +6132,12 @@ class TestServerReboot(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.reboot_server.assert_called_once_with( + self.compute_client.reboot_server.assert_called_once_with( servers[0].id, 'SOFT', ) mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, servers[0].id, callback=mock.ANY, ) @@ -6181,8 +6169,8 @@ class TestServerRebuild(TestServer): 'image': {'id': self.image.id}, } self.server = compute_fakes.create_one_sdk_server(attrs=attrs) - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.rebuild_server.return_value = self.server + self.compute_client.find_server.return_value = self.server + self.compute_client.rebuild_server.return_value = self.server self.cmd = server.RebuildServer(self.app, None) @@ -6204,14 +6192,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_called_with( image_name, ignore_missing=False ) self.image_client.get_image.assert_called_with(self.image.id) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, image ) @@ -6225,14 +6213,14 @@ class TestServerRebuild(TestServer): # Get the command object to test. self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image ) @@ -6269,14 +6257,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, name=name ) @@ -6293,14 +6281,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, preserve_ephemeral=True ) @@ -6318,14 +6306,14 @@ class TestServerRebuild(TestServer): # Get the command object to test self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, preserve_ephemeral=False ) @@ -6337,14 +6325,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, admin_password=password, @@ -6360,14 +6348,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, description=description ) @@ -6397,19 +6385,19 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image ) mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, callback=mock.ANY, success_status=['active'], @@ -6431,17 +6419,17 @@ class TestServerRebuild(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_called_once_with(self.image.id) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image ) mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, callback=mock.ANY, success_status=['active'], @@ -6462,19 +6450,19 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image ) mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, callback=mock.ANY, success_status=['shutoff'], @@ -6495,19 +6483,19 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image ) mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, callback=mock.ANY, success_status=['active'], @@ -6527,12 +6515,12 @@ class TestServerRebuild(TestServer): exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_called_once_with(self.image.id) - self.compute_sdk_client.rebuild_server.assert_not_called() + self.compute_client.rebuild_server.assert_not_called() def test_rebuild_with_property(self): arglist = [ @@ -6551,14 +6539,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, metadata=expected_properties ) @@ -6579,14 +6567,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, key_name=self.server.key_name ) @@ -6624,14 +6612,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, key_name=None ) @@ -6679,14 +6667,14 @@ class TestServerRebuild(TestServer): # Ensure the userdata file is opened mock_file.assert_called_with('userdata.sh', 'rb') - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, user_data=base64.b64encode(user_data).decode('utf-8'), @@ -6726,14 +6714,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, user_data=None ) @@ -6787,14 +6775,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, trusted_image_certificates=['foo', 'bar'] ) @@ -6833,14 +6821,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, trusted_image_certificates=None ) @@ -6877,14 +6865,14 @@ class TestServerRebuild(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_not_called() self.image_client.get_image.assert_has_calls( [mock.call(self.image.id), mock.call(self.image.id)] ) - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.image, hostname='new-hostname' ) @@ -6916,8 +6904,8 @@ class TestServerRebuildVolumeBacked(TestServer): 'image': '', } self.server = compute_fakes.create_one_sdk_server(attrs=attrs) - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.rebuild_server.return_value = self.server + self.compute_client.find_server.return_value = self.server + self.compute_client.rebuild_server.return_value = self.server self.cmd = server.RebuildServer(self.app, None) @@ -6939,14 +6927,14 @@ class TestServerRebuildVolumeBacked(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.image_client.find_image.assert_called_with( self.new_image.id, ignore_missing=False ) self.image_client.get_image.assert_not_called() - self.compute_sdk_client.rebuild_server.assert_called_once_with( + self.compute_client.rebuild_server.assert_called_once_with( self.server, self.new_image ) @@ -7011,8 +6999,8 @@ class TestServerEvacuate(TestServer): self.new_server = compute_fakes.create_one_sdk_server(attrs=attrs) # Return value for utils.find_resource for server. - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.get_server.return_value = self.server + self.compute_client.find_server.return_value = self.server + self.compute_client.get_server.return_value = self.server self.cmd = server.EvacuateServer(self.app, None) @@ -7020,15 +7008,13 @@ class TestServerEvacuate(TestServer): parsed_args = self.check_parser(self.cmd, args, verify_args) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.evacuate_server.assert_called_once_with( + self.compute_client.evacuate_server.assert_called_once_with( self.server, **evac_args ) - self.compute_sdk_client.get_server.assert_called_once_with( - self.server.id - ) + self.compute_client.get_server.assert_called_once_with(self.server.id) def test_evacuate(self): args = [ @@ -7142,7 +7128,7 @@ class TestServerEvacuate(TestServer): } self._test_evacuate(args, verify_args, evac_args) mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, callback=mock.ANY, ) @@ -7170,12 +7156,10 @@ class TestServerRemoveFixedIP(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.remove_fixed_ip_from_server( - self.server, '1.2.3.4' - ) + self.compute_client.remove_fixed_ip_from_server(self.server, '1.2.3.4') self.assertIsNone(result) @@ -7184,7 +7168,7 @@ class TestServerRescue(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.cmd = server.RescueServer(self.app, None) @@ -7199,10 +7183,10 @@ class TestServerRescue(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.rescue_server.assert_called_once_with( + self.compute_client.rescue_server.assert_called_once_with( self.server, admin_pass=None, image_ref=None ) self.assertIsNone(result) @@ -7226,10 +7210,10 @@ class TestServerRescue(compute_fakes.TestComputev2): self.image_client.find_image.assert_called_with( new_image.id, ignore_missing=False ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.rescue_server.assert_called_once_with( + self.compute_client.rescue_server.assert_called_once_with( self.server, admin_pass=None, image_ref=new_image.id ) self.assertIsNone(result) @@ -7249,10 +7233,10 @@ class TestServerRescue(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.rescue_server.assert_called_once_with( + self.compute_client.rescue_server.assert_called_once_with( self.server, admin_pass=password, image_ref=None ) self.assertIsNone(result) @@ -7264,7 +7248,7 @@ class TestServerRemoveFloatingIPCompute(compute_fakes.TestComputev2): self.app.client_manager.network_endpoint_enabled = False self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.cmd = server.RemoveFloatingIP(self.app, None) @@ -7281,10 +7265,10 @@ class TestServerRemoveFloatingIPCompute(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False ) - self.compute_sdk_client.remove_floating_ip_from_server.assert_called_once_with( + self.compute_client.remove_floating_ip_from_server.assert_called_once_with( self.server, '1.2.3.4' ) @@ -7352,7 +7336,7 @@ class TestServerRemovePort(TestServer): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.delete_server_interface.assert_called_with( + self.compute_client.delete_server_interface.assert_called_with( port_id, server=servers[0], ignore_missing=False ) self.assertIsNone(result) @@ -7381,9 +7365,7 @@ class TestServerRemoveNetwork(TestServer): self.find_network = mock.Mock() self.app.client_manager.network.find_network = self.find_network - self.compute_sdk_client.server_interfaces.return_value = [ - self.fake_inf - ] + self.compute_client.server_interfaces.return_value = [self.fake_inf] def _test_server_remove_network(self, network_id): self.fake_inf.net_id = network_id @@ -7403,10 +7385,10 @@ class TestServerRemoveNetwork(TestServer): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.server_interfaces.assert_called_once_with( + self.compute_client.server_interfaces.assert_called_once_with( servers[0] ) - self.compute_sdk_client.delete_server_interface.assert_called_once_with( + self.compute_client.delete_server_interface.assert_called_once_with( 'fake-port', server=servers[0] ) self.assertIsNone(result) @@ -7428,8 +7410,10 @@ class TestServerRemoveSecurityGroup(TestServer): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.remove_security_group_from_server.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.remove_security_group_from_server.return_value = ( + None + ) # Get the command object to test self.cmd = server.RemoveServerSecurityGroup(self.app, None) @@ -7454,14 +7438,14 @@ class TestServerRemoveSecurityGroup(TestServer): ) as mock_find_nova_net_sg: result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with( + self.compute_client.remove_security_group_from_server.assert_called_once_with( self.server, {'name': 'fake_sg'} ) mock_find_nova_net_sg.assert_called_once_with( - self.compute_sdk_client, 'fake_sg' + self.compute_client, 'fake_sg' ) self.assertIsNone(result) @@ -7475,10 +7459,10 @@ class TestServerRemoveSecurityGroup(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with( + self.compute_client.remove_security_group_from_server.assert_called_once_with( self.server, {'name': 'fake_sg'} ) self.assertIsNone(result) @@ -7489,12 +7473,12 @@ class TestServerResize(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.flavor = compute_fakes.create_one_flavor() - self.compute_sdk_client.find_flavor.return_value = self.flavor - self.compute_sdk_client.resize_server.return_value = None - self.compute_sdk_client.revert_server_resize.return_value = None - self.compute_sdk_client.confirm_server_resize.return_value = None + self.compute_client.find_flavor.return_value = self.flavor + self.compute_client.resize_server.return_value = None + self.compute_client.revert_server_resize.return_value = None + self.compute_client.confirm_server_resize.return_value = None # Get the command object to test self.cmd = server.ResizeServer(self.app, None) @@ -7512,11 +7496,11 @@ class TestServerResize(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.find_flavor.assert_not_called() - self.compute_sdk_client.resize_server.assert_not_called() + self.compute_client.find_flavor.assert_not_called() + self.compute_client.resize_server.assert_not_called() self.assertIsNone(result) def test_server_resize(self): @@ -7535,17 +7519,17 @@ class TestServerResize(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.find_flavor.assert_called_once_with( + self.compute_client.find_flavor.assert_called_once_with( self.flavor.id, ignore_missing=False ) - self.compute_sdk_client.resize_server.assert_called_once_with( + self.compute_client.resize_server.assert_called_once_with( self.server, self.flavor ) - self.compute_sdk_client.confirm_server_resize.assert_not_called() - self.compute_sdk_client.revert_server_resize.assert_not_called() + self.compute_client.confirm_server_resize.assert_not_called() + self.compute_client.revert_server_resize.assert_not_called() self.assertIsNone(result) def test_server_resize_confirm(self): @@ -7563,15 +7547,15 @@ class TestServerResize(compute_fakes.TestComputev2): with mock.patch.object(self.cmd.log, 'warning') as mock_warning: result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.find_flavor.assert_not_called() - self.compute_sdk_client.resize_server.assert_not_called() - self.compute_sdk_client.confirm_server_resize.assert_called_once_with( + self.compute_client.find_flavor.assert_not_called() + self.compute_client.resize_server.assert_not_called() + self.compute_client.confirm_server_resize.assert_called_once_with( self.server ) - self.compute_sdk_client.revert_server_resize.assert_not_called() + self.compute_client.revert_server_resize.assert_not_called() self.assertIsNone(result) # A warning should have been logged for using --confirm. @@ -7596,13 +7580,13 @@ class TestServerResize(compute_fakes.TestComputev2): with mock.patch.object(self.cmd.log, 'warning') as mock_warning: result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.find_flavor.assert_not_called() - self.compute_sdk_client.resize_server.assert_not_called() - self.compute_sdk_client.confirm_server_resize.assert_not_called() - self.compute_sdk_client.revert_server_resize.assert_called_once_with( + self.compute_client.find_flavor.assert_not_called() + self.compute_client.resize_server.assert_not_called() + self.compute_client.confirm_server_resize.assert_not_called() + self.compute_client.revert_server_resize.assert_called_once_with( self.server ) self.assertIsNone(result) @@ -7632,20 +7616,20 @@ class TestServerResize(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.find_flavor.assert_called_once_with( + self.compute_client.find_flavor.assert_called_once_with( self.flavor.id, ignore_missing=False ) - self.compute_sdk_client.resize_server.assert_called_once_with( + self.compute_client.resize_server.assert_called_once_with( self.server, self.flavor ) - self.compute_sdk_client.confirm_server_resize.assert_not_called() - self.compute_sdk_client.revert_server_resize.assert_not_called() + self.compute_client.confirm_server_resize.assert_not_called() + self.compute_client.revert_server_resize.assert_not_called() mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, success_status=('active', 'verify_resize'), callback=mock.ANY, @@ -7672,20 +7656,20 @@ class TestServerResize(compute_fakes.TestComputev2): exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.find_flavor.assert_called_once_with( + self.compute_client.find_flavor.assert_called_once_with( self.flavor.id, ignore_missing=False ) - self.compute_sdk_client.resize_server.assert_called_once_with( + self.compute_client.resize_server.assert_called_once_with( self.server, self.flavor ) - self.compute_sdk_client.confirm_server_resize.assert_not_called() - self.compute_sdk_client.revert_server_resize.assert_not_called() + self.compute_client.confirm_server_resize.assert_not_called() + self.compute_client.revert_server_resize.assert_not_called() mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, success_status=('active', 'verify_resize'), callback=mock.ANY, @@ -7697,8 +7681,8 @@ class TestServerResizeConfirm(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.confirm_server_resize.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.confirm_server_resize.return_value = None # Get the command object to test self.cmd = server.ResizeConfirm(self.app, None) @@ -7714,10 +7698,10 @@ class TestServerResizeConfirm(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.confirm_server_resize.assert_called_once_with( + self.compute_client.confirm_server_resize.assert_called_once_with( self.server ) self.assertIsNone(result) @@ -7729,8 +7713,8 @@ class TestServerMigrateConfirm(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.confirm_server_resize.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.confirm_server_resize.return_value = None # Get the command object to test self.cmd = server.MigrateConfirm(self.app, None) @@ -7747,10 +7731,10 @@ class TestServerMigrateConfirm(compute_fakes.TestComputev2): with mock.patch.object(self.cmd.log, 'warning') as mock_warning: result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.confirm_server_resize.assert_called_once_with( + self.compute_client.confirm_server_resize.assert_called_once_with( self.server ) self.assertIsNone(result) @@ -7767,8 +7751,8 @@ class TestServerConfirmMigration(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.confirm_server_resize.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.confirm_server_resize.return_value = None # Get the command object to test self.cmd = server.ConfirmMigration(self.app, None) @@ -7784,10 +7768,10 @@ class TestServerConfirmMigration(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.confirm_server_resize.assert_called_once_with( + self.compute_client.confirm_server_resize.assert_called_once_with( self.server ) self.assertIsNone(result) @@ -7798,8 +7782,8 @@ class TestServerResizeRevert(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.revert_server_resize.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.revert_server_resize.return_value = None # Get the command object to test self.cmd = server.ResizeRevert(self.app, None) @@ -7815,10 +7799,10 @@ class TestServerResizeRevert(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.revert_server_resize.assert_called_once_with( + self.compute_client.revert_server_resize.assert_called_once_with( self.server ) self.assertIsNone(result) @@ -7830,8 +7814,8 @@ class TestServerMigrateRevert(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.revert_server_resize.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.revert_server_resize.return_value = None # Get the command object to test self.cmd = server.MigrateRevert(self.app, None) @@ -7848,10 +7832,10 @@ class TestServerMigrateRevert(compute_fakes.TestComputev2): with mock.patch.object(self.cmd.log, 'warning') as mock_warning: result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.revert_server_resize.assert_called_once_with( + self.compute_client.revert_server_resize.assert_called_once_with( self.server ) self.assertIsNone(result) @@ -7868,8 +7852,8 @@ class TestServerRevertMigration(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.revert_server_resize.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.revert_server_resize.return_value = None # Get the command object to test self.cmd = server.RevertMigration(self.app, None) @@ -7885,10 +7869,10 @@ class TestServerRevertMigration(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.revert_server_resize.assert_called_once_with( + self.compute_client.revert_server_resize.assert_called_once_with( self.server ) self.assertIsNone(result) @@ -7927,7 +7911,7 @@ class TestServerSet(TestServer): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server # Get the command object to test self.cmd = server.SetServer(self.app, None) @@ -7939,12 +7923,12 @@ class TestServerSet(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.update_server.assert_not_called() - self.compute_sdk_client.set_server_metadata.assert_not_called() - self.compute_sdk_client.reset_server_state.assert_not_called() - self.compute_sdk_client.change_server_password.assert_not_called() - self.compute_sdk_client.clear_server_password.assert_not_called() - self.compute_sdk_client.add_tag_to_server.assert_not_called() + self.compute_client.update_server.assert_not_called() + self.compute_client.set_server_metadata.assert_not_called() + self.compute_client.reset_server_state.assert_not_called() + self.compute_client.change_server_password.assert_not_called() + self.compute_client.clear_server_password.assert_not_called() + self.compute_client.add_tag_to_server.assert_not_called() self.assertIsNone(result) def test_server_set_with_state(self): @@ -7961,14 +7945,14 @@ class TestServerSet(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.reset_server_state.assert_called_once_with( + self.compute_client.reset_server_state.assert_called_once_with( self.server, state='active' ) - self.compute_sdk_client.update_server.assert_not_called() - self.compute_sdk_client.set_server_metadata.assert_not_called() - self.compute_sdk_client.change_server_password.assert_not_called() - self.compute_sdk_client.clear_server_password.assert_not_called() - self.compute_sdk_client.add_tag_to_server.assert_not_called() + self.compute_client.update_server.assert_not_called() + self.compute_client.set_server_metadata.assert_not_called() + self.compute_client.change_server_password.assert_not_called() + self.compute_client.clear_server_password.assert_not_called() + self.compute_client.add_tag_to_server.assert_not_called() self.assertIsNone(result) def test_server_set_with_invalid_state(self): @@ -8003,14 +7987,14 @@ class TestServerSet(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.update_server.assert_called_once_with( + self.compute_client.update_server.assert_called_once_with( self.server, name='foo_name' ) - self.compute_sdk_client.set_server_metadata.assert_not_called() - self.compute_sdk_client.reset_server_state.assert_not_called() - self.compute_sdk_client.change_server_password.assert_not_called() - self.compute_sdk_client.clear_server_password.assert_not_called() - self.compute_sdk_client.add_tag_to_server.assert_not_called() + self.compute_client.set_server_metadata.assert_not_called() + self.compute_client.reset_server_state.assert_not_called() + self.compute_client.change_server_password.assert_not_called() + self.compute_client.clear_server_password.assert_not_called() + self.compute_client.add_tag_to_server.assert_not_called() self.assertIsNone(result) def test_server_set_with_property(self): @@ -8029,14 +8013,14 @@ class TestServerSet(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.set_server_metadata.assert_called_once_with( + self.compute_client.set_server_metadata.assert_called_once_with( self.server, key1='value1', key2='value2' ) - self.compute_sdk_client.update_server.assert_not_called() - self.compute_sdk_client.reset_server_state.assert_not_called() - self.compute_sdk_client.change_server_password.assert_not_called() - self.compute_sdk_client.clear_server_password.assert_not_called() - self.compute_sdk_client.add_tag_to_server.assert_not_called() + self.compute_client.update_server.assert_not_called() + self.compute_client.reset_server_state.assert_not_called() + self.compute_client.change_server_password.assert_not_called() + self.compute_client.clear_server_password.assert_not_called() + self.compute_client.add_tag_to_server.assert_not_called() self.assertIsNone(result) def test_server_set_with_password(self): @@ -8053,14 +8037,14 @@ class TestServerSet(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.change_server_password.assert_called_once_with( + self.compute_client.change_server_password.assert_called_once_with( self.server, 'foo' ) - self.compute_sdk_client.update_server.assert_not_called() - self.compute_sdk_client.set_server_metadata.assert_not_called() - self.compute_sdk_client.reset_server_state.assert_not_called() - self.compute_sdk_client.clear_server_password.assert_not_called() - self.compute_sdk_client.add_tag_to_server.assert_not_called() + self.compute_client.update_server.assert_not_called() + self.compute_client.set_server_metadata.assert_not_called() + self.compute_client.reset_server_state.assert_not_called() + self.compute_client.clear_server_password.assert_not_called() + self.compute_client.add_tag_to_server.assert_not_called() self.assertIsNone(result) def test_server_set_with_no_password(self): @@ -8076,14 +8060,14 @@ class TestServerSet(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.clear_server_password.assert_called_once_with( + self.compute_client.clear_server_password.assert_called_once_with( self.server ) - self.compute_sdk_client.update_server.assert_not_called() - self.compute_sdk_client.set_server_metadata.assert_not_called() - self.compute_sdk_client.reset_server_state.assert_not_called() - self.compute_sdk_client.change_server_password.assert_not_called() - self.compute_sdk_client.add_tag_to_server.assert_not_called() + self.compute_client.update_server.assert_not_called() + self.compute_client.set_server_metadata.assert_not_called() + self.compute_client.reset_server_state.assert_not_called() + self.compute_client.change_server_password.assert_not_called() + self.compute_client.add_tag_to_server.assert_not_called() self.assertIsNone(result) # TODO(stephenfin): Remove this in a future major version @@ -8103,14 +8087,14 @@ class TestServerSet(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.change_server_password.assert_called_once_with( + self.compute_client.change_server_password.assert_called_once_with( self.server, mock.sentinel.fake_pass ) - self.compute_sdk_client.update_server.assert_not_called() - self.compute_sdk_client.set_server_metadata.assert_not_called() - self.compute_sdk_client.reset_server_state.assert_not_called() - self.compute_sdk_client.clear_server_password.assert_not_called() - self.compute_sdk_client.add_tag_to_server.assert_not_called() + self.compute_client.update_server.assert_not_called() + self.compute_client.set_server_metadata.assert_not_called() + self.compute_client.reset_server_state.assert_not_called() + self.compute_client.clear_server_password.assert_not_called() + self.compute_client.add_tag_to_server.assert_not_called() self.assertIsNone(result) def test_server_set_with_description(self): @@ -8129,14 +8113,14 @@ class TestServerSet(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.update_server.assert_called_once_with( + self.compute_client.update_server.assert_called_once_with( self.server, description='foo_description' ) - self.compute_sdk_client.set_server_metadata.assert_not_called() - self.compute_sdk_client.reset_server_state.assert_not_called() - self.compute_sdk_client.change_server_password.assert_not_called() - self.compute_sdk_client.clear_server_password.assert_not_called() - self.compute_sdk_client.add_tag_to_server.assert_not_called() + self.compute_client.set_server_metadata.assert_not_called() + self.compute_client.reset_server_state.assert_not_called() + self.compute_client.change_server_password.assert_not_called() + self.compute_client.clear_server_password.assert_not_called() + self.compute_client.add_tag_to_server.assert_not_called() self.assertIsNone(result) def test_server_set_with_description_pre_v219(self): @@ -8175,17 +8159,17 @@ class TestServerSet(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.add_tag_to_server.assert_has_calls( + self.compute_client.add_tag_to_server.assert_has_calls( [ mock.call(self.server, tag='tag1'), mock.call(self.server, tag='tag2'), ] ) - self.compute_sdk_client.update_server.assert_not_called() - self.compute_sdk_client.set_server_metadata.assert_not_called() - self.compute_sdk_client.reset_server_state.assert_not_called() - self.compute_sdk_client.change_server_password.assert_not_called() - self.compute_sdk_client.clear_server_password.assert_not_called() + self.compute_client.update_server.assert_not_called() + self.compute_client.set_server_metadata.assert_not_called() + self.compute_client.reset_server_state.assert_not_called() + self.compute_client.change_server_password.assert_not_called() + self.compute_client.clear_server_password.assert_not_called() self.assertIsNone(result) def test_server_set_with_tag_pre_v226(self): @@ -8227,14 +8211,14 @@ class TestServerSet(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.update_server.assert_called_once_with( + self.compute_client.update_server.assert_called_once_with( self.server, hostname='foo-hostname' ) - self.compute_sdk_client.set_server_metadata.assert_not_called() - self.compute_sdk_client.reset_server_state.assert_not_called() - self.compute_sdk_client.change_server_password.assert_not_called() - self.compute_sdk_client.clear_server_password.assert_not_called() - self.compute_sdk_client.add_tag_to_server.assert_not_called() + self.compute_client.set_server_metadata.assert_not_called() + self.compute_client.reset_server_state.assert_not_called() + self.compute_client.change_server_password.assert_not_called() + self.compute_client.clear_server_password.assert_not_called() + self.compute_client.add_tag_to_server.assert_not_called() self.assertIsNone(result) def test_server_set_with_hostname_pre_v290(self): @@ -8263,8 +8247,8 @@ class TestServerShelve(TestServer): attrs={'status': 'ACTIVE'}, ) - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.shelve_server.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.shelve_server.return_value = None # Get the command object to test self.cmd = server.ShelveServer(self.app, None) @@ -8281,14 +8265,12 @@ class TestServerShelve(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.name, ignore_missing=False, ) - self.compute_sdk_client.shelve_server.assert_called_with( - self.server.id - ) - self.compute_sdk_client.shelve_offload_server.assert_not_called() + self.compute_client.shelve_server.assert_called_with(self.server.id) + self.compute_client.shelve_offload_server.assert_not_called() def test_shelve_already_shelved(self): self.server.status = 'SHELVED' @@ -8304,12 +8286,12 @@ class TestServerShelve(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.name, ignore_missing=False, ) - self.compute_sdk_client.shelve_server.assert_not_called() - self.compute_sdk_client.shelve_offload_server.assert_not_called() + self.compute_client.shelve_server.assert_not_called() + self.compute_client.shelve_offload_server.assert_not_called() @mock.patch.object(common_utils, 'wait_for_status', return_value=True) def test_shelve_with_wait(self, mock_wait_for_status): @@ -8324,16 +8306,14 @@ class TestServerShelve(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.name, ignore_missing=False, ) - self.compute_sdk_client.shelve_server.assert_called_with( - self.server.id - ) - self.compute_sdk_client.shelve_offload_server.assert_not_called() + self.compute_client.shelve_server.assert_called_with(self.server.id) + self.compute_client.shelve_offload_server.assert_not_called() mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, callback=mock.ANY, success_status=('shelved', 'shelved_offloaded'), @@ -8353,25 +8333,21 @@ class TestServerShelve(TestServer): self.assertIsNone(result) # one call to retrieve to retrieve the server state before shelving - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False, ) # one call to retrieve the server state before offloading - self.compute_sdk_client.get_server.assert_called_once_with( - self.server.id - ) + self.compute_client.get_server.assert_called_once_with(self.server.id) # one call to shelve the server - self.compute_sdk_client.shelve_server.assert_called_with( - self.server.id - ) + self.compute_client.shelve_server.assert_called_with(self.server.id) # one call to shelve offload the server - self.compute_sdk_client.shelve_offload_server.assert_called_once_with( + self.compute_client.shelve_offload_server.assert_called_once_with( self.server.id, ) # one call to wait for the shelve offload to complete mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, callback=mock.ANY, success_status=('shelved', 'shelved_offloaded'), @@ -8386,7 +8362,7 @@ class TestServerShow(TestServer): self.image_client.get_image.return_value = self.image self.flavor = compute_fakes.create_one_flavor() - self.compute_sdk_client.find_flavor.return_value = self.flavor + self.compute_client.find_flavor.return_value = self.flavor self.topology = { 'nodes': [{'vcpu_set': [0, 1]}, {'vcpu_set': [2, 3]}], @@ -8398,14 +8374,14 @@ class TestServerShow(TestServer): 'tenant_id': 'tenant-id-xxx', 'addresses': {'public': ['10.20.30.40', '2001:db8::f']}, } - self.compute_sdk_client.get_server_diagnostics.return_value = { + self.compute_client.get_server_diagnostics.return_value = { 'test': 'test' } self.server = compute_fakes.create_one_sdk_server( attrs=server_info, ) self.server.fetch_topology = mock.MagicMock(return_value=self.topology) - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server # Get the command object to test self.cmd = server.ShowServer(self.app, None) @@ -8534,10 +8510,10 @@ class TestServerShow(TestServer): self.assertTupleEqual(self.columns, columns) self.assertTupleEqual(self.data, data) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False, details=True ) - self.compute_sdk_client.get_server.assert_not_called() + self.compute_client.get_server.assert_not_called() def test_show_embedded_flavor(self): # Tests using --os-compute-api-version >= 2.47 where the flavor @@ -8566,10 +8542,10 @@ class TestServerShow(TestServer): # Since the flavor details are in a dict we can't be sure of the # ordering so just assert that one of the keys is in the output. self.assertIn('original_name', data[columns.index('flavor')]._value) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False, details=True ) - self.compute_sdk_client.get_server.assert_not_called() + self.compute_client.get_server.assert_not_called() def test_show_diagnostics(self): arglist = [ @@ -8587,13 +8563,13 @@ class TestServerShow(TestServer): self.assertEqual(('test',), columns) self.assertEqual(('test',), data) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False, details=True ) - self.compute_sdk_client.get_server_diagnostics.assert_called_once_with( + self.compute_client.get_server_diagnostics.assert_called_once_with( self.server ) - self.compute_sdk_client.get_server.assert_not_called() + self.compute_client.get_server.assert_not_called() def test_show_topology(self): self.set_compute_api_version('2.78') @@ -8616,13 +8592,11 @@ class TestServerShow(TestServer): self.assertCountEqual(self.columns, columns) self.assertCountEqual(self.data, data) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False, details=True ) - self.server.fetch_topology.assert_called_once_with( - self.compute_sdk_client - ) - self.compute_sdk_client.get_server.assert_not_called() + self.server.fetch_topology.assert_called_once_with(self.compute_client) + self.compute_client.get_server.assert_not_called() def test_show_topology_pre_v278(self): self.set_compute_api_version('2.77') @@ -8641,11 +8615,11 @@ class TestServerShow(TestServer): self.assertRaises( exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False, details=True ) self.server.fetch_topology.assert_not_called() - self.compute_sdk_client.get_server.assert_not_called() + self.compute_client.get_server.assert_not_called() @mock.patch('openstackclient.compute.v2.server.os.system') @@ -8673,7 +8647,7 @@ class TestServerSsh(TestServer): self.server = compute_fakes.create_one_sdk_server( attrs=self.attrs, ) - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server def test_server_ssh_no_opts(self, mock_exec): arglist = [ @@ -8696,7 +8670,7 @@ class TestServerSsh(TestServer): with mock.patch.object(self.cmd.log, 'warning') as mock_warning: result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False ) self.assertIsNone(result) @@ -8729,7 +8703,7 @@ class TestServerSsh(TestServer): with mock.patch.object(self.cmd.log, 'warning') as mock_warning: result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False ) self.assertIsNone(result) @@ -8763,7 +8737,7 @@ class TestServerSsh(TestServer): with mock.patch.object(self.cmd.log, 'warning') as mock_warning: result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.name, ignore_missing=False ) self.assertIsNone(result) @@ -8792,7 +8766,7 @@ class TestServerStart(TestServerAction): def test_server_start_with_all_projects(self): server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = server + self.compute_client.find_server.return_value = server arglist = [ server.id, @@ -8805,7 +8779,7 @@ class TestServerStart(TestServerAction): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( server.id, ignore_missing=False, details=False, @@ -8828,7 +8802,7 @@ class TestServerStop(TestServerAction): def test_server_start_with_all_projects(self): server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = server + self.compute_client.find_server.return_value = server arglist = [ server.id, @@ -8841,7 +8815,7 @@ class TestServerStop(TestServerAction): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( server.id, ignore_missing=False, details=False, @@ -8896,7 +8870,7 @@ class TestServerUnrescue(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.cmd = server.UnrescueServer(self.app, None) @@ -8911,10 +8885,10 @@ class TestServerUnrescue(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.unrescue_server.assert_called_once_with( + self.compute_client.unrescue_server.assert_called_once_with( self.server ) self.assertIsNone(result) @@ -8925,7 +8899,7 @@ class TestServerUnset(TestServer): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server # Get the command object to test self.cmd = server.UnsetServer(self.app, None) @@ -8941,12 +8915,10 @@ class TestServerUnset(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server( - self.server.id, ignore_missing=False - ) - self.compute_sdk_client.delete_server_metadata.assert_not_called() - self.compute_sdk_client.update_server.assert_not_called() - self.compute_sdk_client.remove_tag_from_server.assert_not_called() + self.compute_client.find_server(self.server.id, ignore_missing=False) + self.compute_client.delete_server_metadata.assert_not_called() + self.compute_client.update_server.assert_not_called() + self.compute_client.remove_tag_from_server.assert_not_called() self.assertIsNone(result) def test_server_unset_with_property(self): @@ -8965,15 +8937,13 @@ class TestServerUnset(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server( - self.server.id, ignore_missing=False - ) - self.compute_sdk_client.delete_server_metadata.assert_called_once_with( + self.compute_client.find_server(self.server.id, ignore_missing=False) + self.compute_client.delete_server_metadata.assert_called_once_with( self.server, ['key1', 'key2'], ) - self.compute_sdk_client.update_server.assert_not_called() - self.compute_sdk_client.remove_tag_from_server.assert_not_called() + self.compute_client.update_server.assert_not_called() + self.compute_client.remove_tag_from_server.assert_not_called() self.assertIsNone(result) def test_server_unset_with_description(self): @@ -8992,14 +8962,12 @@ class TestServerUnset(TestServer): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server( - self.server.id, ignore_missing=False - ) - self.compute_sdk_client.update_server.assert_called_once_with( + self.compute_client.find_server(self.server.id, ignore_missing=False) + self.compute_client.update_server.assert_called_once_with( self.server, description='' ) - self.compute_sdk_client.delete_server_metadata.assert_not_called() - self.compute_sdk_client.remove_tag_from_server.assert_not_called() + self.compute_client.delete_server_metadata.assert_not_called() + self.compute_client.remove_tag_from_server.assert_not_called() self.assertIsNone(result) def test_server_unset_with_description_pre_v219(self): @@ -9042,17 +9010,15 @@ class TestServerUnset(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.find_server( - self.server.id, ignore_missing=False - ) - self.compute_sdk_client.remove_tag_from_server.assert_has_calls( + self.compute_client.find_server(self.server.id, ignore_missing=False) + self.compute_client.remove_tag_from_server.assert_has_calls( [ mock.call(self.server, 'tag1'), mock.call(self.server, 'tag2'), ] ) - self.compute_sdk_client.delete_server_metadata.assert_not_called() - self.compute_sdk_client.update_server.assert_not_called() + self.compute_client.delete_server_metadata.assert_not_called() + self.compute_client.update_server.assert_not_called() def test_server_unset_with_tag_pre_v226(self): self.set_compute_api_version('2.25') @@ -9086,8 +9052,8 @@ class TestServerUnshelve(TestServer): attrs={'status': 'SHELVED'}, ) - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.unshelve_server.return_value = None + self.compute_client.find_server.return_value = self.server + self.compute_client.unshelve_server.return_value = None # Get the command object to test self.cmd = server.UnshelveServer(self.app, None) @@ -9103,11 +9069,11 @@ class TestServerUnshelve(TestServer): self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, ) - self.compute_sdk_client.unshelve_server.assert_called_once_with( + self.compute_client.unshelve_server.assert_called_once_with( self.server.id ) @@ -9127,11 +9093,11 @@ class TestServerUnshelve(TestServer): self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, ) - self.compute_sdk_client.unshelve_server.assert_called_once_with( + self.compute_client.unshelve_server.assert_called_once_with( self.server.id, availability_zone='foo-az', ) @@ -9173,11 +9139,11 @@ class TestServerUnshelve(TestServer): self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, ) - self.compute_sdk_client.unshelve_server.assert_called_once_with( + self.compute_client.unshelve_server.assert_called_once_with( self.server.id, host='server1', ) @@ -9219,11 +9185,11 @@ class TestServerUnshelve(TestServer): self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, ) - self.compute_sdk_client.unshelve_server.assert_called_once_with( + self.compute_client.unshelve_server.assert_called_once_with( self.server.id, availability_zone=None, ) @@ -9295,15 +9261,13 @@ class TestServerUnshelve(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.name, ignore_missing=False, ) - self.compute_sdk_client.unshelve_server.assert_called_with( - self.server.id - ) + self.compute_client.unshelve_server.assert_called_with(self.server.id) mock_wait_for_status.assert_called_once_with( - self.compute_sdk_client.get_server, + self.compute_client.get_server, self.server.id, callback=mock.ANY, success_status=('active', 'shutoff'), @@ -9395,7 +9359,7 @@ class TestServerGeneral(TestServer): self.image_client.get_image.return_value = _image _flavor = compute_fakes.create_one_flavor() - self.compute_sdk_client.find_flavor.return_value = _flavor + self.compute_client.find_flavor.return_value = _flavor server_info = { 'image': {'id': _image.id}, @@ -9407,7 +9371,7 @@ class TestServerGeneral(TestServer): 'volumes_attached': [{"id": "6344fe9d-ef20-45b2-91a6"}], } _server = compute_fakes.create_one_sdk_server(server_info) - self.compute_sdk_client.get_server.return_value = _server + self.compute_client.get_server.return_value = _server expected = { 'OS-DCF:diskConfig': None, @@ -9458,14 +9422,14 @@ class TestServerGeneral(TestServer): } actual = server._prep_server_detail( - self.compute_sdk_client, + self.compute_client, self.image_client, _server, ) self.assertCountEqual(expected, actual) # this should be called since we need the flavor (< 2.47) - self.compute_sdk_client.find_flavor.assert_called_once_with( + self.compute_client.find_flavor.assert_called_once_with( _flavor.id, ignore_missing=False ) @@ -9474,7 +9438,7 @@ class TestServerGeneral(TestServer): self.image_client.get_image.return_value = _image _flavor = compute_fakes.create_one_flavor() - self.compute_sdk_client.find_flavor.return_value = _flavor + self.compute_client.find_flavor.return_value = _flavor server_info = { 'image': {'id': _image.id}, @@ -9494,7 +9458,7 @@ class TestServerGeneral(TestServer): 'volumes_attached': [{"id": "6344fe9d-ef20-45b2-91a6"}], } _server = compute_fakes.create_one_sdk_server(server_info) - self.compute_sdk_client.get_server.return_value = _server + self.compute_client.get_server.return_value = _server expected = { 'OS-DCF:diskConfig': None, @@ -9545,11 +9509,11 @@ class TestServerGeneral(TestServer): } actual = server._prep_server_detail( - self.compute_sdk_client, + self.compute_client, self.image_client, _server, ) self.assertCountEqual(expected, actual) # this shouldn't be called since we have a full flavor (>= 2.47) - self.compute_sdk_client.find_flavor.assert_not_called() + self.compute_client.find_flavor.assert_not_called() diff --git a/openstackclient/tests/unit/compute/v2/test_server_backup.py b/openstackclient/tests/unit/compute/v2/test_server_backup.py index 9d5269ddbe..bc1fca2b88 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_backup.py +++ b/openstackclient/tests/unit/compute/v2/test_server_backup.py @@ -27,9 +27,7 @@ class TestServerBackup(compute_fakes.TestComputev2): servers = compute_fakes.create_sdk_servers( count=count, ) - - # This is the return value for compute_client.find_server() - self.compute_sdk_client.find_server = compute_fakes.get_servers( + self.compute_client.find_server = compute_fakes.get_servers( servers, 0, ) @@ -110,7 +108,7 @@ class TestServerBackupCreate(TestServerBackup): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.backup_server.assert_called_with( + self.compute_client.backup_server.assert_called_with( servers[0].id, servers[0].name, '', @@ -146,7 +144,7 @@ class TestServerBackupCreate(TestServerBackup): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.backup_server.assert_called_with( + self.compute_client.backup_server.assert_called_with( servers[0].id, 'image', 'daily', @@ -186,7 +184,7 @@ class TestServerBackupCreate(TestServerBackup): parsed_args, ) - self.compute_sdk_client.backup_server.assert_called_with( + self.compute_client.backup_server.assert_called_with( servers[0].id, 'image', 'daily', @@ -227,7 +225,7 @@ class TestServerBackupCreate(TestServerBackup): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.backup_server.assert_called_with( + self.compute_client.backup_server.assert_called_with( servers[0].id, 'image', 'daily', diff --git a/openstackclient/tests/unit/compute/v2/test_server_event.py b/openstackclient/tests/unit/compute/v2/test_server_event.py index 728d9f8424..a5e5116a1d 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_event.py +++ b/openstackclient/tests/unit/compute/v2/test_server_event.py @@ -64,8 +64,8 @@ class TestListServerEvent(compute_fakes.TestComputev2): def setUp(self): super().setUp() - self.compute_sdk_client.find_server.return_value = self.fake_server - self.compute_sdk_client.server_actions.return_value = [ + self.compute_client.find_server.return_value = self.fake_server + self.compute_client.server_actions.return_value = [ self.fake_event, ] @@ -83,11 +83,11 @@ class TestListServerEvent(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.fake_server.name, ignore_missing=False, ) - self.compute_sdk_client.server_actions.assert_called_with( + self.compute_client.server_actions.assert_called_with( self.fake_server.id ) @@ -107,11 +107,11 @@ class TestListServerEvent(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.fake_server.name, ignore_missing=False, ) - self.compute_sdk_client.server_actions.assert_called_with( + self.compute_client.server_actions.assert_called_with( self.fake_server.id ) @@ -134,11 +134,11 @@ class TestListServerEvent(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.fake_server.name, ignore_missing=False, ) - self.compute_sdk_client.server_actions.assert_called_with( + self.compute_client.server_actions.assert_called_with( self.fake_server.id, changes_since='2016-03-04T06:27:59Z', ) @@ -214,11 +214,11 @@ class TestListServerEvent(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.fake_server.name, ignore_missing=False, ) - self.compute_sdk_client.server_actions.assert_called_with( + self.compute_client.server_actions.assert_called_with( self.fake_server.id, changes_before='2016-03-04T06:27:59Z', ) @@ -290,7 +290,7 @@ class TestListServerEvent(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.server_actions.assert_called_with( + self.compute_client.server_actions.assert_called_with( self.fake_server.id, limit=1, paginated=False, @@ -337,7 +337,7 @@ class TestListServerEvent(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.server_actions.assert_called_with( + self.compute_client.server_actions.assert_called_with( self.fake_server.id, marker='test_event', ) @@ -392,10 +392,8 @@ class TestShowServerEvent(compute_fakes.TestComputev2): def setUp(self): super().setUp() - self.compute_sdk_client.find_server.return_value = self.fake_server - self.compute_sdk_client.get_server_action.return_value = ( - self.fake_event - ) + self.compute_client.find_server.return_value = self.fake_server + self.compute_client.get_server_action.return_value = self.fake_event self.cmd = server_event.ShowServerEvent(self.app, None) @@ -412,11 +410,11 @@ class TestShowServerEvent(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.fake_server.name, ignore_missing=False, ) - self.compute_sdk_client.get_server_action.assert_called_with( + self.compute_client.get_server_action.assert_called_with( self.fake_event.request_id, self.fake_server.id, ) diff --git a/openstackclient/tests/unit/compute/v2/test_server_group.py b/openstackclient/tests/unit/compute/v2/test_server_group.py index 2e34493239..a91824a9cb 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_group.py +++ b/openstackclient/tests/unit/compute/v2/test_server_group.py @@ -55,7 +55,7 @@ class TestServerGroupCreate(TestServerGroup): def setUp(self): super().setUp() - self.compute_sdk_client.create_server_group.return_value = ( + self.compute_client.create_server_group.return_value = ( self.fake_server_group ) self.cmd = server_group.CreateServerGroup(self.app, None) @@ -74,7 +74,7 @@ class TestServerGroupCreate(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server_group.assert_called_once_with( + self.compute_client.create_server_group.assert_called_once_with( name=parsed_args.name, policy=parsed_args.policy, ) @@ -96,7 +96,7 @@ class TestServerGroupCreate(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server_group.assert_called_once_with( + self.compute_client.create_server_group.assert_called_once_with( name=parsed_args.name, policy=parsed_args.policy, ) @@ -141,7 +141,7 @@ class TestServerGroupCreate(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server_group.assert_called_once_with( + self.compute_client.create_server_group.assert_called_once_with( name=parsed_args.name, policy=parsed_args.policy, rules=parsed_args.rules, @@ -179,7 +179,7 @@ class TestServerGroupDelete(TestServerGroup): def setUp(self): super().setUp() - self.compute_sdk_client.find_server_group.return_value = ( + self.compute_client.find_server_group.return_value = ( self.fake_server_group ) self.cmd = server_group.DeleteServerGroup(self.app, None) @@ -193,10 +193,10 @@ class TestServerGroupDelete(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server_group.assert_called_once_with( + self.compute_client.find_server_group.assert_called_once_with( 'affinity_group', ignore_missing=False ) - self.compute_sdk_client.delete_server_group.assert_called_once_with( + self.compute_client.delete_server_group.assert_called_once_with( self.fake_server_group.id ) self.assertIsNone(result) @@ -208,21 +208,17 @@ class TestServerGroupDelete(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server_group.assert_any_call( + self.compute_client.find_server_group.assert_any_call( 'affinity_group', ignore_missing=False ) - self.compute_sdk_client.find_server_group.assert_any_call( + self.compute_client.find_server_group.assert_any_call( 'anti_affinity_group', ignore_missing=False ) - self.compute_sdk_client.delete_server_group.assert_called_with( + self.compute_client.delete_server_group.assert_called_with( self.fake_server_group.id ) - self.assertEqual( - 2, self.compute_sdk_client.find_server_group.call_count - ) - self.assertEqual( - 2, self.compute_sdk_client.delete_server_group.call_count - ) + self.assertEqual(2, self.compute_client.find_server_group.call_count) + self.assertEqual(2, self.compute_client.delete_server_group.call_count) self.assertIsNone(result) def test_server_group_delete_no_input(self): @@ -243,7 +239,7 @@ class TestServerGroupDelete(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.compute_sdk_client.find_server_group.side_effect = [ + self.compute_client.find_server_group.side_effect = [ self.fake_server_group, exceptions.CommandError, ] @@ -253,16 +249,14 @@ class TestServerGroupDelete(TestServerGroup): except exceptions.CommandError as e: self.assertEqual('1 of 2 server groups failed to delete.', str(e)) - self.compute_sdk_client.find_server_group.assert_any_call( + self.compute_client.find_server_group.assert_any_call( 'affinity_group', ignore_missing=False ) - self.compute_sdk_client.find_server_group.assert_any_call( + self.compute_client.find_server_group.assert_any_call( 'anti_affinity_group', ignore_missing=False ) - self.assertEqual( - 2, self.compute_sdk_client.find_server_group.call_count - ) - self.compute_sdk_client.delete_server_group.assert_called_once_with( + self.assertEqual(2, self.compute_client.find_server_group.call_count) + self.compute_client.delete_server_group.assert_called_once_with( self.fake_server_group.id ) @@ -271,7 +265,7 @@ class TestServerGroupList(TestServerGroup): def setUp(self): super().setUp() - self.compute_sdk_client.server_groups.return_value = [ + self.compute_client.server_groups.return_value = [ self.fake_server_group ] self.cmd = server_group.ListServerGroup(self.app, None) @@ -287,7 +281,7 @@ class TestServerGroupList(TestServerGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.server_groups.assert_called_once_with() + self.compute_client.server_groups.assert_called_once_with() expected_columns = ( 'ID', @@ -318,7 +312,7 @@ class TestServerGroupList(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.server_groups.assert_called_once_with( + self.compute_client.server_groups.assert_called_once_with( all_projects=True ) @@ -359,7 +353,7 @@ class TestServerGroupList(TestServerGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.server_groups.assert_called_once_with(limit=1) + self.compute_client.server_groups.assert_called_once_with(limit=1) def test_server_group_list_with_offset(self): arglist = [ @@ -376,7 +370,7 @@ class TestServerGroupList(TestServerGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.compute_sdk_client.server_groups.assert_called_once_with(offset=5) + self.compute_client.server_groups.assert_called_once_with(offset=5) def test_server_group_list_v264(self): self.set_compute_api_version('2.64') @@ -388,7 +382,7 @@ class TestServerGroupList(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.server_groups.assert_called_once_with() + self.compute_client.server_groups.assert_called_once_with() expected_columns = ( 'ID', @@ -419,7 +413,7 @@ class TestServerGroupList(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.server_groups.assert_called_once_with( + self.compute_client.server_groups.assert_called_once_with( all_projects=True ) @@ -450,7 +444,7 @@ class TestServerGroupShow(TestServerGroup): def setUp(self): super().setUp() - self.compute_sdk_client.find_server_group.return_value = ( + self.compute_client.find_server_group.return_value = ( self.fake_server_group ) self.cmd = server_group.ShowServerGroup(self.app, None) diff --git a/openstackclient/tests/unit/compute/v2/test_server_image.py b/openstackclient/tests/unit/compute/v2/test_server_image.py index 8ba6d12620..7feb0b22f4 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_image.py +++ b/openstackclient/tests/unit/compute/v2/test_server_image.py @@ -26,9 +26,7 @@ class TestServerImage(compute_fakes.TestComputev2): servers = compute_fakes.create_sdk_servers( count=count, ) - - # This is the return value for compute_client.find_server() - self.compute_sdk_client.find_server = compute_fakes.get_servers( + self.compute_client.find_server = compute_fakes.get_servers( servers, 0, ) @@ -85,7 +83,7 @@ class TestServerImageCreate(TestServerImage): ) self.image_client.find_image = mock.Mock(side_effect=images) - self.compute_sdk_client.create_server_image = mock.Mock( + self.compute_client.create_server_image = mock.Mock( return_value=images[0], ) return images @@ -107,7 +105,7 @@ class TestServerImageCreate(TestServerImage): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server_image.assert_called_with( + self.compute_client.create_server_image.assert_called_with( servers[0].id, servers[0].name, None, @@ -139,7 +137,7 @@ class TestServerImageCreate(TestServerImage): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server_image.assert_called_with( + self.compute_client.create_server_image.assert_called_with( servers[0].id, 'img-nam', {'key': 'value'}, @@ -169,7 +167,7 @@ class TestServerImageCreate(TestServerImage): parsed_args, ) - self.compute_sdk_client.create_server_image.assert_called_with( + self.compute_client.create_server_image.assert_called_with( servers[0].id, servers[0].name, None, @@ -199,7 +197,7 @@ class TestServerImageCreate(TestServerImage): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.create_server_image.assert_called_with( + self.compute_client.create_server_image.assert_called_with( servers[0].id, servers[0].name, None, diff --git a/openstackclient/tests/unit/compute/v2/test_server_migration.py b/openstackclient/tests/unit/compute/v2/test_server_migration.py index 09ceae6fe9..362c9bae6c 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_migration.py +++ b/openstackclient/tests/unit/compute/v2/test_server_migration.py @@ -53,10 +53,10 @@ class TestListMigration(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.migrations = compute_fakes.create_migrations(count=3) - self.compute_sdk_client.migrations.return_value = self.migrations + self.compute_client.migrations.return_value = self.migrations self.data = ( common_utils.get_item_properties(s, self.MIGRATION_FIELDS) @@ -76,7 +76,7 @@ class TestListMigration(compute_fakes.TestComputev2): # Set expected values kwargs = {} - self.compute_sdk_client.migrations.assert_called_with(**kwargs) + self.compute_client.migrations.assert_called_with(**kwargs) self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -108,10 +108,10 @@ class TestListMigration(compute_fakes.TestComputev2): 'migration_type': 'migration', } - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( 'server1', ignore_missing=False ) - self.compute_sdk_client.migrations.assert_called_with(**kwargs) + self.compute_client.migrations.assert_called_with(**kwargs) self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -169,7 +169,7 @@ class TestListMigrationV223(TestListMigration): 'status': 'migrating', } - self.compute_sdk_client.migrations.assert_called_with(**kwargs) + self.compute_client.migrations.assert_called_with(**kwargs) self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -247,7 +247,7 @@ class TestListMigrationV259(TestListMigration): 'changes_since': '2019-08-09T08:03:25Z', } - self.compute_sdk_client.migrations.assert_called_with(**kwargs) + self.compute_client.migrations.assert_called_with(**kwargs) self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -376,7 +376,7 @@ class TestListMigrationV266(TestListMigration): 'changes_before': '2019-08-09T08:03:25Z', } - self.compute_sdk_client.migrations.assert_called_with(**kwargs) + self.compute_client.migrations.assert_called_with(**kwargs) self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -495,7 +495,7 @@ class TestListMigrationV280(TestListMigration): 'changes_before': "2019-08-09T08:03:25Z", } - self.compute_sdk_client.migrations.assert_called_with(**kwargs) + self.compute_client.migrations.assert_called_with(**kwargs) self.MIGRATION_COLUMNS.insert( len(self.MIGRATION_COLUMNS) - 2, "Project" @@ -572,7 +572,7 @@ class TestListMigrationV280(TestListMigration): 'changes_before': "2019-08-09T08:03:25Z", } - self.compute_sdk_client.migrations.assert_called_with(**kwargs) + self.compute_client.migrations.assert_called_with(**kwargs) self.MIGRATION_COLUMNS.insert(len(self.MIGRATION_COLUMNS) - 2, "User") self.MIGRATION_FIELDS.insert(len(self.MIGRATION_FIELDS) - 2, "user_id") @@ -644,7 +644,7 @@ class TestListMigrationV280(TestListMigration): 'changes_before': "2019-08-09T08:03:25Z", } - self.compute_sdk_client.migrations.assert_called_with(**kwargs) + self.compute_client.migrations.assert_called_with(**kwargs) self.MIGRATION_COLUMNS.insert( len(self.MIGRATION_COLUMNS) - 2, "Project" @@ -695,13 +695,13 @@ class TestServerMigrationShow(compute_fakes.TestComputev2): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.server_migration = compute_fakes.create_one_server_migration() - self.compute_sdk_client.get_server_migration.return_value = ( + self.compute_client.get_server_migration.return_value = ( self.server_migration ) - self.compute_sdk_client.server_migrations.return_value = iter( + self.compute_client.server_migrations.return_value = iter( [self.server_migration] ) @@ -759,10 +759,10 @@ class TestServerMigrationShow(compute_fakes.TestComputev2): self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.get_server_migration.assert_called_with( + self.compute_client.get_server_migration.assert_called_with( self.server.id, '2', ignore_missing=False ) @@ -811,7 +811,7 @@ class TestServerMigrationShow(compute_fakes.TestComputev2): def test_server_migration_show_by_uuid(self): self.set_compute_api_version('2.59') - self.compute_sdk_client.server_migrations.return_value = iter( + self.compute_client.server_migrations.return_value = iter( [self.server_migration] ) @@ -830,18 +830,18 @@ class TestServerMigrationShow(compute_fakes.TestComputev2): self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.server_migrations.assert_called_with( + self.compute_client.server_migrations.assert_called_with( self.server.id ) - self.compute_sdk_client.get_server_migration.assert_not_called() + self.compute_client.get_server_migration.assert_not_called() def test_server_migration_show_by_uuid_no_matches(self): self.set_compute_api_version('2.59') - self.compute_sdk_client.server_migrations.return_value = iter([]) + self.compute_client.server_migrations.return_value = iter([]) arglist = [ self.server.id, @@ -900,7 +900,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2): self.server = compute_fakes.create_one_sdk_server() # Return value for utils.find_resource for server. - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server # Get the command object to test self.cmd = server_migration.AbortMigration(self.app, None) @@ -917,10 +917,10 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.abort_server_migration.assert_called_with( + self.compute_client.abort_server_migration.assert_called_with( '2', self.server.id, ignore_missing=False ) self.assertIsNone(result) @@ -946,7 +946,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2): self.set_compute_api_version('2.59') self.server_migration = compute_fakes.create_one_server_migration() - self.compute_sdk_client.server_migrations.return_value = iter( + self.compute_client.server_migrations.return_value = iter( [self.server_migration] ) @@ -959,13 +959,13 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.server_migrations.assert_called_with( + self.compute_client.server_migrations.assert_called_with( self.server.id ) - self.compute_sdk_client.abort_server_migration.assert_called_with( + self.compute_client.abort_server_migration.assert_called_with( self.server_migration.id, self.server.id, ignore_missing=False ) self.assertIsNone(result) @@ -973,7 +973,7 @@ class TestServerMigrationAbort(compute_fakes.TestComputev2): def test_server_migration_abort_by_uuid_no_matches(self): self.set_compute_api_version('2.59') - self.compute_sdk_client.server_migrations.return_value = iter([]) + self.compute_client.server_migrations.return_value = iter([]) arglist = [ self.server.id, @@ -1015,7 +1015,7 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2): self.server = compute_fakes.create_one_sdk_server() # Return value for utils.find_resource for server. - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server # Get the command object to test self.cmd = server_migration.ForceCompleteMigration(self.app, None) @@ -1032,10 +1032,10 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.force_complete_server_migration.assert_called_with( + self.compute_client.force_complete_server_migration.assert_called_with( '2', self.server.id ) self.assertIsNone(result) @@ -1061,7 +1061,7 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2): self.set_compute_api_version('2.59') self.server_migration = compute_fakes.create_one_server_migration() - self.compute_sdk_client.server_migrations.return_value = iter( + self.compute_client.server_migrations.return_value = iter( [self.server_migration] ) @@ -1074,13 +1074,13 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.find_server.assert_called_with( + self.compute_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.compute_sdk_client.server_migrations.assert_called_with( + self.compute_client.server_migrations.assert_called_with( self.server.id ) - self.compute_sdk_client.force_complete_server_migration.assert_called_with( + self.compute_client.force_complete_server_migration.assert_called_with( self.server_migration.id, self.server.id ) self.assertIsNone(result) @@ -1088,7 +1088,7 @@ class TestServerMigrationForceComplete(compute_fakes.TestComputev2): def test_server_migration_force_complete_by_uuid_no_matches(self): self.set_compute_api_version('2.59') - self.compute_sdk_client.server_migrations.return_value = iter([]) + self.compute_client.server_migrations.return_value = iter([]) arglist = [ self.server.id, diff --git a/openstackclient/tests/unit/compute/v2/test_server_volume.py b/openstackclient/tests/unit/compute/v2/test_server_volume.py index d42da95577..9f26c6d5e3 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_volume.py +++ b/openstackclient/tests/unit/compute/v2/test_server_volume.py @@ -31,8 +31,8 @@ class TestServerVolumeList(compute_fakes.TestComputev2): ) ) - self.compute_sdk_client.find_server.return_value = self.server - self.compute_sdk_client.volume_attachments.return_value = ( + self.compute_client.find_server.return_value = self.server + self.compute_client.volume_attachments.return_value = ( self.volume_attachments ) @@ -68,7 +68,7 @@ class TestServerVolumeList(compute_fakes.TestComputev2): ), tuple(data), ) - self.compute_sdk_client.volume_attachments.assert_called_once_with( + self.compute_client.volume_attachments.assert_called_once_with( self.server, ) @@ -114,7 +114,7 @@ class TestServerVolumeList(compute_fakes.TestComputev2): ), tuple(data), ) - self.compute_sdk_client.volume_attachments.assert_called_once_with( + self.compute_client.volume_attachments.assert_called_once_with( self.server, ) @@ -163,7 +163,7 @@ class TestServerVolumeList(compute_fakes.TestComputev2): ), tuple(data), ) - self.compute_sdk_client.volume_attachments.assert_called_once_with( + self.compute_client.volume_attachments.assert_called_once_with( self.server, ) @@ -215,7 +215,7 @@ class TestServerVolumeList(compute_fakes.TestComputev2): ), tuple(data), ) - self.compute_sdk_client.volume_attachments.assert_called_once_with( + self.compute_client.volume_attachments.assert_called_once_with( self.server, ) @@ -225,7 +225,7 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2): super().setUp() self.server = sdk_fakes.generate_fake_resource(_server.Server) - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.volume = sdk_fakes.generate_fake_resource(_volume.Volume) self.volume_sdk_client.find_volume.return_value = self.volume @@ -248,7 +248,7 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) # This is a no-op - self.compute_sdk_client.update_volume_attachment.assert_not_called() + self.compute_client.update_volume_attachment.assert_not_called() self.assertIsNone(result) def test_server_volume_update_with_delete_on_termination(self): @@ -268,7 +268,7 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.update_volume_attachment.assert_called_once_with( + self.compute_client.update_volume_attachment.assert_called_once_with( self.server, self.volume, delete_on_termination=True, @@ -292,7 +292,7 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.update_volume_attachment.assert_called_once_with( + self.compute_client.update_volume_attachment.assert_called_once_with( self.server, self.volume, delete_on_termination=False ) self.assertIsNone(result) @@ -317,7 +317,7 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2): self.cmd.take_action, parsed_args, ) - self.compute_sdk_client.update_volume_attachment.assert_not_called() + self.compute_client.update_volume_attachment.assert_not_called() def test_server_volume_update_with_preserve_on_termination_pre_v285(self): self.set_compute_api_version('2.84') @@ -339,4 +339,4 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2): self.cmd.take_action, parsed_args, ) - self.compute_sdk_client.update_volume_attachment.assert_not_called() + self.compute_client.update_volume_attachment.assert_not_called() diff --git a/openstackclient/tests/unit/compute/v2/test_service.py b/openstackclient/tests/unit/compute/v2/test_service.py index ce7791d237..c64a2b9c8a 100644 --- a/openstackclient/tests/unit/compute/v2/test_service.py +++ b/openstackclient/tests/unit/compute/v2/test_service.py @@ -30,7 +30,7 @@ class TestServiceDelete(compute_fakes.TestComputev2): sdk_fakes.generate_fake_resources(_service.Service, count=2) ) - self.compute_sdk_client.delete_service.return_value = None + self.compute_client.delete_service.return_value = None # Get the command object to test self.cmd = service.DeleteService(self.app, None) @@ -46,7 +46,7 @@ class TestServiceDelete(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.delete_service.assert_called_with( + self.compute_client.delete_service.assert_called_with( self.services[0].binary, ignore_missing=False ) self.assertIsNone(result) @@ -65,7 +65,7 @@ class TestServiceDelete(compute_fakes.TestComputev2): calls = [] for s in self.services: calls.append(mock.call(s.binary, ignore_missing=False)) - self.compute_sdk_client.delete_service.assert_has_calls(calls) + self.compute_client.delete_service.assert_has_calls(calls) self.assertIsNone(result) def test_multi_services_delete_with_exception(self): @@ -77,7 +77,7 @@ class TestServiceDelete(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) delete_mock_result = [None, exceptions.CommandError] - self.compute_sdk_client.delete_service = mock.Mock( + self.compute_client.delete_service = mock.Mock( side_effect=delete_mock_result ) @@ -89,10 +89,10 @@ class TestServiceDelete(compute_fakes.TestComputev2): '1 of 2 compute services failed to delete.', str(e) ) - self.compute_sdk_client.delete_service.assert_any_call( + self.compute_client.delete_service.assert_any_call( self.services[0].binary, ignore_missing=False ) - self.compute_sdk_client.delete_service.assert_any_call( + self.compute_client.delete_service.assert_any_call( 'unexist_service', ignore_missing=False ) @@ -103,7 +103,7 @@ class TestServiceList(compute_fakes.TestComputev2): self.service = sdk_fakes.generate_fake_resource(_service.Service) - self.compute_sdk_client.services.return_value = [self.service] + self.compute_client.services.return_value = [self.service] # Get the command object to test self.cmd = service.ListService(self.app, None) @@ -126,7 +126,7 @@ class TestServiceList(compute_fakes.TestComputev2): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.services.assert_called_with( + self.compute_client.services.assert_called_with( host=self.service.host, binary=self.service.binary, ) @@ -175,7 +175,7 @@ class TestServiceList(compute_fakes.TestComputev2): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.services.assert_called_with( + self.compute_client.services.assert_called_with( host=self.service.host, binary=self.service.binary, ) @@ -228,7 +228,7 @@ class TestServiceList(compute_fakes.TestComputev2): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.services.assert_called_with( + self.compute_client.services.assert_called_with( host=self.service.host, binary=self.service.binary, ) @@ -269,8 +269,8 @@ class TestServiceSet(compute_fakes.TestComputev2): self.service = sdk_fakes.generate_fake_resource(_service.Service) - self.compute_sdk_client.enable_service.return_value = self.service - self.compute_sdk_client.disable_service.return_value = self.service + self.compute_client.enable_service.return_value = self.service + self.compute_client.disable_service.return_value = self.service self.cmd = service.SetService(self.app, None) @@ -286,8 +286,8 @@ class TestServiceSet(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.enable_service.assert_not_called() - self.compute_sdk_client.disable_service.assert_not_called() + self.compute_client.enable_service.assert_not_called() + self.compute_client.disable_service.assert_not_called() self.assertIsNone(result) def test_service_set_enable(self): @@ -305,7 +305,7 @@ class TestServiceSet(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.enable_service.assert_called_with( + self.compute_client.enable_service.assert_called_with( None, self.service.host, self.service.binary ) self.assertIsNone(result) @@ -325,7 +325,7 @@ class TestServiceSet(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.disable_service.assert_called_with( + self.compute_client.disable_service.assert_called_with( None, self.service.host, self.service.binary, None ) self.assertIsNone(result) @@ -349,7 +349,7 @@ class TestServiceSet(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.disable_service.assert_called_with( + self.compute_client.disable_service.assert_called_with( None, self.service.host, self.service.binary, reason ) self.assertIsNone(result) @@ -419,11 +419,11 @@ class TestServiceSet(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_client.update_service_forced_down.assert_called_once_with( None, self.service.host, self.service.binary, False ) - self.assertNotCalled(self.compute_sdk_client.enable_service) - self.assertNotCalled(self.compute_sdk_client.disable_service) + self.assertNotCalled(self.compute_client.enable_service) + self.assertNotCalled(self.compute_client.disable_service) self.assertIsNone(result) def test_service_set_state_down(self): @@ -441,11 +441,11 @@ class TestServiceSet(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_client.update_service_forced_down.assert_called_once_with( None, self.service.host, self.service.binary, True ) - self.assertNotCalled(self.compute_sdk_client.enable_service) - self.assertNotCalled(self.compute_sdk_client.disable_service) + self.assertNotCalled(self.compute_client.enable_service) + self.assertNotCalled(self.compute_client.disable_service) self.assertIsNone(result) def test_service_set_enable_and_state_down(self): @@ -465,10 +465,10 @@ class TestServiceSet(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.enable_service.assert_called_once_with( + self.compute_client.enable_service.assert_called_once_with( None, self.service.host, self.service.binary ) - self.compute_sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_client.update_service_forced_down.assert_called_once_with( None, self.service.host, self.service.binary, True ) self.assertIsNone(result) @@ -491,12 +491,12 @@ class TestServiceSet(compute_fakes.TestComputev2): parsed_args = self.check_parser(self.cmd, arglist, verifylist) with mock.patch.object( - self.compute_sdk_client, 'enable_service', side_effect=Exception() + self.compute_client, 'enable_service', side_effect=Exception() ): self.assertRaises( exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.compute_sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_client.update_service_forced_down.assert_called_once_with( None, self.service.host, self.service.binary, True ) @@ -519,14 +519,12 @@ class TestServiceSet(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c' - self.compute_sdk_client.services.return_value = [ - mock.Mock(id=service_id) - ] + self.compute_client.services.return_value = [mock.Mock(id=service_id)] result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.disable_service.assert_called_once_with( + self.compute_client.disable_service.assert_called_once_with( service_id, self.service.host, self.service.binary, None ) - self.compute_sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_client.update_service_forced_down.assert_called_once_with( service_id, self.service.host, self.service.binary, True ) self.assertIsNone(result) @@ -552,11 +550,9 @@ class TestServiceSet(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c' - self.compute_sdk_client.services.return_value = [ - mock.Mock(id=service_id) - ] + self.compute_client.services.return_value = [mock.Mock(id=service_id)] result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.disable_service.assert_called_once_with( + self.compute_client.disable_service.assert_called_once_with( service_id, self.service.host, self.service.binary, reason ) self.assertIsNone(result) @@ -580,25 +576,23 @@ class TestServiceSet(compute_fakes.TestComputev2): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c' - self.compute_sdk_client.services.return_value = [ - mock.Mock(id=service_id) - ] + self.compute_client.services.return_value = [mock.Mock(id=service_id)] result = self.cmd.take_action(parsed_args) - self.compute_sdk_client.enable_service.assert_called_once_with( + self.compute_client.enable_service.assert_called_once_with( service_id, self.service.host, self.service.binary ) - self.compute_sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_client.update_service_forced_down.assert_called_once_with( service_id, self.service.host, self.service.binary, False ) self.assertIsNone(result) def test_service_set_find_service_by_host_and_binary_no_results(self): # Tests that no compute services are found by host and binary. - self.compute_sdk_client.services.return_value = [] + self.compute_client.services.return_value = [] ex = self.assertRaises( exceptions.CommandError, self.cmd._find_service_by_host_and_binary, - self.compute_sdk_client, + self.compute_client, 'fake-host', 'nova-compute', ) @@ -610,14 +604,14 @@ class TestServiceSet(compute_fakes.TestComputev2): def test_service_set_find_service_by_host_and_binary_many_results(self): # Tests that more than one compute service is found by host and binary. - self.compute_sdk_client.services.return_value = [ + self.compute_client.services.return_value = [ mock.Mock(), mock.Mock(), ] ex = self.assertRaises( exceptions.CommandError, self.cmd._find_service_by_host_and_binary, - self.compute_sdk_client, + self.compute_client, 'fake-host', 'nova-compute', ) diff --git a/openstackclient/tests/unit/compute/v2/test_usage.py b/openstackclient/tests/unit/compute/v2/test_usage.py index 346e2fb0b5..6169678185 100644 --- a/openstackclient/tests/unit/compute/v2/test_usage.py +++ b/openstackclient/tests/unit/compute/v2/test_usage.py @@ -58,7 +58,7 @@ class TestUsageList(TestUsage): def setUp(self): super().setUp() - self.compute_sdk_client.usages.return_value = self.usages + self.compute_client.usages.return_value = self.usages self.projects_mock.list.return_value = [self.project] # Get the command object to test @@ -97,7 +97,7 @@ class TestUsageList(TestUsage): columns, data = self.cmd.take_action(parsed_args) self.projects_mock.list.assert_called_with() - self.compute_sdk_client.usages.assert_called_with( + self.compute_client.usages.assert_called_with( start=datetime.datetime(2016, 11, 11, 0, 0), end=datetime.datetime(2016, 12, 20, 0, 0), detailed=True, @@ -118,7 +118,7 @@ class TestUsageList(TestUsage): columns, data = self.cmd.take_action(parsed_args) self.projects_mock.list.assert_called_with() - self.compute_sdk_client.usages.assert_has_calls( + self.compute_client.usages.assert_has_calls( [mock.call(start=mock.ANY, end=mock.ANY, detailed=True)] ) self.assertCountEqual(self.columns, columns) @@ -151,7 +151,7 @@ class TestUsageShow(TestUsage): def setUp(self): super().setUp() - self.compute_sdk_client.get_usage.return_value = self.usage + self.compute_client.get_usage.return_value = self.usage self.projects_mock.get.return_value = self.project # Get the command object to test @@ -194,7 +194,7 @@ class TestUsageShow(TestUsage): columns, data = self.cmd.take_action(parsed_args) - self.compute_sdk_client.get_usage.assert_called_with( + self.compute_client.get_usage.assert_called_with( project=self.project.id, start=datetime.datetime(2016, 11, 11, 0, 0), end=datetime.datetime(2016, 12, 20, 0, 0), diff --git a/openstackclient/tests/unit/network/v2/test_floating_ip_compute.py b/openstackclient/tests/unit/network/v2/test_floating_ip_compute.py index d310f199af..89137d6e98 100644 --- a/openstackclient/tests/unit/network/v2/test_floating_ip_compute.py +++ b/openstackclient/tests/unit/network/v2/test_floating_ip_compute.py @@ -73,7 +73,7 @@ class TestCreateFloatingIPCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) fip_mock.assert_called_once_with( - self.compute_sdk_client, self._floating_ip['pool'] + self.compute_client, self._floating_ip['pool'] ) self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) @@ -103,7 +103,7 @@ class TestDeleteFloatingIPCompute(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) fip_mock.assert_called_once_with( - self.compute_sdk_client, self._floating_ips[0]['id'] + self.compute_client, self._floating_ips[0]['id'] ) self.assertIsNone(result) @@ -122,12 +122,8 @@ class TestDeleteFloatingIPCompute(compute_fakes.TestComputev2): fip_mock.assert_has_calls( [ - mock.call( - self.compute_sdk_client, self._floating_ips[0]['id'] - ), - mock.call( - self.compute_sdk_client, self._floating_ips[1]['id'] - ), + mock.call(self.compute_client, self._floating_ips[0]['id']), + mock.call(self.compute_client, self._floating_ips[1]['id']), ] ) self.assertIsNone(result) @@ -157,11 +153,9 @@ class TestDeleteFloatingIPCompute(compute_fakes.TestComputev2): self.assertEqual('1 of 2 floating_ips failed to delete.', str(e)) fip_mock.assert_any_call( - self.compute_sdk_client, self._floating_ips[0]['id'] - ) - fip_mock.assert_any_call( - self.compute_sdk_client, 'unexist_floating_ip' + self.compute_client, self._floating_ips[0]['id'] ) + fip_mock.assert_any_call(self.compute_client, 'unexist_floating_ip') @mock.patch.object(compute_v2, 'list_floating_ips') @@ -203,7 +197,7 @@ class TestListFloatingIPCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) - fip_mock.assert_called_once_with(self.compute_sdk_client) + fip_mock.assert_called_once_with(self.compute_client) self.assertEqual(self.columns, columns) self.assertEqual(self.data, list(data)) @@ -248,7 +242,7 @@ class TestShowFloatingIPCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) fip_mock.assert_called_once_with( - self.compute_sdk_client, self._floating_ip['id'] + self.compute_client, self._floating_ip['id'] ) self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) diff --git a/openstackclient/tests/unit/network/v2/test_floating_ip_pool_compute.py b/openstackclient/tests/unit/network/v2/test_floating_ip_pool_compute.py index 26fc3918e5..90ded06280 100644 --- a/openstackclient/tests/unit/network/v2/test_floating_ip_pool_compute.py +++ b/openstackclient/tests/unit/network/v2/test_floating_ip_pool_compute.py @@ -44,6 +44,6 @@ class TestListFloatingIPPoolCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) - fipp_mock.assert_called_once_with(self.compute_sdk_client) + fipp_mock.assert_called_once_with(self.compute_client) self.assertEqual(self.columns, columns) self.assertEqual(self.data, list(data)) diff --git a/openstackclient/tests/unit/network/v2/test_network_compute.py b/openstackclient/tests/unit/network/v2/test_network_compute.py index 045fa1f6b6..e08e6baf0c 100644 --- a/openstackclient/tests/unit/network/v2/test_network_compute.py +++ b/openstackclient/tests/unit/network/v2/test_network_compute.py @@ -148,7 +148,7 @@ class TestCreateNetworkCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) net_mock.assert_called_once_with( - self.compute_sdk_client, + self.compute_client, subnet=self._network['cidr'], name=self._network['label'], ) @@ -182,7 +182,7 @@ class TestDeleteNetworkCompute(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) delete_net_mock.assert_called_once_with( - self.compute_sdk_client, + self.compute_client, self._networks[0]['id'], ) self.assertIsNone(result) @@ -203,8 +203,8 @@ class TestDeleteNetworkCompute(compute_fakes.TestComputev2): delete_net_mock.assert_has_calls( [ - mock.call(self.compute_sdk_client, self._networks[0]['id']), - mock.call(self.compute_sdk_client, self._networks[1]['id']), + mock.call(self.compute_client, self._networks[0]['id']), + mock.call(self.compute_client, self._networks[1]['id']), ] ) self.assertIsNone(result) @@ -238,15 +238,15 @@ class TestDeleteNetworkCompute(compute_fakes.TestComputev2): find_net_mock.assert_has_calls( [ - mock.call(self.compute_sdk_client, self._networks[0]['id']), - mock.call(self.compute_sdk_client, 'xxxx-yyyy-zzzz'), - mock.call(self.compute_sdk_client, self._networks[1]['id']), + mock.call(self.compute_client, self._networks[0]['id']), + mock.call(self.compute_client, 'xxxx-yyyy-zzzz'), + mock.call(self.compute_client, self._networks[1]['id']), ] ) delete_net_mock.assert_has_calls( [ - mock.call(self.compute_sdk_client, self._networks[0]['id']), - mock.call(self.compute_sdk_client, self._networks[1]['id']), + mock.call(self.compute_client, self._networks[0]['id']), + mock.call(self.compute_client, self._networks[1]['id']), ] ) @@ -286,7 +286,7 @@ class TestListNetworkCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) - net_mock.assert_called_once_with(self.compute_sdk_client) + net_mock.assert_called_once_with(self.compute_client) self.assertEqual(self.columns, columns) self.assertEqual(self.data, list(data)) @@ -398,7 +398,7 @@ class TestShowNetworkCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) net_mock.assert_called_once_with( - self.compute_sdk_client, self._network['label'] + self.compute_client, self._network['label'] ) self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) diff --git a/openstackclient/tests/unit/network/v2/test_port.py b/openstackclient/tests/unit/network/v2/test_port.py index 7f5271d109..4484ec42e2 100644 --- a/openstackclient/tests/unit/network/v2/test_port.py +++ b/openstackclient/tests/unit/network/v2/test_port.py @@ -1378,7 +1378,7 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort): def test_port_list_with_server_option(self): fake_server = compute_fakes.create_one_sdk_server() - self.compute_sdk_client.find_server.return_value = fake_server + self.compute_client.find_server.return_value = fake_server arglist = [ '--server', @@ -1393,7 +1393,7 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort): self.network_client.ports.assert_called_once_with( device_id=fake_server.id, fields=LIST_FIELDS_TO_RETRIEVE ) - self.compute_sdk_client.find_server.aassert_called_once_with( + self.compute_client.find_server.aassert_called_once_with( mock.ANY, 'fake-server-name' ) self.assertEqual(self.columns, columns) diff --git a/openstackclient/tests/unit/network/v2/test_security_group_compute.py b/openstackclient/tests/unit/network/v2/test_security_group_compute.py index 243f830210..e23bb24977 100644 --- a/openstackclient/tests/unit/network/v2/test_security_group_compute.py +++ b/openstackclient/tests/unit/network/v2/test_security_group_compute.py @@ -72,7 +72,7 @@ class TestCreateSecurityGroupCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) sg_mock.assert_called_once_with( - self.compute_sdk_client, + self.compute_client, self._security_group['name'], self._security_group['name'], ) @@ -95,7 +95,7 @@ class TestCreateSecurityGroupCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) sg_mock.assert_called_once_with( - self.compute_sdk_client, + self.compute_client, self._security_group['name'], self._security_group['description'], ) @@ -133,7 +133,7 @@ class TestDeleteSecurityGroupCompute(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) sg_mock.assert_called_once_with( - self.compute_sdk_client, + self.compute_client, self._security_groups[0]['id'], ) self.assertIsNone(result) @@ -153,12 +153,8 @@ class TestDeleteSecurityGroupCompute(compute_fakes.TestComputev2): sg_mock.assert_has_calls( [ - mock.call( - self.compute_sdk_client, self._security_groups[0]['id'] - ), - mock.call( - self.compute_sdk_client, self._security_groups[1]['id'] - ), + mock.call(self.compute_client, self._security_groups[0]['id']), + mock.call(self.compute_client, self._security_groups[1]['id']), ] ) self.assertIsNone(result) @@ -187,9 +183,7 @@ class TestDeleteSecurityGroupCompute(compute_fakes.TestComputev2): sg_mock.assert_has_calls( [ - mock.call( - self.compute_sdk_client, self._security_groups[0]['id'] - ), + mock.call(self.compute_client, self._security_groups[0]['id']), ] ) @@ -250,7 +244,7 @@ class TestListSecurityGroupCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) sg_mock.assert_called_once_with( - self.compute_sdk_client, all_projects=False + self.compute_client, all_projects=False ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, list(data)) @@ -267,9 +261,7 @@ class TestListSecurityGroupCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) - sg_mock.assert_called_once_with( - self.compute_sdk_client, all_projects=True - ) + sg_mock.assert_called_once_with(self.compute_client, all_projects=True) self.assertEqual(self.columns_all_projects, columns) self.assertCountEqual(self.data_all_projects, list(data)) @@ -309,7 +301,7 @@ class TestSetSecurityGroupCompute(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) sg_mock.assert_called_once_with( - self.compute_sdk_client, self._security_group['id'] + self.compute_client, self._security_group['id'] ) self.assertIsNone(result) @@ -334,7 +326,7 @@ class TestSetSecurityGroupCompute(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) sg_mock.assert_called_once_with( - self.compute_sdk_client, + self.compute_client, self._security_group['id'], name=new_name, description=new_description, @@ -394,7 +386,7 @@ class TestShowSecurityGroupCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) sg_mock.assert_called_once_with( - self.compute_sdk_client, self._security_group['id'] + self.compute_client, self._security_group['id'] ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) diff --git a/openstackclient/tests/unit/network/v2/test_security_group_rule_compute.py b/openstackclient/tests/unit/network/v2/test_security_group_rule_compute.py index fc3c0ddb19..678ff8a30d 100644 --- a/openstackclient/tests/unit/network/v2/test_security_group_rule_compute.py +++ b/openstackclient/tests/unit/network/v2/test_security_group_rule_compute.py @@ -159,7 +159,7 @@ class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) sgr_mock.assert_called_once_with( - self.compute_sdk_client, + self.compute_client, security_group_id=self._security_group['id'], ip_protocol=self._security_group_rule['ip_protocol'], from_port=self._security_group_rule['from_port'], @@ -202,7 +202,7 @@ class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) sgr_mock.assert_called_once_with( - self.compute_sdk_client, + self.compute_client, security_group_id=self._security_group['id'], ip_protocol=self._security_group_rule['ip_protocol'], from_port=self._security_group_rule['from_port'], @@ -240,7 +240,7 @@ class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) sgr_mock.assert_called_once_with( - self.compute_sdk_client, + self.compute_client, security_group_id=self._security_group['id'], ip_protocol=self._security_group_rule['ip_protocol'], from_port=self._security_group_rule['from_port'], @@ -279,7 +279,7 @@ class TestCreateSecurityGroupRuleCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) sgr_mock.assert_called_once_with( - self.compute_sdk_client, + self.compute_client, security_group_id=self._security_group['id'], ip_protocol=self._security_group_rule['ip_protocol'], from_port=self._security_group_rule['from_port'], @@ -316,7 +316,7 @@ class TestDeleteSecurityGroupRuleCompute(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) sgr_mock.assert_called_once_with( - self.compute_sdk_client, self._security_group_rules[0]['id'] + self.compute_client, self._security_group_rules[0]['id'] ) self.assertIsNone(result) @@ -335,11 +335,11 @@ class TestDeleteSecurityGroupRuleCompute(compute_fakes.TestComputev2): sgr_mock.assert_has_calls( [ mock.call( - self.compute_sdk_client, + self.compute_client, self._security_group_rules[0]['id'], ), mock.call( - self.compute_sdk_client, + self.compute_client, self._security_group_rules[1]['id'], ), ] @@ -367,10 +367,10 @@ class TestDeleteSecurityGroupRuleCompute(compute_fakes.TestComputev2): sgr_mock.assert_has_calls( [ mock.call( - self.compute_sdk_client, + self.compute_client, self._security_group_rules[0]['id'], ), - mock.call(self.compute_sdk_client, 'unexist_rule'), + mock.call(self.compute_client, 'unexist_rule'), ] ) @@ -457,7 +457,7 @@ class TestListSecurityGroupRuleCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) compute_v2.list_security_groups.assert_called_once_with( - self.compute_sdk_client, all_projects=False + self.compute_client, all_projects=False ) self.assertEqual(self.expected_columns_no_group, columns) self.assertEqual(self.expected_data_no_group, list(data)) @@ -473,7 +473,7 @@ class TestListSecurityGroupRuleCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) compute_v2.find_security_group.assert_called_once_with( - self.compute_sdk_client, self._security_group['id'] + self.compute_client, self._security_group['id'] ) self.assertEqual(self.expected_columns_with_group, columns) self.assertEqual(self.expected_data_with_group, list(data)) @@ -489,7 +489,7 @@ class TestListSecurityGroupRuleCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) compute_v2.list_security_groups.assert_called_once_with( - self.compute_sdk_client, all_projects=True + self.compute_client, all_projects=True ) self.assertEqual(self.expected_columns_no_group, columns) self.assertEqual(self.expected_data_no_group, list(data)) @@ -505,7 +505,7 @@ class TestListSecurityGroupRuleCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) compute_v2.list_security_groups.assert_called_once_with( - self.compute_sdk_client, all_projects=False + self.compute_client, all_projects=False ) self.assertEqual(self.expected_columns_no_group, columns) self.assertEqual(self.expected_data_no_group, list(data)) @@ -551,7 +551,7 @@ class TestShowSecurityGroupRuleCompute(compute_fakes.TestComputev2): columns, data = self.cmd.take_action(parsed_args) compute_v2.list_security_groups.assert_called_once_with( - self.compute_sdk_client + self.compute_client ) self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) diff --git a/openstackclient/tests/unit/volume/v3/fakes.py b/openstackclient/tests/unit/volume/v3/fakes.py index 01519d70d0..eb5c170f63 100644 --- a/openstackclient/tests/unit/volume/v3/fakes.py +++ b/openstackclient/tests/unit/volume/v3/fakes.py @@ -129,10 +129,8 @@ class TestVolume( # avoid circular imports by defining this manually rather than using # openstackclient.tests.unit.compute.v2.fakes.FakeClientMixin - # TODO(stephenfin): Rename to 'compute_client' once all commands are - # migrated to SDK self.app.client_manager.compute = mock.Mock(_compute_proxy.Proxy) - self.compute_sdk_client = self.app.client_manager.compute + self.compute_client = self.app.client_manager.compute # avoid circular imports by defining this manually rather than using # openstackclient.tests.unit.image.v2.fakes.FakeClientMixin diff --git a/openstackclient/tests/unit/volume/v3/test_volume_attachment.py b/openstackclient/tests/unit/volume/v3/test_volume_attachment.py index aca2e3399a..d4dc469e37 100644 --- a/openstackclient/tests/unit/volume/v3/test_volume_attachment.py +++ b/openstackclient/tests/unit/volume/v3/test_volume_attachment.py @@ -61,7 +61,7 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment): self.volume_sdk_client.create_attachment.return_value = ( self.volume_attachment.to_dict() ) - self.compute_sdk_client.find_server.return_value = self.server + self.compute_client.find_server.return_value = self.server self.cmd = volume_attachment.CreateVolumeAttachment(self.app, None) @@ -92,7 +92,7 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment): self.volume_sdk_client.find_volume.assert_called_once_with( self.volume.id, ignore_missing=False ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.volume_sdk_client.create_attachment.assert_called_once_with( @@ -159,7 +159,7 @@ class TestVolumeAttachmentCreate(TestVolumeAttachment): self.volume_sdk_client.find_volume.assert_called_once_with( self.volume.id, ignore_missing=False ) - self.compute_sdk_client.find_server.assert_called_once_with( + self.compute_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False ) self.volume_sdk_client.create_attachment.assert_called_once_with(