python-openstackclient 6.3.0__py3-none-any.whl → 6.5.0__py3-none-any.whl

openstackclient/tests/functional/network/v2/test_subnet_pool.py

@@ -21,12 +21,6 @@ class SubnetPoolTests(common.NetworkTagTests):
 
     base_command = 'subnet pool'
 
-    def setUp(self):
-        super(SubnetPoolTests, self).setUp()
-        # Nothing in this class works with Nova Network
-        if not self.haz_network:
-            self.skipTest("No Network service present")
-
     def test_subnet_pool_create_delete(self):
         """Test create, delete"""
         name1 = uuid.uuid4().hex

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(network_fakes.FakeClientMixin, utils.TestCommand):
-    def setUp(self):
-        super().setUp()
-
-        self.app.client_manager.sdk_connection = mock.Mock()
-
-        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.app.client_manager.sdk_connection.volume = mock.Mock()
-        self.volume_client = self.app.client_manager.sdk_connection.volume
-        self.volume_client.availability_zones = mock.Mock()
-
-
-class TestAvailabilityZoneList(TestAvailabilityZone):
+class TestAvailabilityZoneList(
+    network_fakes.FakeClientMixin,
+    volume_fakes.FakeClientMixin,
+    compute_fakes.FakeClientMixin,
+    utils.TestCommand,
+):
     compute_azs = compute_fakes.create_availability_zones()
     volume_azs = volume_fakes.create_availability_zones(count=1)
     network_azs = network_fakes.create_availability_zones()
@@ -111,8 +99,12 @@ class TestAvailabilityZoneList(TestAvailabilityZone):
     def setUp(self):
         super().setUp()
 
-        self.compute_client.availability_zones.return_value = self.compute_azs
-        self.volume_client.availability_zones.return_value = self.volume_azs
+        self.compute_sdk_client.availability_zones.return_value = (
+            self.compute_azs
+        )
+        self.volume_sdk_client.availability_zones.return_value = (
+            self.volume_azs
+        )
         self.network_client.availability_zones.return_value = self.network_azs
 
         # Get the command object to test
@@ -128,8 +120,10 @@ 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.volume_client.availability_zones.assert_called_with()
+        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()
 
         self.assertEqual(self.short_columnslist, columns)
@@ -156,8 +150,10 @@ 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.volume_client.availability_zones.assert_called_with()
+        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()
 
         self.assertEqual(self.long_columnslist, columns)
@@ -190,8 +186,10 @@ 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.volume_client.availability_zones.assert_not_called()
+        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()
 
         self.assertEqual(self.short_columnslist, columns)
@@ -214,8 +212,8 @@ 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.volume_client.availability_zones.assert_called_with()
+        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()
 
         self.assertEqual(self.short_columnslist, columns)
@@ -238,8 +236,8 @@ 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.volume_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()
 
         self.assertEqual(self.short_columnslist, columns)

openstackclient/tests/unit/common/test_extension.py

@@ -34,12 +34,9 @@ class TestExtension(network_fakes.FakeClientMixin, utils.TestCommand):
         self.identity_extensions_mock = identity_client.extensions
         self.identity_extensions_mock.reset_mock()
 
-        sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection = sdk_connection
-
+        sdk_connection = self.app.client_manager.sdk_connection
         self.compute_extensions_mock = sdk_connection.compute.extensions
         self.compute_extensions_mock.reset_mock()
-
         self.volume_extensions_mock = sdk_connection.volume.extensions
         self.volume_extensions_mock.reset_mock()
 

openstackclient/tests/unit/common/test_limits.py

