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

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

@@ -52,7 +52,7 @@ class TestImageCreate(image_fakes.TestImagev1):
     )
 
     def setUp(self):
-        super(TestImageCreate, self).setUp()
+        super().setUp()
 
         self.image_client.create_image = mock.Mock(return_value=self.new_image)
         self.image_client.find_image = mock.Mock(return_value=self.new_image)
@@ -145,7 +145,7 @@ class TestImageCreate(image_fakes.TestImagev1):
         self.assertEqual(self.columns, columns)
         self.assertCountEqual(self.data, data)
 
-    @mock.patch('openstackclient.image.v1.image.io.open', name='Open')
+    @mock.patch('openstackclient.image.v1.image.open', name='Open')
     def test_image_create_file(self, mock_open):
         mock_file = mock.Mock(name='File')
         mock_open.return_value = mock_file
@@ -209,7 +209,7 @@ class TestImageDelete(image_fakes.TestImagev1):
     _image = image_fakes.create_one_image()
 
     def setUp(self):
-        super(TestImageDelete, self).setUp()
+        super().setUp()
 
         # This is the return value for utils.find_resource()
         self.image_client.find_image = mock.Mock(return_value=self._image)
@@ -259,7 +259,7 @@ class TestImageList(image_fakes.TestImagev1):
     image_info = copy.deepcopy(info)
 
     def setUp(self):
-        super(TestImageList, self).setUp()
+        super().setUp()
 
         self.image_client.images = mock.Mock()
         self.image_client.images.side_effect = [
@@ -438,7 +438,7 @@ class TestImageSet(image_fakes.TestImagev1):
     _image = image_fakes.create_one_image()
 
     def setUp(self):
-        super(TestImageSet, self).setUp()
+        super().setUp()
 
         # This is the return value for utils.find_resource()
         self.image_client.find_image = mock.Mock(return_value=self._image)
@@ -710,7 +710,7 @@ class TestImageShow(image_fakes.TestImagev1):
     )
 
     def setUp(self):
-        super(TestImageShow, self).setUp()
+        super().setUp()
 
         self.image_client.find_image = mock.Mock(return_value=self._image)
 

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

@@ -27,7 +27,6 @@ from openstack.image.v2 import metadef_resource_type
 from openstack.image.v2 import service_info as _service_info
 from openstack.image.v2 import task
 
-from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit import utils
 
@@ -40,14 +39,11 @@ class FakeClientMixin:
         self.image_client = self.app.client_manager.image
 
 
-class TestImagev2(FakeClientMixin, utils.TestCommand):
-    def setUp(self):
-        super().setUp()
-
-        self.app.client_manager.identity = identity_fakes.FakeIdentityv3Client(
-            endpoint=fakes.AUTH_URL,
-            token=fakes.AUTH_TOKEN,
-        )
+class TestImagev2(
+    identity_fakes.FakeClientMixin,
+    FakeClientMixin,
+    utils.TestCommand,
+): ...
 
 
 def create_one_image(attrs=None):
@@ -381,3 +377,44 @@ def create_one_metadef_object(attrs=None):
     # Overwrite default attributes if there are some attributes set
     metadef_objects_list.update(attrs)
     return metadef_object.MetadefObject(**metadef_objects_list)
+
+
+def create_one_resource_type_association(attrs=None):
+    """Create a fake MetadefResourceTypeAssociation.
+
+    :param attrs: A dictionary with all attributes of
+        metadef_resource_type_association member
+    :type attrs: dict
+    :return: A fake MetadefResourceTypeAssociation object
+    :rtype: A `metadef_resource_type_association.
+        MetadefResourceTypeAssociation`
+    """
+    attrs = attrs or {}
+
+    metadef_resource_type_association_info = {
+        'namespace_name': 'OS::Compute::Quota',
+        'name': 'OS::Nova::Flavor',
+    }
+
+    metadef_resource_type_association_info.update(attrs)
+    return metadef_resource_type.MetadefResourceTypeAssociation(
+        **metadef_resource_type_association_info
+    )
+
+
+def create_resource_type_associations(attrs=None, count=2):
+    """Create mutiple fake resource type associations/
+
+    :param attrs: A dictionary with all attributes of
+        metadef_resource_type_association member
+    :type attrs: dict
+    :return: A list of fake MetadefResourceTypeAssociation objects
+    :rtype: list
+    """
+    resource_type_associations = []
+    for n in range(0, count):
+        resource_type_associations.append(
+            create_one_resource_type_association(attrs)
+        )
+
+    return resource_type_associations

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

