python-openstackclient 6.6.1__py3-none-any.whl → 7.1.0__py3-none-any.whl

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

@@ -10,9 +10,6 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from unittest import mock
-
-from openstack import utils as sdk_utils
 from osc_lib import exceptions
 
 from openstackclient.compute.v2 import server_volume
@@ -35,10 +32,7 @@ class TestServerVolumeList(compute_fakes.TestComputev2):
         # Get the command object to test
         self.cmd = server_volume.ListServerVolume(self.app, None)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_server_volume_list(self, sm_mock):
-        sm_mock.side_effect = [False, False, False, False]
-
+    def test_server_volume_list(self):
         arglist = [
             self.server.id,
         ]
@@ -71,9 +65,8 @@ class TestServerVolumeList(compute_fakes.TestComputev2):
             self.server,
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_server_volume_list_with_tags(self, sm_mock):
-        sm_mock.side_effect = [False, True, False, False]
+    def test_server_volume_list_with_tags(self):
+        self.set_compute_api_version('2.70')
 
         arglist = [
             self.server.id,
@@ -118,9 +111,9 @@ class TestServerVolumeList(compute_fakes.TestComputev2):
             self.server,
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_server_volume_list_with_delete_on_attachment(self, sm_mock):
-        sm_mock.side_effect = [False, True, True, False]
+    def test_server_volume_list_with_delete_on_attachment(self):
+        self.set_compute_api_version('2.79')
+
         arglist = [
             self.server.id,
         ]
@@ -167,9 +160,9 @@ class TestServerVolumeList(compute_fakes.TestComputev2):
             self.server,
         )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_server_volume_list_with_attachment_ids(self, sm_mock):
-        sm_mock.side_effect = [True, True, True, True]
+    def test_server_volume_list_with_attachment_ids(self):
+        self.set_compute_api_version('2.89')
+
         arglist = [
             self.server.id,
         ]
