tests: Add network v2 FakeClientMixin

This ensures we are speccing the network proxy API. Future changes will
do the same for the image proxy API and eventually the compute proxy API
(once everything has been converted).

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

Author: stephenfin

openstackclient/tests/unit/common/test_availability_zone.py

@@ -9,7 +9,6 @@
 #   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
 
@@ -79,7 +78,7 @@ def _build_network_az_datalist(network_az, long_datalist=False):
     return (datalist,)
 
 
-class TestAvailabilityZone(utils.TestCommand):
+class TestAvailabilityZone(network_fakes.FakeClientMixin, utils.TestCommand):
     def setUp(self):
         super().setUp()
 
@@ -93,11 +92,6 @@ def setUp(self):
         self.volume_client = self.app.client_manager.sdk_connection.volume
         self.volume_client.availability_zones = mock.Mock()
 
-        self.app.client_manager.network = mock.Mock()
-        self.network_client = self.app.client_manager.network
-        self.network_client.availability_zones = mock.Mock()
-        self.network_client.find_extension = mock.Mock()
-
 
 class TestAvailabilityZoneList(TestAvailabilityZone):
     compute_azs = compute_fakes.create_availability_zones()

openstackclient/tests/unit/common/test_extension.py

@@ -9,7 +9,6 @@
 #   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
 
@@ -23,7 +22,7 @@
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 
 
-class TestExtension(utils.TestCommand):
+class TestExtension(network_fakes.FakeClientMixin, utils.TestCommand):
     def setUp(self):
         super().setUp()
 
@@ -44,9 +43,6 @@ def setUp(self):
         self.volume_extensions_mock = sdk_connection.volume.extensions
         self.volume_extensions_mock.reset_mock()
 
-        self.app.client_manager.network = mock.Mock()
-        self.network_client = self.app.client_manager.network
-
 
 class TestExtensionList(TestExtension):
     columns = ('Name', 'Alias', 'Description')

openstackclient/tests/unit/common/test_quota.py

@@ -62,9 +62,6 @@ def setUp(self):
         )
         self.volume_quotas_class_mock.reset_mock()
 
-        self.app.client_manager.network = mock.Mock()
-        self.network_client = self.app.client_manager.network
-
         self.app.client_manager.auth_ref = mock.Mock()
         self.app.client_manager.auth_ref.service_catalog = mock.Mock()
         self.service_catalog_mock = (
@@ -662,8 +659,6 @@ def setUp(self):
             loaded=True,
         )
 
-        self.network_client.update_quota = mock.Mock()
-
         self.cmd = quota.SetQuota(self.app, None)
 
     def test_quota_set(self):
@@ -1321,8 +1316,6 @@ class TestQuotaDelete(TestQuota):
     def setUp(self):
         super().setUp()
 
-        self.network_client.delete_quota = mock.Mock()
-
         self.cmd = quota.DeleteQuota(self.app, None)
 
     def test_delete(self):

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

@@ -39,6 +39,7 @@
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
+from openstackclient.tests.unit.network.v2 import fakes as network_fakes
 from openstackclient.tests.unit import utils
 from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes
 
@@ -147,7 +148,7 @@ def __init__(self, **kwargs):
         self.api_version = api_versions.APIVersion('2.1')
 
 
-class TestComputev2(utils.TestCommand):
+class TestComputev2(network_fakes.FakeClientMixin, utils.TestCommand):
     def setUp(self):
         super().setUp()
 
@@ -171,8 +172,6 @@ def setUp(self):
             token=fakes.AUTH_TOKEN,
         )
 