@@ -184,13 +184,13 @@ class TestCacheClear(fakes.TestImagev2):
     def test_cache_clear_no_option(self):
         arglist = []
 
-        verifylist = [('target', None)]
+        verifylist = [('target', 'both')]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
         self.assertIsNone(
-            self.image_client.clear_cache.assert_called_with(None)
+            self.image_client.clear_cache.assert_called_with('both')
         )
 
     def test_cache_clear_queue_option(self):

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

@@ -33,9 +33,9 @@ class TestImage(image_fakes.TestImagev2, volume_fakes.TestVolume):
         super().setUp()
 
         # Get shortcut to the Mocks in identity client
-        self.project_mock = self.app.client_manager.identity.projects
+        self.project_mock = self.identity_client.projects
         self.project_mock.reset_mock()
-        self.domain_mock = self.app.client_manager.identity.domains
+        self.domain_mock = self.identity_client.domains
         self.domain_mock.reset_mock()
         self.volumes_mock = self.volume_client.volumes
         fake_body = {
@@ -894,7 +894,7 @@ class TestImageList(TestImage):
         columns, data = self.cmd.take_action(parsed_args)
         self.image_client.images.assert_called_with(
             limit=ret_limit,
-            paginated=False
+            paginated=False,
             # marker=None
         )
 

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

@@ -12,6 +12,8 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
+from osc_lib import exceptions
+
 from openstackclient.image.v2 import metadef_objects
 from openstackclient.tests.unit.image.v2 import fakes
 
@@ -198,3 +200,63 @@ class TestMetadefObjectSet(fakes.TestImagev2):
         result = self.cmd.take_action(parsed_args)
 
         self.assertIsNone(result)
+
+
+class TestMetadefObjectPropertyShow(fakes.TestImagev2):
+    _metadef_namespace = fakes.create_one_metadef_namespace()
+    _metadef_objects = fakes.create_one_metadef_object()
+    md_property = _metadef_objects['properties']['quota:cpu_quota']
+    md_property['name'] = 'quota:cpu_quota'
+
+    expected_columns = (
+        'description',
+        'name',
+        'title',
+        'type',
+    )
+    expected_data = (
+        md_property['description'],
+        md_property['name'],
+        md_property['title'],
+        md_property['type'],
+    )
+
+    def setUp(self):
+        super().setUp()
+
+        self.image_client.get_metadef_object.return_value = (
+            self._metadef_objects
+        )
+        self.cmd = metadef_objects.ShowMetadefObjectProperty(self.app, None)
+
+    def test_object_property_show(self):
+        arglist = [
+            self._metadef_namespace.namespace,
+            self._metadef_objects.name,
+            'quota:cpu_quota',
+        ]
+        verifylist = []
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.assertEqual(self.expected_columns, columns)
+        self.assertEqual(self.expected_data, data)
+
+    def test_neg_object_property_show(self):
+        arglist = [
+            self._metadef_namespace.namespace,
+            self._metadef_objects.name,
+            'prop1',
+        ]
+        verifylist = []
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        exc = self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+        self.assertIn(
+            'Property %s not found in object %s.'
+            % (parsed_args.property, parsed_args.object),
+            str(exc),
+        )

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

@@ -0,0 +1,131 @@
+#   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 openstackclient.image.v2 import metadef_resource_type_association
+from openstackclient.tests.unit.image.v2 import fakes as resource_type_fakes
+
+
+class TestMetadefResourceTypeAssociationCreate(
+    resource_type_fakes.TestImagev2
+):
+    resource_type_association = (
+        resource_type_fakes.create_one_resource_type_association()
+    )
+
+    columns = (
+        'created_at',
+        'id',
+        'name',
+        'prefix',
+        'properties_target',
+        'updated_at',
+    )
+
+    data = (
+        resource_type_association.created_at,
+        resource_type_association.id,
+        resource_type_association.name,
+        resource_type_association.prefix,
+        resource_type_association.properties_target,
+        resource_type_association.updated_at,
+    )
+
+    def setUp(self):
+        super().setUp()
+
+        self.image_client.create_metadef_resource_type_association.return_value = (
+            self.resource_type_association
+        )
+        self.cmd = metadef_resource_type_association.CreateMetadefResourceTypeAssociation(
+            self.app, None
+        )
+
+    def test_resource_type_association_create(self):
+        arglist = [
+            self.resource_type_association.namespace_name,
+            self.resource_type_association.name,
+        ]
+
+        verifylist = []
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, data)
+
+
+class TestMetadefResourceTypeAssociationDelete(
+    resource_type_fakes.TestImagev2
+):
+    resource_type_association = (
+        resource_type_fakes.create_one_resource_type_association()
+    )
+
+    def setUp(self):
+        super().setUp()
+
+        self.image_client.delete_metadef_resource_type_association.return_value = (
+            self.resource_type_association
+        )
+        self.cmd = metadef_resource_type_association.DeleteMetadefResourceTypeAssociation(
+            self.app, None
+        )
+
+    def test_resource_type_association_delete(self):
+        arglist = [
+            self.resource_type_association.namespace_name,
+            self.resource_type_association.name,
+        ]
+
+        verifylist = []
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.assertIsNone(result)
+
+
+class TestMetadefResourceTypeAssociationList(resource_type_fakes.TestImagev2):
+    resource_type_associations = (
+        resource_type_fakes.create_resource_type_associations()
+    )
+
+    columns = ['Name']
+
+    datalist = [
+        (resource_type_association.name,)
+        for resource_type_association in resource_type_associations
+    ]
+
+    def setUp(self):
+        super().setUp()
+
+        self.image_client.metadef_resource_type_associations.side_effect = [
+            self.resource_type_associations,
+            [],
+        ]
+
+        self.cmd = metadef_resource_type_association.ListMetadefResourceTypeAssociations(
+            self.app, None
+        )
+
+    def test_resource_type_association_list(self):
+        arglist = [
+            self.resource_type_associations[0].namespace_name,
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, [])
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.assertEqual(self.columns, columns)
+        self.assertCountEqual(self.datalist, data)

