Merge "tests: Use consistent shortcut to fake compute client"

Author: Zuul

openstackclient/compute/v2/server.py

@@ -1575,8 +1575,8 @@ def _match_image(image_api, wanted_properties):
         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)
 
@@ -4964,8 +4964,8 @@ def take_action(self, parsed_args):
         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(

openstackclient/tests/unit/common/test_availability_zone.py

@@ -87,8 +87,10 @@ def setUp(self):
         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 @@ def test_availability_zone_list_no_options(self):
         # 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 @@ def test_availability_zone_list_long(self):
         # 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 @@ def test_availability_zone_list_compute(self):
         # 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 @@ def test_availability_zone_list_volume(self):
         # 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 @@ def test_availability_zone_list_network(self):
         # 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()
 

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']

openstackclient/tests/unit/common/test_quota.py

@@ -48,11 +48,10 @@ def setUp(self):
         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 @@ def setUp(self):
             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 @@ def test_quota_list_details_compute(self):
             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 @@ def test_quota_list_details_volume(self):
 
     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 @@ def test_quota_list_compute(self):
 
     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 @@ def test_quota_list_compute_default(self):
 
     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 @@ def test_quota_list_compute_no_project_not_found(self):
 
     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 @@ def test_quota_list_compute_no_project_4xx(self):
 
     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 @@ def test_quota_list_compute_no_project_5xx(self):
 
     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,
         )
 

openstackclient/tests/unit/compute/v2/fakes.py

@@ -161,8 +161,9 @@ def setUp(self):
             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,
         )

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()