diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 4ead22112c..91c5b476ae 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -1575,8 +1575,8 @@ class CreateServer(command.ShowOne): if parsed_args.description: if compute_client.api_version < api_versions.APIVersion("2.19"): msg = _( - "Description is not supported for " - "--os-compute-api-version less than 2.19" + '--os-compute-api-version 2.19 or greater is ' + 'required to support the --description option' ) raise exceptions.CommandError(msg) @@ -4958,8 +4958,8 @@ class UnsetServer(command.Command): if parsed_args.description: if compute_client.api_version < api_versions.APIVersion("2.19"): msg = _( - "Description is not supported for " - "--os-compute-api-version less than 2.19" + '--os-compute-api-version 2.19 or greater is ' + 'required to support the --description option' ) raise exceptions.CommandError(msg) compute_client.servers.update( diff --git a/openstackclient/tests/unit/common/test_availability_zone.py b/openstackclient/tests/unit/common/test_availability_zone.py index 1071f23d2c..1e5cbf9d37 100644 --- a/openstackclient/tests/unit/common/test_availability_zone.py +++ b/openstackclient/tests/unit/common/test_availability_zone.py @@ -87,8 +87,10 @@ class TestAvailabilityZone( super().setUp() self.app.client_manager.sdk_connection.compute = mock.Mock() - self.compute_client = self.app.client_manager.sdk_connection.compute - self.compute_client.availability_zones = mock.Mock() + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) + self.compute_sdk_client.availability_zones = mock.Mock() class TestAvailabilityZoneList(TestAvailabilityZone): @@ -109,7 +111,9 @@ class TestAvailabilityZoneList(TestAvailabilityZone): def setUp(self): super().setUp() - self.compute_client.availability_zones.return_value = self.compute_azs + self.compute_sdk_client.availability_zones.return_value = ( + self.compute_azs + ) self.volume_sdk_client.availability_zones.return_value = ( self.volume_azs ) @@ -128,7 +132,9 @@ class TestAvailabilityZoneList(TestAvailabilityZone): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_client.availability_zones.assert_called_with(details=True) + self.compute_sdk_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() @@ -156,7 +162,9 @@ class TestAvailabilityZoneList(TestAvailabilityZone): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_client.availability_zones.assert_called_with(details=True) + self.compute_sdk_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() @@ -190,7 +198,9 @@ class TestAvailabilityZoneList(TestAvailabilityZone): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_client.availability_zones.assert_called_with(details=True) + self.compute_sdk_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() @@ -214,7 +224,7 @@ class TestAvailabilityZoneList(TestAvailabilityZone): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_client.availability_zones.assert_not_called() + self.compute_sdk_client.availability_zones.assert_not_called() self.volume_sdk_client.availability_zones.assert_called_with() self.network_client.availability_zones.assert_not_called() @@ -238,7 +248,7 @@ class TestAvailabilityZoneList(TestAvailabilityZone): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.compute_client.availability_zones.assert_not_called() + self.compute_sdk_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_limits.py b/openstackclient/tests/unit/common/test_limits.py index 87f6c1921c..ecbbe534ab 100644 --- a/openstackclient/tests/unit/common/test_limits.py +++ b/openstackclient/tests/unit/common/test_limits.py @@ -27,10 +27,10 @@ class TestComputeLimits(compute_fakes.TestComputev2): def setUp(self): super().setUp() self.app.client_manager.volume_endpoint_enabled = False - self.compute = self.app.client_manager.compute + self.compute_client = self.app.client_manager.compute self.fake_limits = compute_fakes.FakeLimits() - self.compute.limits.get.return_value = self.fake_limits + self.compute_client.limits.get.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 647f0b0db2..8a15fb4c48 100644 --- a/openstackclient/tests/unit/common/test_quota.py +++ b/openstackclient/tests/unit/common/test_quota.py @@ -48,11 +48,10 @@ class TestQuota(compute_fakes.TestComputev2): self.projects_mock.reset_mock() self.projects_mock.get.return_value = self.projects[0] - self.compute_quotas_mock = self.app.client_manager.compute.quotas + self.compute_client = self.app.client_manager.compute + self.compute_quotas_mock = self.compute_client.quotas self.compute_quotas_mock.reset_mock() - self.compute_quotas_class_mock = ( - self.app.client_manager.compute.quota_classes - ) + self.compute_quotas_class_mock = self.compute_client.quota_classes self.compute_quotas_class_mock.reset_mock() self.volume_quotas_mock = self.volume_client.quotas @@ -125,8 +124,7 @@ class TestQuotaList(TestQuota): compute_fakes.create_one_default_comp_quota(), compute_fakes.create_one_default_comp_quota(), ] - self.compute = self.app.client_manager.compute - self.compute.quotas.defaults = mock.Mock( + self.compute_client.quotas.defaults = mock.Mock( side_effect=self.compute_default_quotas, ) @@ -221,7 +219,7 @@ class TestQuotaList(TestQuota): detailed_quota ) - self.compute.quotas.get = mock.Mock(return_value=detailed_quota) + self.compute_client.quotas.get = mock.Mock(return_value=detailed_quota) arglist = [ '--detail', @@ -305,7 +303,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute(self): # Two projects with non-default quotas - self.compute.quotas.get = mock.Mock( + self.compute_client.quotas.get = mock.Mock( side_effect=self.compute_quotas, ) @@ -326,7 +324,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute_default(self): # One of the projects is at defaults - self.compute.quotas.get = mock.Mock( + self.compute_client.quotas.get = mock.Mock( side_effect=[ self.compute_quotas[0], compute_fakes.create_one_default_comp_quota(), @@ -350,7 +348,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute_no_project_not_found(self): # Make one of the projects disappear - self.compute.quotas.get = mock.Mock( + self.compute_client.quotas.get = mock.Mock( side_effect=[ self.compute_quotas[0], exceptions.NotFound("NotFound"), @@ -374,7 +372,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute_no_project_4xx(self): # Make one of the projects disappear - self.compute.quotas.get = mock.Mock( + self.compute_client.quotas.get = mock.Mock( side_effect=[ self.compute_quotas[0], exceptions.BadRequest("Bad request"), @@ -398,7 +396,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute_no_project_5xx(self): # Make one of the projects disappear - self.compute.quotas.get = mock.Mock( + self.compute_client.quotas.get = mock.Mock( side_effect=[ self.compute_quotas[0], exceptions.HTTPNotImplemented("Not implemented??"), @@ -421,7 +419,7 @@ class TestQuotaList(TestQuota): def test_quota_list_compute_by_project(self): # Two projects with non-default quotas - self.compute.quotas.get = mock.Mock( + self.compute_client.quotas.get = mock.Mock( side_effect=self.compute_quotas, ) diff --git a/openstackclient/tests/unit/compute/v2/fakes.py b/openstackclient/tests/unit/compute/v2/fakes.py index b27471d988..5632458634 100644 --- a/openstackclient/tests/unit/compute/v2/fakes.py +++ b/openstackclient/tests/unit/compute/v2/fakes.py @@ -161,8 +161,9 @@ class TestComputev2( endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN, ) + self.compute_client = self.app.client_manager.compute - self.app.client_manager.compute.api = compute_v2.APIv2( + self.compute_client.api = compute_v2.APIv2( session=self.app.client_manager.session, endpoint=fakes.AUTH_URL, ) diff --git a/openstackclient/tests/unit/compute/v2/test_agent.py b/openstackclient/tests/unit/compute/v2/test_agent.py index 76172ae0e5..dc3ba6730d 100644 --- a/openstackclient/tests/unit/compute/v2/test_agent.py +++ b/openstackclient/tests/unit/compute/v2/test_agent.py @@ -51,7 +51,7 @@ class TestAgent(compute_fakes.TestComputev2): def setUp(self): super(TestAgent, self).setUp() - self.agents_mock = self.app.client_manager.compute.agents + self.agents_mock = self.compute_client.agents self.agents_mock.reset_mock() diff --git a/openstackclient/tests/unit/compute/v2/test_aggregate.py b/openstackclient/tests/unit/compute/v2/test_aggregate.py index dbed0058e1..52f6759a89 100644 --- a/openstackclient/tests/unit/compute/v2/test_aggregate.py +++ b/openstackclient/tests/unit/compute/v2/test_aggregate.py @@ -60,23 +60,27 @@ class TestAggregate(compute_fakes.TestComputev2): # Get a shortcut to the AggregateManager Mock self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute - self.sdk_client.aggregates = mock.Mock() - self.sdk_client.find_aggregate = mock.Mock() - self.sdk_client.create_aggregate = mock.Mock() - self.sdk_client.update_aggregate = mock.Mock() - self.sdk_client.update_aggregate = mock.Mock() - self.sdk_client.set_aggregate_metadata = mock.Mock() - self.sdk_client.add_host_to_aggregate = mock.Mock() - self.sdk_client.remove_host_from_aggregate = mock.Mock() + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) + self.compute_sdk_client.aggregates = mock.Mock() + self.compute_sdk_client.find_aggregate = mock.Mock() + self.compute_sdk_client.create_aggregate = mock.Mock() + self.compute_sdk_client.update_aggregate = mock.Mock() + self.compute_sdk_client.update_aggregate = mock.Mock() + self.compute_sdk_client.set_aggregate_metadata = mock.Mock() + self.compute_sdk_client.add_host_to_aggregate = mock.Mock() + self.compute_sdk_client.remove_host_from_aggregate = mock.Mock() class TestAggregateAddHost(TestAggregate): def setUp(self): super(TestAggregateAddHost, self).setUp() - self.sdk_client.find_aggregate.return_value = self.fake_ag - self.sdk_client.add_host_to_aggregate.return_value = self.fake_ag + 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.cmd = aggregate.AddAggregateHost(self.app, None) def test_aggregate_add_host(self): @@ -90,10 +94,10 @@ class TestAggregateAddHost(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.sdk_client.add_host_to_aggregate.assert_called_once_with( + self.compute_sdk_client.add_host_to_aggregate.assert_called_once_with( self.fake_ag.id, parsed_args.host ) self.assertEqual(self.columns, columns) @@ -104,8 +108,10 @@ class TestAggregateCreate(TestAggregate): def setUp(self): super(TestAggregateCreate, self).setUp() - self.sdk_client.create_aggregate.return_value = self.fake_ag - self.sdk_client.set_aggregate_metadata.return_value = self.fake_ag + self.compute_sdk_client.create_aggregate.return_value = self.fake_ag + self.compute_sdk_client.set_aggregate_metadata.return_value = ( + self.fake_ag + ) self.cmd = aggregate.CreateAggregate(self.app, None) def test_aggregate_create(self): @@ -117,7 +123,7 @@ class TestAggregateCreate(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_aggregate.assert_called_once_with( + self.compute_sdk_client.create_aggregate.assert_called_once_with( name=parsed_args.name ) self.assertEqual(self.columns, columns) @@ -136,7 +142,7 @@ class TestAggregateCreate(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_aggregate.assert_called_once_with( + self.compute_sdk_client.create_aggregate.assert_called_once_with( name=parsed_args.name, availability_zone=parsed_args.zone ) self.assertEqual(self.columns, columns) @@ -156,10 +162,10 @@ class TestAggregateCreate(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_aggregate.assert_called_once_with( + self.compute_sdk_client.create_aggregate.assert_called_once_with( name=parsed_args.name ) - self.sdk_client.set_aggregate_metadata.assert_called_once_with( + self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, parsed_args.properties ) self.assertEqual(self.columns, columns) @@ -172,7 +178,7 @@ class TestAggregateDelete(TestAggregate): def setUp(self): super(TestAggregateDelete, self).setUp() - self.sdk_client.find_aggregate = compute_fakes.get_aggregates( + self.compute_sdk_client.find_aggregate = compute_fakes.get_aggregates( self.fake_ags ) self.cmd = aggregate.DeleteAggregate(self.app, None) @@ -184,10 +190,10 @@ class TestAggregateDelete(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( self.fake_ags[0].id, ignore_missing=False ) - self.sdk_client.delete_aggregate.assert_called_once_with( + self.compute_sdk_client.delete_aggregate.assert_called_once_with( self.fake_ags[0].id, ignore_missing=False ) @@ -205,8 +211,8 @@ class TestAggregateDelete(TestAggregate): calls = [] for a in self.fake_ags: calls.append(call(a.id, ignore_missing=False)) - self.sdk_client.find_aggregate.assert_has_calls(calls) - self.sdk_client.delete_aggregate.assert_has_calls(calls) + self.compute_sdk_client.find_aggregate.assert_has_calls(calls) + self.compute_sdk_client.delete_aggregate.assert_has_calls(calls) def test_delete_multiple_agggregates_with_exception(self): arglist = [ @@ -219,7 +225,7 @@ class TestAggregateDelete(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.sdk_client.find_aggregate.side_effect = [ + self.compute_sdk_client.find_aggregate.side_effect = [ self.fake_ags[0], sdk_exceptions.NotFoundException, ] @@ -232,8 +238,8 @@ class TestAggregateDelete(TestAggregate): calls = [] for a in arglist: calls.append(call(a, ignore_missing=False)) - self.sdk_client.find_aggregate.assert_has_calls(calls) - self.sdk_client.delete_aggregate.assert_called_with( + self.compute_sdk_client.find_aggregate.assert_has_calls(calls) + self.compute_sdk_client.delete_aggregate.assert_called_with( self.fake_ags[0].id, ignore_missing=False ) @@ -280,7 +286,7 @@ class TestAggregateList(TestAggregate): def setUp(self): super(TestAggregateList, self).setUp() - self.sdk_client.aggregates.return_value = [self.fake_ag] + self.compute_sdk_client.aggregates.return_value = [self.fake_ag] self.cmd = aggregate.ListAggregate(self.app, None) def test_aggregate_list(self): @@ -308,8 +314,10 @@ class TestAggregateRemoveHost(TestAggregate): def setUp(self): super(TestAggregateRemoveHost, self).setUp() - self.sdk_client.find_aggregate.return_value = self.fake_ag - self.sdk_client.remove_host_from_aggregate.return_value = self.fake_ag + self.compute_sdk_client.find_aggregate.return_value = self.fake_ag + self.compute_sdk_client.remove_host_from_aggregate.return_value = ( + self.fake_ag + ) self.cmd = aggregate.RemoveAggregateHost(self.app, None) def test_aggregate_remove_host(self): @@ -323,10 +331,10 @@ class TestAggregateRemoveHost(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.sdk_client.remove_host_from_aggregate.assert_called_once_with( + self.compute_sdk_client.remove_host_from_aggregate.assert_called_once_with( self.fake_ag.id, parsed_args.host ) self.assertEqual(self.columns, columns) @@ -337,7 +345,7 @@ class TestAggregateSet(TestAggregate): def setUp(self): super(TestAggregateSet, self).setUp() - self.sdk_client.find_aggregate.return_value = self.fake_ag + self.compute_sdk_client.find_aggregate.return_value = self.fake_ag self.cmd = aggregate.SetAggregate(self.app, None) def test_aggregate_set_no_option(self): @@ -350,11 +358,11 @@ class TestAggregateSet(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.assertNotCalled(self.sdk_client.update_aggregate) - self.assertNotCalled(self.sdk_client.set_aggregate_metadata) + self.assertNotCalled(self.compute_sdk_client.update_aggregate) + self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata) self.assertIsNone(result) def test_aggregate_set_with_name(self): @@ -370,13 +378,13 @@ class TestAggregateSet(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.sdk_client.update_aggregate.assert_called_once_with( + self.compute_sdk_client.update_aggregate.assert_called_once_with( self.fake_ag.id, name=parsed_args.name ) - self.assertNotCalled(self.sdk_client.set_aggregate_metadata) + self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata) self.assertIsNone(result) def test_aggregate_set_with_zone(self): @@ -392,13 +400,13 @@ class TestAggregateSet(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.sdk_client.update_aggregate.assert_called_once_with( + self.compute_sdk_client.update_aggregate.assert_called_once_with( self.fake_ag.id, availability_zone=parsed_args.zone ) - self.assertNotCalled(self.sdk_client.set_aggregate_metadata) + self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata) self.assertIsNone(result) def test_aggregate_set_with_property(self): @@ -416,11 +424,11 @@ class TestAggregateSet(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.assertNotCalled(self.sdk_client.update_aggregate) - self.sdk_client.set_aggregate_metadata.assert_called_once_with( + self.assertNotCalled(self.compute_sdk_client.update_aggregate) + self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, parsed_args.properties ) self.assertIsNone(result) @@ -439,11 +447,11 @@ class TestAggregateSet(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.assertNotCalled(self.sdk_client.update_aggregate) - self.sdk_client.set_aggregate_metadata.assert_called_once_with( + self.assertNotCalled(self.compute_sdk_client.update_aggregate) + self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, {'key1': None, 'key2': 'value2'} ) self.assertIsNone(result) @@ -459,11 +467,11 @@ class TestAggregateSet(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.assertNotCalled(self.sdk_client.update_aggregate) - self.sdk_client.set_aggregate_metadata.assert_called_once_with( + self.assertNotCalled(self.compute_sdk_client.update_aggregate) + self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, {'key1': None} ) self.assertIsNone(result) @@ -482,13 +490,13 @@ class TestAggregateSet(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.sdk_client.update_aggregate.assert_called_once_with( + self.compute_sdk_client.update_aggregate.assert_called_once_with( self.fake_ag.id, availability_zone=parsed_args.zone ) - self.sdk_client.set_aggregate_metadata.assert_called_once_with( + self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, {'key1': None} ) self.assertIsNone(result) @@ -524,7 +532,7 @@ class TestAggregateShow(TestAggregate): def setUp(self): super(TestAggregateShow, self).setUp() - self.sdk_client.find_aggregate.return_value = self.fake_ag + self.compute_sdk_client.find_aggregate.return_value = self.fake_ag self.cmd = aggregate.ShowAggregate(self.app, None) def test_aggregate_show(self): @@ -536,7 +544,7 @@ class TestAggregateShow(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) @@ -548,7 +556,7 @@ class TestAggregateUnset(TestAggregate): def setUp(self): super(TestAggregateUnset, self).setUp() - self.sdk_client.find_aggregate.return_value = self.fake_ag + self.compute_sdk_client.find_aggregate.return_value = self.fake_ag self.cmd = aggregate.UnsetAggregate(self.app, None) def test_aggregate_unset(self): @@ -564,7 +572,7 @@ class TestAggregateUnset(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.set_aggregate_metadata.assert_called_once_with( + self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, {'unset_key': None} ) self.assertIsNone(result) @@ -584,7 +592,7 @@ class TestAggregateUnset(TestAggregate): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.set_aggregate_metadata.assert_called_once_with( + self.compute_sdk_client.set_aggregate_metadata.assert_called_once_with( self.fake_ag.id, {'unset_key1': None, 'unset_key2': None} ) self.assertIsNone(result) @@ -599,7 +607,7 @@ class TestAggregateUnset(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.assertNotCalled(self.sdk_client.set_aggregate_metadata) + self.assertNotCalled(self.compute_sdk_client.set_aggregate_metadata) self.assertIsNone(result) @@ -609,7 +617,7 @@ class TestAggregateCacheImage(TestAggregate): def setUp(self): super(TestAggregateCacheImage, self).setUp() - self.sdk_client.find_aggregate.return_value = self.fake_ag + self.compute_sdk_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 @@ -638,10 +646,10 @@ class TestAggregateCacheImage(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.sdk_client.aggregate_precache_images.assert_called_once_with( + self.compute_sdk_client.aggregate_precache_images.assert_called_once_with( self.fake_ag.id, [self.images[0].id] ) @@ -658,9 +666,9 @@ class TestAggregateCacheImage(TestAggregate): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.find_aggregate.assert_called_once_with( + self.compute_sdk_client.find_aggregate.assert_called_once_with( parsed_args.aggregate, ignore_missing=False ) - self.sdk_client.aggregate_precache_images.assert_called_once_with( + self.compute_sdk_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 efc4f4d4ed..07772fa44f 100644 --- a/openstackclient/tests/unit/compute/v2/test_console.py +++ b/openstackclient/tests/unit/compute/v2/test_console.py @@ -26,9 +26,11 @@ class TestConsole(compute_fakes.TestComputev2): # SDK mock self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute - self.sdk_client.find_server = mock.Mock() - self.sdk_client.get_server_console_output = mock.Mock() + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) + self.compute_sdk_client.find_server = mock.Mock() + self.compute_sdk_client.get_server_console_output = mock.Mock() class TestConsoleLog(TestConsole): @@ -37,7 +39,7 @@ class TestConsoleLog(TestConsole): def setUp(self): super(TestConsoleLog, self).setUp() - self.sdk_client.find_server.return_value = self._server + self.compute_sdk_client.find_server.return_value = self._server self.cmd = console.ShowConsoleLog(self.app, None) @@ -58,13 +60,13 @@ class TestConsoleLog(TestConsole): parsed_args = self.check_parser(self.cmd, arglist, verifylist) output = {'output': '1st line\n2nd line\n'} - self.sdk_client.get_server_console_output.return_value = output + self.compute_sdk_client.get_server_console_output.return_value = output self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( name_or_id='fake_server', ignore_missing=False ) - self.sdk_client.get_server_console_output.assert_called_with( + self.compute_sdk_client.get_server_console_output.assert_called_with( self._server.id, length=None ) stdout = self.app.stdout.content @@ -76,13 +78,13 @@ class TestConsoleLog(TestConsole): parsed_args = self.check_parser(self.cmd, arglist, verifylist) output = {'output': '1st line\n2nd line'} - self.sdk_client.get_server_console_output.return_value = output + self.compute_sdk_client.get_server_console_output.return_value = output self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( name_or_id='fake_server', ignore_missing=False ) - self.sdk_client.get_server_console_output.assert_called_with( + self.compute_sdk_client.get_server_console_output.assert_called_with( self._server.id, length=15 ) @@ -92,13 +94,13 @@ class TestConsoleUrlShow(TestConsole): def setUp(self): super(TestConsoleUrlShow, self).setUp() - self.sdk_client.find_server.return_value = self._server + self.compute_sdk_client.find_server.return_value = self._server fake_console_data = { 'url': 'http://localhost', 'protocol': 'fake_protocol', 'type': 'fake_type', } - self.sdk_client.create_console = mock.Mock( + self.compute_sdk_client.create_console = mock.Mock( return_value=fake_console_data ) @@ -125,7 +127,7 @@ class TestConsoleUrlShow(TestConsole): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_console.assert_called_once_with( + self.compute_sdk_client.create_console.assert_called_once_with( self._server.id, console_type='novnc' ) self.assertEqual(self.columns, columns) @@ -142,7 +144,7 @@ class TestConsoleUrlShow(TestConsole): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_console.assert_called_once_with( + self.compute_sdk_client.create_console.assert_called_once_with( self._server.id, console_type='novnc' ) self.assertEqual(self.columns, columns) @@ -159,7 +161,7 @@ class TestConsoleUrlShow(TestConsole): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_console.assert_called_once_with( + self.compute_sdk_client.create_console.assert_called_once_with( self._server.id, console_type='xvpvnc' ) self.assertEqual(self.columns, columns) @@ -176,7 +178,7 @@ class TestConsoleUrlShow(TestConsole): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_console.assert_called_once_with( + self.compute_sdk_client.create_console.assert_called_once_with( self._server.id, console_type='spice-html5' ) self.assertEqual(self.columns, columns) @@ -193,7 +195,7 @@ class TestConsoleUrlShow(TestConsole): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_console.assert_called_once_with( + self.compute_sdk_client.create_console.assert_called_once_with( self._server.id, console_type='rdp-html5' ) self.assertEqual(self.columns, columns) @@ -210,7 +212,7 @@ class TestConsoleUrlShow(TestConsole): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_console.assert_called_once_with( + self.compute_sdk_client.create_console.assert_called_once_with( self._server.id, console_type='serial' ) self.assertEqual(self.columns, columns) @@ -227,7 +229,7 @@ class TestConsoleUrlShow(TestConsole): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_console.assert_called_once_with( + self.compute_sdk_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 f7701e492d..1f28545639 100644 --- a/openstackclient/tests/unit/compute/v2/test_flavor.py +++ b/openstackclient/tests/unit/compute/v2/test_flavor.py @@ -32,16 +32,22 @@ class TestFlavor(compute_fakes.TestComputev2): # SDK mock self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute - self.sdk_client.flavors = mock.Mock() - self.sdk_client.find_flavor = mock.Mock() - self.sdk_client.delete_flavor = mock.Mock() - self.sdk_client.update_flavor = mock.Mock() - self.sdk_client.flavor_add_tenant_access = mock.Mock() - self.sdk_client.flavor_remove_tenant_access = mock.Mock() - self.sdk_client.create_flavor_extra_specs = mock.Mock() - self.sdk_client.update_flavor_extra_specs_property = mock.Mock() - self.sdk_client.delete_flavor_extra_specs_property = mock.Mock() + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) + self.compute_sdk_client.flavors = mock.Mock() + self.compute_sdk_client.find_flavor = mock.Mock() + self.compute_sdk_client.delete_flavor = mock.Mock() + self.compute_sdk_client.update_flavor = mock.Mock() + self.compute_sdk_client.flavor_add_tenant_access = mock.Mock() + self.compute_sdk_client.flavor_remove_tenant_access = mock.Mock() + self.compute_sdk_client.create_flavor_extra_specs = mock.Mock() + self.compute_sdk_client.update_flavor_extra_specs_property = ( + mock.Mock() + ) + self.compute_sdk_client.delete_flavor_extra_specs_property = ( + mock.Mock() + ) self.projects_mock = self.app.client_manager.identity.projects self.projects_mock.reset_mock() @@ -100,7 +106,7 @@ class TestFlavorCreate(TestFlavor): # Return a project self.projects_mock.get.return_value = self.project - self.sdk_client.create_flavor.return_value = self.flavor + self.compute_sdk_client.create_flavor.return_value = self.flavor self.cmd = flavor.CreateFlavor(self.app, None) def test_flavor_create_default_options(self): @@ -123,7 +129,9 @@ class TestFlavorCreate(TestFlavor): } columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_flavor.assert_called_once_with(**default_args) + self.compute_sdk_client.create_flavor.assert_called_once_with( + **default_args + ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data, data) @@ -190,8 +198,8 @@ 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.sdk_client.create_flavor.return_value = create_flavor - self.sdk_client.create_flavor_extra_specs.return_value = ( + self.compute_sdk_client.create_flavor.return_value = create_flavor + self.compute_sdk_client.create_flavor_extra_specs.return_value = ( expected_flavor ) @@ -199,11 +207,13 @@ class TestFlavorCreate(TestFlavor): sdk_utils, 'supports_microversion', return_value=True ): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_flavor.assert_called_once_with(**args) - self.sdk_client.create_flavor_extra_specs.assert_called_once_with( + self.compute_sdk_client.create_flavor.assert_called_once_with( + **args + ) + self.compute_sdk_client.create_flavor_extra_specs.assert_called_once_with( create_flavor, props ) - self.sdk_client.get_flavor_access.assert_not_called() + self.compute_sdk_client.get_flavor_access.assert_not_called() self.assertEqual(self.columns, columns) self.assertCountEqual(tuple(cmp_data), data) @@ -276,8 +286,8 @@ 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.sdk_client.create_flavor.return_value = create_flavor - self.sdk_client.create_flavor_extra_specs.return_value = ( + self.compute_sdk_client.create_flavor.return_value = create_flavor + self.compute_sdk_client.create_flavor_extra_specs.return_value = ( expected_flavor ) @@ -285,12 +295,12 @@ class TestFlavorCreate(TestFlavor): sdk_utils, 'supports_microversion', return_value=True ): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_flavor.assert_called_once_with(**args) - self.sdk_client.flavor_add_tenant_access.assert_called_with( + self.compute_sdk_client.create_flavor.assert_called_once_with(**args) + self.compute_sdk_client.flavor_add_tenant_access.assert_called_with( self.flavor.id, self.project.id, ) - self.sdk_client.create_flavor_extra_specs.assert_called_with( + self.compute_sdk_client.create_flavor_extra_specs.assert_called_with( create_flavor, props ) self.assertEqual(self.columns, columns) @@ -375,7 +385,7 @@ class TestFlavorCreate(TestFlavor): 'description': 'fake description', } - self.sdk_client.create_flavor.assert_called_once_with(**args) + self.compute_sdk_client.create_flavor.assert_called_once_with(**args) self.assertEqual(self.columns, columns) self.assertCountEqual(self.data_private, data) @@ -414,7 +424,7 @@ class TestFlavorDelete(TestFlavor): def setUp(self): super(TestFlavorDelete, self).setUp() - self.sdk_client.delete_flavor.return_value = None + self.compute_sdk_client.delete_flavor.return_value = None self.cmd = flavor.DeleteFlavor(self.app, None) @@ -425,14 +435,16 @@ class TestFlavorDelete(TestFlavor): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.sdk_client.find_flavor.return_value = self.flavors[0] + self.compute_sdk_client.find_flavor.return_value = self.flavors[0] result = self.cmd.take_action(parsed_args) - self.sdk_client.find_flavor.assert_called_with( + self.compute_sdk_client.find_flavor.assert_called_with( self.flavors[0].id, ignore_missing=False ) - self.sdk_client.delete_flavor.assert_called_with(self.flavors[0].id) + self.compute_sdk_client.delete_flavor.assert_called_with( + self.flavors[0].id + ) self.assertIsNone(result) def test_delete_multiple_flavors(self): @@ -445,7 +457,7 @@ class TestFlavorDelete(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.sdk_client.find_flavor.side_effect = self.flavors + self.compute_sdk_client.find_flavor.side_effect = self.flavors result = self.cmd.take_action(parsed_args) @@ -453,8 +465,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.sdk_client.find_flavor.assert_has_calls(find_calls) - self.sdk_client.delete_flavor.assert_has_calls(delete_calls) + self.compute_sdk_client.find_flavor.assert_has_calls(find_calls) + self.compute_sdk_client.delete_flavor.assert_has_calls(delete_calls) self.assertIsNone(result) def test_multi_flavors_delete_with_exception(self): @@ -465,7 +477,7 @@ class TestFlavorDelete(TestFlavor): verifylist = [('flavor', [self.flavors[0].id, 'unexist_flavor'])] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.sdk_client.find_flavor.side_effect = [ + self.compute_sdk_client.find_flavor.side_effect = [ self.flavors[0], sdk_exceptions.ResourceNotFound, ] @@ -481,8 +493,8 @@ class TestFlavorDelete(TestFlavor): mock.call('unexist_flavor', ignore_missing=False), ] delete_calls = [mock.call(self.flavors[0].id)] - self.sdk_client.find_flavor.assert_has_calls(find_calls) - self.sdk_client.delete_flavor.assert_has_calls(delete_calls) + self.compute_sdk_client.find_flavor.assert_has_calls(find_calls) + self.compute_sdk_client.delete_flavor.assert_has_calls(delete_calls) class TestFlavorList(TestFlavor): @@ -528,7 +540,7 @@ class TestFlavorList(TestFlavor): [], ] - self.sdk_client.flavors = self.api_mock + self.compute_sdk_client.flavors = self.api_mock # Get the command object to test self.cmd = flavor.ListFlavor(self.app, None) @@ -553,8 +565,8 @@ class TestFlavorList(TestFlavor): 'is_public': True, } - self.sdk_client.flavors.assert_called_with(**kwargs) - self.sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_sdk_client.flavors.assert_called_with(**kwargs) + self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -579,8 +591,8 @@ class TestFlavorList(TestFlavor): 'is_public': None, } - self.sdk_client.flavors.assert_called_with(**kwargs) - self.sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_sdk_client.flavors.assert_called_with(**kwargs) + self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -605,8 +617,8 @@ class TestFlavorList(TestFlavor): 'is_public': False, } - self.sdk_client.flavors.assert_called_with(**kwargs) - self.sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_sdk_client.flavors.assert_called_with(**kwargs) + self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -631,8 +643,8 @@ class TestFlavorList(TestFlavor): 'is_public': True, } - self.sdk_client.flavors.assert_called_with(**kwargs) - self.sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_sdk_client.flavors.assert_called_with(**kwargs) + self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -657,8 +669,8 @@ class TestFlavorList(TestFlavor): 'is_public': True, } - self.sdk_client.flavors.assert_called_with(**kwargs) - self.sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_sdk_client.flavors.assert_called_with(**kwargs) + self.compute_sdk_client.fetch_flavor_extra_specs.assert_not_called() self.assertEqual(self.columns_long, columns) self.assertCountEqual(self.data_long, tuple(data)) @@ -690,8 +702,10 @@ class TestFlavorList(TestFlavor): [], ] - self.sdk_client.flavors = self.api_mock - self.sdk_client.fetch_flavor_extra_specs = mock.Mock(return_value=None) + self.compute_sdk_client.flavors = self.api_mock + self.compute_sdk_client.fetch_flavor_extra_specs = mock.Mock( + return_value=None + ) arglist = [ '--long', @@ -712,8 +726,8 @@ class TestFlavorList(TestFlavor): 'is_public': True, } - self.sdk_client.flavors.assert_called_with(**kwargs) - self.sdk_client.fetch_flavor_extra_specs.assert_called_once_with( + self.compute_sdk_client.flavors.assert_called_with(**kwargs) + self.compute_sdk_client.fetch_flavor_extra_specs.assert_called_once_with( flavor ) @@ -746,15 +760,15 @@ class TestFlavorList(TestFlavor): 'min_ram': 2048, } - self.sdk_client.flavors.assert_called_with(**kwargs) - self.sdk_client.fetch_flavor_extra_specs.assert_not_called() + self.compute_sdk_client.flavors.assert_called_with(**kwargs) + self.compute_sdk_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.sdk_client.find_flavor(). + # Return value of self.compute_sdk_client.find_flavor(). flavor = compute_fakes.create_one_flavor( attrs={'os-flavor-access:is_public': False} ) @@ -763,7 +777,7 @@ class TestFlavorSet(TestFlavor): def setUp(self): super(TestFlavorSet, self).setUp() - self.sdk_client.find_flavor.return_value = self.flavor + self.compute_sdk_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) @@ -777,10 +791,10 @@ class TestFlavorSet(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_flavor.assert_called_with( + self.compute_sdk_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) - self.sdk_client.create_flavor_extra_specs.assert_called_with( + self.compute_sdk_client.create_flavor_extra_specs.assert_called_with( self.flavor.id, {'FOO': '"B A R"'} ) self.assertIsNone(result) @@ -791,10 +805,10 @@ class TestFlavorSet(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_flavor.assert_called_with( + self.compute_sdk_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) - self.sdk_client.delete_flavor_extra_specs_property.assert_called_with( + self.compute_sdk_client.delete_flavor_extra_specs_property.assert_called_with( self.flavor.id, 'property' ) self.assertIsNone(result) @@ -813,14 +827,14 @@ class TestFlavorSet(TestFlavor): result = self.cmd.take_action(parsed_args) - self.sdk_client.find_flavor.assert_called_with( + self.compute_sdk_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) - self.sdk_client.flavor_add_tenant_access.assert_called_with( + self.compute_sdk_client.flavor_add_tenant_access.assert_called_with( self.flavor.id, self.project.id, ) - self.sdk_client.create_flavor_extra_specs.assert_not_called() + self.compute_sdk_client.create_flavor_extra_specs.assert_not_called() self.assertIsNone(result) def test_flavor_set_no_project(self): @@ -857,7 +871,7 @@ class TestFlavorSet(TestFlavor): ) def test_flavor_set_with_unexist_flavor(self): - self.sdk_client.find_flavor.side_effect = [ + self.compute_sdk_client.find_flavor.side_effect = [ sdk_exceptions.ResourceNotFound() ] @@ -886,10 +900,10 @@ class TestFlavorSet(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_flavor.assert_called_with( + self.compute_sdk_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) - self.sdk_client.flavor_add_tenant_access.assert_not_called() + self.compute_sdk_client.flavor_add_tenant_access.assert_not_called() self.assertIsNone(result) def test_flavor_set_description_api_newer(self): @@ -903,12 +917,12 @@ class TestFlavorSet(TestFlavor): ('flavor', self.flavor.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.compute.api_version = 2.55 + with mock.patch.object( sdk_utils, 'supports_microversion', return_value=True ): result = self.cmd.take_action(parsed_args) - self.sdk_client.update_flavor.assert_called_with( + self.compute_sdk_client.update_flavor.assert_called_with( flavor=self.flavor.id, description='description' ) self.assertIsNone(result) @@ -924,7 +938,7 @@ class TestFlavorSet(TestFlavor): ('flavor', self.flavor.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.compute.api_version = 2.54 + with mock.patch.object( sdk_utils, 'supports_microversion', return_value=False ): @@ -943,13 +957,12 @@ class TestFlavorSet(TestFlavor): ('flavor', self.flavor.name), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.compute.api_version = 2.55 with mock.patch.object( sdk_utils, 'supports_microversion', return_value=True ): result = self.cmd.take_action(parsed_args) - self.sdk_client.update_flavor.assert_called_with( + self.compute_sdk_client.update_flavor.assert_called_with( flavor=self.flavor.id, description='description' ) self.assertIsNone(result) @@ -965,7 +978,6 @@ class TestFlavorSet(TestFlavor): ('flavor', self.flavor.name), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.compute.api_version = 2.54 with mock.patch.object( sdk_utils, 'supports_microversion', return_value=False @@ -976,7 +988,7 @@ class TestFlavorSet(TestFlavor): class TestFlavorShow(TestFlavor): - # Return value of self.sdk_client.find_flavor(). + # Return value of self.compute_sdk_client.find_flavor(). flavor_access = compute_fakes.create_one_flavor_access() flavor = compute_fakes.create_one_flavor() @@ -1016,8 +1028,10 @@ class TestFlavorShow(TestFlavor): super(TestFlavorShow, self).setUp() # Return value of _find_resource() - self.sdk_client.find_flavor.return_value = self.flavor - self.sdk_client.get_flavor_access.return_value = [self.flavor_access] + self.compute_sdk_client.find_flavor.return_value = self.flavor + self.compute_sdk_client.get_flavor_access.return_value = [ + self.flavor_access + ] self.cmd = flavor.ShowFlavor(self.app, None) def test_show_no_options(self): @@ -1054,7 +1068,7 @@ class TestFlavorShow(TestFlavor): 'os-flavor-access:is_public': False, } ) - self.sdk_client.find_flavor.return_value = private_flavor + self.compute_sdk_client.find_flavor.return_value = private_flavor arglist = [ private_flavor.name, @@ -1083,7 +1097,7 @@ class TestFlavorShow(TestFlavor): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.get_flavor_access.assert_called_with( + self.compute_sdk_client.get_flavor_access.assert_called_with( flavor=private_flavor.id ) self.assertEqual(self.columns, columns) @@ -1091,7 +1105,7 @@ class TestFlavorShow(TestFlavor): class TestFlavorUnset(TestFlavor): - # Return value of self.sdk_client.find_flavor(). + # Return value of self.compute_sdk_client.find_flavor(). flavor = compute_fakes.create_one_flavor( attrs={'os-flavor-access:is_public': False} ) @@ -1100,12 +1114,14 @@ class TestFlavorUnset(TestFlavor): def setUp(self): super(TestFlavorUnset, self).setUp() - self.sdk_client.find_flavor.return_value = self.flavor + self.compute_sdk_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.sdk_client.delete_flavor_extra_specs_property + self.mock_shortcut = ( + self.compute_sdk_client.delete_flavor_extra_specs_property + ) def test_flavor_unset_property(self): arglist = ['--property', 'property', 'baremetal'] @@ -1116,11 +1132,11 @@ class TestFlavorUnset(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_flavor.assert_called_with( + self.compute_sdk_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.sdk_client.flavor_remove_tenant_access.assert_not_called() + self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called() self.assertIsNone(result) def test_flavor_unset_properties(self): @@ -1138,7 +1154,7 @@ class TestFlavorUnset(TestFlavor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.find_flavor.assert_called_with( + self.compute_sdk_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) calls = [ @@ -1153,7 +1169,7 @@ class TestFlavorUnset(TestFlavor): AssertionError, self.mock_shortcut.assert_has_calls, calls ) - self.sdk_client.flavor_remove_tenant_access.assert_not_called() + self.compute_sdk_client.flavor_remove_tenant_access.assert_not_called() def test_flavor_unset_project(self): arglist = [ @@ -1170,14 +1186,14 @@ class TestFlavorUnset(TestFlavor): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.sdk_client.find_flavor.assert_called_with( + self.compute_sdk_client.find_flavor.assert_called_with( parsed_args.flavor, get_extra_specs=True, ignore_missing=False ) - self.sdk_client.flavor_remove_tenant_access.assert_called_with( + self.compute_sdk_client.flavor_remove_tenant_access.assert_called_with( self.flavor.id, self.project.id, ) - self.sdk_client.delete_flavor_extra_specs_proerty.assert_not_called() + self.compute_sdk_client.delete_flavor_extra_specs_proerty.assert_not_called() self.assertIsNone(result) def test_flavor_unset_no_project(self): @@ -1214,7 +1230,7 @@ class TestFlavorUnset(TestFlavor): ) def test_flavor_unset_with_unexist_flavor(self): - self.sdk_client.find_flavor.side_effect = [ + self.compute_sdk_client.find_flavor.side_effect = [ sdk_exceptions.ResourceNotFound ] @@ -1244,4 +1260,4 @@ class TestFlavorUnset(TestFlavor): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.sdk_client.flavor_remove_tenant_access.assert_not_called() + self.compute_sdk_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 64103940c5..6fbce9afaa 100644 --- a/openstackclient/tests/unit/compute/v2/test_host.py +++ b/openstackclient/tests/unit/compute/v2/test_host.py @@ -27,8 +27,10 @@ class TestHost(compute_fakes.TestComputev2): # Get a shortcut to the compute client self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute - self.sdk_client.get = mock.Mock() + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) + self.compute_sdk_client.get = mock.Mock() @mock.patch('openstackclient.api.compute_v2.APIv2.host_list') @@ -38,7 +40,7 @@ class TestHostList(TestHost): def setUp(self): super(TestHostList, self).setUp() - self.sdk_client.get.return_value = fakes.FakeResponse( + self.compute_sdk_client.get.return_value = fakes.FakeResponse( data={'hosts': [self._host]} ) @@ -63,7 +65,9 @@ class TestHostList(TestHost): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.get.assert_called_with('/os-hosts', microversion='2.1') + self.compute_sdk_client.get.assert_called_with( + '/os-hosts', microversion='2.1' + ) self.assertEqual(self.columns, columns) self.assertEqual(self.data, list(data)) @@ -81,7 +85,9 @@ class TestHostList(TestHost): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.get.assert_called_with('/os-hosts', microversion='2.1') + self.compute_sdk_client.get.assert_called_with( + '/os-hosts', microversion='2.1' + ) self.assertEqual(self.columns, columns) self.assertEqual(self.data, list(data)) @@ -153,7 +159,7 @@ class TestHostShow(TestHost): } } - self.sdk_client.get.return_value = fakes.FakeResponse( + self.compute_sdk_client.get.return_value = fakes.FakeResponse( data={'host': [output_data]} ) @@ -204,7 +210,7 @@ class TestHostShow(TestHost): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.get.assert_called_with( + self.compute_sdk_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 5148b0d1c7..1651b04a18 100644 --- a/openstackclient/tests/unit/compute/v2/test_hypervisor.py +++ b/openstackclient/tests/unit/compute/v2/test_hypervisor.py @@ -30,8 +30,10 @@ class TestHypervisor(compute_fakes.TestComputev2): super().setUp() # Create and get a shortcut to the compute client mock - self.sdk_client = self.app.client_manager.sdk_connection.compute - self.sdk_client.reset_mock() + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) + self.compute_sdk_client.reset_mock() class TestHypervisorList(TestHypervisor): @@ -40,7 +42,7 @@ class TestHypervisorList(TestHypervisor): # Fake hypervisors to be listed up self.hypervisors = compute_fakes.create_hypervisors() - self.sdk_client.hypervisors.return_value = self.hypervisors + self.compute_sdk_client.hypervisors.return_value = self.hypervisors self.columns = ( "ID", @@ -114,7 +116,7 @@ class TestHypervisorList(TestHypervisor): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.hypervisors.assert_called_with(details=True) + self.compute_sdk_client.hypervisors.assert_called_with(details=True) self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -129,7 +131,9 @@ class TestHypervisorList(TestHypervisor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) # Fake the return value of search() - self.sdk_client.hypervisors.return_value = [self.hypervisors[0]] + self.compute_sdk_client.hypervisors.return_value = [ + self.hypervisors[0] + ] self.data = ( ( @@ -146,7 +150,7 @@ class TestHypervisorList(TestHypervisor): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.hypervisors.assert_called_with( + self.compute_sdk_client.hypervisors.assert_called_with( hypervisor_hostname_pattern=self.hypervisors[0].name, details=True ) self.assertEqual(self.columns, columns) @@ -163,7 +167,9 @@ class TestHypervisorList(TestHypervisor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) # Fake exception raised from search() - self.sdk_client.hypervisors.side_effect = exceptions.NotFound(None) + self.compute_sdk_client.hypervisors.side_effect = exceptions.NotFound( + None + ) self.assertRaises( exceptions.NotFound, self.cmd.take_action, parsed_args @@ -211,7 +217,7 @@ class TestHypervisorList(TestHypervisor): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.hypervisors.assert_called_with(details=True) + self.compute_sdk_client.hypervisors.assert_called_with(details=True) self.assertEqual(self.columns_long, columns) self.assertEqual(self.data_long, tuple(data)) @@ -228,7 +234,9 @@ class TestHypervisorList(TestHypervisor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.hypervisors.assert_called_with(limit=1, details=True) + self.compute_sdk_client.hypervisors.assert_called_with( + limit=1, details=True + ) @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False) def test_hypervisor_list_with_limit_pre_v233(self, sm_mock): @@ -262,7 +270,7 @@ class TestHypervisorList(TestHypervisor): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.hypervisors.assert_called_with( + self.compute_sdk_client.hypervisors.assert_called_with( marker='test_hyp', details=True ) @@ -303,10 +311,10 @@ class TestHypervisorShow(TestHypervisor): ) # Return value of compute_client.find_hypervisor - self.sdk_client.find_hypervisor.return_value = self.hypervisor + self.compute_sdk_client.find_hypervisor.return_value = self.hypervisor # Return value of compute_client.aggregates() - self.sdk_client.aggregates.return_value = [] + self.compute_sdk_client.aggregates.return_value = [] # Return value of compute_client.get_hypervisor_uptime() uptime_info = { @@ -316,7 +324,9 @@ class TestHypervisorShow(TestHypervisor): 'hypervisor_hostname': self.hypervisor.name, 'uptime': uptime_string, } - self.sdk_client.get_hypervisor_uptime.return_value = uptime_info + self.compute_sdk_client.get_hypervisor_uptime.return_value = ( + uptime_info + ) self.columns_v288 = ( 'aggregates', @@ -457,7 +467,7 @@ class TestHypervisorShow(TestHypervisor): # before microversion 2.28, nova returned a stringified version of this # field self.hypervisor.cpu_info = json.dumps(self.hypervisor.cpu_info) - self.sdk_client.find_hypervisor.return_value = self.hypervisor + self.compute_sdk_client.find_hypervisor.return_value = self.hypervisor arglist = [ self.hypervisor.name, @@ -487,7 +497,7 @@ class TestHypervisorShow(TestHypervisor): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.sdk_client.get_hypervisor_uptime.side_effect = ( + self.compute_sdk_client.get_hypervisor_uptime.side_effect = ( nova_exceptions.HTTPNotImplemented(501) ) diff --git a/openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py b/openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py index 58d101c172..b35475cfca 100644 --- a/openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py +++ b/openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py @@ -25,8 +25,10 @@ class TestHypervisorStats(compute_fakes.TestComputev2): # Get a shortcut to the compute client hypervisors mock self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute - self.sdk_client.get = mock.Mock() + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) + self.compute_sdk_client.get = mock.Mock() # Not in fakes.py because hypervisor stats has been deprecated @@ -70,7 +72,7 @@ class TestHypervisorStatsShow(TestHypervisorStats): def setUp(self): super(TestHypervisorStatsShow, self).setUp() - self.sdk_client.get.return_value = fakes.FakeResponse( + self.compute_sdk_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 8ac0557902..7fd56d4e8f 100644 --- a/openstackclient/tests/unit/compute/v2/test_keypair.py +++ b/openstackclient/tests/unit/compute/v2/test_keypair.py @@ -11,14 +11,12 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -# import copy from unittest import mock from unittest.mock import call import uuid -from novaclient import api_versions from openstack import utils as sdk_utils from osc_lib import exceptions @@ -43,11 +41,13 @@ class TestKeypair(compute_fakes.TestComputev2): ) self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute - self.sdk_client.keypairs = mock.Mock() - self.sdk_client.create_keypair = mock.Mock() - self.sdk_client.delete_keypair = mock.Mock() - self.sdk_client.find_keypair = mock.Mock() + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) + self.compute_sdk_client.keypairs = mock.Mock() + self.compute_sdk_client.create_keypair = mock.Mock() + self.compute_sdk_client.delete_keypair = mock.Mock() + self.compute_sdk_client.find_keypair = mock.Mock() class TestKeypairCreate(TestKeypair): @@ -78,7 +78,7 @@ class TestKeypairCreate(TestKeypair): # Get the command object to test self.cmd = keypair.CreateKeypair(self.app, None) - self.sdk_client.create_keypair.return_value = self.keypair + self.compute_sdk_client.create_keypair.return_value = self.keypair @mock.patch.object( keypair, @@ -96,7 +96,7 @@ class TestKeypairCreate(TestKeypair): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_keypair.assert_called_with( + self.compute_sdk_client.create_keypair.assert_called_with( name=self.keypair.name, public_key=mock_generate.return_value.public_key, ) @@ -134,7 +134,7 @@ class TestKeypairCreate(TestKeypair): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_keypair.assert_called_with( + self.compute_sdk_client.create_keypair.assert_called_with( name=self.keypair.name, public_key=self.keypair.public_key, ) @@ -167,7 +167,7 @@ class TestKeypairCreate(TestKeypair): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_keypair.assert_called_with( + self.compute_sdk_client.create_keypair.assert_called_with( name=self.keypair.name, public_key=mock_generate.return_value.public_key, ) @@ -183,7 +183,7 @@ class TestKeypairCreate(TestKeypair): @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True) def test_keypair_create_with_key_type(self, sm_mock): for key_type in ['x509', 'ssh']: - self.sdk_client.create_keypair.return_value = self.keypair + self.compute_sdk_client.create_keypair.return_value = self.keypair self.data = ( self.keypair.created_at, @@ -214,7 +214,7 @@ class TestKeypairCreate(TestKeypair): m_file.read.return_value = 'dummy' columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_keypair.assert_called_with( + self.compute_sdk_client.create_keypair.assert_called_with( name=self.keypair.name, public_key=self.keypair.public_key, key_type=key_type, @@ -273,7 +273,7 @@ class TestKeypairCreate(TestKeypair): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_keypair.assert_called_with( + self.compute_sdk_client.create_keypair.assert_called_with( name=self.keypair.name, user_id=identity_fakes.user_id, public_key=mock_generate.return_value.public_key, @@ -322,7 +322,7 @@ class TestKeypairDelete(TestKeypair): ret = self.cmd.take_action(parsed_args) self.assertIsNone(ret) - self.sdk_client.delete_keypair.assert_called_with( + self.compute_sdk_client.delete_keypair.assert_called_with( self.keypairs[0].name, ignore_missing=False ) @@ -340,7 +340,7 @@ class TestKeypairDelete(TestKeypair): calls = [] for k in self.keypairs: calls.append(call(k.name, ignore_missing=False)) - self.sdk_client.delete_keypair.assert_has_calls(calls) + self.compute_sdk_client.delete_keypair.assert_has_calls(calls) self.assertIsNone(result) def test_delete_multiple_keypairs_with_exception(self): @@ -354,7 +354,7 @@ class TestKeypairDelete(TestKeypair): parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.sdk_client.delete_keypair.side_effect = [ + self.compute_sdk_client.delete_keypair.side_effect = [ None, exceptions.CommandError, ] @@ -367,7 +367,7 @@ class TestKeypairDelete(TestKeypair): calls = [] for k in arglist: calls.append(call(k, ignore_missing=False)) - self.sdk_client.delete_keypair.assert_has_calls(calls) + self.compute_sdk_client.delete_keypair.assert_has_calls(calls) @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True) def test_keypair_delete_with_user(self, sm_mock): @@ -381,7 +381,7 @@ class TestKeypairDelete(TestKeypair): ret = self.cmd.take_action(parsed_args) self.assertIsNone(ret) - self.sdk_client.delete_keypair.assert_called_with( + self.compute_sdk_client.delete_keypair.assert_called_with( self.keypairs[0].name, user_id=identity_fakes.user_id, ignore_missing=False, @@ -389,10 +389,6 @@ class TestKeypairDelete(TestKeypair): @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False) def test_keypair_delete_with_user_pre_v210(self, sm_mock): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.9' - ) - arglist = ['--user', identity_fakes.user_name, self.keypairs[0].name] verifylist = [ ('user', identity_fakes.user_name), @@ -409,13 +405,13 @@ class TestKeypairDelete(TestKeypair): class TestKeypairList(TestKeypair): - # Return value of self.sdk_client.keypairs(). + # Return value of self.compute_sdk_client.keypairs(). keypairs = compute_fakes.create_keypairs(count=1) def setUp(self): super().setUp() - self.sdk_client.keypairs.return_value = self.keypairs + self.compute_sdk_client.keypairs.return_value = self.keypairs # Get the command object to test self.cmd = keypair.ListKeypair(self.app, None) @@ -434,7 +430,7 @@ class TestKeypairList(TestKeypair): # Set expected values - self.sdk_client.keypairs.assert_called_with() + self.compute_sdk_client.keypairs.assert_called_with() self.assertEqual(('Name', 'Fingerprint'), columns) self.assertEqual( @@ -456,7 +452,7 @@ class TestKeypairList(TestKeypair): # Set expected values - self.sdk_client.keypairs.assert_called_with() + self.compute_sdk_client.keypairs.assert_called_with() self.assertEqual(('Name', 'Fingerprint', 'Type'), columns) self.assertEqual( @@ -492,7 +488,7 @@ class TestKeypairList(TestKeypair): columns, data = self.cmd.take_action(parsed_args) users_mock.get.assert_called_with(identity_fakes.user_name) - self.sdk_client.keypairs.assert_called_with( + self.compute_sdk_client.keypairs.assert_called_with( user_id=identity_fakes.user_id, ) @@ -554,7 +550,7 @@ class TestKeypairList(TestKeypair): projects_mock.get.assert_called_with(identity_fakes.project_name) users_mock.list.assert_called_with(tenant_id=identity_fakes.project_id) - self.sdk_client.keypairs.assert_called_with( + self.compute_sdk_client.keypairs.assert_called_with( user_id=identity_fakes.user_id, ) @@ -614,7 +610,7 @@ class TestKeypairList(TestKeypair): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.keypairs.assert_called_with(limit=1) + self.compute_sdk_client.keypairs.assert_called_with(limit=1) @mock.patch.object( sdk_utils, 'supports_microversion', new=mock.Mock(return_value=False) @@ -652,7 +648,7 @@ class TestKeypairList(TestKeypair): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.keypairs.assert_called_with(marker='test_kp') + self.compute_sdk_client.keypairs.assert_called_with(marker='test_kp') @mock.patch.object( sdk_utils, 'supports_microversion', new=mock.Mock(return_value=False) @@ -708,7 +704,7 @@ class TestKeypairShow(TestKeypair): def test_keypair_show(self): self.keypair = compute_fakes.create_one_keypair() - self.sdk_client.find_keypair.return_value = self.keypair + self.compute_sdk_client.find_keypair.return_value = self.keypair self.data = ( self.keypair.created_at, @@ -727,7 +723,7 @@ class TestKeypairShow(TestKeypair): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.find_keypair.assert_called_with( + self.compute_sdk_client.find_keypair.assert_called_with( self.keypair.name, ignore_missing=False ) @@ -736,7 +732,7 @@ class TestKeypairShow(TestKeypair): def test_keypair_show_public(self): self.keypair = compute_fakes.create_one_keypair() - self.sdk_client.find_keypair.return_value = self.keypair + self.compute_sdk_client.find_keypair.return_value = self.keypair arglist = ['--public-key', self.keypair.name] verifylist = [('public_key', True), ('name', self.keypair.name)] @@ -751,7 +747,7 @@ class TestKeypairShow(TestKeypair): @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True) def test_keypair_show_with_user(self, sm_mock): self.keypair = compute_fakes.create_one_keypair() - self.sdk_client.find_keypair.return_value = self.keypair + self.compute_sdk_client.find_keypair.return_value = self.keypair self.data = ( self.keypair.created_at, @@ -778,7 +774,7 @@ class TestKeypairShow(TestKeypair): columns, data = self.cmd.take_action(parsed_args) self.users_mock.get.assert_called_with(identity_fakes.user_name) - self.sdk_client.find_keypair.assert_called_with( + self.compute_sdk_client.find_keypair.assert_called_with( self.keypair.name, ignore_missing=False, user_id=identity_fakes.user_id, diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py index e0e3fd06e4..ea29c1b78c 100644 --- a/openstackclient/tests/unit/compute/v2/test_server.py +++ b/openstackclient/tests/unit/compute/v2/test_server.py @@ -67,28 +67,28 @@ class TestServer(compute_fakes.TestComputev2): super(TestServer, self).setUp() # Get a shortcut to the compute client ServerManager Mock - self.servers_mock = self.app.client_manager.compute.servers + self.servers_mock = self.compute_client.servers self.servers_mock.reset_mock() self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) # Get a shortcut to the compute client ServerMigrationsManager Mock - self.server_migrations_mock = ( - self.app.client_manager.compute.server_migrations - ) + self.server_migrations_mock = self.compute_client.server_migrations self.server_migrations_mock.reset_mock() # Get a shortcut to the compute client VolumeManager mock - self.servers_volumes_mock = self.app.client_manager.compute.volumes + self.servers_volumes_mock = self.compute_client.volumes self.servers_volumes_mock.reset_mock() # Get a shortcut to the compute client MigrationManager mock - self.migrations_mock = self.app.client_manager.compute.migrations + self.migrations_mock = self.compute_client.migrations self.migrations_mock.reset_mock() # Get a shortcut to the compute client FlavorManager Mock - self.flavors_mock = self.app.client_manager.compute.flavors + self.flavors_mock = self.compute_client.flavors self.flavors_mock.reset_mock() # Get a shortcut to the volume client VolumeManager Mock @@ -111,7 +111,7 @@ class TestServer(compute_fakes.TestComputev2): self.addCleanup(patcher.stop) self.supports_microversion_mock = patcher.start() self._set_mock_microversion( - self.app.client_manager.compute.api_version.get_string() + self.compute_client.api_version.get_string() ) def _set_mock_microversion(self, mock_v): @@ -151,7 +151,7 @@ class TestServer(compute_fakes.TestComputev2): ) # This is the return value for compute_client.find_server() - self.sdk_client.find_server.side_effect = servers + self.compute_sdk_client.find_server.side_effect = servers return servers @@ -175,7 +175,7 @@ class TestServer(compute_fakes.TestComputev2): result = self.cmd.take_action(parsed_args) calls = [call(s.id) for s in servers] - method = getattr(self.sdk_client, method_name) + method = getattr(self.compute_sdk_client, method_name) method.assert_has_calls(calls) self.assertIsNone(result) @@ -233,7 +233,9 @@ 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.sdk_client.create_server_interface.return_value = interface + self.compute_sdk_client.create_server_interface.return_value = ( + interface + ) with mock.patch.object( self.app.client_manager, @@ -268,7 +270,7 @@ class TestServerAddFixedIP(TestServer): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, tuple(data)) - self.sdk_client.create_server_interface.assert_called_once_with( + self.compute_sdk_client.create_server_interface.assert_called_once_with( servers[0].id, net_id=network['id'] ) @@ -279,7 +281,9 @@ 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.sdk_client.create_server_interface.return_value = interface + self.compute_sdk_client.create_server_interface.return_value = ( + interface + ) with mock.patch.object( self.app.client_manager, @@ -320,7 +324,7 @@ class TestServerAddFixedIP(TestServer): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, tuple(data)) - self.sdk_client.create_server_interface.assert_called_once_with( + self.compute_sdk_client.create_server_interface.assert_called_once_with( servers[0].id, net_id=network['id'], fixed_ips=[{'ip_address': '5.6.7.8'}], @@ -333,7 +337,9 @@ 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.sdk_client.create_server_interface.return_value = interface + self.compute_sdk_client.create_server_interface.return_value = ( + interface + ) with mock.patch.object( self.app.client_manager, @@ -379,7 +385,7 @@ class TestServerAddFixedIP(TestServer): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, tuple(data)) - self.sdk_client.create_server_interface.assert_called_once_with( + self.compute_sdk_client.create_server_interface.assert_called_once_with( servers[0].id, net_id=network['id'], fixed_ips=[{'ip_address': '5.6.7.8'}], @@ -393,7 +399,9 @@ 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.sdk_client.create_server_interface.return_value = interface + self.compute_sdk_client.create_server_interface.return_value = ( + interface + ) with mock.patch.object( self.app.client_manager, @@ -439,7 +447,7 @@ class TestServerAddFixedIP(TestServer): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, tuple(data)) - self.sdk_client.create_server_interface.assert_called_once_with( + self.compute_sdk_client.create_server_interface.assert_called_once_with( servers[0].id, net_id=network['id'], fixed_ips=[{'ip_address': '5.6.7.8'}], @@ -745,7 +753,7 @@ class TestServerAddPort(TestServer): result = self.cmd.take_action(parsed_args) - self.sdk_client.create_server_interface.assert_called_once_with( + self.compute_sdk_client.create_server_interface.assert_called_once_with( servers[0], port_id=port_id ) self.assertIsNone(result) @@ -763,10 +771,6 @@ class TestServerAddPort(TestServer): @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True) def test_server_add_port_with_tag(self, sm_mock): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.49' - ) - servers = self.setup_sdk_servers_mock(count=1) self.find_port.return_value.id = 'fake-port' arglist = [ @@ -785,16 +789,12 @@ class TestServerAddPort(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.sdk_client.create_server_interface.assert_called_once_with( + self.compute_sdk_client.create_server_interface.assert_called_once_with( servers[0], port_id='fake-port', tag='tag1' ) @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False) def test_server_add_port_with_tag_pre_v249(self, sm_mock): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.48' - ) - servers = self.setup_servers_mock(count=1) self.find_port.return_value.id = 'fake-port' arglist = [ @@ -837,7 +837,7 @@ class TestServerVolume(TestServer): attrs=attrs ) - self.sdk_client.create_volume_attachment.return_value = ( + self.compute_sdk_client.create_volume_attachment.return_value = ( self.volume_attachment ) @@ -877,7 +877,7 @@ class TestServerAddVolume(TestServerVolume): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, data) - self.sdk_client.create_volume_attachment.assert_called_once_with( + self.compute_sdk_client.create_volume_attachment.assert_called_once_with( self.servers[0], volumeId=self.volumes[0].id, device='/dev/sdb' ) @@ -920,7 +920,7 @@ class TestServerAddVolume(TestServerVolume): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, data) - self.sdk_client.create_volume_attachment.assert_called_once_with( + self.compute_sdk_client.create_volume_attachment.assert_called_once_with( self.servers[0], volumeId=self.volumes[0].id, device='/dev/sdb', @@ -991,7 +991,7 @@ class TestServerAddVolume(TestServerVolume): columns, data = self.cmd.take_action(parsed_args) self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, data) - self.sdk_client.create_volume_attachment.assert_called_once_with( + self.compute_sdk_client.create_volume_attachment.assert_called_once_with( self.servers[0], volumeId=self.volumes[0].id, device='/dev/sdb', @@ -1042,7 +1042,7 @@ class TestServerAddVolume(TestServerVolume): self.assertEqual(expected_columns, columns) self.assertEqual(expected_data, data) - self.sdk_client.create_volume_attachment.assert_called_once_with( + self.compute_sdk_client.create_volume_attachment.assert_called_once_with( self.servers[0], volumeId=self.volumes[0].id, device='/dev/sdb', @@ -1169,7 +1169,7 @@ class TestServerRemoveVolume(TestServerVolume): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.sdk_client.delete_volume_attachment.assert_called_once_with( + self.compute_sdk_client.delete_volume_attachment.assert_called_once_with( self.volumes[0], self.servers[0], ignore_missing=False, @@ -1204,7 +1204,7 @@ class TestServerAddNetwork(TestServer): result = self.cmd.take_action(parsed_args) - self.sdk_client.create_server_interface.assert_called_once_with( + self.compute_sdk_client.create_server_interface.assert_called_once_with( servers[0], net_id=net_id ) self.assertIsNone(result) @@ -1222,10 +1222,6 @@ class TestServerAddNetwork(TestServer): @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True) def test_server_add_network_with_tag(self, sm_mock): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.49' - ) - servers = self.setup_sdk_servers_mock(count=1) self.find_network.return_value.id = 'fake-network' @@ -1245,16 +1241,12 @@ class TestServerAddNetwork(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.sdk_client.create_server_interface.assert_called_once_with( + self.compute_sdk_client.create_server_interface.assert_called_once_with( servers[0], net_id='fake-network', tag='tag1' ) @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False) def test_server_add_network_with_tag_pre_v249(self, sm_mock): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.48' - ) - servers = self.setup_sdk_servers_mock(count=1) self.find_network.return_value.id = 'fake-network' @@ -1578,7 +1570,7 @@ class TestServerCreate(TestServer): return_value=False, ): with mock.patch.object( - self.app.client_manager.compute.api, + self.compute_client.api, 'security_group_find', return_value={'name': 'fake_sg'}, ) as mock_find: @@ -1784,9 +1776,7 @@ class TestServerCreate(TestServer): self.assertEqual(self.datalist(), data) def test_server_create_with_network_tag(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.43' - ) + self.compute_client.api_version = api_versions.APIVersion('2.43') arglist = [ '--image', @@ -1862,9 +1852,7 @@ class TestServerCreate(TestServer): self.app.client_manager.network.find_network.assert_called_once() def test_server_create_with_network_tag_pre_v243(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.42' - ) + self.compute_client.api_version = api_versions.APIVersion('2.42') arglist = [ '--image', @@ -1900,9 +1888,7 @@ class TestServerCreate(TestServer): def _test_server_create_with_auto_network(self, arglist): # requires API microversion 2.37 or later - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.37' - ) + self.compute_client.api_version = api_versions.APIVersion('2.37') verifylist = [ ('image', 'image1'), @@ -1968,9 +1954,7 @@ class TestServerCreate(TestServer): def test_server_create_with_auto_network_pre_v237(self): # use an API microversion that's too old - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.36' - ) + self.compute_client.api_version = api_versions.APIVersion('2.36') arglist = [ '--image', @@ -2006,9 +1990,7 @@ class TestServerCreate(TestServer): def test_server_create_with_auto_network_default_v2_37(self): """Tests creating a server without specifying --nic using 2.37.""" # requires API microversion 2.37 or later - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.37' - ) + self.compute_client.api_version = api_versions.APIVersion('2.37') arglist = [ '--image', @@ -2054,9 +2036,7 @@ class TestServerCreate(TestServer): def _test_server_create_with_none_network(self, arglist): # requires API microversion 2.37 or later - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.37' - ) + self.compute_client.api_version = api_versions.APIVersion('2.37') verifylist = [ ('image', 'image1'), @@ -2122,9 +2102,7 @@ class TestServerCreate(TestServer): def test_server_create_with_none_network_pre_v237(self): # use an API microversion that's too old - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.36' - ) + self.compute_client.api_version = api_versions.APIVersion('2.36') arglist = [ '--image', @@ -2607,9 +2585,7 @@ class TestServerCreate(TestServer): self.assertEqual(self.datalist(), data) def test_server_create_with_block_device_full(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.67' - ) + self.compute_client.api_version = api_versions.APIVersion('2.67') block_device = ( f'uuid={self.volume.id},source_type=volume,' @@ -2710,9 +2686,7 @@ class TestServerCreate(TestServer): self.assertEqual(self.datalist(), data) def test_server_create_with_block_device_from_file(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.67' - ) + self.compute_client.api_version = api_versions.APIVersion('2.67') block_device = { 'uuid': self.volume.id, @@ -2866,9 +2840,7 @@ class TestServerCreate(TestServer): ) def test_server_create_with_block_device_tag_pre_v242(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.41' - ) + self.compute_client.api_version = api_versions.APIVersion('2.41') block_device = f'uuid={self.volume.name},tag=foo' arglist = [ @@ -2889,9 +2861,7 @@ class TestServerCreate(TestServer): ) def test_server_create_with_block_device_volume_type_pre_v267(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.66' - ) + self.compute_client.api_version = api_versions.APIVersion('2.66') block_device = f'uuid={self.volume.name},volume_type=foo' arglist = [ @@ -3828,7 +3798,7 @@ class TestServerCreate(TestServer): def test_server_create_with_description_api_newer(self): # Description is supported for nova api version 2.19 or above - self.app.client_manager.compute.api_version = 2.19 + self.compute_client.api_version = 2.19 arglist = [ '--image', @@ -3884,7 +3854,7 @@ class TestServerCreate(TestServer): def test_server_create_with_description_api_older(self): # Description is not supported for nova api version below 2.19 - self.app.client_manager.compute.api_version = 2.18 + self.compute_client.api_version = 2.18 arglist = [ '--image', @@ -3910,9 +3880,7 @@ class TestServerCreate(TestServer): ) def test_server_create_with_tag(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.52' - ) + self.compute_client.api_version = api_versions.APIVersion('2.52') arglist = [ '--image', @@ -3965,9 +3933,7 @@ class TestServerCreate(TestServer): self.assertFalse(self.flavors_mock.called) def test_server_create_with_tag_pre_v252(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.51' - ) + self.compute_client.api_version = api_versions.APIVersion('2.51') arglist = [ '--image', @@ -3998,7 +3964,7 @@ class TestServerCreate(TestServer): def test_server_create_with_host_v274(self): # Explicit host is supported for nova api version 2.74 or above - self.app.client_manager.compute.api_version = 2.74 + self.compute_client.api_version = 2.74 arglist = [ '--image', @@ -4054,7 +4020,7 @@ class TestServerCreate(TestServer): def test_server_create_with_host_pre_v274(self): # Host is not supported for nova api version below 2.74 - self.app.client_manager.compute.api_version = 2.73 + self.compute_client.api_version = 2.73 arglist = [ '--image', @@ -4082,7 +4048,7 @@ class TestServerCreate(TestServer): def test_server_create_with_hypervisor_hostname_v274(self): # Explicit hypervisor_hostname is supported for nova api version # 2.74 or above - self.app.client_manager.compute.api_version = 2.74 + self.compute_client.api_version = 2.74 arglist = [ '--image', @@ -4138,7 +4104,7 @@ class TestServerCreate(TestServer): def test_server_create_with_hypervisor_hostname_pre_v274(self): # Hypervisor_hostname is not supported for nova api version below 2.74 - self.app.client_manager.compute.api_version = 2.73 + self.compute_client.api_version = 2.73 arglist = [ '--image', @@ -4166,7 +4132,7 @@ class TestServerCreate(TestServer): def test_server_create_with_host_and_hypervisor_hostname_v274(self): # Explicit host and hypervisor_hostname is supported for nova api # version 2.74 or above - self.app.client_manager.compute.api_version = 2.74 + self.compute_client.api_version = 2.74 arglist = [ '--image', @@ -4225,9 +4191,7 @@ class TestServerCreate(TestServer): self.assertFalse(self.flavors_mock.called) def test_server_create_with_hostname_v290(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.90' - ) + self.compute_client.api_version = api_versions.APIVersion('2.90') arglist = [ '--image', @@ -4276,9 +4240,7 @@ class TestServerCreate(TestServer): self.assertFalse(self.flavors_mock.called) def test_server_create_with_hostname_pre_v290(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.89' - ) + self.compute_client.api_version = api_versions.APIVersion('2.89') arglist = [ '--image', @@ -4303,9 +4265,7 @@ class TestServerCreate(TestServer): ) def test_server_create_with_trusted_image_cert(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.63' - ) + self.compute_client.api_version = api_versions.APIVersion('2.63') arglist = [ '--image', @@ -4356,9 +4316,7 @@ class TestServerCreate(TestServer): self.assertFalse(self.flavors_mock.called) def test_server_create_with_trusted_image_cert_prev263(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.62' - ) + self.compute_client.api_version = api_versions.APIVersion('2.62') arglist = [ '--image', @@ -4385,9 +4343,7 @@ class TestServerCreate(TestServer): ) def test_server_create_with_trusted_image_cert_from_volume(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.63' - ) + self.compute_client.api_version = api_versions.APIVersion('2.63') arglist = [ '--volume', 'volume1', @@ -4413,9 +4369,7 @@ class TestServerCreate(TestServer): ) def test_server_create_with_trusted_image_cert_from_snapshot(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.63' - ) + self.compute_client.api_version = api_versions.APIVersion('2.63') arglist = [ '--snapshot', 'snapshot1', @@ -4441,9 +4395,7 @@ class TestServerCreate(TestServer): ) def test_server_create_with_trusted_image_cert_boot_from_volume(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.63' - ) + self.compute_client.api_version = api_versions.APIVersion('2.63') arglist = [ '--image', 'image1', @@ -4629,7 +4581,9 @@ class TestServerDumpCreate(TestServer): self.assertIsNone(result) for s in servers: - s.trigger_crash_dump.assert_called_once_with(self.sdk_client) + s.trigger_crash_dump.assert_called_once_with( + self.compute_sdk_client + ) def test_server_dump_one_server(self): self.run_test_server_dump(1) @@ -4704,12 +4658,12 @@ class _TestServerList(TestServer): self.image_client.get_image.return_value = self.image self.flavor = compute_fakes.create_one_flavor() - self.sdk_client.find_flavor.return_value = self.flavor + self.compute_sdk_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.sdk_client.servers.return_value = self.servers + self.compute_sdk_client.servers.return_value = self.servers # Get the command object to test self.cmd = server.ListServer(self.app, None) @@ -4728,7 +4682,7 @@ class TestServerList(_TestServerList): ] Flavor = collections.namedtuple('Flavor', 'id name') - self.sdk_client.flavors.return_value = [ + self.compute_sdk_client.flavors.return_value = [ Flavor(id=s.flavor['id'], name=self.flavor.name) for s in self.servers ] @@ -4758,9 +4712,9 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_called() - self.sdk_client.flavors.assert_called() + self.compute_sdk_client.flavors.assert_called() # we did not pass image or flavor, so gets on those must be absent self.assertFalse(self.flavors_mock.get.call_count) self.assertFalse(self.image_client.get_image.call_count) @@ -4775,14 +4729,14 @@ class TestServerList(_TestServerList): ('deleted', False), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.sdk_client.servers.return_value = [] + self.compute_sdk_client.servers.return_value = [] self.data = () columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_not_called() - self.sdk_client.flavors.assert_not_called() + self.compute_sdk_client.flavors.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4816,12 +4770,12 @@ class TestServerList(_TestServerList): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_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.sdk_client.flavors.assert_called_once_with(is_public=None) + self.compute_sdk_client.flavors.assert_called_once_with(is_public=None) self.assertEqual(self.columns_long, columns) self.assertEqual(self.data, tuple(data)) @@ -4858,7 +4812,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertIn('Project ID', columns) self.assertIn('User ID', columns) self.assertIn('Created At', columns) @@ -4897,9 +4851,9 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_not_called() - self.sdk_client.flavors.assert_not_called() + self.compute_sdk_client.flavors.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4928,9 +4882,9 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_not_called() - self.sdk_client.flavors.assert_not_called() + self.compute_sdk_client.flavors.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4945,11 +4899,11 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_not_called() - self.sdk_client.flavors.assert_not_called() + self.compute_sdk_client.flavors.assert_not_called() self.image_client.get_image.assert_called() - self.sdk_client.find_flavor.assert_called() + self.compute_sdk_client.find_flavor.assert_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4966,9 +4920,9 @@ class TestServerList(_TestServerList): ) self.kwargs['image'] = self.image.id - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_not_called() - self.sdk_client.flavors.assert_called_once() + self.compute_sdk_client.flavors.assert_called_once() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -4980,14 +4934,14 @@ class TestServerList(_TestServerList): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.find_flavor.assert_has_calls( + self.compute_sdk_client.find_flavor.assert_has_calls( [mock.call(self.flavor.id)] ) self.kwargs['flavor'] = self.flavor.id - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.image_client.images.assert_called_once() - self.sdk_client.flavors.assert_not_called() + self.compute_sdk_client.flavors.assert_not_called() self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -5004,7 +4958,7 @@ class TestServerList(_TestServerList): self.kwargs['changes-since'] = '2016-03-04T06:27:59Z' self.kwargs['deleted'] = True - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -5047,7 +5001,7 @@ class TestServerList(_TestServerList): self.kwargs['tags'] = 'tag1,tag2' - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -5090,7 +5044,7 @@ class TestServerList(_TestServerList): self.kwargs['not-tags'] = 'tag1,tag2' - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -5129,7 +5083,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['availability_zone'] = 'test-az' - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5146,7 +5100,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['key_name'] = 'test-key' - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5162,7 +5116,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['config_drive'] = True - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5178,7 +5132,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['config_drive'] = False - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5195,7 +5149,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['progress'] = '100' - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5226,7 +5180,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['vm_state'] = 'active' - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5243,7 +5197,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['task_state'] = 'deleting' - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5260,7 +5214,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['power_state'] = 1 - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(self.columns, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -5296,18 +5250,18 @@ class TestServerList(_TestServerList): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_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.sdk_client.servers.reset_mock() + self.compute_sdk_client.servers.reset_mock() self.attrs['host_status'] = 'UP' servers = self.setup_sdk_servers_mock(3) - self.sdk_client.servers.return_value = servers + self.compute_sdk_client.servers.return_value = servers # Make sure the returned image and flavor IDs match the servers. Image = collections.namedtuple('Image', 'id name') @@ -5343,7 +5297,7 @@ class TestServerList(_TestServerList): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertEqual(columns_long, columns) self.assertEqual(tuple(self.data2), tuple(data)) @@ -5391,7 +5345,7 @@ class TestServerListV273(_TestServerList): # The servers to be listed. self.servers = self.setup_sdk_servers_mock(3) - self.sdk_client.servers.return_value = self.servers + self.compute_sdk_client.servers.return_value = self.servers Image = collections.namedtuple('Image', 'id name') self.image_client.images.return_value = [ @@ -5403,7 +5357,7 @@ class TestServerListV273(_TestServerList): # The flavor information is embedded, so now reason for this to be # called - self.sdk_client.flavors = mock.NonCallableMock() + self.compute_sdk_client.flavors = mock.NonCallableMock() self.data = tuple( ( @@ -5439,7 +5393,7 @@ class TestServerListV273(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['locked'] = True - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertCountEqual(self.columns, columns) self.assertCountEqual(self.data, tuple(data)) @@ -5454,7 +5408,7 @@ class TestServerListV273(_TestServerList): columns, data = self.cmd.take_action(parsed_args) self.kwargs['locked'] = False - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertCountEqual(self.columns, columns) self.assertCountEqual(self.data, tuple(data)) @@ -5487,7 +5441,7 @@ class TestServerListV273(_TestServerList): self.kwargs['changes-before'] = '2016-03-05T06:27:59Z' self.kwargs['deleted'] = True - self.sdk_client.servers.assert_called_with(**self.kwargs) + self.compute_sdk_client.servers.assert_called_with(**self.kwargs) self.assertCountEqual(self.columns, columns) self.assertCountEqual(self.data, tuple(data)) @@ -5577,8 +5531,8 @@ class TestServerLock(TestServer): self.server = compute_fakes.create_one_sdk_server() - self.sdk_client.find_server.return_value = self.server - self.sdk_client.lock_server.return_value = None + self.compute_sdk_client.find_server.return_value = self.server + self.compute_sdk_client.lock_server.return_value = None # Get the command object to test self.cmd = server.LockServer(self.app, None) @@ -5607,11 +5561,11 @@ class TestServerLock(TestServer): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.id, ignore_missing=False, ) - self.sdk_client.lock_server.assert_called_with( + self.compute_sdk_client.lock_server.assert_called_with( self.server.id, locked_reason="blah", ) @@ -5632,12 +5586,12 @@ class TestServerLock(TestServer): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.assertEqual(2, self.sdk_client.find_server.call_count) - self.sdk_client.lock_server.assert_called_with( + self.assertEqual(2, self.compute_sdk_client.find_server.call_count) + self.compute_sdk_client.lock_server.assert_called_with( self.server.id, locked_reason="choo..choo", ) - self.assertEqual(2, self.sdk_client.lock_server.call_count) + self.assertEqual(2, self.compute_sdk_client.lock_server.call_count) @mock.patch.object(sdk_utils, 'supports_microversion') def test_server_lock_with_reason_pre_v273(self, sm_mock): @@ -5719,9 +5673,7 @@ class TestServerMigrate(TestServer): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.56' - ) + self.compute_client.api_version = api_versions.APIVersion('2.56') result = self.cmd.take_action(parsed_args) @@ -5845,9 +5797,7 @@ class TestServerMigrate(TestServer): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.30' - ) + self.compute_client.api_version = api_versions.APIVersion('2.30') result = self.cmd.take_action(parsed_args) @@ -5907,9 +5857,7 @@ class TestServerMigrate(TestServer): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.24' - ) + self.compute_client.api_version = api_versions.APIVersion('2.24') result = self.cmd.take_action(parsed_args) @@ -5934,9 +5882,7 @@ class TestServerMigrate(TestServer): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.24' - ) + self.compute_client.api_version = api_versions.APIVersion('2.24') result = self.cmd.take_action(parsed_args) @@ -5961,9 +5907,7 @@ class TestServerMigrate(TestServer): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.25' - ) + self.compute_client.api_version = api_versions.APIVersion('2.25') with mock.patch.object(self.cmd.log, 'warning') as mock_warning: result = self.cmd.take_action(parsed_args) @@ -6028,7 +5972,7 @@ class TestServerReboot(TestServer): def setUp(self): super().setUp() - self.sdk_client.reboot_server.return_value = None + self.compute_sdk_client.reboot_server.return_value = None self.cmd = server.RebootServer(self.app, None) @@ -6047,7 +5991,7 @@ class TestServerReboot(TestServer): result = self.cmd.take_action(parsed_args) - self.sdk_client.reboot_server.assert_called_once_with( + self.compute_sdk_client.reboot_server.assert_called_once_with( servers[0].id, 'SOFT', ) @@ -6069,7 +6013,7 @@ class TestServerReboot(TestServer): result = self.cmd.take_action(parsed_args) - self.sdk_client.reboot_server.assert_called_once_with( + self.compute_sdk_client.reboot_server.assert_called_once_with( servers[0].id, 'HARD', ) @@ -6093,12 +6037,12 @@ class TestServerReboot(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.sdk_client.reboot_server.assert_called_once_with( + self.compute_sdk_client.reboot_server.assert_called_once_with( servers[0].id, 'SOFT', ) mock_wait_for_status.assert_called_once_with( - self.sdk_client.get_server, + self.compute_sdk_client.get_server, servers[0].id, callback=mock.ANY, ) @@ -6126,12 +6070,12 @@ class TestServerReboot(TestServer): self.assertRaises(SystemExit, self.cmd.take_action, parsed_args) self.assertIn('Error rebooting server', mock_log.call_args[0][0]) - self.sdk_client.reboot_server.assert_called_once_with( + self.compute_sdk_client.reboot_server.assert_called_once_with( servers[0].id, 'SOFT', ) mock_wait_for_status.assert_called_once_with( - self.sdk_client.get_server, + self.compute_sdk_client.get_server, servers[0].id, callback=mock.ANY, ) @@ -6316,9 +6260,7 @@ class TestServerRebuild(TestServer): self.server.rebuild.assert_called_with(self.image, password) def test_rebuild_with_description(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.19' - ) + self.compute_client.api_version = api_versions.APIVersion('2.19') description = 'description1' arglist = [self.server.id, '--description', description] @@ -6334,9 +6276,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_description_pre_v219(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.18' - ) + self.compute_client.api_version = api_versions.APIVersion('2.18') description = 'description1' arglist = [self.server.id, '--description', description] @@ -6504,9 +6444,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_keypair_name(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.54' - ) + self.compute_client.api_version = api_versions.APIVersion('2.54') self.server.key_name = 'mykey' arglist = [ @@ -6529,9 +6467,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_keypair_name_pre_v254(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.53' - ) + self.compute_client.api_version = api_versions.APIVersion('2.53') self.server.key_name = 'mykey' arglist = [ @@ -6550,9 +6486,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_no_keypair_name(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.54' - ) + self.compute_client.api_version = api_versions.APIVersion('2.54') self.server.key_name = 'mykey' arglist = [ @@ -6591,9 +6525,7 @@ class TestServerRebuild(TestServer): @mock.patch('openstackclient.compute.v2.server.io.open') def test_rebuild_with_user_data(self, mock_open): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.57' - ) + self.compute_client.api_version = api_versions.APIVersion('2.57') mock_file = mock.Mock(name='File') mock_open.return_value = mock_file @@ -6627,9 +6559,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_user_data_pre_v257(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.56' - ) + self.compute_client.api_version = api_versions.APIVersion('2.56') arglist = [ self.server.id, @@ -6647,9 +6577,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_no_user_data(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.54' - ) + self.compute_client.api_version = api_versions.APIVersion('2.54') self.server.key_name = 'mykey' arglist = [ @@ -6668,9 +6596,7 @@ class TestServerRebuild(TestServer): self.server.rebuild.assert_called_with(self.image, None, userdata=None) def test_rebuild_with_no_user_data_pre_v254(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.53' - ) + self.compute_client.api_version = api_versions.APIVersion('2.53') arglist = [ self.server.id, @@ -6698,9 +6624,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_trusted_image_cert(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.63' - ) + self.compute_client.api_version = api_versions.APIVersion('2.63') arglist = [ self.server.id, @@ -6724,9 +6648,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_trusted_image_cert_pre_v263(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.62' - ) + self.compute_client.api_version = api_versions.APIVersion('2.62') arglist = [ self.server.id, @@ -6746,9 +6668,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_no_trusted_image_cert(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.63' - ) + self.compute_client.api_version = api_versions.APIVersion('2.63') arglist = [ self.server.id, @@ -6768,9 +6688,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_no_trusted_image_cert_pre_v263(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.62' - ) + self.compute_client.api_version = api_versions.APIVersion('2.62') arglist = [ self.server.id, @@ -6787,9 +6705,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_hostname(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.90' - ) + self.compute_client.api_version = api_versions.APIVersion('2.90') arglist = [self.server.id, '--hostname', 'new-hostname'] verifylist = [('server', self.server.id), ('hostname', 'new-hostname')] @@ -6804,9 +6720,7 @@ class TestServerRebuild(TestServer): ) def test_rebuild_with_hostname_pre_v290(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.89' - ) + self.compute_client.api_version = api_versions.APIVersion('2.89') arglist = [ self.server.id, @@ -6851,9 +6765,7 @@ class TestServerRebuildVolumeBacked(TestServer): self.cmd = server.RebuildServer(self.app, None) def test_rebuild_with_reimage_boot_volume(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.93' - ) + self.compute_client.api_version = api_versions.APIVersion('2.93') arglist = [ self.server.id, @@ -6874,9 +6786,7 @@ class TestServerRebuildVolumeBacked(TestServer): self.server.rebuild.assert_called_with(self.new_image, None) def test_rebuild_with_no_reimage_boot_volume(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.93' - ) + self.compute_client.api_version = api_versions.APIVersion('2.93') arglist = [ self.server.id, @@ -6897,9 +6807,7 @@ class TestServerRebuildVolumeBacked(TestServer): self.assertIn('--reimage-boot-volume is required', str(exc)) def test_rebuild_with_reimage_boot_volume_pre_v293(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.92' - ) + self.compute_client.api_version = api_versions.APIVersion('2.92') arglist = [ self.server.id, @@ -6992,9 +6900,7 @@ class TestEvacuateServer(TestServer): self._test_evacuate(args, verify_args, evac_args) def test_evacuate_with_host(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.29' - ) + self.compute_client.api_version = api_versions.APIVersion('2.29') host = 'target-host' args = [ @@ -7011,9 +6917,7 @@ class TestEvacuateServer(TestServer): self._test_evacuate(args, verify_args, evac_args) def test_evacuate_with_host_pre_v229(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.28' - ) + self.compute_client.api_version = api_versions.APIVersion('2.28') args = [ self.server.id, @@ -7031,9 +6935,7 @@ class TestEvacuateServer(TestServer): ) def test_evacuate_without_share_storage(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.13' - ) + self.compute_client.api_version = api_versions.APIVersion('2.13') args = [self.server.id, '--shared-storage'] verify_args = [ @@ -7048,9 +6950,7 @@ class TestEvacuateServer(TestServer): self._test_evacuate(args, verify_args, evac_args) def test_evacuate_without_share_storage_post_v213(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.14' - ) + self.compute_client.api_version = api_versions.APIVersion('2.14') args = [self.server.id, '--shared-storage'] verify_args = [ @@ -7303,7 +7203,7 @@ class TestServerRemovePort(TestServer): result = self.cmd.take_action(parsed_args) - self.sdk_client.delete_server_interface.assert_called_with( + self.compute_sdk_client.delete_server_interface.assert_called_with( port_id, server=servers[0], ignore_missing=False ) self.assertIsNone(result) @@ -7336,7 +7236,9 @@ class TestServerRemoveNetwork(TestServer): self.find_network = mock.Mock() self.app.client_manager.network.find_network = self.find_network - self.sdk_client.server_interfaces.return_value = [self.fake_inf] + self.compute_sdk_client.server_interfaces.return_value = [ + self.fake_inf + ] def _test_server_remove_network(self, network_id): self.fake_inf.net_id = network_id @@ -7356,8 +7258,10 @@ class TestServerRemoveNetwork(TestServer): result = self.cmd.take_action(parsed_args) - self.sdk_client.server_interfaces.assert_called_once_with(servers[0]) - self.sdk_client.delete_server_interface.assert_called_once_with( + self.compute_sdk_client.server_interfaces.assert_called_once_with( + servers[0] + ) + self.compute_sdk_client.delete_server_interface.assert_called_once_with( 'fake-port', server=servers[0] ) self.assertIsNone(result) @@ -8133,8 +8037,8 @@ class TestServerShelve(TestServer): attrs={'status': 'ACTIVE'}, ) - self.sdk_client.find_server.return_value = self.server - self.sdk_client.shelve_server.return_value = None + self.compute_sdk_client.find_server.return_value = self.server + self.compute_sdk_client.shelve_server.return_value = None # Get the command object to test self.cmd = server.ShelveServer(self.app, None) @@ -8151,12 +8055,14 @@ class TestServerShelve(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.name, ignore_missing=False, ) - self.sdk_client.shelve_server.assert_called_with(self.server.id) - self.sdk_client.shelve_offload_server.assert_not_called() + self.compute_sdk_client.shelve_server.assert_called_with( + self.server.id + ) + self.compute_sdk_client.shelve_offload_server.assert_not_called() def test_shelve_already_shelved(self): self.server.status = 'SHELVED' @@ -8172,12 +8078,12 @@ class TestServerShelve(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.name, ignore_missing=False, ) - self.sdk_client.shelve_server.assert_not_called() - self.sdk_client.shelve_offload_server.assert_not_called() + self.compute_sdk_client.shelve_server.assert_not_called() + self.compute_sdk_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): @@ -8192,14 +8098,16 @@ class TestServerShelve(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.name, ignore_missing=False, ) - self.sdk_client.shelve_server.assert_called_with(self.server.id) - self.sdk_client.shelve_offload_server.assert_not_called() + self.compute_sdk_client.shelve_server.assert_called_with( + self.server.id + ) + self.compute_sdk_client.shelve_offload_server.assert_not_called() mock_wait_for_status.assert_called_once_with( - self.sdk_client.get_server, + self.compute_sdk_client.get_server, self.server.id, callback=mock.ANY, success_status=('shelved', 'shelved_offloaded'), @@ -8220,18 +8128,20 @@ class TestServerShelve(TestServer): # two calls - one to retrieve the server state before shelving and # another to do this before offloading - self.sdk_client.find_server.assert_has_calls( + self.compute_sdk_client.find_server.assert_has_calls( [ mock.call(self.server.name, ignore_missing=False), mock.call(self.server.name, ignore_missing=False), ] ) - self.sdk_client.shelve_server.assert_called_with(self.server.id) - self.sdk_client.shelve_offload_server.assert_called_once_with( + self.compute_sdk_client.shelve_server.assert_called_with( + self.server.id + ) + self.compute_sdk_client.shelve_offload_server.assert_called_once_with( self.server.id, ) mock_wait_for_status.assert_called_once_with( - self.sdk_client.get_server, + self.compute_sdk_client.get_server, self.server.id, callback=mock.ANY, success_status=('shelved', 'shelved_offloaded'), @@ -8254,7 +8164,9 @@ class TestServerShow(TestServer): 'tenant_id': 'tenant-id-xxx', 'networks': {'public': ['10.20.30.40', '2001:db8::f']}, } - self.sdk_client.get_server_diagnostics.return_value = {'test': 'test'} + self.compute_sdk_client.get_server_diagnostics.return_value = { + 'test': 'test' + } server_method = { 'fetch_topology': self.topology, } @@ -8263,7 +8175,7 @@ class TestServerShow(TestServer): ) # This is the return value for utils.find_resource() - self.sdk_client.get_server.return_value = self.server + self.compute_sdk_client.get_server.return_value = self.server self.image_client.get_image.return_value = self.image self.flavors_mock.get.return_value = self.flavor @@ -8558,7 +8470,7 @@ class TestServerStart(TestServer): self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_once_with( + self.compute_sdk_client.find_server.assert_called_once_with( servers[0].id, ignore_missing=False, details=False, @@ -8593,7 +8505,7 @@ class TestServerStop(TestServer): self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_once_with( + self.compute_sdk_client.find_server.assert_called_once_with( servers[0].id, ignore_missing=False, details=False, @@ -8685,7 +8597,7 @@ class TestServerUnset(TestServer): def test_server_unset_with_description_api_newer(self): # Description is supported for nova api version 2.19 or above - self.app.client_manager.compute.api_version = 2.19 + self.compute_client.api_version = 2.19 arglist = [ '--description', @@ -8706,7 +8618,7 @@ class TestServerUnset(TestServer): def test_server_unset_with_description_api_older(self): # Description is not supported for nova api version below 2.19 - self.app.client_manager.compute.api_version = 2.18 + self.compute_client.api_version = api_versions.APIVersion('2.18') arglist = [ '--description', @@ -8718,15 +8630,15 @@ class TestServerUnset(TestServer): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - with mock.patch.object(api_versions, 'APIVersion', return_value=2.19): - self.assertRaises( - exceptions.CommandError, self.cmd.take_action, parsed_args - ) + ex = self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) + self.assertIn( + '--os-compute-api-version 2.19 or greater is required', str(ex) + ) def test_server_unset_with_tag(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.26' - ) + self.compute_client.api_version = api_versions.APIVersion('2.26') arglist = [ '--tag', @@ -8752,9 +8664,7 @@ class TestServerUnset(TestServer): ) def test_server_unset_with_tag_pre_v226(self): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.25' - ) + self.compute_client.api_version = api_versions.APIVersion('2.25') arglist = [ '--tag', @@ -8785,8 +8695,8 @@ class TestServerUnshelve(TestServer): attrs={'status': 'SHELVED'}, ) - self.sdk_client.find_server.return_value = self.server - self.sdk_client.unshelve_server.return_value = None + self.compute_sdk_client.find_server.return_value = self.server + self.compute_sdk_client.unshelve_server.return_value = None # Get the command object to test self.cmd = server.UnshelveServer(self.app, None) @@ -8802,11 +8712,13 @@ class TestServerUnshelve(TestServer): self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_once_with( + self.compute_sdk_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, ) - self.sdk_client.unshelve_server.assert_called_once_with(self.server.id) + self.compute_sdk_client.unshelve_server.assert_called_once_with( + self.server.id + ) def test_unshelve_with_az(self): self._set_mock_microversion('2.77') @@ -8824,11 +8736,11 @@ class TestServerUnshelve(TestServer): self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_once_with( + self.compute_sdk_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, ) - self.sdk_client.unshelve_server.assert_called_once_with( + self.compute_sdk_client.unshelve_server.assert_called_once_with( self.server.id, availability_zone='foo-az', ) @@ -8870,11 +8782,11 @@ class TestServerUnshelve(TestServer): self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_once_with( + self.compute_sdk_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, ) - self.sdk_client.unshelve_server.assert_called_once_with( + self.compute_sdk_client.unshelve_server.assert_called_once_with( self.server.id, host='server1', ) @@ -8916,11 +8828,11 @@ class TestServerUnshelve(TestServer): self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_once_with( + self.compute_sdk_client.find_server.assert_called_once_with( self.server.id, ignore_missing=False, ) - self.sdk_client.unshelve_server.assert_called_once_with( + self.compute_sdk_client.unshelve_server.assert_called_once_with( self.server.id, availability_zone=None, ) @@ -8992,13 +8904,15 @@ class TestServerUnshelve(TestServer): result = self.cmd.take_action(parsed_args) self.assertIsNone(result) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.name, ignore_missing=False, ) - self.sdk_client.unshelve_server.assert_called_with(self.server.id) + self.compute_sdk_client.unshelve_server.assert_called_with( + self.server.id + ) mock_wait_for_status.assert_called_once_with( - self.sdk_client.get_server, + self.compute_sdk_client.get_server, self.server.id, callback=mock.ANY, success_status=('active', 'shutoff'), @@ -9124,7 +9038,7 @@ class TestServerGeneral(TestServer): # Call _prep_server_detail(). server_detail = server._prep_server_detail( - self.app.client_manager.compute, + self.compute_client, self.image_client, _server, ) diff --git a/openstackclient/tests/unit/compute/v2/test_server_backup.py b/openstackclient/tests/unit/compute/v2/test_server_backup.py index e5ad8c5b8c..5075672662 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_backup.py +++ b/openstackclient/tests/unit/compute/v2/test_server_backup.py @@ -28,7 +28,9 @@ class TestServerBackup(compute_fakes.TestComputev2): # Get a shortcut to the compute client ServerManager Mock self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) # Set object attributes to be tested. Could be overwritten in subclass. self.attrs = {} @@ -40,7 +42,7 @@ class TestServerBackup(compute_fakes.TestComputev2): ) # This is the return value for compute_client.find_server() - self.sdk_client.find_server = compute_fakes.get_servers( + self.compute_sdk_client.find_server = compute_fakes.get_servers( servers, 0, ) @@ -121,7 +123,7 @@ class TestServerBackupCreate(TestServerBackup): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.backup_server.assert_called_with( + self.compute_sdk_client.backup_server.assert_called_with( servers[0].id, servers[0].name, '', @@ -157,7 +159,7 @@ class TestServerBackupCreate(TestServerBackup): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.backup_server.assert_called_with( + self.compute_sdk_client.backup_server.assert_called_with( servers[0].id, 'image', 'daily', @@ -197,7 +199,7 @@ class TestServerBackupCreate(TestServerBackup): parsed_args, ) - self.sdk_client.backup_server.assert_called_with( + self.compute_sdk_client.backup_server.assert_called_with( servers[0].id, 'image', 'daily', @@ -238,7 +240,7 @@ class TestServerBackupCreate(TestServerBackup): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.backup_server.assert_called_with( + self.compute_sdk_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 9d64762d2f..5598c822e1 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_event.py +++ b/openstackclient/tests/unit/compute/v2/test_server_event.py @@ -30,11 +30,13 @@ class TestServerEvent(compute_fakes.TestComputev2): super(TestServerEvent, self).setUp() self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute - self.sdk_client.find_server = mock.Mock() - self.sdk_client.server_actions = mock.Mock() - self.sdk_client.get_server_action = mock.Mock() - self.sdk_client.reset_mock() + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) + self.compute_sdk_client.find_server = mock.Mock() + self.compute_sdk_client.server_actions = mock.Mock() + self.compute_sdk_client.get_server_action = mock.Mock() + self.compute_sdk_client.reset_mock() patcher = mock.patch.object( sdk_utils, 'supports_microversion', return_value=True @@ -42,7 +44,7 @@ class TestServerEvent(compute_fakes.TestComputev2): self.addCleanup(patcher.stop) self.supports_microversion_mock = patcher.start() self._set_mock_microversion( - self.app.client_manager.compute.api_version.get_string() + self.compute_client.api_version.get_string() ) def _set_mock_microversion(self, mock_v): @@ -97,8 +99,8 @@ class TestListServerEvent(TestServerEvent): def setUp(self): super().setUp() - self.sdk_client.find_server.return_value = self.fake_server - self.sdk_client.server_actions.return_value = [ + self.compute_sdk_client.find_server.return_value = self.fake_server + self.compute_sdk_client.server_actions.return_value = [ self.fake_event, ] @@ -116,11 +118,13 @@ class TestListServerEvent(TestServerEvent): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.fake_server.name, ignore_missing=False, ) - self.sdk_client.server_actions.assert_called_with(self.fake_server.id) + self.compute_sdk_client.server_actions.assert_called_with( + self.fake_server.id + ) self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) @@ -138,11 +142,13 @@ class TestListServerEvent(TestServerEvent): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.fake_server.name, ignore_missing=False, ) - self.sdk_client.server_actions.assert_called_with(self.fake_server.id) + self.compute_sdk_client.server_actions.assert_called_with( + self.fake_server.id + ) self.assertEqual(self.long_columns, columns) self.assertEqual(self.long_data, tuple(data)) @@ -163,11 +169,11 @@ class TestListServerEvent(TestServerEvent): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.fake_server.name, ignore_missing=False, ) - self.sdk_client.server_actions.assert_called_with( + self.compute_sdk_client.server_actions.assert_called_with( self.fake_server.id, changes_since='2016-03-04T06:27:59Z', ) @@ -243,11 +249,11 @@ class TestListServerEvent(TestServerEvent): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.fake_server.name, ignore_missing=False, ) - self.sdk_client.server_actions.assert_called_with( + self.compute_sdk_client.server_actions.assert_called_with( self.fake_server.id, changes_before='2016-03-04T06:27:59Z', ) @@ -319,7 +325,7 @@ class TestListServerEvent(TestServerEvent): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.server_actions.assert_called_with( + self.compute_sdk_client.server_actions.assert_called_with( self.fake_server.id, limit=1, paginated=False, @@ -366,7 +372,7 @@ class TestListServerEvent(TestServerEvent): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.server_actions.assert_called_with( + self.compute_sdk_client.server_actions.assert_called_with( self.fake_server.id, marker='test_event', ) @@ -420,8 +426,10 @@ class TestShowServerEvent(TestServerEvent): def setUp(self): super().setUp() - self.sdk_client.find_server.return_value = self.fake_server - self.sdk_client.get_server_action.return_value = self.fake_event + self.compute_sdk_client.find_server.return_value = self.fake_server + self.compute_sdk_client.get_server_action.return_value = ( + self.fake_event + ) self.cmd = server_event.ShowServerEvent(self.app, None) @@ -438,11 +446,11 @@ class TestShowServerEvent(TestServerEvent): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.fake_server.name, ignore_missing=False, ) - self.sdk_client.get_server_action.assert_called_with( + self.compute_sdk_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 ef6f13e0cc..44fa083f1d 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_group.py +++ b/openstackclient/tests/unit/compute/v2/test_server_group.py @@ -51,15 +51,17 @@ class TestServerGroup(compute_fakes.TestComputev2): super().setUp() # Create and get a shortcut to the compute client mock - self.sdk_client = self.app.client_manager.sdk_connection.compute - self.sdk_client.reset_mock() + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) + self.compute_sdk_client.reset_mock() class TestServerGroupCreate(TestServerGroup): def setUp(self): super().setUp() - self.sdk_client.create_server_group.return_value = ( + self.compute_sdk_client.create_server_group.return_value = ( self.fake_server_group ) self.cmd = server_group.CreateServerGroup(self.app, None) @@ -77,7 +79,7 @@ class TestServerGroupCreate(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_server_group.assert_called_once_with( + self.compute_sdk_client.create_server_group.assert_called_once_with( name=parsed_args.name, policy=parsed_args.policy, ) @@ -98,7 +100,7 @@ class TestServerGroupCreate(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_server_group.assert_called_once_with( + self.compute_sdk_client.create_server_group.assert_called_once_with( name=parsed_args.name, policy=parsed_args.policy, ) @@ -141,7 +143,7 @@ class TestServerGroupCreate(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_server_group.assert_called_once_with( + self.compute_sdk_client.create_server_group.assert_called_once_with( name=parsed_args.name, policy=parsed_args.policy, rules=parsed_args.rules, @@ -180,7 +182,9 @@ class TestServerGroupDelete(TestServerGroup): def setUp(self): super().setUp() - self.sdk_client.find_server_group.return_value = self.fake_server_group + self.compute_sdk_client.find_server_group.return_value = ( + self.fake_server_group + ) self.cmd = server_group.DeleteServerGroup(self.app, None) def test_server_group_delete(self): @@ -192,10 +196,10 @@ class TestServerGroupDelete(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_server_group.assert_called_once_with( + self.compute_sdk_client.find_server_group.assert_called_once_with( 'affinity_group' ) - self.sdk_client.delete_server_group.assert_called_once_with( + self.compute_sdk_client.delete_server_group.assert_called_once_with( self.fake_server_group.id ) self.assertIsNone(result) @@ -207,15 +211,21 @@ class TestServerGroupDelete(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.find_server_group.assert_any_call('affinity_group') - self.sdk_client.find_server_group.assert_any_call( + self.compute_sdk_client.find_server_group.assert_any_call( + 'affinity_group' + ) + self.compute_sdk_client.find_server_group.assert_any_call( 'anti_affinity_group' ) - self.sdk_client.delete_server_group.assert_called_with( + self.compute_sdk_client.delete_server_group.assert_called_with( self.fake_server_group.id ) - self.assertEqual(2, self.sdk_client.find_server_group.call_count) - self.assertEqual(2, self.sdk_client.delete_server_group.call_count) + 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.assertIsNone(result) def test_server_group_delete_no_input(self): @@ -236,7 +246,7 @@ class TestServerGroupDelete(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.sdk_client.find_server_group.side_effect = [ + self.compute_sdk_client.find_server_group.side_effect = [ self.fake_server_group, exceptions.CommandError, ] @@ -246,12 +256,16 @@ class TestServerGroupDelete(TestServerGroup): except exceptions.CommandError as e: self.assertEqual('1 of 2 server groups failed to delete.', str(e)) - self.sdk_client.find_server_group.assert_any_call('affinity_group') - self.sdk_client.find_server_group.assert_any_call( + self.compute_sdk_client.find_server_group.assert_any_call( + 'affinity_group' + ) + self.compute_sdk_client.find_server_group.assert_any_call( 'anti_affinity_group' ) - self.assertEqual(2, self.sdk_client.find_server_group.call_count) - self.sdk_client.delete_server_group.assert_called_once_with( + self.assertEqual( + 2, self.compute_sdk_client.find_server_group.call_count + ) + self.compute_sdk_client.delete_server_group.assert_called_once_with( self.fake_server_group.id ) @@ -336,7 +350,9 @@ class TestServerGroupList(TestServerGroup): def setUp(self): super().setUp() - self.sdk_client.server_groups.return_value = [self.fake_server_group] + self.compute_sdk_client.server_groups.return_value = [ + self.fake_server_group + ] self.cmd = server_group.ListServerGroup(self.app, None) @mock.patch.object(sdk_utils, 'supports_microversion', return_value=False) @@ -351,7 +367,7 @@ class TestServerGroupList(TestServerGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.server_groups.assert_called_once_with() + self.compute_sdk_client.server_groups.assert_called_once_with() self.assertCountEqual(self.list_columns, columns) self.assertCountEqual(self.list_data, tuple(data)) @@ -370,7 +386,7 @@ class TestServerGroupList(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.server_groups.assert_called_once_with( + self.compute_sdk_client.server_groups.assert_called_once_with( all_projects=True ) @@ -393,7 +409,7 @@ class TestServerGroupList(TestServerGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.server_groups.assert_called_once_with(limit=1) + self.compute_sdk_client.server_groups.assert_called_once_with(limit=1) @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True) def test_server_group_list_with_offset(self, sm_mock): @@ -411,7 +427,7 @@ class TestServerGroupList(TestServerGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) - self.sdk_client.server_groups.assert_called_once_with(offset=5) + self.compute_sdk_client.server_groups.assert_called_once_with(offset=5) @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True) def test_server_group_list_v264(self, sm_mock): @@ -422,7 +438,7 @@ class TestServerGroupList(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.server_groups.assert_called_once_with() + self.compute_sdk_client.server_groups.assert_called_once_with() self.assertCountEqual(self.list_columns_v264, columns) self.assertCountEqual(self.list_data_v264, tuple(data)) @@ -439,7 +455,7 @@ class TestServerGroupList(TestServerGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.server_groups.assert_called_once_with( + self.compute_sdk_client.server_groups.assert_called_once_with( all_projects=True ) @@ -451,7 +467,9 @@ class TestServerGroupShow(TestServerGroup): def setUp(self): super().setUp() - self.sdk_client.find_server_group.return_value = self.fake_server_group + self.compute_sdk_client.find_server_group.return_value = ( + self.fake_server_group + ) self.cmd = server_group.ShowServerGroup(self.app, None) @mock.patch.object(sdk_utils, 'supports_microversion', return_value=True) diff --git a/openstackclient/tests/unit/compute/v2/test_server_image.py b/openstackclient/tests/unit/compute/v2/test_server_image.py index 83afe35194..317c055e8f 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_image.py +++ b/openstackclient/tests/unit/compute/v2/test_server_image.py @@ -27,7 +27,9 @@ class TestServerImage(compute_fakes.TestComputev2): # Get a shortcut to the compute client ServerManager Mock self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) # Set object attributes to be tested. Could be overwritten in subclass. self.attrs = {} @@ -39,7 +41,7 @@ class TestServerImage(compute_fakes.TestComputev2): ) # This is the return value for compute_client.find_server() - self.sdk_client.find_server = compute_fakes.get_servers( + self.compute_sdk_client.find_server = compute_fakes.get_servers( servers, 0, ) @@ -96,7 +98,7 @@ class TestServerImageCreate(TestServerImage): ) self.image_client.find_image = mock.Mock(side_effect=images) - self.sdk_client.create_server_image = mock.Mock( + self.compute_sdk_client.create_server_image = mock.Mock( return_value=images[0], ) return images @@ -118,7 +120,7 @@ class TestServerImageCreate(TestServerImage): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_server_image.assert_called_with( + self.compute_sdk_client.create_server_image.assert_called_with( servers[0].id, servers[0].name, None, @@ -150,7 +152,7 @@ class TestServerImageCreate(TestServerImage): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_server_image.assert_called_with( + self.compute_sdk_client.create_server_image.assert_called_with( servers[0].id, 'img-nam', {'key': 'value'}, @@ -180,7 +182,7 @@ class TestServerImageCreate(TestServerImage): parsed_args, ) - self.sdk_client.create_server_image.assert_called_with( + self.compute_sdk_client.create_server_image.assert_called_with( servers[0].id, servers[0].name, None, @@ -210,7 +212,7 @@ class TestServerImageCreate(TestServerImage): # data to be shown. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.create_server_image.assert_called_with( + self.compute_sdk_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 4031c6ae53..236e28b45e 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_migration.py +++ b/openstackclient/tests/unit/compute/v2/test_server_migration.py @@ -27,17 +27,17 @@ class TestServerMigration(compute_fakes.TestComputev2): super().setUp() # Get a shortcut to the compute client ServerManager Mock - self.servers_mock = self.app.client_manager.compute.servers + self.servers_mock = self.compute_client.servers self.servers_mock.reset_mock() # Get a shortcut to the compute client ServerMigrationsManager Mock - self.server_migrations_mock = ( - self.app.client_manager.compute.server_migrations - ) + self.server_migrations_mock = self.compute_client.server_migrations self.server_migrations_mock.reset_mock() self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) patcher = mock.patch.object( sdk_utils, 'supports_microversion', return_value=True @@ -91,10 +91,10 @@ class TestListMigration(TestServerMigration): self._set_mock_microversion('2.1') self.server = compute_fakes.create_one_sdk_server() - self.sdk_client.find_server.return_value = self.server + self.compute_sdk_client.find_server.return_value = self.server self.migrations = compute_fakes.create_migrations(count=3) - self.sdk_client.migrations.return_value = self.migrations + self.compute_sdk_client.migrations.return_value = self.migrations self.data = ( common_utils.get_item_properties(s, self.MIGRATION_FIELDS) @@ -114,7 +114,7 @@ class TestListMigration(TestServerMigration): # Set expected values kwargs = {} - self.sdk_client.migrations.assert_called_with(**kwargs) + self.compute_sdk_client.migrations.assert_called_with(**kwargs) self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -146,8 +146,8 @@ class TestListMigration(TestServerMigration): 'migration_type': 'migration', } - self.sdk_client.find_server.assert_called_with('server1') - self.sdk_client.migrations.assert_called_with(**kwargs) + self.compute_sdk_client.find_server.assert_called_with('server1') + self.compute_sdk_client.migrations.assert_called_with(**kwargs) self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -205,7 +205,7 @@ class TestListMigrationV223(TestListMigration): 'status': 'migrating', } - self.sdk_client.migrations.assert_called_with(**kwargs) + self.compute_sdk_client.migrations.assert_called_with(**kwargs) self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -283,7 +283,7 @@ class TestListMigrationV259(TestListMigration): 'changes_since': '2019-08-09T08:03:25Z', } - self.sdk_client.migrations.assert_called_with(**kwargs) + self.compute_sdk_client.migrations.assert_called_with(**kwargs) self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -409,7 +409,7 @@ class TestListMigrationV266(TestListMigration): 'changes_before': '2019-08-09T08:03:25Z', } - self.sdk_client.migrations.assert_called_with(**kwargs) + self.compute_sdk_client.migrations.assert_called_with(**kwargs) self.assertEqual(self.MIGRATION_COLUMNS, columns) self.assertEqual(tuple(self.data), tuple(data)) @@ -527,7 +527,7 @@ class TestListMigrationV280(TestListMigration): 'changes_before': "2019-08-09T08:03:25Z", } - self.sdk_client.migrations.assert_called_with(**kwargs) + self.compute_sdk_client.migrations.assert_called_with(**kwargs) self.MIGRATION_COLUMNS.insert( len(self.MIGRATION_COLUMNS) - 2, "Project" @@ -603,7 +603,7 @@ class TestListMigrationV280(TestListMigration): 'changes_before': "2019-08-09T08:03:25Z", } - self.sdk_client.migrations.assert_called_with(**kwargs) + self.compute_sdk_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") @@ -674,7 +674,7 @@ class TestListMigrationV280(TestListMigration): 'changes_before': "2019-08-09T08:03:25Z", } - self.sdk_client.migrations.assert_called_with(**kwargs) + self.compute_sdk_client.migrations.assert_called_with(**kwargs) self.MIGRATION_COLUMNS.insert( len(self.MIGRATION_COLUMNS) - 2, "Project" @@ -724,13 +724,13 @@ class TestServerMigrationShow(TestServerMigration): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.sdk_client.find_server.return_value = self.server + self.compute_sdk_client.find_server.return_value = self.server self.server_migration = compute_fakes.create_one_server_migration() - self.sdk_client.get_server_migration.return_value = ( + self.compute_sdk_client.get_server_migration.return_value = ( self.server_migration ) - self.sdk_client.server_migrations.return_value = iter( + self.compute_sdk_client.server_migrations.return_value = iter( [self.server_migration] ) @@ -788,10 +788,10 @@ class TestServerMigrationShow(TestServerMigration): self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.sdk_client.get_server_migration.assert_called_with( + self.compute_sdk_client.get_server_migration.assert_called_with( self.server.id, '2', ignore_missing=False ) @@ -840,7 +840,7 @@ class TestServerMigrationShow(TestServerMigration): def test_server_migration_show_by_uuid(self): self._set_mock_microversion('2.59') - self.sdk_client.server_migrations.return_value = iter( + self.compute_sdk_client.server_migrations.return_value = iter( [self.server_migration] ) @@ -859,15 +859,17 @@ class TestServerMigrationShow(TestServerMigration): self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.sdk_client.server_migrations.assert_called_with(self.server.id) - self.sdk_client.get_server_migration.assert_not_called() + self.compute_sdk_client.server_migrations.assert_called_with( + self.server.id + ) + self.compute_sdk_client.get_server_migration.assert_not_called() def test_server_migration_show_by_uuid_no_matches(self): self._set_mock_microversion('2.59') - self.sdk_client.server_migrations.return_value = iter([]) + self.compute_sdk_client.server_migrations.return_value = iter([]) arglist = [ self.server.id, @@ -926,7 +928,7 @@ class TestServerMigrationAbort(TestServerMigration): self.server = compute_fakes.create_one_sdk_server() # Return value for utils.find_resource for server. - self.sdk_client.find_server.return_value = self.server + self.compute_sdk_client.find_server.return_value = self.server # Get the command object to test self.cmd = server_migration.AbortMigration(self.app, None) @@ -943,10 +945,10 @@ class TestServerMigrationAbort(TestServerMigration): result = self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.sdk_client.abort_server_migration.assert_called_with( + self.compute_sdk_client.abort_server_migration.assert_called_with( '2', self.server.id, ignore_missing=False ) self.assertIsNone(result) @@ -972,7 +974,7 @@ class TestServerMigrationAbort(TestServerMigration): self._set_mock_microversion('2.59') self.server_migration = compute_fakes.create_one_server_migration() - self.sdk_client.server_migrations.return_value = iter( + self.compute_sdk_client.server_migrations.return_value = iter( [self.server_migration] ) @@ -985,11 +987,13 @@ class TestServerMigrationAbort(TestServerMigration): result = self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.sdk_client.server_migrations.assert_called_with(self.server.id) - self.sdk_client.abort_server_migration.assert_called_with( + self.compute_sdk_client.server_migrations.assert_called_with( + self.server.id + ) + self.compute_sdk_client.abort_server_migration.assert_called_with( self.server_migration.id, self.server.id, ignore_missing=False ) self.assertIsNone(result) @@ -997,7 +1001,7 @@ class TestServerMigrationAbort(TestServerMigration): def test_server_migration_abort_by_uuid_no_matches(self): self._set_mock_microversion('2.59') - self.sdk_client.server_migrations.return_value = iter([]) + self.compute_sdk_client.server_migrations.return_value = iter([]) arglist = [ self.server.id, @@ -1039,7 +1043,7 @@ class TestServerMigrationForceComplete(TestServerMigration): self.server = compute_fakes.create_one_sdk_server() # Return value for utils.find_resource for server. - self.sdk_client.find_server.return_value = self.server + self.compute_sdk_client.find_server.return_value = self.server # Get the command object to test self.cmd = server_migration.ForceCompleteMigration(self.app, None) @@ -1056,10 +1060,10 @@ class TestServerMigrationForceComplete(TestServerMigration): result = self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.sdk_client.force_complete_server_migration.assert_called_with( + self.compute_sdk_client.force_complete_server_migration.assert_called_with( '2', self.server.id ) self.assertIsNone(result) @@ -1085,7 +1089,7 @@ class TestServerMigrationForceComplete(TestServerMigration): self._set_mock_microversion('2.59') self.server_migration = compute_fakes.create_one_server_migration() - self.sdk_client.server_migrations.return_value = iter( + self.compute_sdk_client.server_migrations.return_value = iter( [self.server_migration] ) @@ -1098,11 +1102,13 @@ class TestServerMigrationForceComplete(TestServerMigration): result = self.cmd.take_action(parsed_args) - self.sdk_client.find_server.assert_called_with( + self.compute_sdk_client.find_server.assert_called_with( self.server.id, ignore_missing=False ) - self.sdk_client.server_migrations.assert_called_with(self.server.id) - self.sdk_client.force_complete_server_migration.assert_called_with( + self.compute_sdk_client.server_migrations.assert_called_with( + self.server.id + ) + self.compute_sdk_client.force_complete_server_migration.assert_called_with( self.server_migration.id, self.server.id ) self.assertIsNone(result) @@ -1110,7 +1116,7 @@ class TestServerMigrationForceComplete(TestServerMigration): def test_server_migration_force_complete_by_uuid_no_matches(self): self._set_mock_microversion('2.59') - self.sdk_client.server_migrations.return_value = iter([]) + self.compute_sdk_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 1ef7260167..316d6de770 100644 --- a/openstackclient/tests/unit/compute/v2/test_server_volume.py +++ b/openstackclient/tests/unit/compute/v2/test_server_volume.py @@ -9,11 +9,9 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -# from unittest import mock -from novaclient import api_versions from openstack import utils as sdk_utils from osc_lib import exceptions @@ -27,7 +25,9 @@ class TestServerVolume(compute_fakes.TestComputev2): super().setUp() self.app.client_manager.sdk_connection.compute = mock.Mock() - self.compute_client = self.app.client_manager.sdk_connection.compute + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) class TestServerVolumeList(TestServerVolume): @@ -37,8 +37,8 @@ class TestServerVolumeList(TestServerVolume): self.server = compute_fakes.create_one_sdk_server() self.volume_attachments = compute_fakes.create_volume_attachments() - self.compute_client.find_server.return_value = self.server - self.compute_client.volume_attachments.return_value = ( + self.compute_sdk_client.find_server.return_value = self.server + self.compute_sdk_client.volume_attachments.return_value = ( self.volume_attachments ) @@ -47,9 +47,6 @@ class TestServerVolumeList(TestServerVolume): @mock.patch.object(sdk_utils, 'supports_microversion') def test_server_volume_list(self, sm_mock): - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.1' - ) sm_mock.side_effect = [False, False, False, False] arglist = [ @@ -80,7 +77,7 @@ class TestServerVolumeList(TestServerVolume): ), tuple(data), ) - self.compute_client.volume_attachments.assert_called_once_with( + self.compute_sdk_client.volume_attachments.assert_called_once_with( self.server, ) @@ -127,7 +124,7 @@ class TestServerVolumeList(TestServerVolume): ), tuple(data), ) - self.compute_client.volume_attachments.assert_called_once_with( + self.compute_sdk_client.volume_attachments.assert_called_once_with( self.server, ) @@ -176,7 +173,7 @@ class TestServerVolumeList(TestServerVolume): ), tuple(data), ) - self.compute_client.volume_attachments.assert_called_once_with( + self.compute_sdk_client.volume_attachments.assert_called_once_with( self.server, ) @@ -228,7 +225,7 @@ class TestServerVolumeList(TestServerVolume): ), tuple(data), ) - self.compute_client.volume_attachments.assert_called_once_with( + self.compute_sdk_client.volume_attachments.assert_called_once_with( self.server, ) @@ -238,7 +235,7 @@ class TestServerVolumeUpdate(TestServerVolume): super().setUp() self.server = compute_fakes.create_one_sdk_server() - self.compute_client.find_server.return_value = self.server + self.compute_sdk_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 @@ -261,7 +258,7 @@ class TestServerVolumeUpdate(TestServerVolume): result = self.cmd.take_action(parsed_args) # This is a no-op - self.compute_client.update_volume_attachment.assert_not_called() + self.compute_sdk_client.update_volume_attachment.assert_not_called() self.assertIsNone(result) @mock.patch.object(sdk_utils, 'supports_microversion') @@ -282,7 +279,7 @@ class TestServerVolumeUpdate(TestServerVolume): result = self.cmd.take_action(parsed_args) - self.compute_client.update_volume_attachment.assert_called_once_with( + self.compute_sdk_client.update_volume_attachment.assert_called_once_with( self.server, self.volume, delete_on_termination=True, @@ -307,7 +304,7 @@ class TestServerVolumeUpdate(TestServerVolume): result = self.cmd.take_action(parsed_args) - self.compute_client.update_volume_attachment.assert_called_once_with( + self.compute_sdk_client.update_volume_attachment.assert_called_once_with( self.server, self.volume, delete_on_termination=False ) self.assertIsNone(result) @@ -336,7 +333,7 @@ class TestServerVolumeUpdate(TestServerVolume): self.cmd.take_action, parsed_args, ) - self.compute_client.update_volume_attachment.assert_not_called() + self.compute_sdk_client.update_volume_attachment.assert_not_called() @mock.patch.object(sdk_utils, 'supports_microversion') def test_server_volume_update_with_preserve_on_termination_pre_v285( @@ -362,4 +359,4 @@ class TestServerVolumeUpdate(TestServerVolume): self.cmd.take_action, parsed_args, ) - self.compute_client.update_volume_attachment.assert_not_called() + self.compute_sdk_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 97ac275230..31b7cf82c2 100644 --- a/openstackclient/tests/unit/compute/v2/test_service.py +++ b/openstackclient/tests/unit/compute/v2/test_service.py @@ -11,12 +11,10 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -# from unittest import mock from unittest.mock import call -from novaclient import api_versions from openstack import utils as sdk_utils from osc_lib import exceptions @@ -29,7 +27,9 @@ class TestService(compute_fakes.TestComputev2): super(TestService, self).setUp() self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) class TestServiceDelete(TestService): @@ -38,7 +38,7 @@ class TestServiceDelete(TestService): def setUp(self): super(TestServiceDelete, self).setUp() - self.sdk_client.delete_service.return_value = None + self.compute_sdk_client.delete_service.return_value = None # Get the command object to test self.cmd = service.DeleteService(self.app, None) @@ -54,7 +54,7 @@ class TestServiceDelete(TestService): result = self.cmd.take_action(parsed_args) - self.sdk_client.delete_service.assert_called_with( + self.compute_sdk_client.delete_service.assert_called_with( self.services[0].binary, ignore_missing=False ) self.assertIsNone(result) @@ -73,7 +73,7 @@ class TestServiceDelete(TestService): calls = [] for s in self.services: calls.append(call(s.binary, ignore_missing=False)) - self.sdk_client.delete_service.assert_has_calls(calls) + self.compute_sdk_client.delete_service.assert_has_calls(calls) self.assertIsNone(result) def test_multi_services_delete_with_exception(self): @@ -85,7 +85,7 @@ class TestServiceDelete(TestService): parsed_args = self.check_parser(self.cmd, arglist, verifylist) delete_mock_result = [None, exceptions.CommandError] - self.sdk_client.delete_service = mock.Mock( + self.compute_sdk_client.delete_service = mock.Mock( side_effect=delete_mock_result ) @@ -97,10 +97,10 @@ class TestServiceDelete(TestService): '1 of 2 compute services failed to delete.', str(e) ) - self.sdk_client.delete_service.assert_any_call( + self.compute_sdk_client.delete_service.assert_any_call( self.services[0].binary, ignore_missing=False ) - self.sdk_client.delete_service.assert_any_call( + self.compute_sdk_client.delete_service.assert_any_call( 'unexist_service', ignore_missing=False ) @@ -135,7 +135,7 @@ class TestServiceList(TestService): def setUp(self): super(TestServiceList, self).setUp() - self.sdk_client.services.return_value = [self.service] + self.compute_sdk_client.services.return_value = [self.service] # Get the command object to test self.cmd = service.ListService(self.app, None) @@ -158,7 +158,7 @@ class TestServiceList(TestService): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.services.assert_called_with( + self.compute_sdk_client.services.assert_called_with( host=self.service.host, binary=self.service.binary, ) @@ -189,7 +189,7 @@ class TestServiceList(TestService): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.services.assert_called_with( + self.compute_sdk_client.services.assert_called_with( host=self.service.host, binary=self.service.binary, ) @@ -214,16 +214,13 @@ class TestServiceList(TestService): ('long', True), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.compute.api_version = api_versions.APIVersion( - '2.11' - ) # In base command class Lister in cliff, abstract method take_action() # returns a tuple containing the column names and an iterable # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.services.assert_called_with( + self.compute_sdk_client.services.assert_called_with( host=self.service.host, binary=self.service.binary, ) @@ -242,8 +239,8 @@ class TestServiceSet(TestService): self.service = compute_fakes.create_one_service() - self.sdk_client.enable_service.return_value = self.service - self.sdk_client.disable_service.return_value = self.service + self.compute_sdk_client.enable_service.return_value = self.service + self.compute_sdk_client.disable_service.return_value = self.service self.cmd = service.SetService(self.app, None) @@ -261,8 +258,8 @@ class TestServiceSet(TestService): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.enable_service.assert_not_called() - self.sdk_client.disable_service.assert_not_called() + self.compute_sdk_client.enable_service.assert_not_called() + self.compute_sdk_client.disable_service.assert_not_called() self.assertIsNone(result) @mock.patch.object(sdk_utils, 'supports_microversion') @@ -282,7 +279,7 @@ class TestServiceSet(TestService): result = self.cmd.take_action(parsed_args) - self.sdk_client.enable_service.assert_called_with( + self.compute_sdk_client.enable_service.assert_called_with( None, self.service.host, self.service.binary ) self.assertIsNone(result) @@ -304,7 +301,7 @@ class TestServiceSet(TestService): result = self.cmd.take_action(parsed_args) - self.sdk_client.disable_service.assert_called_with( + self.compute_sdk_client.disable_service.assert_called_with( None, self.service.host, self.service.binary, None ) self.assertIsNone(result) @@ -330,7 +327,7 @@ class TestServiceSet(TestService): result = self.cmd.take_action(parsed_args) - self.sdk_client.disable_service.assert_called_with( + self.compute_sdk_client.disable_service.assert_called_with( None, self.service.host, self.service.binary, reason ) self.assertIsNone(result) @@ -404,11 +401,11 @@ class TestServiceSet(TestService): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_sdk_client.update_service_forced_down.assert_called_once_with( None, self.service.host, self.service.binary, False ) - self.assertNotCalled(self.sdk_client.enable_service) - self.assertNotCalled(self.sdk_client.disable_service) + self.assertNotCalled(self.compute_sdk_client.enable_service) + self.assertNotCalled(self.compute_sdk_client.disable_service) self.assertIsNone(result) @mock.patch.object(sdk_utils, 'supports_microversion') @@ -426,11 +423,11 @@ class TestServiceSet(TestService): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_sdk_client.update_service_forced_down.assert_called_once_with( None, self.service.host, self.service.binary, True ) - self.assertNotCalled(self.sdk_client.enable_service) - self.assertNotCalled(self.sdk_client.disable_service) + self.assertNotCalled(self.compute_sdk_client.enable_service) + self.assertNotCalled(self.compute_sdk_client.disable_service) self.assertIsNone(result) @mock.patch.object(sdk_utils, 'supports_microversion') @@ -450,10 +447,10 @@ class TestServiceSet(TestService): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.sdk_client.enable_service.assert_called_once_with( + self.compute_sdk_client.enable_service.assert_called_once_with( None, self.service.host, self.service.binary ) - self.sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_sdk_client.update_service_forced_down.assert_called_once_with( None, self.service.host, self.service.binary, True ) self.assertIsNone(result) @@ -476,12 +473,12 @@ class TestServiceSet(TestService): parsed_args = self.check_parser(self.cmd, arglist, verifylist) with mock.patch.object( - self.sdk_client, 'enable_service', side_effect=Exception() + self.compute_sdk_client, 'enable_service', side_effect=Exception() ): self.assertRaises( exceptions.CommandError, self.cmd.take_action, parsed_args ) - self.sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_sdk_client.update_service_forced_down.assert_called_once_with( None, self.service.host, self.service.binary, True ) @@ -504,12 +501,14 @@ class TestServiceSet(TestService): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c' - self.sdk_client.services.return_value = [mock.Mock(id=service_id)] + self.compute_sdk_client.services.return_value = [ + mock.Mock(id=service_id) + ] result = self.cmd.take_action(parsed_args) - self.sdk_client.disable_service.assert_called_once_with( + self.compute_sdk_client.disable_service.assert_called_once_with( service_id, self.service.host, self.service.binary, None ) - self.sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_sdk_client.update_service_forced_down.assert_called_once_with( service_id, self.service.host, self.service.binary, True ) self.assertIsNone(result) @@ -535,9 +534,11 @@ class TestServiceSet(TestService): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c' - self.sdk_client.services.return_value = [mock.Mock(id=service_id)] + self.compute_sdk_client.services.return_value = [ + mock.Mock(id=service_id) + ] result = self.cmd.take_action(parsed_args) - self.sdk_client.disable_service.assert_called_once_with( + self.compute_sdk_client.disable_service.assert_called_once_with( service_id, self.service.host, self.service.binary, reason ) self.assertIsNone(result) @@ -561,23 +562,25 @@ class TestServiceSet(TestService): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c' - self.sdk_client.services.return_value = [mock.Mock(id=service_id)] + self.compute_sdk_client.services.return_value = [ + mock.Mock(id=service_id) + ] result = self.cmd.take_action(parsed_args) - self.sdk_client.enable_service.assert_called_once_with( + self.compute_sdk_client.enable_service.assert_called_once_with( service_id, self.service.host, self.service.binary ) - self.sdk_client.update_service_forced_down.assert_called_once_with( + self.compute_sdk_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.sdk_client.services.return_value = [] + self.compute_sdk_client.services.return_value = [] ex = self.assertRaises( exceptions.CommandError, self.cmd._find_service_by_host_and_binary, - self.sdk_client, + self.compute_sdk_client, 'fake-host', 'nova-compute', ) @@ -589,11 +592,14 @@ class TestServiceSet(TestService): 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.sdk_client.services.return_value = [mock.Mock(), mock.Mock()] + self.compute_sdk_client.services.return_value = [ + mock.Mock(), + mock.Mock(), + ] ex = self.assertRaises( exceptions.CommandError, self.cmd._find_service_by_host_and_binary, - self.sdk_client, + self.compute_sdk_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 76b70117aa..9ddc6c82df 100644 --- a/openstackclient/tests/unit/compute/v2/test_usage.py +++ b/openstackclient/tests/unit/compute/v2/test_usage.py @@ -23,7 +23,9 @@ class TestUsage(compute_fakes.TestComputev2): super(TestUsage, self).setUp() self.app.client_manager.sdk_connection.compute = mock.Mock() - self.sdk_client = self.app.client_manager.sdk_connection.compute + self.compute_sdk_client = ( + self.app.client_manager.sdk_connection.compute + ) self.projects_mock = self.app.client_manager.identity.projects self.projects_mock.reset_mock() @@ -57,7 +59,7 @@ class TestUsageList(TestUsage): def setUp(self): super(TestUsageList, self).setUp() - self.sdk_client.usages.return_value = self.usages + self.compute_sdk_client.usages.return_value = self.usages self.projects_mock.list.return_value = [self.project] # Get the command object to test @@ -96,7 +98,7 @@ class TestUsageList(TestUsage): columns, data = self.cmd.take_action(parsed_args) self.projects_mock.list.assert_called_with() - self.sdk_client.usages.assert_called_with( + self.compute_sdk_client.usages.assert_called_with( start='2016-11-11T00:00:00', end='2016-12-20T00:00:00', detailed=True, @@ -117,7 +119,7 @@ class TestUsageList(TestUsage): columns, data = self.cmd.take_action(parsed_args) self.projects_mock.list.assert_called_with() - self.sdk_client.usages.assert_has_calls( + self.compute_sdk_client.usages.assert_has_calls( [mock.call(start=mock.ANY, end=mock.ANY, detailed=True)] ) self.assertCountEqual(self.columns, columns) @@ -148,7 +150,7 @@ class TestUsageShow(TestUsage): def setUp(self): super(TestUsageShow, self).setUp() - self.sdk_client.get_usage.return_value = self.usage + self.compute_sdk_client.get_usage.return_value = self.usage self.projects_mock.get.return_value = self.project # Get the command object to test @@ -191,7 +193,7 @@ class TestUsageShow(TestUsage): columns, data = self.cmd.take_action(parsed_args) - self.sdk_client.get_usage.assert_called_with( + self.compute_sdk_client.get_usage.assert_called_with( project=self.project.id, start='2016-11-11T00:00:00', end='2016-12-20T00:00:00', diff --git a/openstackclient/tests/unit/network/test_common.py b/openstackclient/tests/unit/network/test_common.py index edc315a287..40d78e6bc3 100644 --- a/openstackclient/tests/unit/network/test_common.py +++ b/openstackclient/tests/unit/network/test_common.py @@ -138,8 +138,8 @@ class TestNetworkAndCompute(utils.TestCommand): ) self.app.client_manager.compute = mock.Mock() - self.compute = self.app.client_manager.compute - self.compute.compute_action = mock.Mock( + self.compute_client = self.app.client_manager.compute + self.compute_client.compute_action = mock.Mock( return_value='take_action_compute' ) @@ -161,7 +161,7 @@ class TestNetworkAndCompute(utils.TestCommand): self.app.client_manager.network_endpoint_enabled = False parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.compute.compute_action.assert_called_with(parsed_args) + self.compute_client.compute_action.assert_called_with(parsed_args) self.assertEqual('take_action_compute', result) 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 238a2c6b28..1385b09df2 100644 --- a/openstackclient/tests/unit/network/v2/test_floating_ip_compute.py +++ b/openstackclient/tests/unit/network/v2/test_floating_ip_compute.py @@ -29,7 +29,7 @@ class TestFloatingIPCompute(compute_fakes.TestComputev2): super(TestFloatingIPCompute, self).setUp() # Get a shortcut to the compute client - self.compute = self.app.client_manager.compute + self.compute_client = self.app.client_manager.compute @mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_create') @@ -58,7 +58,7 @@ class TestCreateFloatingIPCompute(TestFloatingIPCompute): self.app.client_manager.network_endpoint_enabled = False - # self.compute.floating_ips.create.return_value = self.floating_ip + # self.compute_client.floating_ips.create.return_value = self.floating_ip # Get the command object to test self.cmd = fip.CreateFloatingIP(self.app, None) 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 6c3d4ee796..289a58bedd 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 @@ -25,7 +25,7 @@ class TestFloatingIPPoolCompute(compute_fakes.TestComputev2): super(TestFloatingIPPoolCompute, self).setUp() # Get a shortcut to the compute client - self.compute = self.app.client_manager.compute + self.compute_client = self.app.client_manager.compute @mock.patch('openstackclient.api.compute_v2.APIv2.floating_ip_pool_list') diff --git a/openstackclient/tests/unit/network/v2/test_network_compute.py b/openstackclient/tests/unit/network/v2/test_network_compute.py index ada1d72377..775ee4e91a 100644 --- a/openstackclient/tests/unit/network/v2/test_network_compute.py +++ b/openstackclient/tests/unit/network/v2/test_network_compute.py @@ -28,7 +28,7 @@ class TestNetworkCompute(compute_fakes.TestComputev2): super(TestNetworkCompute, self).setUp() # Get a shortcut to the compute client - self.compute = self.app.client_manager.compute + self.compute_client = self.app.client_manager.compute @mock.patch('openstackclient.api.compute_v2.APIv2.network_create') @@ -182,7 +182,7 @@ class TestDeleteNetworkCompute(TestNetworkCompute): self._networks = compute_fakes.create_networks(count=3) # Return value of utils.find_resource() - self.compute.api.network_find = compute_fakes.get_networks( + self.compute_client.api.network_find = compute_fakes.get_networks( networks=self._networks ) diff --git a/openstackclient/tests/unit/network/v2/test_port.py b/openstackclient/tests/unit/network/v2/test_port.py index c897a1afaa..460a49904a 100644 --- a/openstackclient/tests/unit/network/v2/test_port.py +++ b/openstackclient/tests/unit/network/v2/test_port.py @@ -1200,8 +1200,6 @@ class TestListPort(TestPort): def setUp(self): super(TestListPort, self).setUp() - # Get the command object to test - self.cmd = port.ListPort(self.app, self.namespace) self.network_client.ports = mock.Mock(return_value=self._ports) fake_router = network_fakes.FakeRouter.create_one_router( { @@ -1215,7 +1213,12 @@ class TestListPort(TestPort): ) self.network_client.find_router = mock.Mock(return_value=fake_router) self.network_client.find_network = mock.Mock(return_value=fake_network) + self.app.client_manager.compute = mock.Mock() + self.compute_client = self.app.client_manager.compute + + # Get the command object to test + self.cmd = port.ListPort(self.app, self.namespace) def test_port_list_no_options(self): arglist = [] 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 57defbd3e8..06f5085928 100644 --- a/openstackclient/tests/unit/network/v2/test_security_group_compute.py +++ b/openstackclient/tests/unit/network/v2/test_security_group_compute.py @@ -27,7 +27,7 @@ class TestSecurityGroupCompute(compute_fakes.TestComputev2): super(TestSecurityGroupCompute, self).setUp() # Get a shortcut to the compute client - self.compute = self.app.client_manager.compute + self.compute_client = self.app.client_manager.compute @mock.patch('openstackclient.api.compute_v2.APIv2.security_group_create') @@ -119,7 +119,7 @@ class TestDeleteSecurityGroupCompute(TestSecurityGroupCompute): self.app.client_manager.network_endpoint_enabled = False - self.compute.api.security_group_find = ( + self.compute_client.api.security_group_find = ( compute_fakes.get_security_groups(self._security_groups) ) @@ -279,7 +279,7 @@ class TestSetSecurityGroupCompute(TestSecurityGroupCompute): self.app.client_manager.network_endpoint_enabled = False - self.compute.api.security_group_find = mock.Mock( + self.compute_client.api.security_group_find = mock.Mock( return_value=self._security_group ) 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 2a1609bac5..1fb4831ec4 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 @@ -28,7 +28,7 @@ class TestSecurityGroupRuleCompute(compute_fakes.TestComputev2): super(TestSecurityGroupRuleCompute, self).setUp() # Get a shortcut to the network client - self.compute = self.app.client_manager.compute + self.compute_client = self.app.client_manager.compute @mock.patch('openstackclient.api.compute_v2.APIv2.security_group_rule_create') @@ -59,7 +59,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): self.app.client_manager.network_endpoint_enabled = False - self.compute.api.security_group_find = mock.Mock( + self.compute_client.api.security_group_find = mock.Mock( return_value=self._security_group, ) @@ -168,7 +168,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): columns, data = self.cmd.take_action(parsed_args) # TODO(dtroyer): save this for the security group rule changes - # self.compute.api.security_group_rule_create.assert_called_once_with( + # self.compute_client.api.security_group_rule_create.assert_called_once_with( sgr_mock.assert_called_once_with( security_group_id=self._security_group['id'], ip_protocol=self._security_group_rule['ip_protocol'], @@ -212,7 +212,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): columns, data = self.cmd.take_action(parsed_args) # TODO(dtroyer): save this for the security group rule changes - # self.compute.api.security_group_rule_create.assert_called_once_with( + # self.compute_client.api.security_group_rule_create.assert_called_once_with( sgr_mock.assert_called_once_with( security_group_id=self._security_group['id'], ip_protocol=self._security_group_rule['ip_protocol'], @@ -251,7 +251,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): columns, data = self.cmd.take_action(parsed_args) # TODO(dtroyer): save this for the security group rule changes - # self.compute.api.security_group_rule_create.assert_called_once_with( + # self.compute_client.api.security_group_rule_create.assert_called_once_with( sgr_mock.assert_called_once_with( security_group_id=self._security_group['id'], ip_protocol=self._security_group_rule['ip_protocol'], @@ -291,7 +291,7 @@ class TestCreateSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): columns, data = self.cmd.take_action(parsed_args) # TODO(dtroyer): save this for the security group rule changes - # self.compute.api.security_group_rule_create.assert_called_once_with( + # self.compute_client.api.security_group_rule_create.assert_called_once_with( sgr_mock.assert_called_once_with( security_group_id=self._security_group['id'], ip_protocol=self._security_group_rule['ip_protocol'], @@ -440,10 +440,10 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): self.app.client_manager.network_endpoint_enabled = False - self.compute.api.security_group_find = mock.Mock( + self.compute_client.api.security_group_find = mock.Mock( return_value=self._security_group, ) - self.compute.api.security_group_list = mock.Mock( + self.compute_client.api.security_group_list = mock.Mock( return_value=[self._security_group], ) @@ -454,7 +454,7 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): parsed_args = self.check_parser(self.cmd, [], []) columns, data = self.cmd.take_action(parsed_args) - self.compute.api.security_group_list.assert_called_once_with( + self.compute_client.api.security_group_list.assert_called_once_with( search_opts={'all_tenants': False} ) self.assertEqual(self.expected_columns_no_group, columns) @@ -470,7 +470,7 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute.api.security_group_find.assert_called_once_with( + self.compute_client.api.security_group_find.assert_called_once_with( self._security_group['id'] ) self.assertEqual(self.expected_columns_with_group, columns) @@ -486,7 +486,7 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute.api.security_group_list.assert_called_once_with( + self.compute_client.api.security_group_list.assert_called_once_with( search_opts={'all_tenants': True} ) self.assertEqual(self.expected_columns_no_group, columns) @@ -502,7 +502,7 @@ class TestListSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.compute.api.security_group_list.assert_called_once_with( + self.compute_client.api.security_group_list.assert_called_once_with( search_opts={'all_tenants': False} ) self.assertEqual(self.expected_columns_no_group, columns) @@ -525,7 +525,7 @@ class TestShowSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): # Build a security group fake customized for this test. security_group_rules = [self._security_group_rule] security_group = {'rules': security_group_rules} - self.compute.api.security_group_list = mock.Mock( + self.compute_client.api.security_group_list = mock.Mock( return_value=[security_group], ) @@ -548,6 +548,6 @@ class TestShowSecurityGroupRuleCompute(TestSecurityGroupRuleCompute): columns, data = self.cmd.take_action(parsed_args) - self.compute.api.security_group_list.assert_called_once_with() + self.compute_client.api.security_group_list.assert_called_once_with() 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 ea8f545663..dcd8b11f31 100644 --- a/openstackclient/tests/unit/volume/v3/fakes.py +++ b/openstackclient/tests/unit/volume/v3/fakes.py @@ -89,10 +89,12 @@ class TestVolume(FakeClientMixin, utils.TestCommand): self.app.client_manager.identity = identity_fakes.FakeIdentityv3Client( endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN ) + self.app.client_manager.compute = compute_fakes.FakeComputev2Client( endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN, ) + self.compute_client = self.app.client_manager.compute # TODO(stephenfin): Check if the responses are actually the same diff --git a/openstackclient/tests/unit/volume/v3/test_volume_attachment.py b/openstackclient/tests/unit/volume/v3/test_volume_attachment.py index 3655c8bfb1..c6fbbe58a0 100644 --- a/openstackclient/tests/unit/volume/v3/test_volume_attachment.py +++ b/openstackclient/tests/unit/volume/v3/test_volume_attachment.py @@ -33,7 +33,8 @@ class TestVolumeAttachment(volume_fakes.TestVolume): self.projects_mock = self.app.client_manager.identity.projects self.projects_mock.reset_mock() - self.servers_mock = self.app.client_manager.compute.servers + self.compute_client = self.app.client_manager.compute + self.servers_mock = self.compute_client.servers self.servers_mock.reset_mock()