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

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

@@ -11,12 +11,10 @@
 #   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
 from unittest.mock import call
 
-from novaclient import api_versions
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 
@@ -24,22 +22,13 @@ from openstackclient.compute.v2 import service
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 
 
-class TestService(compute_fakes.TestComputev2):
-    def setUp(self):
-        super(TestService, self).setUp()
-
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-
-
-class TestServiceDelete(TestService):
+class TestServiceDelete(compute_fakes.TestComputev2):
     services = compute_fakes.create_services(count=2)
 
     def setUp(self):
         super(TestServiceDelete, self).setUp()
 
-        self.sdk_client.delete_service.return_value = None
+        self.compute_sdk_client.delete_service.return_value = None
 
         # Get the command object to test
         self.cmd = service.DeleteService(self.app, None)
@@ -55,7 +44,7 @@ class TestServiceDelete(TestService):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.delete_service.assert_called_with(
+        self.compute_sdk_client.delete_service.assert_called_with(
             self.services[0].binary, ignore_missing=False
         )
         self.assertIsNone(result)
@@ -74,7 +63,7 @@ class TestServiceDelete(TestService):
         calls = []
         for s in self.services:
             calls.append(call(s.binary, ignore_missing=False))
-        self.sdk_client.delete_service.assert_has_calls(calls)
+        self.compute_sdk_client.delete_service.assert_has_calls(calls)
         self.assertIsNone(result)
 
     def test_multi_services_delete_with_exception(self):
@@ -86,7 +75,7 @@ class TestServiceDelete(TestService):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         delete_mock_result = [None, exceptions.CommandError]
-        self.sdk_client.delete_service = mock.Mock(
+        self.compute_sdk_client.delete_service = mock.Mock(
             side_effect=delete_mock_result
         )
 
@@ -98,15 +87,15 @@ class TestServiceDelete(TestService):
                 '1 of 2 compute services failed to delete.', str(e)
             )
 
-        self.sdk_client.delete_service.assert_any_call(
+        self.compute_sdk_client.delete_service.assert_any_call(
             self.services[0].binary, ignore_missing=False
         )
-        self.sdk_client.delete_service.assert_any_call(
+        self.compute_sdk_client.delete_service.assert_any_call(
             'unexist_service', ignore_missing=False
         )
 
 
-class TestServiceList(TestService):
+class TestServiceList(compute_fakes.TestComputev2):
     service = compute_fakes.create_one_service()
 
     columns = (
@@ -136,7 +125,7 @@ class TestServiceList(TestService):
     def setUp(self):
         super(TestServiceList, self).setUp()
 
-        self.sdk_client.services.return_value = [self.service]
+        self.compute_sdk_client.services.return_value = [self.service]
 
         # Get the command object to test
         self.cmd = service.ListService(self.app, None)
@@ -159,7 +148,7 @@ class TestServiceList(TestService):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.services.assert_called_with(
+        self.compute_sdk_client.services.assert_called_with(
             host=self.service.host,
             binary=self.service.binary,
         )
@@ -190,7 +179,7 @@ class TestServiceList(TestService):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.services.assert_called_with(
+        self.compute_sdk_client.services.assert_called_with(
             host=self.service.host,
             binary=self.service.binary,
         )
@@ -215,16 +204,13 @@ class TestServiceList(TestService):
             ('long', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.app.client_manager.compute.api_version = api_versions.APIVersion(
-            '2.11'
-        )
 
         # 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)
 
-        self.sdk_client.services.assert_called_with(
+        self.compute_sdk_client.services.assert_called_with(
             host=self.service.host,
             binary=self.service.binary,
         )
@@ -237,14 +223,14 @@ class TestServiceList(TestService):
         self.assertEqual(data_long, list(data))
 
 
-class TestServiceSet(TestService):
+class TestServiceSet(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestServiceSet, self).setUp()
 
         self.service = compute_fakes.create_one_service()
 
-        self.sdk_client.enable_service.return_value = self.service
-        self.sdk_client.disable_service.return_value = self.service
+        self.compute_sdk_client.enable_service.return_value = self.service
+        self.compute_sdk_client.disable_service.return_value = self.service
 
         self.cmd = service.SetService(self.app, None)
 
@@ -262,8 +248,8 @@ class TestServiceSet(TestService):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.enable_service.assert_not_called()
-        self.sdk_client.disable_service.assert_not_called()
+        self.compute_sdk_client.enable_service.assert_not_called()
+        self.compute_sdk_client.disable_service.assert_not_called()
         self.assertIsNone(result)
 
     @mock.patch.object(sdk_utils, 'supports_microversion')
@@ -283,7 +269,7 @@ class TestServiceSet(TestService):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.enable_service.assert_called_with(
+        self.compute_sdk_client.enable_service.assert_called_with(
             None, self.service.host, self.service.binary
         )
         self.assertIsNone(result)
@@ -305,7 +291,7 @@ class TestServiceSet(TestService):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.disable_service.assert_called_with(
+        self.compute_sdk_client.disable_service.assert_called_with(
             None, self.service.host, self.service.binary, None
         )
         self.assertIsNone(result)
@@ -331,7 +317,7 @@ class TestServiceSet(TestService):
 
         result = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.disable_service.assert_called_with(
+        self.compute_sdk_client.disable_service.assert_called_with(
             None, self.service.host, self.service.binary, reason
         )
         self.assertIsNone(result)
@@ -405,11 +391,11 @@ class TestServiceSet(TestService):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.update_service_forced_down.assert_called_once_with(
+        self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
             None, self.service.host, self.service.binary, False
         )
-        self.assertNotCalled(self.sdk_client.enable_service)
-        self.assertNotCalled(self.sdk_client.disable_service)
+        self.assertNotCalled(self.compute_sdk_client.enable_service)
+        self.assertNotCalled(self.compute_sdk_client.disable_service)
         self.assertIsNone(result)
 
     @mock.patch.object(sdk_utils, 'supports_microversion')
@@ -427,11 +413,11 @@ class TestServiceSet(TestService):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.update_service_forced_down.assert_called_once_with(
+        self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
             None, self.service.host, self.service.binary, True
         )
-        self.assertNotCalled(self.sdk_client.enable_service)
-        self.assertNotCalled(self.sdk_client.disable_service)
+        self.assertNotCalled(self.compute_sdk_client.enable_service)
+        self.assertNotCalled(self.compute_sdk_client.disable_service)
         self.assertIsNone(result)
 
     @mock.patch.object(sdk_utils, 'supports_microversion')
@@ -451,10 +437,10 @@ class TestServiceSet(TestService):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.enable_service.assert_called_once_with(
+        self.compute_sdk_client.enable_service.assert_called_once_with(
             None, self.service.host, self.service.binary
         )
-        self.sdk_client.update_service_forced_down.assert_called_once_with(
+        self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
             None, self.service.host, self.service.binary, True
         )
         self.assertIsNone(result)
@@ -477,12 +463,12 @@ class TestServiceSet(TestService):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         with mock.patch.object(
-            self.sdk_client, 'enable_service', side_effect=Exception()
+            self.compute_sdk_client, 'enable_service', side_effect=Exception()
         ):
             self.assertRaises(
                 exceptions.CommandError, self.cmd.take_action, parsed_args
             )
-            self.sdk_client.update_service_forced_down.assert_called_once_with(
+            self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
                 None, self.service.host, self.service.binary, True
             )
 
@@ -505,12 +491,14 @@ class TestServiceSet(TestService):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c'
-        self.sdk_client.services.return_value = [mock.Mock(id=service_id)]
+        self.compute_sdk_client.services.return_value = [
+            mock.Mock(id=service_id)
+        ]
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.disable_service.assert_called_once_with(
+        self.compute_sdk_client.disable_service.assert_called_once_with(
             service_id, self.service.host, self.service.binary, None
         )
-        self.sdk_client.update_service_forced_down.assert_called_once_with(
+        self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
             service_id, self.service.host, self.service.binary, True
         )
         self.assertIsNone(result)
@@ -536,9 +524,11 @@ class TestServiceSet(TestService):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c'
-        self.sdk_client.services.return_value = [mock.Mock(id=service_id)]
+        self.compute_sdk_client.services.return_value = [
+            mock.Mock(id=service_id)
+        ]
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.disable_service.assert_called_once_with(
+        self.compute_sdk_client.disable_service.assert_called_once_with(
             service_id, self.service.host, self.service.binary, reason
         )
         self.assertIsNone(result)
@@ -562,23 +552,25 @@ class TestServiceSet(TestService):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         service_id = '339478d0-0b95-4a94-be63-d5be05dfeb1c'
-        self.sdk_client.services.return_value = [mock.Mock(id=service_id)]
+        self.compute_sdk_client.services.return_value = [
+            mock.Mock(id=service_id)
+        ]
         result = self.cmd.take_action(parsed_args)
-        self.sdk_client.enable_service.assert_called_once_with(
+        self.compute_sdk_client.enable_service.assert_called_once_with(
             service_id, self.service.host, self.service.binary
         )
-        self.sdk_client.update_service_forced_down.assert_called_once_with(
+        self.compute_sdk_client.update_service_forced_down.assert_called_once_with(
             service_id, self.service.host, self.service.binary, False
         )
         self.assertIsNone(result)
 
     def test_service_set_find_service_by_host_and_binary_no_results(self):
         # Tests that no compute services are found by host and binary.
-        self.sdk_client.services.return_value = []
+        self.compute_sdk_client.services.return_value = []
         ex = self.assertRaises(
             exceptions.CommandError,
             self.cmd._find_service_by_host_and_binary,
-            self.sdk_client,
+            self.compute_sdk_client,
             'fake-host',
             'nova-compute',
         )
@@ -590,11 +582,14 @@ class TestServiceSet(TestService):
 
     def test_service_set_find_service_by_host_and_binary_many_results(self):
         # Tests that more than one compute service is found by host and binary.
-        self.sdk_client.services.return_value = [mock.Mock(), mock.Mock()]
+        self.compute_sdk_client.services.return_value = [
+            mock.Mock(),
+            mock.Mock(),
+        ]
         ex = self.assertRaises(
             exceptions.CommandError,
             self.cmd._find_service_by_host_and_binary,
-            self.sdk_client,
+            self.compute_sdk_client,
             'fake-host',
             'nova-compute',
         )

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

@@ -11,6 +11,7 @@
 #   under the License.
 #
 
+import datetime
 from unittest import mock
 
 from openstackclient.compute.v2 import usage as usage_cmds
@@ -22,10 +23,6 @@ class TestUsage(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestUsage, self).setUp()
 
-        self.app.client_manager.sdk_connection = mock.Mock()
-        self.app.client_manager.sdk_connection.compute = mock.Mock()
-        self.sdk_client = self.app.client_manager.sdk_connection.compute
-
         self.projects_mock = self.app.client_manager.identity.projects
         self.projects_mock.reset_mock()
 
@@ -58,7 +55,7 @@ class TestUsageList(TestUsage):
     def setUp(self):
         super(TestUsageList, self).setUp()
 
-        self.sdk_client.usages.return_value = self.usages
+        self.compute_sdk_client.usages.return_value = self.usages
 
         self.projects_mock.list.return_value = [self.project]
         # Get the command object to test
@@ -97,9 +94,9 @@ class TestUsageList(TestUsage):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.projects_mock.list.assert_called_with()
-        self.sdk_client.usages.assert_called_with(
-            start='2016-11-11T00:00:00',
-            end='2016-12-20T00:00:00',
+        self.compute_sdk_client.usages.assert_called_with(
+            start=datetime.datetime(2016, 11, 11, 0, 0),
+            end=datetime.datetime(2016, 12, 20, 0, 0),
             detailed=True,
         )
 
@@ -118,7 +115,7 @@ class TestUsageList(TestUsage):
         columns, data = self.cmd.take_action(parsed_args)
 
         self.projects_mock.list.assert_called_with()
-        self.sdk_client.usages.assert_has_calls(
+        self.compute_sdk_client.usages.assert_has_calls(
             [mock.call(start=mock.ANY, end=mock.ANY, detailed=True)]
         )
         self.assertCountEqual(self.columns, columns)
@@ -149,7 +146,7 @@ class TestUsageShow(TestUsage):
     def setUp(self):
         super(TestUsageShow, self).setUp()
 
-        self.sdk_client.get_usage.return_value = self.usage
+        self.compute_sdk_client.get_usage.return_value = self.usage
 
         self.projects_mock.get.return_value = self.project
         # Get the command object to test
@@ -192,10 +189,10 @@ class TestUsageShow(TestUsage):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.sdk_client.get_usage.assert_called_with(
+        self.compute_sdk_client.get_usage.assert_called_with(
             project=self.project.id,
-            start='2016-11-11T00:00:00',
-            end='2016-12-20T00:00:00',
+            start=datetime.datetime(2016, 11, 11, 0, 0),
+            end=datetime.datetime(2016, 12, 20, 0, 0),
         )
 
         self.assertEqual(self.columns, columns)

openstackclient/tests/unit/fakes.py

@@ -115,12 +115,16 @@ class FakeClientManager(object):
         self.object_store = None
         self.volume = None
         self.network = None
+        self.sdk_connection = mock.Mock()
+
         self.session = None
         self.auth_ref = None
         self.auth_plugin_name = None
+
         self.network_endpoint_enabled = True
         self.compute_endpoint_enabled = True
         self.volume_endpoint_enabled = True
+
         # The source of configuration. This is either 'cloud_config' (a
         # clouds.yaml file) or 'global_env' ('OS_'-prefixed envvars)
         self.configuration_type = 'cloud_config'

openstackclient/tests/unit/identity/v3/test_mappings.py

@@ -63,6 +63,7 @@ class TestMappingCreate(TestMapping):
         self.mapping_mock.create.assert_called_with(
             mapping_id=identity_fakes.mapping_id,
             rules=identity_fakes.MAPPING_RULES,
+            schema_version=None,
         )
 
         collist = ('id', 'rules')
@@ -106,12 +107,12 @@ class TestMappingList(TestMapping):
         self.mapping_mock.list.return_value = [
             fakes.FakeResource(
                 None,
-                {'id': identity_fakes.mapping_id},
+                {'id': identity_fakes.mapping_id, 'schema_version': '1.0'},
                 loaded=True,
             ),
             fakes.FakeResource(
                 None,
-                {'id': 'extra_mapping'},
+                {'id': 'extra_mapping', 'schema_version': '2.0'},
                 loaded=True,
             ),
         ]
@@ -128,10 +129,13 @@ class TestMappingList(TestMapping):
 
         self.mapping_mock.list.assert_called_with()
 
-        collist = ('ID',)
+        collist = ('ID', 'schema_version')
         self.assertEqual(collist, columns)
 
-        datalist = [(identity_fakes.mapping_id,), ('extra_mapping',)]
+        datalist = [
+            (identity_fakes.mapping_id, '1.0'),
+            ('extra_mapping', '2.0'),
+        ]
         self.assertEqual(datalist, data)
 
 
@@ -173,6 +177,7 @@ class TestMappingSet(TestMapping):
         self.mapping_mock.update.assert_called_with(
             mapping=identity_fakes.mapping_id,
             rules=identity_fakes.MAPPING_RULES_2,
+            schema_version=None,
         )
 
         self.assertIsNone(result)

openstackclient/tests/unit/identity/v3/test_trust.py

@@ -294,7 +294,6 @@ class TestTrustList(TestTrust):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        print(self.trusts_mock.list.call_args_list)
         self.trusts_mock.list.assert_any_call(
             trustee_user=self.users_mock.get(),
             trustor_user=None,
@@ -335,7 +334,6 @@ class TestTrustList(TestTrust):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        print(self.trusts_mock.list.call_args_list)
         self.trusts_mock.list.assert_any_call(
             trustor_user=self.users_mock.get(),
             trustee_user=None,

openstackclient/tests/unit/image/v1/fakes.py

@@ -39,13 +39,14 @@ class TestImagev1(FakeClientMixin, utils.TestCommand):
             endpoint=fakes.AUTH_URL,
             token=fakes.AUTH_TOKEN,
         )
+        self.volume_client = self.app.client_manager.volume
 
 
 def create_one_image(attrs=None):
     """Create a fake image.
 
     :param Dictionary attrs:
-        A dictionary with all attrbutes of image
+        A dictionary with all attributes of image
     :return:
         A FakeResource object with id, name, owner, protected,
         visibility and tags attrs

openstackclient/tests/unit/image/v1/test_image.py

@@ -593,7 +593,7 @@ class TestImageSet(image_fakes.TestImagev1):
 
     def test_image_update_volume(self):
         # Set up VolumeManager Mock
-        volumes_mock = self.app.client_manager.volume.volumes
+        volumes_mock = self.volume_client.volumes
         volumes_mock.reset_mock()
         volumes_mock.get.return_value = fakes.FakeResource(
             None,

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

@@ -17,9 +17,12 @@ from unittest import mock
 import uuid
 
 from openstack.image.v2 import _proxy
+from openstack.image.v2 import cache
 from openstack.image.v2 import image
 from openstack.image.v2 import member
 from openstack.image.v2 import metadef_namespace
+from openstack.image.v2 import metadef_object
+from openstack.image.v2 import metadef_property
 from openstack.image.v2 import metadef_resource_type
 from openstack.image.v2 import service_info as _service_info
 from openstack.image.v2 import task
@@ -238,6 +241,28 @@ def create_tasks(attrs=None, count=2):
     return tasks
 
 
+def create_cache(attrs=None):
+    attrs = attrs or {}
+    cache_info = {
+        'cached_images': [
+            {
+                'hits': 0,
+                'image_id': '1a56983c-f71f-490b-a7ac-6b321a18935a',
+                'last_accessed': 1671699579.444378,
+                'last_modified': 1671699579.444378,
+                'size': 0,
+            },
+        ],
+        'queued_images': [
+            '3a4560a1-e585-443e-9b39-553b46ec92d1',
+            '6f99bf80-2ee6-47cf-acfe-1f1fabb7e810',
+        ],
+    }
+    cache_info.update(attrs)
+
+    return cache.Cache(**cache_info)
+
+
 def create_one_metadef_namespace(attrs=None):
     """Create a fake MetadefNamespace member.
 
@@ -263,6 +288,20 @@ def create_one_metadef_namespace(attrs=None):
     return metadef_namespace.MetadefNamespace(**metadef_namespace_list)
 
 
+def create_one_metadef_property(attrs=None):
+    attrs = attrs or {}
+
+    metadef_property_list = {
+        'name': 'cpu_cores',
+        'title': 'vCPU Cores',
+        'type': 'integer',
+    }
+
+    # Overwrite default attributes if there are some attributes set
+    metadef_property_list.update(attrs)
+    return metadef_property.MetadefProperty(**metadef_property_list)
+
+
 def create_one_resource_type(attrs=None):
     """Create a fake MetadefResourceType member.
 
@@ -299,3 +338,46 @@ def create_resource_types(attrs=None, count=2):
         metadef_resource_types.append(create_one_resource_type(attrs))
 
     return metadef_resource_types
+
+
+def create_one_metadef_object(attrs=None):
+    """Create a fake MetadefNamespace member.
+
+    :param attrs: A dictionary with all attributes of metadef_namespace member
+    :type attrs: dict
+    :return: a list of MetadefNamespace objects
+    :rtype: list of `metadef_namespace.MetadefNamespace`
+    """
+    attrs = attrs or {}
+
+    metadef_objects_list = {
+        'created_at': '2014-09-19T18:20:56Z',
+        'description': 'The CPU limits with control parameters.',
+        'name': 'CPU Limits',
+        'properties': {
+            'quota:cpu_period': {
+                'description': 'The enforcement interval',
+                'maximum': 1000000,
+                'minimum': 1000,
+                'title': 'Quota: CPU Period',
+                'type': 'integer',
+            },
+            'quota:cpu_quota': {
+                'description': 'The maximum allowed bandwidth',
+                'title': 'Quota: CPU Quota',
+                'type': 'integer',
+            },
+            'quota:cpu_shares': {
+                'description': 'The proportional weighted',
+                'title': 'Quota: CPU Shares',
+                'type': 'integer',
+            },
+        },
+        'required': [],
+        'schema': '/v2/schemas/metadefs/object',
+        'updated_at': '2014-09-19T18:20:56Z',
+    }
+
+    # Overwrite default attributes if there are some attributes set
+    metadef_objects_list.update(attrs)
+    return metadef_object.MetadefObject(**metadef_objects_list)