tests: Add compute v2 FakeClientMixin

This ensures we are speccing the compute proxy API.

Change-Id: I7adbf2666d71f222fbd9c1479216f72cb9893348
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/tests/unit/common/test_availability_zone.py

@@ -10,8 +10,6 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from unittest import mock
-
 from openstackclient.common import availability_zone
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
@@ -78,22 +76,12 @@ def _build_network_az_datalist(network_az, long_datalist=False):
     return (datalist,)
 
 
-class TestAvailabilityZone(
+class TestAvailabilityZoneList(
     network_fakes.FakeClientMixin,
     volume_fakes.FakeClientMixin,
+    compute_fakes.FakeClientMixin,
     utils.TestCommand,
 ):
-    def setUp(self):
-        super().setUp()
-
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.compute_sdk_client = (
-            self.app.client_manager.sdk_connection.compute
-        )
-        self.compute_sdk_client.availability_zones = mock.Mock()
-
-
-class TestAvailabilityZoneList(TestAvailabilityZone):
     compute_azs = compute_fakes.create_availability_zones()
     volume_azs = volume_fakes.create_availability_zones(count=1)
     network_azs = network_fakes.create_availability_zones()

openstackclient/tests/unit/common/test_limits.py

@@ -27,7 +27,6 @@ class TestComputeLimits(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
         self.app.client_manager.volume_endpoint_enabled = False
-        self.compute_client = self.app.client_manager.compute
 
         self.fake_limits = compute_fakes.FakeLimits()
         self.compute_client.limits.get.return_value = self.fake_limits

openstackclient/tests/unit/common/test_quota.py

@@ -48,7 +48,6 @@ def setUp(self):
         self.projects_mock.reset_mock()
         self.projects_mock.get.return_value = self.projects[0]
 
-        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.compute_client.quota_classes

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

@@ -19,6 +19,7 @@
 import uuid
 
 from novaclient import api_versions
+from openstack.compute.v2 import _proxy
 from openstack.compute.v2 import aggregate as _aggregate
 from openstack.compute.v2 import availability_zone as _availability_zone
 from openstack.compute.v2 import extension as _extension
@@ -148,12 +149,7 @@ def __init__(self, **kwargs):
         self.api_version = api_versions.APIVersion('2.1')
 
 
-class TestComputev2(
-    network_fakes.FakeClientMixin,
-    image_fakes.FakeClientMixin,
-    volume_fakes.FakeClientMixin,
-    utils.TestCommand,
-):
+class FakeClientMixin:
     def setUp(self):
         super().setUp()
 
@@ -168,6 +164,26 @@ def setUp(self):
             endpoint=fakes.AUTH_URL,
         )
 
+        # TODO(stephenfin): Rename to 'compute_client' once all commands are
+        # migrated to SDK
+        self.app.client_manager.sdk_connection.compute = mock.Mock(
+            _proxy.Proxy
+        )
+        self.compute_sdk_client = (
+            self.app.client_manager.sdk_connection.compute
+        )
+
+
+class TestComputev2(
+    network_fakes.FakeClientMixin,
+    image_fakes.FakeClientMixin,
+    volume_fakes.FakeClientMixin,
+    FakeClientMixin,
+    utils.TestCommand,
+):
+    def setUp(self):
+        super().setUp()
+
         self.app.client_manager.identity = identity_fakes.FakeIdentityv2Client(
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,

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

@@ -55,23 +55,6 @@ class TestAggregate(compute_fakes.TestComputev2):
         fake_ag.uuid,
     )
 
-    def setUp(self):
-        super(TestAggregate, self).setUp()
-
-        # Get a shortcut to the AggregateManager Mock
-        self.app.client_manager.sdk_connection.compute = 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):

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

@@ -20,20 +20,7 @@
 from openstackclient.tests.unit import utils
 
 
-class TestConsole(compute_fakes.TestComputev2):
-    def setUp(self):
-        super(TestConsole, self).setUp()
-
-        # SDK mock
-        self.app.client_manager.sdk_connection.compute = 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):
+class TestConsoleLog(compute_fakes.TestComputev2):
     _server = compute_fakes.create_one_server()
 
     def setUp(self):
@@ -89,7 +76,7 @@ def test_show_lines(self):
         )
 
 
-class TestConsoleUrlShow(TestConsole):
+class TestConsoleUrlShow(compute_fakes.TestComputev2):
     _server = compute_fakes.create_one_server()
 
     def setUp(self):

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

@@ -30,25 +30,6 @@ class TestFlavor(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestFlavor, self).setUp()
 
-        # SDK mock
-        self.app.client_manager.sdk_connection.compute = 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()
 
@@ -1193,7 +1174,7 @@ def test_flavor_unset_project(self):
             self.flavor.id,
             self.project.id,
         )
-        self.compute_sdk_client.delete_flavor_extra_specs_proerty.assert_not_called()
+        self.compute_sdk_client.delete_flavor_extra_specs_property.assert_not_called()
         self.assertIsNone(result)
 
     def test_flavor_unset_no_project(self):

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

@@ -21,20 +21,8 @@
 from openstackclient.tests.unit import utils as tests_utils
 
 
-class TestHost(compute_fakes.TestComputev2):
-    def setUp(self):
-        super(TestHost, self).setUp()
-
-        # Get a shortcut to the compute client
-        self.app.client_manager.sdk_connection.compute = 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')
-class TestHostList(TestHost):
+class TestHostList(compute_fakes.TestComputev2):
     _host = compute_fakes.create_one_host()
 
     def setUp(self):
@@ -93,7 +81,7 @@ def test_host_list_with_option(self, h_mock):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.host_set')
-class TestHostSet(TestHost):
+class TestHostSet(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestHostSet, self).setUp()
 
@@ -143,7 +131,7 @@ def test_host_set(self, h_mock):
 
 
 @mock.patch('openstackclient.api.compute_v2.APIv2.host_show')
-class TestHostShow(TestHost):
+class TestHostShow(compute_fakes.TestComputev2):
     _host = compute_fakes.create_one_host()
 
     def setUp(self):

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

@@ -25,18 +25,7 @@
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestHypervisor(compute_fakes.TestComputev2):
-    def setUp(self):
-        super().setUp()
-
-        # Create and get a shortcut to the compute client mock
-        self.compute_sdk_client = (
-            self.app.client_manager.sdk_connection.compute
-        )
-        self.compute_sdk_client.reset_mock()
-
-
-class TestHypervisorList(TestHypervisor):
+class TestHypervisorList(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
@@ -294,7 +283,7 @@ def test_hypervisor_list_with_marker_pre_v233(self, sm_mock):
         )
 
 
-class TestHypervisorShow(TestHypervisor):
+class TestHypervisorShow(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 

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

@@ -23,11 +23,6 @@ class TestHypervisorStats(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestHypervisorStats, self).setUp()
 
-        # Get a shortcut to the compute client hypervisors mock
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.compute_sdk_client = (
-            self.app.client_manager.sdk_connection.compute
-        )
         self.compute_sdk_client.get = mock.Mock()