python-openstackclient 7.3.1__py3-none-any.whl → 8.0.0__py3-none-any.whl

openstackclient/tests/unit/common/test_quota.py

@@ -98,7 +98,7 @@ class TestQuotaList(TestQuota):
             _compute_quota_set.QuotaSet
         )
         # the defaults are global hence use of return_value here
-        self.compute_sdk_client.get_quota_set_defaults.return_value = (
+        self.compute_client.get_quota_set_defaults.return_value = (
             self.default_compute_quotas
         )
         self.compute_reference_data = (
@@ -164,7 +164,7 @@ class TestQuotaList(TestQuota):
 
     def test_quota_list_compute(self):
         # Two projects with non-default quotas
-        self.compute_sdk_client.get_quota_set.side_effect = self.compute_quotas
+        self.compute_client.get_quota_set.side_effect = self.compute_quotas
 
         arglist = [
             '--compute',
@@ -183,7 +183,7 @@ class TestQuotaList(TestQuota):
 
     def test_quota_list_compute_default(self):
         # One of the projects is at defaults
-        self.compute_sdk_client.get_quota_set.side_effect = [
+        self.compute_client.get_quota_set.side_effect = [
             self.compute_quotas[0],
             self.default_compute_quotas,
         ]
@@ -205,7 +205,7 @@ class TestQuotaList(TestQuota):
 
     def test_quota_list_compute_project_not_found(self):
         # Make one of the projects disappear
-        self.compute_sdk_client.get_quota_set.side_effect = [
+        self.compute_client.get_quota_set.side_effect = [
             self.compute_quotas[0],
             sdk_exceptions.NotFoundException("NotFound"),
         ]
@@ -227,7 +227,7 @@ class TestQuotaList(TestQuota):
 
     def test_quota_list_compute_project_inaccessible(self):
         # Make one of the projects inaccessible
-        self.compute_sdk_client.get_quota_set.side_effect = [
+        self.compute_client.get_quota_set.side_effect = [
             self.compute_quotas[0],
             sdk_exceptions.ForbiddenException("Forbidden"),
         ]
@@ -249,7 +249,7 @@ class TestQuotaList(TestQuota):
 
     def test_quota_list_compute_server_error(self):
         # Make the server "break"
-        self.compute_sdk_client.get_quota_set.side_effect = (
+        self.compute_client.get_quota_set.side_effect = (
             sdk_exceptions.HttpException("Not implemented?")
         )
 
@@ -470,7 +470,7 @@ class TestQuotaSet(TestQuota):
             'server_group_members': servgroup_members_num,
         }
 
-        self.compute_sdk_client.update_quota_set.assert_called_once_with(
+        self.compute_client.update_quota_set.assert_called_once_with(
             self.projects[0].id, **kwargs
         )
         self.assertIsNone(result)
@@ -744,7 +744,7 @@ class TestQuotaSet(TestQuota):
             'volumes': volumes,
         }
 
-        self.compute_sdk_client.update_quota_class_set.assert_called_with(
+        self.compute_client.update_quota_class_set.assert_called_with(
             self.projects[0].name, **kwargs_compute
         )
         self.volume_sdk_client.update_quota_class_set.assert_called_with(
@@ -842,7 +842,7 @@ class TestQuotaSet(TestQuota):
             'volumes': volumes,
         }
 
-        self.compute_sdk_client.update_quota_class_set.assert_called_with(
+        self.compute_client.update_quota_class_set.assert_called_with(
             'default', **kwargs_compute
         )
         self.volume_sdk_client.update_quota_class_set.assert_called_with(
@@ -899,7 +899,7 @@ class TestQuotaSet(TestQuota):
             'subnet': subnet,
             'force': True,
         }
-        self.compute_sdk_client.update_quota_set.assert_called_once_with(
+        self.compute_client.update_quota_set.assert_called_once_with(
             self.projects[0].id, **kwargs_compute
         )
         self.volume_sdk_client.update_quota_set.assert_called_once_with(
@@ -942,7 +942,7 @@ class TestQuotaSet(TestQuota):
             'subnet': 10,
             'check_limit': True,
         }
-        self.compute_sdk_client.update_quota_set.assert_called_once_with(
+        self.compute_client.update_quota_set.assert_called_once_with(
             self.projects[0].id, **kwargs_compute
         )
         self.volume_sdk_client.update_quota_set.assert_called_once_with(
@@ -955,18 +955,35 @@ class TestQuotaSet(TestQuota):
 
 
 class TestQuotaShow(TestQuota):
+    _network_quota_details = {
+        'floating_ips': {'limit': 0, 'reserved': 0, 'used': 0},
+        'health_monitors': {'limit': 0, 'reserved': 0, 'used': 0},
+        'l7_policies': {'limit': 0, 'reserved': 0, 'used': 0},
+        'listeners': {'limit': 0, 'reserved': 0, 'used': 0},
+        'load_balancers': {'limit': 0, 'reserved': 0, 'used': 0},
+        'networks': {'limit': 0, 'reserved': 0, 'used': 0},
+        'pools': {'limit': 0, 'reserved': 0, 'used': 0},
+        'ports': {'limit': 0, 'reserved': 0, 'used': 0},
+        'rbac_policies': {'limit': 0, 'reserved': 0, 'used': 0},
+        'routers': {'limit': 0, 'reserved': 0, 'used': 0},
+        'security_group_rules': {'limit': 0, 'reserved': 0, 'used': 0},
+        'security_groups': {'limit': 0, 'reserved': 0, 'used': 0},
+        'subnet_pools': {'limit': 0, 'reserved': 0, 'used': 0},
+        'subnets': {'limit': 0, 'reserved': 0, 'used': 0},
+    }
+
     def setUp(self):
         super().setUp()
 
         self.identity_sdk_client.find_project.return_value = self.projects[0]
 
-        self.compute_sdk_client.get_quota_set.return_value = (
+        self.compute_client.get_quota_set.return_value = (
             sdk_fakes.generate_fake_resource(_compute_quota_set.QuotaSet)
         )
         self.default_compute_quotas = sdk_fakes.generate_fake_resource(
             _compute_quota_set.QuotaSet
         )
-        self.compute_sdk_client.get_quota_set_defaults.return_value = (
+        self.compute_client.get_quota_set_defaults.return_value = (
             self.default_compute_quotas
         )
 
@@ -980,9 +997,15 @@ class TestQuotaShow(TestQuota):
             self.default_volume_quotas
         )
 
-        self.network_client.get_quota.return_value = (
-            sdk_fakes.generate_fake_resource(_network_quota_set.Quota)
-        )
+        def get_network_quota_mock(*args, **kwargs):
+            if kwargs.get("details"):
+                return sdk_fakes.generate_fake_resource(
+                    _network_quota_set.QuotaDetails,
+                    **self._network_quota_details,
+                )
+            return sdk_fakes.generate_fake_resource(_network_quota_set.Quota)
+
+        self.network_client.get_quota.side_effect = get_network_quota_mock
         self.default_network_quotas = sdk_fakes.generate_fake_resource(
             _network_quota_set.QuotaDefault
         )
@@ -1004,7 +1027,7 @@ class TestQuotaShow(TestQuota):
 
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get_quota_set.assert_called_once_with(
+        self.compute_client.get_quota_set.assert_called_once_with(
             self.projects[0].id,
             usage=False,
         )
@@ -1031,7 +1054,7 @@ class TestQuotaShow(TestQuota):
 
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get_quota_set.assert_called_once_with(
+        self.compute_client.get_quota_set.assert_called_once_with(
             self.projects[0].id,
             usage=False,
         )
@@ -1051,7 +1074,7 @@ class TestQuotaShow(TestQuota):
 
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get_quota_set.assert_not_called()
+        self.compute_client.get_quota_set.assert_not_called()
         self.volume_sdk_client.get_quota_set.assert_called_once_with(
             self.projects[0].id,
             usage=False,
@@ -1071,7 +1094,7 @@ class TestQuotaShow(TestQuota):
 
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get_quota_set.assert_not_called()
+        self.compute_client.get_quota_set.assert_not_called()
         self.volume_sdk_client.get_quota_set.assert_not_called()
         self.network_client.get_quota.assert_called_once_with(
             self.projects[0].id,
@@ -1092,7 +1115,7 @@ class TestQuotaShow(TestQuota):
 
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get_quota_set_defaults.assert_called_once_with(
+        self.compute_client.get_quota_set_defaults.assert_called_once_with(
             self.projects[0].id,
         )
         self.volume_sdk_client.get_quota_set_defaults.assert_called_once_with(
@@ -1116,7 +1139,7 @@ class TestQuotaShow(TestQuota):
 
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get_quota_set.assert_called_once_with(
+        self.compute_client.get_quota_set.assert_called_once_with(
             self.projects[0].id,
             usage=True,
         )
@@ -1138,7 +1161,7 @@ class TestQuotaShow(TestQuota):
 
         self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.get_quota_set.assert_called_once_with(
+        self.compute_client.get_quota_set.assert_called_once_with(
             self.projects[1].id, usage=False
         )
         self.volume_sdk_client.get_quota_set.assert_called_once_with(
@@ -1158,7 +1181,7 @@ class TestQuotaDelete(TestQuota):
 
         self.identity_sdk_client.find_project.return_value = self.projects[0]
 
-        self.compute_sdk_client.revert_quota_set.return_value = None
+        self.compute_client.revert_quota_set.return_value = None
         self.volume_sdk_client.revert_quota_set.return_value = None
         self.network_client.delete_quota.return_value = None
 
@@ -1182,7 +1205,7 @@ class TestQuotaDelete(TestQuota):
         self.identity_sdk_client.find_project.assert_called_once_with(
             self.projects[0].id, ignore_missing=False
         )
-        self.compute_sdk_client.revert_quota_set.assert_called_once_with(
+        self.compute_client.revert_quota_set.assert_called_once_with(
             self.projects[0].id,
         )
         self.volume_sdk_client.revert_quota_set.assert_called_once_with(
@@ -1211,7 +1234,7 @@ class TestQuotaDelete(TestQuota):
         self.identity_sdk_client.find_project.assert_called_once_with(
             self.projects[0].id, ignore_missing=False
         )
-        self.compute_sdk_client.revert_quota_set.assert_called_once_with(
+        self.compute_client.revert_quota_set.assert_called_once_with(
             self.projects[0].id,
         )
         self.volume_sdk_client.revert_quota_set.assert_not_called()
@@ -1236,7 +1259,7 @@ class TestQuotaDelete(TestQuota):
         self.identity_sdk_client.find_project.assert_called_once_with(
             self.projects[0].id, ignore_missing=False
         )
-        self.compute_sdk_client.revert_quota_set.assert_not_called()
+        self.compute_client.revert_quota_set.assert_not_called()
         self.volume_sdk_client.revert_quota_set.assert_called_once_with(
             self.projects[0].id,
         )
@@ -1261,7 +1284,7 @@ class TestQuotaDelete(TestQuota):
         self.identity_sdk_client.find_project.assert_called_once_with(
             self.projects[0].id, ignore_missing=False
         )
-        self.compute_sdk_client.revert_quota_set.assert_not_called()
+        self.compute_client.revert_quota_set.assert_not_called()
         self.volume_sdk_client.revert_quota_set.assert_not_called()
         self.network_client.delete_quota.assert_called_once_with(
             self.projects[0].id,

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

@@ -98,14 +98,8 @@ class FakeClientMixin:
     def setUp(self):
         super().setUp()
 
-        # 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.compute = mock.Mock(_proxy.Proxy)
+        self.compute_client = self.app.client_manager.compute
         self.set_compute_api_version()  # default to the lowest
 
     def set_compute_api_version(self, version: str = '2.1'):
@@ -117,8 +111,8 @@ class FakeClientMixin:
         """
         assert re.match(r'2.\d+', version)
 
-        self.compute_sdk_client.default_microversion = version
-        self.compute_sdk_client.get_endpoint_data.return_value = (
+        self.compute_client.default_microversion = version
+        self.compute_client.get_endpoint_data.return_value = (
             discover.EndpointData(
                 min_microversion='2.1',  # nova has not bumped this yet
                 max_microversion=version,

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

@@ -61,7 +61,7 @@ class TestAgentCreate(compute_fakes.TestComputev2):
             self._agent['version'],
         )
 
-        self.compute_sdk_client.post.return_value = fakes.FakeResponse(
+        self.compute_client.post.return_value = fakes.FakeResponse(
             data={'agent': self._agent}
         )
         self.cmd = agent.CreateAgent(self.app, None)
@@ -87,7 +87,7 @@ class TestAgentCreate(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.post.assert_called_with(
+        self.compute_client.post.assert_called_with(
             '/os-agents',
             json={
                 'agent': {
@@ -110,7 +110,7 @@ class TestAgentDelete(compute_fakes.TestComputev2):
     def setUp(self):
         super().setUp()
 
-        self.compute_sdk_client.delete.return_value = fakes.FakeResponse(
+        self.compute_client.delete.return_value = fakes.FakeResponse(
             status_code=http.HTTPStatus.NO_CONTENT
         )
 
@@ -125,7 +125,7 @@ class TestAgentDelete(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.delete.assert_called_once_with(
+        self.compute_client.delete.assert_called_once_with(
             '/os-agents/123',
             microversion='2.1',
         )
@@ -143,7 +143,7 @@ class TestAgentDelete(compute_fakes.TestComputev2):
         calls = [
             mock.call(f'/os-agents/{x}', microversion='2.1') for x in arglist
         ]
-        self.compute_sdk_client.delete.assert_has_calls(calls)
+        self.compute_client.delete.assert_has_calls(calls)
         self.assertIsNone(result)
 
     def test_delete_multiple_agents_exception(self):
@@ -154,7 +154,7 @@ class TestAgentDelete(compute_fakes.TestComputev2):
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.compute_sdk_client.delete.side_effect = [
+        self.compute_client.delete.side_effect = [
             fakes.FakeResponse(status_code=http.HTTPStatus.NO_CONTENT),
             fakes.FakeResponse(status_code=http.HTTPStatus.NO_CONTENT),
             fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND),
@@ -166,7 +166,7 @@ class TestAgentDelete(compute_fakes.TestComputev2):
         calls = [
             mock.call(f'/os-agents/{x}', microversion='2.1') for x in arglist
         ]
-        self.compute_sdk_client.delete.assert_has_calls(calls)
+        self.compute_client.delete.assert_has_calls(calls)
 
     def test_agent_delete_no_input(self):
         arglist = []
@@ -208,7 +208,7 @@ class TestAgentList(compute_fakes.TestComputev2):
             for _agent in _agents
         ]
 
-        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
+        self.compute_client.get.return_value = fakes.FakeResponse(
             data={'agents': _agents},
         )
         self.cmd = agent.ListAgent(self.app, None)
@@ -222,7 +222,7 @@ class TestAgentList(compute_fakes.TestComputev2):
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
-        self.compute_sdk_client.get.assert_called_once_with(
+        self.compute_client.get.assert_called_once_with(
             '/os-agents',
             microversion='2.1',
         )
@@ -241,7 +241,7 @@ class TestAgentList(compute_fakes.TestComputev2):
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
-        self.compute_sdk_client.get.assert_called_once_with(
+        self.compute_client.get.assert_called_once_with(
             '/os-agents?hypervisor=hypervisor',
             microversion='2.1',
         )
@@ -252,10 +252,10 @@ class TestAgentSet(compute_fakes.TestComputev2):
         super().setUp()
 
         self.agent = _generate_fake_agent()
-        self.compute_sdk_client.get.return_value = fakes.FakeResponse(
+        self.compute_client.get.return_value = fakes.FakeResponse(
             data={'agents': [self.agent]},
         )
-        self.compute_sdk_client.put.return_value = fakes.FakeResponse()
+        self.compute_client.put.return_value = fakes.FakeResponse()
 
         self.cmd = agent.SetAgent(self.app, None)
 
@@ -269,7 +269,7 @@ class TestAgentSet(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.put.assert_called_once_with(
+        self.compute_client.put.assert_called_once_with(
             f'/os-agents/{self.agent["agent_id"]}',
             json={
                 'para': {
@@ -297,7 +297,7 @@ class TestAgentSet(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.put.assert_called_once_with(
+        self.compute_client.put.assert_called_once_with(
             f'/os-agents/{self.agent["agent_id"]}',
             json={
                 'para': {
@@ -325,7 +325,7 @@ class TestAgentSet(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.put.assert_called_once_with(
+        self.compute_client.put.assert_called_once_with(
             f'/os-agents/{self.agent["agent_id"]}',
             json={
                 'para': {
@@ -353,7 +353,7 @@ class TestAgentSet(compute_fakes.TestComputev2):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.compute_sdk_client.put.assert_called_once_with(
+        self.compute_client.put.assert_called_once_with(
             f'/os-agents/{self.agent["agent_id"]}',
             json={
                 'para': {