openstackclient/tests/unit/integ/base.py

@@ -119,6 +119,6 @@ def make_v3_token(req_mock):
 
 class TestInteg(utils.TestCase):
     def setUp(self):
-        super(TestInteg, self).setUp()
+        super().setUp()
 
         self.requests_mock = self.useFixture(fixture.Fixture())

openstackclient/tests/unit/integ/cli/test_project.py

@@ -21,7 +21,7 @@ from openstackclient.tests.unit import test_shell
 
 class TestIntegV2ProjectID(test_base.TestInteg):
     def setUp(self):
-        super(TestIntegV2ProjectID, self).setUp()
+        super().setUp()
         env = {
             "OS_AUTH_URL": test_base.V2_AUTH_URL,
             "OS_PROJECT_ID": test_shell.DEFAULT_PROJECT_ID,
@@ -78,7 +78,7 @@ class TestIntegV2ProjectID(test_base.TestInteg):
 
 class TestIntegV2ProjectName(test_base.TestInteg):
     def setUp(self):
-        super(TestIntegV2ProjectName, self).setUp()
+        super().setUp()
         env = {
             "OS_AUTH_URL": test_base.V2_AUTH_URL,
             "OS_PROJECT_NAME": test_shell.DEFAULT_PROJECT_NAME,
@@ -135,7 +135,7 @@ class TestIntegV2ProjectName(test_base.TestInteg):
 
 class TestIntegV3ProjectID(test_base.TestInteg):
     def setUp(self):
-        super(TestIntegV3ProjectID, self).setUp()
+        super().setUp()
         env = {
             "OS_AUTH_URL": test_base.V3_AUTH_URL,
             "OS_PROJECT_ID": test_shell.DEFAULT_PROJECT_NAME,
@@ -190,7 +190,7 @@ class TestIntegV3ProjectID(test_base.TestInteg):
 
 class TestIntegV3ProjectName(test_base.TestInteg):
     def setUp(self):
-        super(TestIntegV3ProjectName, self).setUp()
+        super().setUp()
         env = {
             "OS_AUTH_URL": test_base.V3_AUTH_URL,
             "OS_PROJECT_NAME": test_shell.DEFAULT_PROJECT_NAME,

openstackclient/tests/unit/integ/cli/test_shell.py

@@ -23,7 +23,7 @@ from openstackclient.tests.unit import test_shell
 
 class TestIntegShellCliNoAuth(test_base.TestInteg):
     def setUp(self):
-        super(TestIntegShellCliNoAuth, self).setUp()
+        super().setUp()
         env = {}
         self.useFixture(osc_lib_utils.EnvFixture(copy.deepcopy(env)))
 
@@ -67,7 +67,7 @@ class TestIntegShellCliNoAuth(test_base.TestInteg):
 
 class TestIntegShellCliV2(test_base.TestInteg):
     def setUp(self):
-        super(TestIntegShellCliV2, self).setUp()
+        super().setUp()
         env = {
             "OS_AUTH_URL": test_base.V2_AUTH_URL,
             "OS_PROJECT_NAME": test_shell.DEFAULT_PROJECT_NAME,
@@ -154,7 +154,7 @@ class TestIntegShellCliV2(test_base.TestInteg):
 
 class TestIntegShellCliV2Ignore(test_base.TestInteg):
     def setUp(self):
-        super(TestIntegShellCliV2Ignore, self).setUp()
+        super().setUp()
         env = {
             "OS_AUTH_URL": test_base.V2_AUTH_URL,
             "OS_PROJECT_NAME": test_shell.DEFAULT_PROJECT_NAME,
@@ -200,7 +200,7 @@ class TestIntegShellCliV2Ignore(test_base.TestInteg):
 
 class TestIntegShellCliV3(test_base.TestInteg):
     def setUp(self):
-        super(TestIntegShellCliV3, self).setUp()
+        super().setUp()
         env = {
             "OS_AUTH_URL": test_base.V3_AUTH_URL,
             "OS_PROJECT_DOMAIN_ID": test_shell.DEFAULT_PROJECT_DOMAIN_ID,
@@ -290,7 +290,7 @@ class TestIntegShellCliV3(test_base.TestInteg):
 
 class TestIntegShellCliV3Prompt(test_base.TestInteg):
     def setUp(self):
-        super(TestIntegShellCliV3Prompt, self).setUp()
+        super().setUp()
         env = {
             "OS_AUTH_URL": test_base.V3_AUTH_URL,
             "OS_PROJECT_DOMAIN_ID": test_shell.DEFAULT_PROJECT_DOMAIN_ID,
@@ -339,7 +339,7 @@ class TestIntegShellCliPrecedence(test_base.TestInteg):
     """
 
     def setUp(self):
-        super(TestIntegShellCliPrecedence, self).setUp()
+        super().setUp()
         env = {
             "OS_AUTH_URL": test_base.V3_AUTH_URL,
             "OS_PROJECT_DOMAIN_ID": test_shell.DEFAULT_PROJECT_DOMAIN_ID,
@@ -412,7 +412,7 @@ class TestIntegShellCliPrecedenceOCC(test_base.TestInteg):
     """
 
     def setUp(self):
-        super(TestIntegShellCliPrecedenceOCC, self).setUp()
+        super().setUp()
         env = {
             "OS_CLOUD": "megacloud",
             "OS_AUTH_URL": test_base.V3_AUTH_URL,

openstackclient/tests/unit/network/test_common.py

@@ -11,7 +11,6 @@
 #   under the License.
 #
 
-import argparse
 from unittest import mock
 
 import openstack
@@ -103,9 +102,7 @@ class FakeCreateNeutronCommandWithExtraArgs(
     common.NeutronCommandWithExtraArgs
 ):
     def get_parser(self, prog_name):
-        parser = super(FakeCreateNeutronCommandWithExtraArgs, self).get_parser(
-            prog_name
-        )
+        parser = super().get_parser(prog_name)
         parser.add_argument(
             '--known-attribute',
         )
@@ -126,8 +123,6 @@ class TestNetworkAndCompute(utils.TestCommand):
     def setUp(self):
         super().setUp()
 
-        self.namespace = argparse.Namespace()
-
         # Create client mocks. Note that we intentionally do not use specced
         # mocks since we want to test fake methods.
 
@@ -137,13 +132,13 @@ class TestNetworkAndCompute(utils.TestCommand):
             return_value='take_action_network'
         )
 
-        self.app.client_manager.compute = mock.Mock()
-        self.compute_client = self.app.client_manager.compute
+        self.app.client_manager.sdk_connection.compute = mock.Mock()
+        self.compute_client = self.app.client_manager.sdk_connection.compute
         self.compute_client.compute_action = mock.Mock(
             return_value='take_action_compute'
         )
 
-        self.cmd = FakeNetworkAndComputeCommand(self.app, self.namespace)
+        self.cmd = FakeNetworkAndComputeCommand(self.app, None)
 
     def test_take_action_network(self):
         arglist = ['common', 'network']
@@ -167,20 +162,20 @@ class TestNetworkAndCompute(utils.TestCommand):
 
 class TestNetworkAndComputeCommand(TestNetworkAndCompute):
     def setUp(self):
-        super(TestNetworkAndComputeCommand, self).setUp()
-        self.cmd = FakeNetworkAndComputeCommand(self.app, self.namespace)
+        super().setUp()
+        self.cmd = FakeNetworkAndComputeCommand(self.app, None)
 
 
 class TestNetworkAndComputeLister(TestNetworkAndCompute):
     def setUp(self):
-        super(TestNetworkAndComputeLister, self).setUp()
-        self.cmd = FakeNetworkAndComputeLister(self.app, self.namespace)
+        super().setUp()
+        self.cmd = FakeNetworkAndComputeLister(self.app, None)
 
 
 class TestNetworkAndComputeShowOne(TestNetworkAndCompute):
     def setUp(self):
-        super(TestNetworkAndComputeShowOne, self).setUp()
-        self.cmd = FakeNetworkAndComputeShowOne(self.app, self.namespace)
+        super().setUp()
+        self.cmd = FakeNetworkAndComputeShowOne(self.app, None)
 
     def test_take_action_with_http_exception(self):
         with mock.patch.object(self.cmd, 'take_action_network') as m_action:
@@ -205,9 +200,7 @@ class TestNetworkAndComputeShowOne(TestNetworkAndCompute):
 
 class TestNeutronCommandWithExtraArgs(utils.TestCommand):
     def setUp(self):
-        super(TestNeutronCommandWithExtraArgs, self).setUp()
-
-        self.namespace = argparse.Namespace()
+        super().setUp()
 
         # Create client mocks. Note that we intentionally do not use specced
         # mocks since we want to test fake methods.
@@ -217,9 +210,7 @@ class TestNeutronCommandWithExtraArgs(utils.TestCommand):
         self.network_client.test_create_action = mock.Mock()
 
         # Subclasses can override the command object to test.
-        self.cmd = FakeCreateNeutronCommandWithExtraArgs(
-            self.app, self.namespace
-        )
+        self.cmd = FakeCreateNeutronCommandWithExtraArgs(self.app, None)
 
     def test_create_extra_attributes_default_type(self):
         arglist = [