@@ -251,9 +244,8 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
         self.compute_sdk_client.update_volume_attachment.assert_not_called()
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_server_volume_update_with_delete_on_termination(self, sm_mock):
-        sm_mock.return_value = True
+    def test_server_volume_update_with_delete_on_termination(self):
+        self.set_compute_api_version('2.85')
 
         arglist = [
             self.server.id,
@@ -276,9 +268,8 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_server_volume_update_with_preserve_on_termination(self, sm_mock):
-        sm_mock.return_value = True
+    def test_server_volume_update_with_preserve_on_termination(self):
+        self.set_compute_api_version('2.85')
 
         arglist = [
             self.server.id,
@@ -299,12 +290,8 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_server_volume_update_with_delete_on_termination_pre_v285(
-        self,
-        sm_mock,
-    ):
-        sm_mock.return_value = False
+    def test_server_volume_update_with_delete_on_termination_pre_v285(self):
+        self.set_compute_api_version('2.84')
 
         arglist = [
             self.server.id,
@@ -325,12 +312,8 @@ class TestServerVolumeUpdate(compute_fakes.TestComputev2):
         )
         self.compute_sdk_client.update_volume_attachment.assert_not_called()
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_server_volume_update_with_preserve_on_termination_pre_v285(
-        self,
-        sm_mock,
-    ):
-        sm_mock.return_value = False
+    def test_server_volume_update_with_preserve_on_termination_pre_v285(self):
+        self.set_compute_api_version('2.84')
 
         arglist = [
             self.server.id,

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

@@ -13,9 +13,7 @@
 #   under the License.
 
 from unittest import mock
-from unittest.mock import call
 
-from openstack import utils as sdk_utils
 from osc_lib import exceptions
 
 from openstackclient.compute.v2 import service
@@ -26,7 +24,7 @@ class TestServiceDelete(compute_fakes.TestComputev2):
     services = compute_fakes.create_services(count=2)
 
     def setUp(self):
-        super(TestServiceDelete, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.delete_service.return_value = None
 
@@ -62,7 +60,7 @@ class TestServiceDelete(compute_fakes.TestComputev2):
 
         calls = []
         for s in self.services:
-            calls.append(call(s.binary, ignore_missing=False))
+            calls.append(mock.call(s.binary, ignore_missing=False))
         self.compute_sdk_client.delete_service.assert_has_calls(calls)
         self.assertIsNone(result)
 
@@ -123,7 +121,7 @@ class TestServiceList(compute_fakes.TestComputev2):
     data_long = [data[0] + (service.disabled_reason,)]
 
     def setUp(self):
-        super(TestServiceList, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.services.return_value = [self.service]
 
@@ -156,10 +154,7 @@ class TestServiceList(compute_fakes.TestComputev2):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_list_with_long_option(self, sm_mock):
-        sm_mock.return_value = False
-
+    def test_service_list_with_long_option(self):
         arglist = [
             '--host',
             self.service.host,
@@ -187,9 +182,8 @@ class TestServiceList(compute_fakes.TestComputev2):
         self.assertEqual(self.columns_long, columns)
         self.assertEqual(self.data_long, list(data))
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_list_with_long_option_2_11(self, sm_mock):
-        sm_mock.return_value = True
+    def test_service_list_with_long_option_2_11(self):
+        self.set_compute_api_version('2.11')
 
         arglist = [
             '--host',
@@ -225,7 +219,7 @@ class TestServiceList(compute_fakes.TestComputev2):
 
 class TestServiceSet(compute_fakes.TestComputev2):
     def setUp(self):
-        super(TestServiceSet, self).setUp()
+        super().setUp()
 
         self.service = compute_fakes.create_one_service()
 
@@ -234,9 +228,7 @@ class TestServiceSet(compute_fakes.TestComputev2):
 
         self.cmd = service.SetService(self.app, None)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_set_nothing(self, sm_mock):
-        sm_mock.return_value = False
+    def test_set_nothing(self):
         arglist = [
             self.service.host,
             self.service.binary,
@@ -252,9 +244,7 @@ class TestServiceSet(compute_fakes.TestComputev2):
         self.compute_sdk_client.disable_service.assert_not_called()
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_enable(self, sm_mock):
-        sm_mock.return_value = False
+    def test_service_set_enable(self):
         arglist = [
             '--enable',
             self.service.host,
@@ -274,9 +264,7 @@ class TestServiceSet(compute_fakes.TestComputev2):
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_disable(self, sm_mock):
-        sm_mock.return_value = False
+    def test_service_set_disable(self):
         arglist = [
             '--disable',
             self.service.host,
@@ -296,9 +284,7 @@ class TestServiceSet(compute_fakes.TestComputev2):
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_disable_with_reason(self, sm_mock):
-        sm_mock.return_value = False
+    def test_service_set_disable_with_reason(self):
         reason = 'earthquake'
         arglist = [
             '--disable',
@@ -322,9 +308,7 @@ class TestServiceSet(compute_fakes.TestComputev2):
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_only_with_disable_reason(self, sm_mock):
-        sm_mock.return_value = False
+    def test_service_set_only_with_disable_reason(self):
         reason = 'earthquake'
         arglist = [
             '--disable-reason',
@@ -348,9 +332,7 @@ class TestServiceSet(compute_fakes.TestComputev2):
                 str(e),
             )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_enable_with_disable_reason(self, sm_mock):
-        sm_mock.return_value = False
+    def test_service_set_enable_with_disable_reason(self):
         reason = 'earthquake'
         arglist = [
             '--enable',
@@ -376,9 +358,9 @@ class TestServiceSet(compute_fakes.TestComputev2):
                 str(e),
             )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_state_up(self, sm_mock):
-        sm_mock.side_effect = [False, True]
+    def test_service_set_state_up(self):
+        self.set_compute_api_version('2.11')
+
         arglist = [
             '--up',
             self.service.host,
@@ -398,9 +380,9 @@ class TestServiceSet(compute_fakes.TestComputev2):
         self.assertNotCalled(self.compute_sdk_client.disable_service)
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_state_down(self, sm_mock):
-        sm_mock.side_effect = [False, True]
+    def test_service_set_state_down(self):
+        self.set_compute_api_version('2.11')
+
         arglist = [
             '--down',
             self.service.host,
@@ -420,9 +402,9 @@ class TestServiceSet(compute_fakes.TestComputev2):
         self.assertNotCalled(self.compute_sdk_client.disable_service)
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_enable_and_state_down(self, sm_mock):
-        sm_mock.side_effect = [False, True]
+    def test_service_set_enable_and_state_down(self):
+        self.set_compute_api_version('2.11')
+
         arglist = [
             '--enable',
             '--down',
@@ -445,9 +427,9 @@ class TestServiceSet(compute_fakes.TestComputev2):
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_enable_and_state_down_with_exception(self, sm_mock):
-        sm_mock.side_effect = [False, True]
+    def test_service_set_enable_and_state_down_with_exception(self):
+        self.set_compute_api_version('2.11')
+
         arglist = [
             '--enable',
             '--down',
@@ -472,11 +454,11 @@ class TestServiceSet(compute_fakes.TestComputev2):
                 None, self.service.host, self.service.binary, True
             )
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_2_53_disable_down(self, sm_mock):
+    def test_service_set_disable_down(self):
         # Tests disabling and forcing down a compute service with microversion
         # 2.53 which requires looking up the service by host and binary.
-        sm_mock.return_value = True
+        self.set_compute_api_version('2.53')
+
         arglist = [
             '--disable',
             '--down',
@@ -503,11 +485,11 @@ class TestServiceSet(compute_fakes.TestComputev2):
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_2_53_disable_reason(self, sm_mock):
+    def test_service_set_disable_reason(self):
         # Tests disabling with reason a compute service with microversion
         # 2.53 which requires looking up the service by host and binary.
-        sm_mock.return_value = True
+        self.set_compute_api_version('2.53')
+
         reason = 'earthquake'
         arglist = [
             '--disable',
@@ -533,11 +515,11 @@ class TestServiceSet(compute_fakes.TestComputev2):
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(sdk_utils, 'supports_microversion')
-    def test_service_set_2_53_enable_up(self, sm_mock):
+    def test_service_set_enable_up(self):
         # Tests enabling and bringing up a compute service with microversion
         # 2.53 which requires looking up the service by host and binary.
-        sm_mock.return_value = True
+        self.set_compute_api_version('2.53')
+
         arglist = [
             '--enable',
             '--up',

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

@@ -21,9 +21,9 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 class TestUsage(compute_fakes.TestComputev2):
     def setUp(self):
-        super(TestUsage, self).setUp()
+        super().setUp()
 
-        self.projects_mock = self.app.client_manager.identity.projects
+        self.projects_mock = self.identity_client.projects
         self.projects_mock.reset_mock()
 
 
@@ -53,7 +53,7 @@ class TestUsageList(TestUsage):
     ]
 
     def setUp(self):
-        super(TestUsageList, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.usages.return_value = self.usages
 
@@ -144,7 +144,7 @@ class TestUsageShow(TestUsage):
     )
 
     def setUp(self):
-        super(TestUsageShow, self).setUp()
+        super().setUp()
 
         self.compute_sdk_client.get_usage.return_value = self.usage
 

openstackclient/tests/unit/fakes.py

@@ -47,7 +47,7 @@ TEST_RESPONSE_DICT_V3.set_project_scope()
 TEST_VERSIONS = fixture.DiscoveryList(href=AUTH_URL)
 
 
-class FakeStdout(object):
+class FakeStdout:
     def __init__(self):
         self.content = []
 
@@ -61,7 +61,7 @@ class FakeStdout(object):
         return result
 
 
-class FakeLog(object):
+class FakeLog:
     def __init__(self):
         self.messages = {}
 
@@ -81,7 +81,7 @@ class FakeLog(object):
         self.messages['critical'] = msg
 
 
-class FakeApp(object):
+class FakeApp:
     def __init__(self, _stdout, _log):
         self.stdout = _stdout
         self.client_manager = None
@@ -92,18 +92,18 @@ class FakeApp(object):
         self.log = _log
 
 
-class FakeOptions(object):
+class FakeOptions:
     def __init__(self, **kwargs):
         self.os_beta_command = False
 
 
-class FakeClient(object):
+class FakeClient:
     def __init__(self, **kwargs):
         self.endpoint = kwargs['endpoint']
         self.token = kwargs['token']
 
 
-class FakeClientManager(object):
+class FakeClientManager:
     _api_version = {
         'image': '2',
     }
@@ -154,11 +154,11 @@ class FakeClientManager(object):
     def is_compute_endpoint_enabled(self):
         return self.compute_endpoint_enabled
 
-    def is_volume_endpoint_enabled(self, client):
+    def is_volume_endpoint_enabled(self, client=None):
         return self.volume_endpoint_enabled
 
 
-class FakeModule(object):
+class FakeModule:
     def __init__(self, name, version):
         self.name = name
         self.__version__ = version
@@ -167,7 +167,7 @@ class FakeModule(object):
         self.version.__version__ = version
 
 
-class FakeResource(object):
+class FakeResource:
     def __init__(self, manager=None, info=None, loaded=False, methods=None):
         """Set attributes and methods for a resource.
 
@@ -210,8 +210,8 @@ class FakeResource(object):
         reprkeys = sorted(
             k for k in self.__dict__.keys() if k[0] != '_' and k != 'manager'
         )
-        info = ", ".join("%s=%s" % (k, getattr(self, k)) for k in reprkeys)
-        return "<%s %s>" % (self.__class__.__name__, info)
+        info = ", ".join(f"{k}={getattr(self, k)}" for k in reprkeys)
+        return f"<{self.__class__.__name__} {info}>"
 
     def keys(self):
         return self._info.keys()
@@ -237,7 +237,7 @@ class FakeResponse(requests.Response):
     def __init__(
         self, headers=None, status_code=200, data=None, encoding=None
     ):
-        super(FakeResponse, self).__init__()
+        super().__init__()
 
         headers = headers or {}
 

openstackclient/tests/unit/identity/v2_0/fakes.py

@@ -19,6 +19,7 @@ import uuid
 
 from keystoneauth1 import access
 from keystoneauth1 import fixture
+from openstack.identity.v2 import _proxy
 
 from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit import utils
@@ -154,7 +155,7 @@ def fake_auth_ref(fake_token, fake_service=None):
     return auth_ref
 
 
-class FakeIdentityv2Client(object):
+class FakeIdentityv2Client:
     def __init__(self, **kwargs):
         self.roles = mock.Mock()
         self.roles.resource_class = fakes.FakeResource(None, {})
@@ -183,17 +184,33 @@ class FakeIdentityv2Client(object):
             raise AttributeError(name)
 
 
-class TestIdentityv2(utils.TestCommand):
+class FakeClientMixin:
     def setUp(self):
-        super(TestIdentityv2, self).setUp()
+        super().setUp()
 
         self.app.client_manager.identity = FakeIdentityv2Client(
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
         )
+        self.identity_client = self.app.client_manager.identity
+
+        # TODO(stephenfin): Rename to 'identity_client' once all commands are
+        # migrated to SDK
+        self.app.client_manager.sdk_connection.identity = mock.Mock(
+            _proxy.Proxy
+        )
+        self.identity_sdk_client = (
+            self.app.client_manager.sdk_connection.identity
+        )
+
+
+class TestIdentityv2(
+    FakeClientMixin,
+    utils.TestCommand,
+): ...
 
 
-class FakeExtension(object):
+class FakeExtension:
     """Fake one or more extension."""
 
     @staticmethod
@@ -232,7 +249,7 @@ class FakeExtension(object):
         return extension
 
 
-class FakeCatalog(object):
+class FakeCatalog:
     """Fake one or more catalog."""
 
     @staticmethod
@@ -282,7 +299,7 @@ class FakeCatalog(object):
         return catalog
 
 
-class FakeProject(object):
+class FakeProject:
     """Fake one or more project."""
 
     @staticmethod
@@ -329,7 +346,7 @@ class FakeProject(object):
         return projects
 
 
-class FakeEndpoint(object):
+class FakeEndpoint:
     """Fake one or more endpoint."""
 
     @staticmethod
@@ -380,7 +397,7 @@ class FakeEndpoint(object):
         return endpoints
 
 
-class FakeService(object):
+class FakeService:
     """Fake one or more service."""
 
     @staticmethod
@@ -427,7 +444,7 @@ class FakeService(object):
         return services
 
 
-class FakeRole(object):
+class FakeRole:
     """Fake one or more role."""
 
     @staticmethod
@@ -470,7 +487,7 @@ class FakeRole(object):
         return roles
 
 
-class FakeUser(object):
+class FakeUser:
     """Fake one or more user."""
 
     @staticmethod

openstackclient/tests/unit/identity/v2_0/test_catalog.py

@@ -22,7 +22,7 @@ class TestCatalog(utils.TestCommand):
     service_catalog = identity_fakes.FakeCatalog.create_catalog()
 
     def setUp(self):
-        super(TestCatalog, self).setUp()
+        super().setUp()
 
         self.sc_mock = mock.Mock()
         self.sc_mock.service_catalog.catalog.return_value = [
@@ -43,7 +43,7 @@ class TestCatalogList(TestCatalog):
     )
 
     def setUp(self):
-        super(TestCatalogList, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = catalog.ListCatalog(self.app, None)
@@ -126,7 +126,7 @@ class TestCatalogList(TestCatalog):
 
 class TestCatalogShow(TestCatalog):
     def setUp(self):
-        super(TestCatalogShow, self).setUp()
+        super().setUp()
 
         # Get the command object to test
         self.cmd = catalog.ShowCatalog(self.app, None)

openstackclient/tests/unit/identity/v2_0/test_endpoint.py

@@ -24,20 +24,20 @@ class TestEndpoint(identity_fakes.TestIdentityv2):
     fake_endpoint = identity_fakes.FakeEndpoint.create_one_endpoint(attr)
 
     def setUp(self):
-        super(TestEndpoint, self).setUp()
+        super().setUp()
 
         # Get a shortcut to the EndpointManager Mock
-        self.endpoints_mock = self.app.client_manager.identity.endpoints
+        self.endpoints_mock = self.identity_client.endpoints
         self.endpoints_mock.reset_mock()
 
         # Get a shortcut to the ServiceManager Mock
-        self.services_mock = self.app.client_manager.identity.services
+        self.services_mock = self.identity_client.services
         self.services_mock.reset_mock()
 
 
 class TestEndpointCreate(TestEndpoint):
     def setUp(self):
-        super(TestEndpointCreate, self).setUp()
+        super().setUp()
 
         self.endpoints_mock.create.return_value = self.fake_endpoint
 
@@ -109,7 +109,7 @@ class TestEndpointCreate(TestEndpoint):
 
 class TestEndpointDelete(TestEndpoint):
     def setUp(self):
-        super(TestEndpointDelete, self).setUp()
+        super().setUp()
 
         self.endpoints_mock.get.return_value = self.fake_endpoint
         self.endpoints_mock.delete.return_value = None
@@ -136,7 +136,7 @@ class TestEndpointDelete(TestEndpoint):
 
 class TestEndpointList(TestEndpoint):
     def setUp(self):
-        super(TestEndpointList, self).setUp()
+        super().setUp()
 
         self.endpoints_mock.list.return_value = [self.fake_endpoint]
 
@@ -211,7 +211,7 @@ class TestEndpointList(TestEndpoint):
 
 class TestEndpointShow(TestEndpoint):
     def setUp(self):
-        super(TestEndpointShow, self).setUp()
+        super().setUp()
 
         self.endpoints_mock.list.return_value = [self.fake_endpoint]