-        self.app.client_manager.network = mock.Mock()
-
         self.app.client_manager.volume = volume_fakes.FakeVolumeClient(
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,

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

@@ -113,9 +113,6 @@ def setUp(self):
         self.snapshots_mock = self.app.client_manager.volume.volume_snapshots
         self.snapshots_mock.reset_mock()
 
-        self.app.client_manager.network = mock.Mock()
-        self.network_client = self.app.client_manager.network
-
         # Set object attributes to be tested. Could be overwritten in subclass.
         self.attrs = {}
 
@@ -523,7 +520,7 @@ class TestServerAddFloatingIPNetwork(
     network_fakes.TestNetworkV2,
 ):
     def setUp(self):
-        super(TestServerAddFloatingIPNetwork, self).setUp()
+        super().setUp()
 
         self.network_client.update_ip = mock.Mock(return_value=None)
 
@@ -7253,10 +7250,8 @@ def test_server_remove_floating_ip(self, fip_mock):
 
 class TestServerRemoveFloatingIPNetwork(network_fakes.TestNetworkV2):
     def setUp(self):
-        super(TestServerRemoveFloatingIPNetwork, self).setUp()
+        super().setUp()
 
-        self.app.client_manager.network = mock.Mock()
-        self.network_client = self.app.client_manager.network
         self.network_client.update_ip = mock.Mock(return_value=None)
 
         # Get the command object to test

openstackclient/tests/unit/network/test_common.py

@@ -124,25 +124,25 @@ def take_action(self, parsed_args):
 
 class TestNetworkAndCompute(utils.TestCommand):
     def setUp(self):
-        super(TestNetworkAndCompute, self).setUp()
+        super().setUp()
 
         self.namespace = argparse.Namespace()
 
-        # Create network client mocks.
+        # Create client mocks. Note that we intentionally do not use specced
+        # mocks since we want to test fake methods.
+
         self.app.client_manager.network = mock.Mock()
         self.network_client = self.app.client_manager.network
         self.network_client.network_action = mock.Mock(
             return_value='take_action_network'
         )
 
-        # Create compute client mocks.
         self.app.client_manager.compute = mock.Mock()
         self.compute = self.app.client_manager.compute
         self.compute.compute_action = mock.Mock(
             return_value='take_action_compute'
         )
 
-        # Subclasses can override the command object to test.
         self.cmd = FakeNetworkAndComputeCommand(self.app, self.namespace)
 
     def test_take_action_network(self):
@@ -209,6 +209,9 @@ def setUp(self):
 
         self.namespace = argparse.Namespace()
 
+        # Create client mocks. Note that we intentionally do not use specced
+        # mocks since we want to test fake methods.
+
         self.app.client_manager.network = mock.Mock()
         self.network_client = self.app.client_manager.network
         self.network_client.test_create_action = mock.Mock()

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

@@ -9,7 +9,6 @@
 #   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 argparse
 import copy
@@ -18,6 +17,7 @@
 from unittest import mock
 import uuid
 
+from openstack.network.v2 import _proxy
 from openstack.network.v2 import address_group as _address_group
 from openstack.network.v2 import address_scope as _address_scope
 from openstack.network.v2 import agent as network_agent
@@ -93,14 +93,19 @@
 ]
 
 
-class TestNetworkV2(utils.TestCommand):
+class FakeClientMixin:
     def setUp(self):
         super().setUp()
 
-        self.namespace = argparse.Namespace()
+        self.app.client_manager.network = mock.Mock(spec=_proxy.Proxy)
+        self.network_client = self.app.client_manager.network
 
-        self.app.client_manager.session = mock.Mock()
-        self.app.client_manager.network = mock.Mock()
+
+class TestNetworkV2(FakeClientMixin, utils.TestCommand):
+    def setUp(self):
+        super().setUp()
+
+        self.namespace = argparse.Namespace()
 
         self.app.client_manager.identity = (
             identity_fakes_v3.FakeIdentityv3Client(

openstackclient/tests/unit/network/v2/test_address_group.py

@@ -26,8 +26,6 @@ class TestAddressGroup(network_fakes.TestNetworkV2):
     def setUp(self):
         super(TestAddressGroup, self).setUp()
 
-        # Get a shortcut to the network client
-        self.network_client = self.app.client_manager.network
         # Get a shortcut to the ProjectManager Mock
         self.projects_mock = self.app.client_manager.identity.projects
         # Get a shortcut to the DomainManager Mock

openstackclient/tests/unit/network/v2/test_address_scope.py

@@ -26,8 +26,6 @@ class TestAddressScope(network_fakes.TestNetworkV2):
     def setUp(self):
         super(TestAddressScope, self).setUp()
 
-        # Get a shortcut to the network client
-        self.network_client = self.app.client_manager.network
         # Get a shortcut to the ProjectManager Mock
         self.projects_mock = self.app.client_manager.identity.projects
         # Get a shortcut to the DomainManager Mock

openstackclient/tests/unit/network/v2/test_floating_ip_network.py

@@ -22,15 +22,10 @@
 from openstackclient.tests.unit import utils as tests_utils
 
 
-# Tests for Neutron network
-
-
 class TestFloatingIPNetwork(network_fakes.TestNetworkV2):
     def setUp(self):
         super(TestFloatingIPNetwork, self).setUp()
 
-        # Get a shortcut to the network client
-        self.network_client = self.app.client_manager.network
         # Get a shortcut to the ProjectManager Mock
         self.projects_mock = self.app.client_manager.identity.projects
         # Get a shortcut to the DomainManager Mock
@@ -308,7 +303,6 @@ class TestDeleteFloatingIPNetwork(TestFloatingIPNetwork):
     def setUp(self):
         super(TestDeleteFloatingIPNetwork, self).setUp()
 
-        self.network_client.find_ip = mock.Mock()
         self.network_client.delete_ip = mock.Mock(return_value=None)
 
         # Get the command object to test