python-openstackclient 7.2.0__py3-none-any.whl → 7.3.0__py3-none-any.whl

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

@@ -11,58 +11,36 @@
 #   under the License.
 #
 
-import copy
 from unittest import mock
 
 from osc_lib import exceptions
-from osc_lib import utils
+
+from openstack import exceptions as sdk_exceptions
+from openstack.identity.v3 import project as _project
+from openstack.identity.v3 import role as _role
+from openstack.identity.v3 import trust as _trust
+from openstack.identity.v3 import user as _user
+from openstack.test import fakes as sdk_fakes
 
 from openstackclient.identity.v3 import trust
-from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 
 
-class TestTrust(identity_fakes.TestIdentityv3):
+class TestTrustCreate(identity_fakes.TestIdentityv3):
     def setUp(self):
         super().setUp()
 
-        self.trusts_mock = self.identity_client.trusts
-        self.trusts_mock.reset_mock()
-        self.projects_mock = self.identity_client.projects
-        self.projects_mock.reset_mock()
-        self.users_mock = self.identity_client.users
-        self.users_mock.reset_mock()
-        self.roles_mock = self.identity_client.roles
-        self.roles_mock.reset_mock()
-
+        self.trust = sdk_fakes.generate_fake_resource(_trust.Trust)
+        self.identity_sdk_client.create_trust.return_value = self.trust
 
-class TestTrustCreate(TestTrust):
-    def setUp(self):
-        super().setUp()
+        self.project = sdk_fakes.generate_fake_resource(_project.Project)
+        self.identity_sdk_client.find_project.return_value = self.project
 
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.PROJECT),
-            loaded=True,
-        )
+        self.user = sdk_fakes.generate_fake_resource(_user.User)
+        self.identity_sdk_client.find_user.return_value = self.user
 
-        self.users_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.USER),
-            loaded=True,
-        )
-
-        self.roles_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.ROLE),
-            loaded=True,
-        )
-
-        self.trusts_mock.create.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.TRUST),
-            loaded=True,
-        )
+        self.role = sdk_fakes.generate_fake_resource(_role.Role)
+        self.identity_sdk_client.find_role.return_value = self.role
 
         # Get the command object to test
         self.cmd = trust.CreateTrust(self.app, None)
