python-openstackclient 6.6.0__py3-none-any.whl → 7.0.0__py3-none-any.whl

openstackclient/tests/unit/volume/v3/test_block_storage_cluster.py

@@ -10,7 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from cinderclient import api_versions
 from osc_lib import exceptions
 
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
@@ -41,7 +40,7 @@ class TestBlockStorageClusterList(TestBlockStorageCluster):
         )
 
     def test_cluster_list(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.7')
+        self.set_volume_api_version('3.7')
 
         arglist = []
         verifylist = [
@@ -82,7 +81,7 @@ class TestBlockStorageClusterList(TestBlockStorageCluster):
         )
 
     def test_cluster_list_with_full_options(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.7')
+        self.set_volume_api_version('3.7')
 
         arglist = [
             '--cluster',
@@ -152,7 +151,7 @@ class TestBlockStorageClusterList(TestBlockStorageCluster):
         )
 
     def test_cluster_list_pre_v37(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.6')
+        self.set_volume_api_version('3.6')
 
         arglist = []
         verifylist = [
@@ -215,7 +214,7 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster):
         self.cmd = block_storage_cluster.SetBlockStorageCluster(self.app, None)
 
     def test_cluster_set(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.7')
+        self.set_volume_api_version('3.7')
 
         arglist = [
             '--enable',
@@ -242,7 +241,7 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster):
         )
 
     def test_cluster_set_disable_with_reason(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.7')
+        self.set_volume_api_version('3.7')
 
         arglist = [
             '--binary',
@@ -272,7 +271,7 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster):
         )
 
     def test_cluster_set_only_with_disable_reason(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.7')
+        self.set_volume_api_version('3.7')
 
         arglist = [
             '--disable-reason',
@@ -295,7 +294,7 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster):
         )
 
     def test_cluster_set_enable_with_disable_reason(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.7')
+        self.set_volume_api_version('3.7')
 
         arglist = [
             '--enable',
@@ -319,7 +318,7 @@ class TestBlockStorageClusterSet(TestBlockStorageCluster):
         )
 
     def test_cluster_set_pre_v37(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.6')
+        self.set_volume_api_version('3.6')
 
         arglist = [
             '--enable',
@@ -385,7 +384,7 @@ class TestBlockStorageClusterShow(TestBlockStorageCluster):
         )
 
     def test_cluster_show(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.7')
+        self.set_volume_api_version('3.7')
 
         arglist = [
             '--binary',
@@ -409,7 +408,7 @@ class TestBlockStorageClusterShow(TestBlockStorageCluster):
         )
 
     def test_cluster_show_pre_v37(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.6')
+        self.set_volume_api_version('3.6')
 
         arglist = [
             '--binary',

openstackclient/tests/unit/volume/v3/test_block_storage_log_level.py

@@ -12,7 +12,6 @@
 #   under the License.
 #
 
-from cinderclient import api_versions
 import ddt
 from osc_lib import exceptions
 
@@ -42,7 +41,8 @@ class TestBlockStorageLogLevelList(TestService):
         self.cmd = service.BlockStorageLogLevelList(self.app, None)
 
     def test_block_storage_log_level_list(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.32')
+        self.set_volume_api_version('3.32')
+
         arglist = [
             '--host',
             self.service_log.host,
@@ -113,7 +113,8 @@ class TestBlockStorageLogLevelList(TestService):
         )
 
     def test_block_storage_log_level_list_invalid_service_name(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.32')
+        self.set_volume_api_version('3.32')
+
         arglist = [
             '--host',
             self.service_log.host,
@@ -148,7 +149,8 @@ class TestBlockStorageLogLevelSet(TestService):
         self.cmd = service.BlockStorageLogLevelSet(self.app, None)
 
     def test_block_storage_log_level_set(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.32')
+        self.set_volume_api_version('3.32')
+
         arglist = [
             'ERROR',
             '--host',
@@ -202,7 +204,8 @@ class TestBlockStorageLogLevelSet(TestService):
         )
 
     def test_block_storage_log_level_set_invalid_service_name(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.32')
+        self.set_volume_api_version('3.32')
+
         arglist = [
             'ERROR',
             '--host',
@@ -229,7 +232,8 @@ class TestBlockStorageLogLevelSet(TestService):
 
     @ddt.data('WARNING', 'info', 'Error', 'debuG', 'fake-log-level')
     def test_block_storage_log_level_set_log_level(self, log_level):
-        self.volume_client.api_version = api_versions.APIVersion('3.32')
+        self.set_volume_api_version('3.32')
+
         arglist = [
             log_level,
             '--host',

openstackclient/tests/unit/volume/v3/test_block_storage_manage.py

@@ -12,16 +12,14 @@
 
 from unittest import mock
 
-from cinderclient import api_versions
 from osc_lib import exceptions
 
 from openstackclient.tests.unit import utils as tests_utils
-from openstackclient.tests.unit.volume.v2 import fakes as v2_volume_fakes
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 from openstackclient.volume.v3 import block_storage_manage
 
 
-class TestBlockStorageManage(v2_volume_fakes.TestVolume):
+class TestBlockStorageManage(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
@@ -47,7 +45,8 @@ class TestBlockStorageVolumeManage(TestBlockStorageManage):
         )
 
     def test_block_storage_volume_manage_list(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.8')
+        self.set_volume_api_version('3.8')
+
         arglist = [
             'fake_host',
         ]
@@ -88,6 +87,8 @@ class TestBlockStorageVolumeManage(TestBlockStorageManage):
         )
 
     def test_block_storage_volume_manage_list__pre_v38(self):
+        self.set_volume_api_version('3.7')
+
         arglist = [
             'fake_host',
         ]
@@ -104,7 +105,8 @@ class TestBlockStorageVolumeManage(TestBlockStorageManage):
         )
 
     def test_block_storage_volume_manage_list__pre_v317(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.16')
+        self.set_volume_api_version('3.16')
+
         arglist = [
             '--cluster',
             'fake_cluster',
@@ -123,7 +125,8 @@ class TestBlockStorageVolumeManage(TestBlockStorageManage):
         self.assertIn('--cluster', str(exc))
 
     def test_block_storage_volume_manage_list__host_and_cluster(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.17')
+        self.set_volume_api_version('3.17')
+
         arglist = [
             'fake_host',
             '--cluster',
@@ -146,7 +149,8 @@ class TestBlockStorageVolumeManage(TestBlockStorageManage):
 
     def test_block_storage_volume_manage_list__detailed(self):
         """This option is deprecated."""
-        self.volume_client.api_version = api_versions.APIVersion('3.8')
+        self.set_volume_api_version('3.8')
+
         arglist = [
             '--detailed',
             'True',
@@ -206,9 +210,8 @@ class TestBlockStorageVolumeManage(TestBlockStorageManage):
         )
 
     def test_block_storage_volume_manage_list__all_args(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.8'
-        )
+        self.set_volume_api_version('3.8')
+
         arglist = [
             'fake_host',
             '--long',
@@ -286,7 +289,8 @@ class TestBlockStorageSnapshotManage(TestBlockStorageManage):
         )
 
     def test_block_storage_snapshot_manage_list(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.8')
+        self.set_volume_api_version('3.8')
+
         arglist = [
             'fake_host',
         ]
@@ -329,6 +333,8 @@ class TestBlockStorageSnapshotManage(TestBlockStorageManage):
         )
 
     def test_block_storage_snapshot_manage_list__pre_v38(self):
+        self.set_volume_api_version('3.7')
+
         arglist = [
             'fake_host',
         ]
@@ -345,7 +351,8 @@ class TestBlockStorageSnapshotManage(TestBlockStorageManage):
         )
 
     def test_block_storage_snapshot_manage_list__pre_v317(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.16')
+        self.set_volume_api_version('3.16')
+
         arglist = [
             '--cluster',
             'fake_cluster',
@@ -364,7 +371,8 @@ class TestBlockStorageSnapshotManage(TestBlockStorageManage):
         self.assertIn('--cluster', str(exc))
 
     def test_block_storage_snapshot_manage_list__host_and_cluster(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.17')
+        self.set_volume_api_version('3.17')
+
         arglist = [
             'fake_host',
             '--cluster',
@@ -386,7 +394,8 @@ class TestBlockStorageSnapshotManage(TestBlockStorageManage):
         )
 
     def test_block_storage_snapshot_manage_list__detailed(self):
-        self.volume_client.api_version = api_versions.APIVersion('3.8')
+        self.set_volume_api_version('3.8')
+
         arglist = [
             '--detailed',
             'True',
@@ -448,9 +457,8 @@ class TestBlockStorageSnapshotManage(TestBlockStorageManage):
         )
 
     def test_block_storage_snapshot_manage_list__all_args(self):
-        self.app.client_manager.volume.api_version = api_versions.APIVersion(
-            '3.8'
-        )
+        self.set_volume_api_version('3.8')
+
         arglist = [
             '--long',
             '--marker',

openstackclient/tests/unit/volume/v3/test_block_storage_resource_filter.py

@@ -10,10 +10,6 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from unittest import mock
-
-from cinderclient import api_versions
-from openstack import utils as sdk_utils
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
@@ -21,29 +17,7 @@ from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 from openstackclient.volume.v3 import block_storage_resource_filter
 
 
-class TestBlockStorageResourceFilter(volume_fakes.TestVolume):
-    def setUp(self):
-        super().setUp()
-
-        patcher = mock.patch.object(
-            sdk_utils, 'supports_microversion', return_value=True
-        )
-        self.addCleanup(patcher.stop)
-        self.supports_microversion_mock = patcher.start()
-        self._set_mock_microversion(
-            self.app.client_manager.volume.api_version.get_string()
-        )
-
-    def _set_mock_microversion(self, mock_v):
-        """Set a specific microversion for the mock supports_microversion()."""
-        self.supports_microversion_mock.reset_mock(return_value=True)
-        self.supports_microversion_mock.side_effect = (
-            lambda _, v: api_versions.APIVersion(v)
-            <= api_versions.APIVersion(mock_v)
-        )
-
-
-class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter):
+class TestBlockStorageResourceFilterList(volume_fakes.TestVolume):
     # The resource filters to be listed
     fake_resource_filters = volume_fakes.create_resource_filters()
 
@@ -62,7 +36,7 @@ class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter):
         )
 
     def test_resource_filter_list(self):
-        self._set_mock_microversion('3.33')
+        self.set_volume_api_version('3.33')
 
         arglist = []
         verifylist = []
@@ -85,7 +59,7 @@ class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter):
         self.volume_sdk_client.resource_filters.assert_called_with()
 
     def test_resource_filter_list_pre_v333(self):
-        self._set_mock_microversion('3.32')
+        self.set_volume_api_version('3.32')
 
         arglist = []
         verifylist = []
@@ -99,7 +73,7 @@ class TestBlockStorageResourceFilterList(TestBlockStorageResourceFilter):
         )
 
 
-class TestBlockStorageResourceFilterShow(TestBlockStorageResourceFilter):
+class TestBlockStorageResourceFilterShow(volume_fakes.TestVolume):
     # The resource filters to be listed
     fake_resource_filter = volume_fakes.create_one_resource_filter()
 
@@ -118,7 +92,7 @@ class TestBlockStorageResourceFilterShow(TestBlockStorageResourceFilter):
         )
 
     def test_resource_filter_show(self):
-        self._set_mock_microversion('3.33')
+        self.set_volume_api_version('3.33')
 
         arglist = [
             self.fake_resource_filter.resource,
@@ -144,7 +118,7 @@ class TestBlockStorageResourceFilterShow(TestBlockStorageResourceFilter):
         )
 
     def test_resource_filter_show_pre_v333(self):
-        self._set_mock_microversion('3.32')
+        self.set_volume_api_version('3.32')
 
         arglist = [
             self.fake_resource_filter.resource,

openstackclient/tests/unit/volume/v3/test_service.py

@@ -0,0 +1,271 @@
+#
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   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 cinderclient import api_versions
+
+from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
+from openstackclient.volume.v3 import service
+
+
+class TestService(volume_fakes.TestVolume):
+    def setUp(self):
+        super().setUp()
+
+        # Get a shortcut to the ServiceManager Mock
+        self.service_mock = self.volume_client.services
+        self.service_mock.reset_mock()
+
+
+class TestServiceList(TestService):
+    # The service to be listed
+    services = volume_fakes.create_one_service()
+
+    def setUp(self):
+        super().setUp()
+
+        self.service_mock.list.return_value = [self.services]
+
+        # Get the command object to test
+        self.cmd = service.ListService(self.app, None)
+
+    def test_service_list(self):
+        arglist = [
+            '--host',
+            self.services.host,
+            '--service',
+            self.services.binary,
+        ]
+        verifylist = [
+            ('host', self.services.host),
+            ('service', self.services.binary),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # 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)
+
+        expected_columns = [
+            'Binary',
+            'Host',
+            'Zone',
+            'Status',
+            'State',
+            'Updated At',
+        ]
+
+        # confirming if all expected columns are present in the result.
+        self.assertEqual(expected_columns, columns)
+
+        datalist = (
+            (
+                self.services.binary,
+                self.services.host,
+                self.services.zone,
+                self.services.status,
+                self.services.state,
+                self.services.updated_at,
+            ),
+        )
+
+        # confirming if all expected values are present in the result.
+        self.assertEqual(datalist, tuple(data))
+
+        # checking if proper call was made to list services
+        self.service_mock.list.assert_called_with(
+            self.services.host,
+            self.services.binary,
+        )
+
+        # checking if prohibited columns are present in output
+        self.assertNotIn("Disabled Reason", columns)
+        self.assertNotIn(self.services.disabled_reason, tuple(data))
+
+    def test_service_list_with_long_option(self):
+        arglist = [
+            '--host',
+            self.services.host,
+            '--service',
+            self.services.binary,
+            '--long',
+        ]
+        verifylist = [
+            ('host', self.services.host),
+            ('service', self.services.binary),
+            ('long', True),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # 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)
+
+        expected_columns = [
+            'Binary',
+            'Host',
+            'Zone',
+            'Status',
+            'State',
+            'Updated At',
+            'Disabled Reason',
+        ]
+
+        # confirming if all expected columns are present in the result.
+        self.assertEqual(expected_columns, columns)
+
+        datalist = (
+            (
+                self.services.binary,
+                self.services.host,
+                self.services.zone,
+                self.services.status,
+                self.services.state,
+                self.services.updated_at,
+                self.services.disabled_reason,
+            ),
+        )
+
+        # confirming if all expected values are present in the result.
+        self.assertEqual(datalist, tuple(data))
+
+        self.service_mock.list.assert_called_with(
+            self.services.host,
+            self.services.binary,
+        )
+
+    def test_service_list_with_cluster(self):
+        self.volume_client.api_version = api_versions.APIVersion('3.7')
+        cluster = {'cluster': 'fake-cluster'}
+        cluster_service = volume_fakes.create_one_service(attrs=cluster)
+        self.service_mock.list.return_value = [cluster_service]
+
+        arglist = [
+            '--host',
+            cluster_service.host,
+            '--service',
+            cluster_service.binary,
+        ]
+        verifylist = [
+            ('host', cluster_service.host),
+            ('service', cluster_service.binary),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # 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)
+
+        expected_columns = [
+            'Binary',
+            'Host',
+            'Zone',
+            'Status',
+            'State',
+            'Updated At',
+            'Cluster',
+        ]
+
+        # confirming if all expected columns are present in the result.
+        self.assertEqual(expected_columns, columns)
+
+        datalist = (
+            (
+                cluster_service.binary,
+                cluster_service.host,
+                cluster_service.zone,
+                cluster_service.status,
+                cluster_service.state,
+                cluster_service.updated_at,
+                cluster_service.cluster,
+            ),
+        )
+
+        # confirming if all expected values are present in the result.
+        self.assertEqual(datalist, tuple(data))
+
+        # checking if proper call was made to list services
+        self.service_mock.list.assert_called_with(
+            cluster_service.host,
+            cluster_service.binary,
+        )
+
+        # checking if prohibited columns are present in output
+        self.assertNotIn("Disabled Reason", columns)
+        self.assertNotIn(cluster_service.disabled_reason, tuple(data))
+
+    def test_service_list_with_backend_state(self):
+        self.volume_client.api_version = api_versions.APIVersion('3.49')
+        backend_state = {'cluster': 'fake-cluster', 'backend_state': 'up'}
+        backend_service = volume_fakes.create_one_service(attrs=backend_state)
+        self.service_mock.list.return_value = [backend_service]
+
+        arglist = [
+            '--host',
+            backend_service.host,
+            '--service',
+            backend_service.binary,
+        ]
+        verifylist = [
+            ('host', backend_service.host),
+            ('service', backend_service.binary),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # 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)
+
+        expected_columns = [
+            'Binary',
+            'Host',
+            'Zone',
+            'Status',
+            'State',
+            'Updated At',
+            'Cluster',
+            'Backend State',
+        ]
+
+        # confirming if all expected columns are present in the result.
+        self.assertEqual(expected_columns, columns)
+
+        datalist = (
+            (
+                backend_service.binary,
+                backend_service.host,
+                backend_service.zone,
+                backend_service.status,
+                backend_service.state,
+                backend_service.updated_at,
+                backend_service.cluster,
+                backend_service.backend_state,
+            ),
+        )
+
+        # confirming if all expected values are present in the result.
+        self.assertEqual(datalist, tuple(data))
+
+        # checking if proper call was made to list services
+        self.service_mock.list.assert_called_with(
+            backend_service.host,
+            backend_service.binary,
+        )
+
+        # checking if prohibited columns are present in output
+        self.assertNotIn("Disabled Reason", columns)
+        self.assertNotIn(backend_service.disabled_reason, tuple(data))