@@ -27,10 +27,9 @@ 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.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']
@@ -74,10 +73,9 @@ class TestVolumeLimits(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
         self.app.client_manager.compute_endpoint_enabled = False
-        self.volume = self.app.client_manager.volume
 
         self.fake_limits = volume_fakes.FakeLimits()
-        self.volume.limits.get.return_value = self.fake_limits
+        self.volume_client.limits.get.return_value = self.fake_limits
 
     def test_volume_show_absolute(self):
         arglist = ['--absolute']

openstackclient/tests/unit/common/test_project_cleanup.py

@@ -15,17 +15,10 @@ from unittest import mock
 
 from openstackclient.common import project_cleanup
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
-from openstackclient.tests.unit import utils as tests_utils
+from openstackclient.tests.unit import utils as test_utils
 
 
-class TestProjectCleanupBase(tests_utils.TestCommand):
-    def setUp(self):
-        super(TestProjectCleanupBase, self).setUp()
-
-        self.app.client_manager.sdk_connection = mock.Mock()
-
-
-class TestProjectCleanup(TestProjectCleanupBase):
+class TestProjectCleanup(test_utils.TestCommand):
     project = identity_fakes.FakeProject.create_one_project()
 
     def setUp(self):
@@ -51,7 +44,7 @@ class TestProjectCleanup(TestProjectCleanupBase):
         verifylist = []
 
         self.assertRaises(
-            tests_utils.ParserException,
+            test_utils.ParserException,
             self.check_parser,
             self.cmd,
             arglist,

openstackclient/tests/unit/common/test_quota.py

@@ -48,18 +48,14 @@ 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_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.app.client_manager.volume.quotas
+        self.volume_quotas_mock = self.volume_client.quotas
         self.volume_quotas_mock.reset_mock()
-        self.volume_quotas_class_mock = (
-            self.app.client_manager.volume.quota_classes
-        )
+        self.volume_quotas_class_mock = self.volume_client.quota_classes
         self.volume_quotas_class_mock.reset_mock()
 
         self.app.client_manager.auth_ref = mock.Mock()
@@ -127,8 +123,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,
         )
 
@@ -180,8 +175,7 @@ class TestQuotaList(TestQuota):
             volume_fakes.create_one_default_vol_quota(),
             volume_fakes.create_one_default_vol_quota(),
         ]
-        self.volume = self.app.client_manager.volume
-        self.volume.quotas.defaults = mock.Mock(
+        self.volume_client.quotas.defaults = mock.Mock(
             side_effect=self.volume_default_quotas,
         )
 
@@ -224,7 +218,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',
@@ -288,7 +282,7 @@ class TestQuotaList(TestQuota):
             detailed_quota
         )
 
-        self.volume.quotas.get = mock.Mock(return_value=detailed_quota)
+        self.volume_client.quotas.get = mock.Mock(return_value=detailed_quota)
 
         arglist = [
             '--detail',
@@ -308,7 +302,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,
         )
 
@@ -329,7 +323,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(),
@@ -353,7 +347,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"),
@@ -377,7 +371,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"),
@@ -401,7 +395,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??"),
@@ -424,7 +418,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,
         )
 
@@ -541,7 +535,7 @@ class TestQuotaList(TestQuota):
 
     def test_quota_list_volume(self):
         # Two projects with non-default quotas
-        self.volume.quotas.get = mock.Mock(
+        self.volume_client.quotas.get = mock.Mock(
             side_effect=self.volume_quotas,
         )
 
@@ -562,7 +556,7 @@ class TestQuotaList(TestQuota):
 
     def test_quota_list_volume_default(self):
         # Two projects with non-default quotas
-        self.volume.quotas.get = mock.Mock(
+        self.volume_client.quotas.get = mock.Mock(
             side_effect=[
                 self.volume_quotas[0],
                 volume_fakes.create_one_default_vol_quota(),
@@ -586,7 +580,7 @@ class TestQuotaList(TestQuota):
 
     def test_quota_list_volume_no_project(self):
         # Two projects with non-default quotas
-        self.volume.quotas.get = mock.Mock(
+        self.volume_client.quotas.get = mock.Mock(
             side_effect=[
                 self.volume_quotas[0],
                 volume_fakes.create_one_default_vol_quota(),
@@ -610,7 +604,7 @@ class TestQuotaList(TestQuota):
 
     def test_quota_list_volume_by_project(self):
         # Two projects with non-default quotas
-        self.volume.quotas.get = mock.Mock(
+        self.volume_client.quotas.get = mock.Mock(
             side_effect=self.volume_quotas,
         )
 

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

@@ -19,6 +19,7 @@ from unittest import mock
 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
@@ -41,7 +42,7 @@ 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
+from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 
 floating_ip_num = 100
 fix_ip_num = 100
@@ -148,11 +149,7 @@ class FakeComputev2Client(object):
         self.api_version = api_versions.APIVersion('2.1')
 
 
-class TestComputev2(
-    network_fakes.FakeClientMixin,
-    image_fakes.FakeClientMixin,
-    utils.TestCommand,
-):
+class FakeClientMixin:
     def setUp(self):
         super().setUp()
 
@@ -160,18 +157,34 @@ 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,
         )
 
-        self.app.client_manager.identity = identity_fakes.FakeIdentityv2Client(
-            endpoint=fakes.AUTH_URL,
-            token=fakes.AUTH_TOKEN,
+        # 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
+        )
+
 
-        self.app.client_manager.volume = volume_fakes.FakeVolumeClient(
+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_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()