@@ -70,18 +48,17 @@ class TestTrustCreate(TestTrust):
     def test_trust_create_basic(self):
         arglist = [
             '--project',
-            identity_fakes.project_id,
+            self.project.id,
             '--role',
-            identity_fakes.role_id,
-            identity_fakes.user_id,
-            identity_fakes.user_id,
+            self.role.id,
+            self.user.id,
+            self.user.id,
         ]
         verifylist = [
-            ('project', identity_fakes.project_id),
-            ('impersonate', False),
-            ('role', [identity_fakes.role_id]),
-            ('trustor', identity_fakes.user_id),
-            ('trustee', identity_fakes.user_id),
+            ('project', self.project.id),
+            ('roles', [self.role.id]),
+            ('trustor', self.user.id),
+            ('trustee', self.user.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -92,76 +69,71 @@ class TestTrustCreate(TestTrust):
 
         # Set expected values
         kwargs = {
-            'impersonation': False,
-            'project': identity_fakes.project_id,
-            'role_ids': [identity_fakes.role_id],
-            'expires_at': None,
+            'project_id': self.project.id,
+            'roles': [self.role.id],
         }
         # TrustManager.create(trustee_id, trustor_id, impersonation=,
         #   project=, role_names=, expires_at=)
-        self.trusts_mock.create.assert_called_with(
-            identity_fakes.user_id, identity_fakes.user_id, **kwargs
+        self.identity_sdk_client.create_trust.assert_called_with(
+            trustor_id=self.user.id, trustee_id=self.user.id, **kwargs
         )
 
         collist = (
             'expires_at',
             'id',
-            'impersonation',
+            'is_impersonation',
             'project_id',
+            'redelegated_trust_id',
+            'redelegation_count',
+            'remaining_uses',
             'roles',
             'trustee_user_id',
             'trustor_user_id',
         )
         self.assertEqual(collist, columns)
         datalist = (
-            identity_fakes.trust_expires,
-            identity_fakes.trust_id,
-            identity_fakes.trust_impersonation,
-            identity_fakes.project_id,
-            identity_fakes.role_name,
-            identity_fakes.user_id,
-            identity_fakes.user_id,
+            self.trust.expires_at,
+            self.trust.id,
+            self.trust.is_impersonation,
+            self.trust.project_id,
+            self.trust.redelegated_trust_id,
+            self.trust.redelegation_count,
+            self.trust.remaining_uses,
+            self.trust.roles,
+            self.trust.trustee_user_id,
+            self.trust.trustor_user_id,
         )
         self.assertEqual(datalist, data)
 
 
-class TestTrustDelete(TestTrust):
+class TestTrustDelete(identity_fakes.TestIdentityv3):
     def setUp(self):
         super().setUp()
 
-        # This is the return value for utils.find_resource()
-        self.trusts_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.TRUST),
-            loaded=True,
-        )
-        self.trusts_mock.delete.return_value = None
+        self.trust = sdk_fakes.generate_fake_resource(_trust.Trust)
+        self.identity_sdk_client.delete_trust.return_value = None
+        self.identity_sdk_client.find_trust.return_value = self.trust
 
         # Get the command object to test
         self.cmd = trust.DeleteTrust(self.app, None)
 
     def test_trust_delete(self):
         arglist = [
-            identity_fakes.trust_id,
+            self.trust.id,
         ]
-        verifylist = [('trust', [identity_fakes.trust_id])]
+        verifylist = [('trust', [self.trust.id])]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         result = self.cmd.take_action(parsed_args)
 
-        self.trusts_mock.delete.assert_called_with(
-            identity_fakes.trust_id,
+        self.identity_sdk_client.delete_trust.assert_called_with(
+            self.trust.id,
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(utils, 'find_resource')
-    def test_delete_multi_trusts_with_exception(self, find_mock):
-        find_mock.side_effect = [
-            self.trusts_mock.get.return_value,
-            exceptions.CommandError,
-        ]
+    def test_delete_multi_trusts_with_exception(self):
         arglist = [
-            identity_fakes.trust_id,
+            self.trust.id,
             'unexist_trust',
         ]
         verifylist = [
@@ -169,32 +141,37 @@ class TestTrustDelete(TestTrust):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
+        self.identity_sdk_client.find_trust.side_effect = [
+            self.trust,
+            sdk_exceptions.ResourceNotFound,
+        ]
+
         try:
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
             self.assertEqual('1 of 2 trusts failed to delete.', str(e))
 
-        find_mock.assert_any_call(self.trusts_mock, identity_fakes.trust_id)
-        find_mock.assert_any_call(self.trusts_mock, 'unexist_trust')
-
-        self.assertEqual(2, find_mock.call_count)
-        self.trusts_mock.delete.assert_called_once_with(
-            identity_fakes.trust_id
+        self.identity_sdk_client.find_trust.assert_has_calls(
+            [
+                mock.call(self.trust.id, ignore_missing=False),
+                mock.call('unexist_trust', ignore_missing=False),
+            ]
+        )
+        self.identity_sdk_client.delete_trust.assert_called_once_with(
+            self.trust.id
         )
 
 
-class TestTrustList(TestTrust):
+class TestTrustList(identity_fakes.TestIdentityv3):
     def setUp(self):
         super().setUp()
 
-        self.trusts_mock.list.return_value = [
-            fakes.FakeResource(
-                None,
-                copy.deepcopy(identity_fakes.TRUST),
-                loaded=True,
-            ),
-        ]
+        self.trust = sdk_fakes.generate_fake_resource(_trust.Trust)
+        self.identity_sdk_client.trusts.return_value = [self.trust]
+
+        self.user = sdk_fakes.generate_fake_resource(_user.User)
+        self.identity_sdk_client.find_user.return_value = self.user
 
         # Get the command object to test
         self.cmd = trust.ListTrust(self.app, None)
@@ -209,9 +186,9 @@ class TestTrustList(TestTrust):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.trusts_mock.list.assert_called_with(
-            trustor_user=None,
-            trustee_user=None,
+        self.identity_sdk_client.trusts.assert_called_with(
+            trustor_user_id=None,
+            trustee_user_id=None,
         )
 
         collist = (
@@ -225,19 +202,19 @@ class TestTrustList(TestTrust):
         self.assertEqual(collist, columns)
         datalist = (
             (
-                identity_fakes.trust_id,
-                identity_fakes.trust_expires,
-                identity_fakes.trust_impersonation,
-                identity_fakes.project_id,
-                identity_fakes.user_id,
-                identity_fakes.user_id,
+                self.trust.id,
+                self.trust.expires_at,
+                self.trust.is_impersonation,
+                self.trust.project_id,
+                self.trust.trustee_user_id,
+                self.trust.trustor_user_id,
             ),
         )
         self.assertEqual(datalist, tuple(data))
 
     def test_trust_list_auth_user(self):
-        auth_ref = self.app.client_manager.auth_ref = mock.Mock()
-        auth_ref.user_id.return_value = identity_fakes.user_id
+        self.app.client_manager.auth_ref = mock.Mock()
+        auth_ref = self.app.client_manager.auth_ref
 
         arglist = ['--auth-user']
         verifylist = [
@@ -252,11 +229,11 @@ class TestTrustList(TestTrust):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.trusts_mock.list.assert_any_call(
-            trustor_user=self.users_mock.get()
-        )
-        self.trusts_mock.list.assert_any_call(
-            trustee_user=self.users_mock.get()
+        self.identity_sdk_client.trusts.assert_has_calls(
+            [
+                mock.call(trustor_user_id=auth_ref.user_id),
+                mock.call(trustee_user_id=auth_ref.user_id),
+            ]
         )
 
         collist = (
@@ -270,21 +247,21 @@ class TestTrustList(TestTrust):
         self.assertEqual(collist, columns)
         datalist = (
             (
-                identity_fakes.trust_id,
-                identity_fakes.trust_expires,
-                identity_fakes.trust_impersonation,
-                identity_fakes.project_id,
-                identity_fakes.user_id,
-                identity_fakes.user_id,
+                self.trust.id,
+                self.trust.expires_at,
+                self.trust.is_impersonation,
+                self.trust.project_id,
+                self.trust.trustee_user_id,
+                self.trust.trustor_user_id,
             ),
         )
         self.assertEqual(datalist, tuple(data))
 
     def test_trust_list_trustee(self):
-        arglist = ['--trustee', identity_fakes.user_name]
+        arglist = ['--trustee', self.user.name]
         verifylist = [
             ('trustor', None),
-            ('trustee', identity_fakes.user_name),
+            ('trustee', self.user.name),
             ('authuser', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -294,9 +271,9 @@ class TestTrustList(TestTrust):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.trusts_mock.list.assert_any_call(
-            trustee_user=self.users_mock.get(),
-            trustor_user=None,
+        self.identity_sdk_client.trusts.assert_called_with(
+            trustee_user_id=self.user.id,
+            trustor_user_id=None,
         )
 
         collist = (
@@ -310,21 +287,21 @@ class TestTrustList(TestTrust):
         self.assertEqual(collist, columns)
         datalist = (
             (
-                identity_fakes.trust_id,
-                identity_fakes.trust_expires,
-                identity_fakes.trust_impersonation,
-                identity_fakes.project_id,
-                identity_fakes.user_id,
-                identity_fakes.user_id,
+                self.trust.id,
+                self.trust.expires_at,
+                self.trust.is_impersonation,
+                self.trust.project_id,
+                self.trust.trustee_user_id,
+                self.trust.trustor_user_id,
             ),
         )
         self.assertEqual(datalist, tuple(data))
 
     def test_trust_list_trustor(self):
-        arglist = ['--trustor', identity_fakes.user_name]
+        arglist = ['--trustor', self.user.name]
         verifylist = [
             ('trustee', None),
-            ('trustor', identity_fakes.user_name),
+            ('trustor', self.user.name),
             ('authuser', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -334,9 +311,9 @@ class TestTrustList(TestTrust):
         # containing the data to be listed.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.trusts_mock.list.assert_any_call(
-            trustor_user=self.users_mock.get(),
-            trustee_user=None,
+        self.identity_sdk_client.trusts.assert_called_once_with(
+            trustor_user_id=self.user.id,
+            trustee_user_id=None,
         )
 
         collist = (
@@ -350,36 +327,33 @@ class TestTrustList(TestTrust):
         self.assertEqual(collist, columns)
         datalist = (
             (
-                identity_fakes.trust_id,
-                identity_fakes.trust_expires,
-                identity_fakes.trust_impersonation,
-                identity_fakes.project_id,
-                identity_fakes.user_id,
-                identity_fakes.user_id,
+                self.trust.id,
+                self.trust.expires_at,
+                self.trust.is_impersonation,
+                self.trust.project_id,
+                self.trust.trustee_user_id,
+                self.trust.trustor_user_id,
             ),
         )
         self.assertEqual(datalist, tuple(data))
 
 
-class TestTrustShow(TestTrust):
+class TestTrustShow(identity_fakes.TestIdentityv3):
     def setUp(self):
         super().setUp()
 
-        self.trusts_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.TRUST),
-            loaded=True,
-        )
+        self.trust = sdk_fakes.generate_fake_resource(_trust.Trust)
+        self.identity_sdk_client.find_trust.return_value = self.trust
 
         # Get the command object to test
         self.cmd = trust.ShowTrust(self.app, None)
 
     def test_trust_show(self):
         arglist = [
-            identity_fakes.trust_id,
+            self.trust.id,
         ]
         verifylist = [
-            ('trust', identity_fakes.trust_id),
+            ('trust', self.trust.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -388,25 +362,33 @@ class TestTrustShow(TestTrust):
         # data to be shown.
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.trusts_mock.get.assert_called_with(identity_fakes.trust_id)
+        self.identity_sdk_client.find_trust.assert_called_with(
+            self.trust.id, ignore_missing=False
+        )
 
         collist = (
             'expires_at',
             'id',
-            'impersonation',
+            'is_impersonation',
             'project_id',
+            'redelegated_trust_id',
+            'redelegation_count',
+            'remaining_uses',
             'roles',
             'trustee_user_id',
             'trustor_user_id',
         )
         self.assertEqual(collist, columns)
         datalist = (
-            identity_fakes.trust_expires,
-            identity_fakes.trust_id,
-            identity_fakes.trust_impersonation,
-            identity_fakes.project_id,
-            identity_fakes.role_name,
-            identity_fakes.user_id,
-            identity_fakes.user_id,
+            self.trust.expires_at,
+            self.trust.id,
+            self.trust.is_impersonation,
+            self.trust.project_id,
+            self.trust.redelegated_trust_id,
+            self.trust.redelegation_count,
+            self.trust.remaining_uses,
+            self.trust.roles,
+            self.trust.trustee_user_id,
+            self.trust.trustor_user_id,
         )
         self.assertEqual(datalist, data)

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

@@ -55,6 +55,7 @@ class TestImageCreate(TestImage):
         self.new_image = image_fakes.create_one_image()
         self.image_client.create_image.return_value = self.new_image
         self.image_client.update_image.return_value = self.new_image
+        self.image_client.get_image.return_value = self.new_image
 
         self.project_mock.get.return_value = self.project
 
@@ -89,6 +90,7 @@ class TestImageCreate(TestImage):
             container_format=_image.DEFAULT_CONTAINER_FORMAT,
             disk_format=_image.DEFAULT_DISK_FORMAT,
         )
+        self.image_client.get_image.assert_called_once_with(self.new_image)
 
         self.assertEqual(self.expected_columns, columns)
         self.assertCountEqual(self.expected_data, data)
@@ -146,6 +148,7 @@ class TestImageCreate(TestImage):
             is_protected=self.new_image.is_protected,
             visibility=self.new_image.visibility,
         )
+        self.image_client.get_image.assert_called_once_with(self.new_image)
 
         self.assertEqual(self.expected_columns, columns)
         self.assertCountEqual(self.expected_data, data)
@@ -243,6 +246,7 @@ class TestImageCreate(TestImage):
             tags=self.new_image.tags,
             filename=imagefile.name,
         )
+        self.image_client.get_image.assert_called_once_with(self.new_image)
 
         self.assertEqual(self.expected_columns, columns)
         self.assertCountEqual(self.expected_data, data)
@@ -275,6 +279,7 @@ class TestImageCreate(TestImage):
             data=fake_stdin,
             validate_checksum=False,
         )
+        self.image_client.get_image.assert_called_once_with(self.new_image)
 
         self.assertEqual(self.expected_columns, columns)
         self.assertCountEqual(self.expected_data, data)
@@ -315,6 +320,7 @@ class TestImageCreate(TestImage):
             disk_format=_image.DEFAULT_DISK_FORMAT,
             use_import=True,
         )
+        self.image_client.get_image.assert_called_once_with(self.new_image)
 
     @mock.patch('osc_lib.utils.find_resource')
     @mock.patch('openstackclient.image.v2.image.get_data_from_stdin')

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

@@ -1419,6 +1419,7 @@ def create_one_network(attrs=None):
         'availability_zone_hints': [],
         'is_default': False,
         'is_vlan_transparent': True,
+        'is_vlan_qinq': False,
         'port_security_enabled': True,
         'qos_policy_id': 'qos-policy-id-' + uuid.uuid4().hex,
         'ipv4_address_scope': 'ipv4' + uuid.uuid4().hex,
@@ -1676,8 +1677,10 @@ def create_one_port(attrs=None):
         'qos_network_policy_id': 'qos-policy-id-' + uuid.uuid4().hex,
         'qos_policy_id': 'qos-policy-id-' + uuid.uuid4().hex,
         'tags': [],
+        'trusted': None,
         'propagate_uplink_status': False,
         'location': 'MUNCHMUNCHMUNCH',
+        'trunk_details': {},
     }
 
     # Overwrite default attributes.

openstackclient/tests/unit/network/v2/test_network.py

@@ -63,6 +63,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         'ipv6_address_scope',
         'is_default',
         'is_vlan_transparent',
+        'is_vlan_qinq',
         'mtu',
         'name',
         'port_security_enabled',
@@ -103,6 +104,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
         network.RouterExternalColumn(_network.is_router_external),
         _network.is_shared,
         _network.is_vlan_transparent,
+        _network.is_vlan_qinq,
         _network.status,
         _network.segments,
         format_columns.ListColumn(_network.subnet_ids),
@@ -190,6 +192,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             "--qos-policy",
             self.qos_policy.id,
             "--transparent-vlan",
+            "--no-qinq-vlan",
             "--enable-port-security",
             "--dns-domain",
             "example.org.",
@@ -210,6 +213,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             ('segmentation_id', '400'),
             ('qos_policy', self.qos_policy.id),
             ('transparent_vlan', True),
+            ('qinq_vlan', False),
             ('enable_port_security', True),
             ('name', self._network.name),
             ('dns_domain', 'example.org.'),
@@ -234,6 +238,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
                 'provider:segmentation_id': '400',
                 'qos_policy_id': self.qos_policy.id,
                 'vlan_transparent': True,
+                'vlan_qinq': False,
                 'port_security_enabled': True,
                 'dns_domain': 'example.org.',
             }
@@ -246,6 +251,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             "--enable",
             "--no-share",
             "--disable-port-security",
+            "--qinq-vlan",
             self._network.name,
         ]
         verifylist = [
@@ -253,6 +259,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
             ('no_share', True),
             ('name', self._network.name),
             ('external', False),
+            ('qinq_vlan', True),
             ('disable_port_security', True),
         ]
 
@@ -264,6 +271,7 @@ class TestCreateNetworkIdentityV3(TestNetwork):
                 'admin_state_up': True,
                 'name': self._network.name,
                 'shared': False,
+                'vlan_qinq': True,
                 'port_security_enabled': False,
             }
         )
@@ -309,6 +317,19 @@ class TestCreateNetworkIdentityV3(TestNetwork):
     def test_create_with_no_tag(self):
         self._test_create_with_tag(add_tags=False)
 
+    def test_create_with_vlan_qinq_and_transparency_enabled(self):
+        arglist = [
+            "--transparent-vlan",
+            "--qinq-vlan",
+            self._network.name,
+        ]
+        verifylist = []
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(
+            exceptions.CommandError, self.cmd.take_action, parsed_args
+        )
+
 
 class TestCreateNetworkIdentityV2(
     identity_fakes_v2.FakeClientMixin,
@@ -332,6 +353,7 @@ class TestCreateNetworkIdentityV2(
         'ipv6_address_scope',
         'is_default',
         'is_vlan_transparent',
+        'is_vlan_qinq',
         'mtu',
         'name',
         'port_security_enabled',
@@ -372,6 +394,7 @@ class TestCreateNetworkIdentityV2(
         network.RouterExternalColumn(_network.is_router_external),
         _network.is_shared,
         _network.is_vlan_transparent,
+        _network.is_vlan_qinq,
         _network.status,
         _network.segments,
         format_columns.ListColumn(_network.subnet_ids),
@@ -1149,6 +1172,7 @@ class TestShowNetwork(TestNetwork):
         'ipv6_address_scope',
         'is_default',
         'is_vlan_transparent',
+        'is_vlan_qinq',
         'mtu',
         'name',
         'port_security_enabled',
@@ -1189,6 +1213,7 @@ class TestShowNetwork(TestNetwork):
         network.RouterExternalColumn(_network.is_router_external),
         _network.is_shared,
         _network.is_vlan_transparent,
+        _network.is_vlan_qinq,
         _network.status,
         _network.segments,
         format_columns.ListColumn(_network.subnet_ids),