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

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

@@ -23,14 +23,11 @@ class TestFlavorProfile(network_fakes.TestNetworkV2):
     def setUp(self):
         super().setUp()
 
-        # Get the ProjectManager Mock
-        self.projects_mock = self.identity_client.projects
         # Get the DomainManager Mock
         self.domains_mock = self.identity_client.domains
 
 
 class TestCreateFlavorProfile(TestFlavorProfile):
-    project = identity_fakes_v3.FakeProject.create_one_project()
     domain = identity_fakes_v3.FakeDomain.create_one_domain()
     new_flavor_profile = network_fakes.create_one_service_profile()
 
@@ -40,7 +37,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
         'enabled',
         'id',
         'meta_info',
-        'project_id',
     )
 
     data = (
@@ -49,7 +45,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
         new_flavor_profile.is_enabled,
         new_flavor_profile.id,
         new_flavor_profile.meta_info,
-        new_flavor_profile.project_id,
     )
 
     def setUp(self):
@@ -57,7 +52,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
         self.network_client.create_service_profile = mock.Mock(
             return_value=self.new_flavor_profile
         )
-        self.projects_mock.get.return_value = self.project
         # Get the command object to test
         self.cmd = network_flavor_profile.CreateNetworkFlavorProfile(
             self.app, None
@@ -67,10 +61,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
         arglist = [
             "--description",
             self.new_flavor_profile.description,
-            "--project",
-            self.new_flavor_profile.project_id,
-            '--project-domain',
-            self.domain.name,
             "--enable",
             "--driver",
             self.new_flavor_profile.driver,
@@ -80,8 +70,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
 
         verifylist = [
             ('description', self.new_flavor_profile.description),
-            ('project', self.new_flavor_profile.project_id),
-            ('project_domain', self.domain.name),
             ('enable', True),
             ('driver', self.new_flavor_profile.driver),
             ('metainfo', self.new_flavor_profile.meta_info),
@@ -93,7 +81,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
         self.network_client.create_service_profile.assert_called_once_with(
             **{
                 'description': self.new_flavor_profile.description,
-                'project_id': self.project.id,
                 'enabled': self.new_flavor_profile.is_enabled,
                 'driver': self.new_flavor_profile.driver,
                 'metainfo': self.new_flavor_profile.meta_info,
@@ -106,10 +93,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
         arglist = [
             "--description",
             self.new_flavor_profile.description,
-            "--project",
-            self.new_flavor_profile.project_id,
-            '--project-domain',
-            self.domain.name,
             "--enable",
             "--metainfo",
             self.new_flavor_profile.meta_info,
@@ -117,8 +100,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
 
         verifylist = [
             ('description', self.new_flavor_profile.description),
-            ('project', self.new_flavor_profile.project_id),
-            ('project_domain', self.domain.name),
             ('enable', True),
             ('metainfo', self.new_flavor_profile.meta_info),
         ]
@@ -129,7 +110,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
         self.network_client.create_service_profile.assert_called_once_with(
             **{
                 'description': self.new_flavor_profile.description,
-                'project_id': self.project.id,
                 'enabled': self.new_flavor_profile.is_enabled,
                 'metainfo': self.new_flavor_profile.meta_info,
             }
@@ -141,10 +121,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
         arglist = [
             "--description",
             self.new_flavor_profile.description,
-            "--project",
-            self.new_flavor_profile.project_id,
-            '--project-domain',
-            self.domain.name,
             "--enable",
             "--driver",
             self.new_flavor_profile.driver,
@@ -152,8 +128,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
 
         verifylist = [
             ('description', self.new_flavor_profile.description),
-            ('project', self.new_flavor_profile.project_id),
-            ('project_domain', self.domain.name),
             ('enable', True),
             ('driver', self.new_flavor_profile.driver),
         ]
@@ -164,7 +138,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
         self.network_client.create_service_profile.assert_called_once_with(
             **{
                 'description': self.new_flavor_profile.description,
-                'project_id': self.project.id,
                 'enabled': self.new_flavor_profile.is_enabled,
                 'driver': self.new_flavor_profile.driver,
             }
@@ -176,17 +149,11 @@ class TestCreateFlavorProfile(TestFlavorProfile):
         arglist = [
             "--description",
             self.new_flavor_profile.description,
-            "--project",
-            self.new_flavor_profile.project_id,
-            '--project-domain',
-            self.domain.name,
             "--enable",
         ]
 
         verifylist = [
             ('description', self.new_flavor_profile.description),
-            ('project', self.new_flavor_profile.project_id),
-            ('project_domain', self.domain.name),
             ('enable', True),
         ]
 
@@ -377,7 +344,6 @@ class TestShowFlavorProfile(TestFlavorProfile):
         'enabled',
         'id',
         'meta_info',
-        'project_id',
     )
     data = (
         network_flavor_profile.description,
@@ -385,7 +351,6 @@ class TestShowFlavorProfile(TestFlavorProfile):
         network_flavor_profile.is_enabled,
         network_flavor_profile.id,
         network_flavor_profile.meta_info,
-        network_flavor_profile.project_id,
     )
 
     def setUp(self):

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

@@ -12,6 +12,7 @@
 
 from unittest import mock
 from unittest.mock import call
+import uuid
 
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
@@ -23,8 +24,13 @@ from openstackclient.tests.unit.network.v2 import fakes as network_fakes
 from openstackclient.tests.unit import utils as test_utils
 
 
-LIST_FIELDS_TO_RETRIEVE = ('id', 'name', 'mac_address', 'fixed_ips', 'status')
-LIST_FIELDS_TO_RETRIEVE_LONG = ('security_group_ids', 'device_owner', 'tags')
+LIST_FIELDS_TO_RETRIEVE = ['id', 'name', 'mac_address', 'fixed_ips', 'status']
+LIST_FIELDS_TO_RETRIEVE_LONG = [
+    'security_groups',
+    'device_owner',
+    'tags',
+    'trunk_details',
+]
 
 
 class TestPort(network_fakes.TestNetworkV2):
@@ -73,6 +79,7 @@ class TestPort(network_fakes.TestNetworkV2):
             'security_group_ids',
             'status',
             'tags',
+            'trusted',
             'trunk_details',
             'updated_at',
         )
@@ -114,7 +121,8 @@ class TestPort(network_fakes.TestNetworkV2):
             format_columns.ListColumn(fake_port.security_group_ids),
             fake_port.status,
             format_columns.ListColumn(fake_port.tags),
-            fake_port.trunk_details,
+            fake_port.trusted,
+            port.SubPortColumn(fake_port.trunk_details),
             fake_port.updated_at,
         )
 
@@ -330,7 +338,7 @@ class TestCreatePort(TestPort):
                 self._port.network_id,
             ),
             ('enable', True),
-            ('security_group', [secgroup.id]),
+            ('security_groups', [secgroup.id]),
             ('name', 'test-port'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -403,7 +411,7 @@ class TestCreatePort(TestPort):
                 self._port.network_id,
             ),
             ('enable', True),
-            ('security_group', [sg_1.id, sg_2.id]),
+            ('security_groups', [sg_1.id, sg_2.id]),
             ('name', 'test-port'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -432,7 +440,7 @@ class TestCreatePort(TestPort):
         verifylist = [
             ('network', self._port.network_id),
             ('enable', True),
-            ('no_security_group', True),
+            ('security_groups', []),
             ('name', 'test-port'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1111,6 +1119,50 @@ class TestCreatePort(TestPort):
     def test_create_with_hardware_offload_type_null(self):
         self._test_create_with_hardware_offload_type()
 
+    def _test_create_with_trusted_field(self, trusted):
+        arglist = [
+            '--network',
+            self._port.network_id,
+            'test-port',
+        ]
+        if trusted:
+            arglist += ['--trusted']
+        else:
+            arglist += ['--not-trusted']
+
+        verifylist = [
+            (
+                'network',
+                self._port.network_id,
+            ),
+            ('name', 'test-port'),
+        ]
+        if trusted:
+            verifylist.append(('trusted', True))
+        else:
+            verifylist.append(('trusted', False))
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        create_args = {
+            'admin_state_up': True,
+            'network_id': self._port.network_id,
+            'name': 'test-port',
+        }
+        create_args['trusted'] = trusted
+        self.network_client.create_port.assert_called_once_with(**create_args)
+
+        self.assertEqual(set(self.columns), set(columns))
+        self.assertCountEqual(self.data, data)
+
+    def test_create_with_trusted_true(self):
+        self._test_create_with_trusted_field(True)
+
+    def test_create_with_trusted_false(self):
+        self._test_create_with_trusted_field(False)
+
 
 class TestDeletePort(TestPort):
     # Ports to delete.
@@ -1190,17 +1242,47 @@ class TestDeletePort(TestPort):
 
 
 class TestListPort(compute_fakes.FakeClientMixin, TestPort):
-    _ports = network_fakes.create_ports(count=3)
+    _project = identity_fakes.FakeProject.create_one_project()
+    _networks = network_fakes.create_networks(count=3)
+    _sport1 = network_fakes.create_one_port(
+        attrs={'project_id': _project.id, 'network_id': _networks[1]['id']}
+    )
+    _sport2 = network_fakes.create_one_port(
+        attrs={'project_id': _project.id, 'network_id': _networks[2]['id']}
+    )
+    _trunk_details = {
+        'trunk_id': str(uuid.uuid4()),
+        'sub_ports': [
+            {
+                'segmentation_id': 100,
+                'segmentation_type': 'vlan',
+                'port_id': _sport1.id,
+            },
+            {
+                'segmentation_id': 102,
+                'segmentation_type': 'vlan',
+                'port_id': _sport2.id,
+            },
+        ],
+    }
+    _pport = network_fakes.create_one_port(
+        attrs={
+            'project_id': _project.id,
+            'network_id': _networks[0]['id'],
+            'trunk_details': _trunk_details,
+        }
+    )
+    _ports = (_pport, _sport1, _sport2)
 
-    columns = (
+    columns = [
         'ID',
         'Name',
         'MAC Address',
         'Fixed IP Addresses',
         'Status',
-    )
+    ]
 
-    columns_long = (
+    columns_long = [
         'ID',
         'Name',
         'MAC Address',
@@ -1209,7 +1291,8 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort):
         'Security Groups',
         'Device Owner',
         'Tags',
-    )
+        'Trunk subports',
+    ]
 
     data = []
     for prt in _ports:
@@ -1235,6 +1318,7 @@ class TestListPort(compute_fakes.FakeClientMixin, TestPort):
                 format_columns.ListColumn(prt.security_group_ids),
                 prt.device_owner,
                 format_columns.ListColumn(prt.tags),
+                port.SubPortColumn(prt.trunk_details),
             )
         )
 
@@ -2021,7 +2105,7 @@ class TestSetPort(TestPort):
             self._port.name,
         ]
         verifylist = [
-            ('security_group', [sg.id]),
+            ('security_groups', [sg.id]),
             ('port', self._port.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -2054,7 +2138,7 @@ class TestSetPort(TestPort):
             _testport.name,
         ]
         verifylist = [
-            ('security_group', [sg_2.id, sg_3.id]),
+            ('security_groups', [sg_2.id, sg_3.id]),
             ('port', _testport.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -2103,7 +2187,7 @@ class TestSetPort(TestPort):
             _testport.name,
         ]
         verifylist = [
-            ('security_group', [sg2.id]),
+            ('security_groups', [sg2.id]),
             ('no_security_group', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -2520,6 +2604,35 @@ class TestSetPort(TestPort):
         )
         self.assertIsNone(result)
 
+    def _test_set_trusted_field(self, trusted):
+        arglist = [self._port.id]
+        if trusted:
+            arglist += ['--trusted']
+        else:
+            arglist += ['--not-trusted']
+
+        verifylist = [
+            ('port', self._port.id),
+        ]
+        if trusted:
+            verifylist.append(('trusted', True))
+        else:
+            verifylist.append(('trusted', False))
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+        self.network_client.update_port.assert_called_once_with(
+            self._port, **{'trusted': trusted}
+        )
+        self.assertIsNone(result)
+
+    def test_set_trusted_true(self):
+        self._test_set_trusted_field(True)
+
+    def test_set_trusted_false(self):
+        self._test_set_trusted_field(False)
+
 
 class TestShowPort(TestPort):
     # The port to show.
@@ -2695,7 +2808,7 @@ class TestUnsetPort(TestPort):
             _fake_port.name,
         ]
         verifylist = [
-            ('security_group_ids', [_fake_sg2.id]),
+            ('security_groups', [_fake_sg2.id]),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -2722,7 +2835,7 @@ class TestUnsetPort(TestPort):
             _fake_port.name,
         ]
         verifylist = [
-            ('security_group_ids', [_fake_sg2.id]),
+            ('security_groups', [_fake_sg2.id]),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)

openstackclient/tests/unit/utils.py

@@ -93,8 +93,14 @@ class TestCommand(TestCase):
                     f"Argument parse failed: {stderr.getvalue()}"
                 )
         for av in verify_args:
-            attr, value = av
+            attr, expected_value = av
             if attr:
+                actual_value = getattr(parsed_args, attr)
                 self.assertIn(attr, parsed_args)
-                self.assertEqual(value, getattr(parsed_args, attr))
+                self.assertEqual(
+                    expected_value,
+                    actual_value,
+                    f'args.{attr}: expected: {expected_value}, got: '
+                    f'{actual_value}',
+                )
         return parsed_args

openstackclient/tests/unit/volume/v2/test_volume_backup.py

@@ -364,16 +364,28 @@ class TestBackupRestore(volume_fakes.TestVolume):
         attrs={'volume_id': volume.id},
     )
 
+    columns = (
+        "id",
+        "volume_id",
+        "volume_name",
+    )
+
+    data = (
+        backup.id,
+        volume.id,
+        volume.name,
+    )
+
     def setUp(self):
         super().setUp()
 
         self.volume_sdk_client.find_backup.return_value = self.backup
         self.volume_sdk_client.find_volume.return_value = self.volume
-        self.volume_sdk_client.restore_backup.return_value = (
-            volume_fakes.create_one_volume(
-                {'id': self.volume['id']},
-            )
-        )
+        self.volume_sdk_client.restore_backup.return_value = {
+            'id': self.backup['id'],
+            'volume_id': self.volume['id'],
+            'volume_name': self.volume['name'],
+        }
 
         # Get the command object to mock
         self.cmd = volume_backup.RestoreVolumeBackup(self.app, None)
@@ -389,13 +401,15 @@ class TestBackupRestore(volume_fakes.TestVolume):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
+        columns, data = self.cmd.take_action(parsed_args)
         self.volume_sdk_client.restore_backup.assert_called_with(
             self.backup.id,
             volume_id=None,
             name=None,
         )
-        self.assertIsNotNone(result)
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, data)
 
     def test_backup_restore_with_volume(self):
         self.volume_sdk_client.find_volume.side_effect = (
@@ -411,13 +425,15 @@ class TestBackupRestore(volume_fakes.TestVolume):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
+        columns, data = self.cmd.take_action(parsed_args)
         self.volume_sdk_client.restore_backup.assert_called_with(
             self.backup.id,
             volume_id=None,
             name=self.backup.volume_id,
         )
-        self.assertIsNotNone(result)
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, data)
 
     def test_backup_restore_with_volume_force(self):
         arglist = [
@@ -432,13 +448,15 @@ class TestBackupRestore(volume_fakes.TestVolume):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
+        columns, data = self.cmd.take_action(parsed_args)
         self.volume_sdk_client.restore_backup.assert_called_with(
             self.backup.id,
             volume_id=self.volume.id,
             name=None,
         )
-        self.assertIsNotNone(result)
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, data)
 
     def test_backup_restore_with_volume_existing(self):
         arglist = [
@@ -544,7 +562,7 @@ class TestBackupShow(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.volume_sdk_client.get_backup.return_value = self.backup
+        self.volume_sdk_client.find_backup.return_value = self.backup
         # Get the command object to test
         self.cmd = volume_backup.ShowVolumeBackup(self.app, None)
 
@@ -554,7 +572,7 @@ class TestBackupShow(volume_fakes.TestVolume):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.volume_sdk_client.get_backup.assert_called_with(self.backup.id)
+        self.volume_sdk_client.find_backup.assert_called_with(self.backup.id)
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)

openstackclient/tests/unit/volume/v3/test_volume_backup.py

@@ -333,6 +333,7 @@ class TestBackupList(volume_fakes.TestVolume):
         'Status',
         'Size',
         'Incremental',
+        'Created At',
     )
     columns_long = columns + (
         'Availability Zone',
@@ -350,6 +351,7 @@ class TestBackupList(volume_fakes.TestVolume):
                 b.status,
                 b.size,
                 b.is_incremental,
+                b.created_at,
             )
         )
     data_long = []
@@ -362,6 +364,7 @@ class TestBackupList(volume_fakes.TestVolume):
                 b.status,
                 b.size,
                 b.is_incremental,
+                b.created_at,
                 b.availability_zone,
                 volume_backup.VolumeIdColumn(b.volume_id),
                 b.container,
@@ -459,16 +462,28 @@ class TestBackupRestore(volume_fakes.TestVolume):
         attrs={'volume_id': volume.id},
     )
 
+    columns = (
+        "id",
+        "volume_id",
+        "volume_name",
+    )
+
+    data = (
+        backup.id,
+        volume.id,
+        volume.name,
+    )
+
     def setUp(self):
         super().setUp()
 
         self.volume_sdk_client.find_backup.return_value = self.backup
         self.volume_sdk_client.find_volume.return_value = self.volume
-        self.volume_sdk_client.restore_backup.return_value = (
-            volume_fakes.create_one_volume(
-                {'id': self.volume['id']},
-            )
-        )
+        self.volume_sdk_client.restore_backup.return_value = {
+            'id': self.backup['id'],
+            'volume_id': self.volume['id'],
+            'volume_name': self.volume['name'],
+        }
 
         # Get the command object to mock
         self.cmd = volume_backup.RestoreVolumeBackup(self.app, None)
@@ -484,13 +499,15 @@ class TestBackupRestore(volume_fakes.TestVolume):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
+        columns, data = self.cmd.take_action(parsed_args)
         self.volume_sdk_client.restore_backup.assert_called_with(
             self.backup.id,
             volume_id=None,
             name=None,
         )
-        self.assertIsNotNone(result)
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, data)
 
     def test_backup_restore_with_volume(self):
         self.volume_sdk_client.find_volume.side_effect = (
@@ -506,13 +523,15 @@ class TestBackupRestore(volume_fakes.TestVolume):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
+        columns, data = self.cmd.take_action(parsed_args)
         self.volume_sdk_client.restore_backup.assert_called_with(
             self.backup.id,
             volume_id=None,
             name=self.backup.volume_id,
         )
-        self.assertIsNotNone(result)
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, data)
 
     def test_backup_restore_with_volume_force(self):
         arglist = [
@@ -527,13 +546,15 @@ class TestBackupRestore(volume_fakes.TestVolume):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
+        columns, data = self.cmd.take_action(parsed_args)
         self.volume_sdk_client.restore_backup.assert_called_with(
             self.backup.id,
             volume_id=self.volume.id,
             name=None,
         )
-        self.assertIsNotNone(result)
+
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(self.data, data)
 
     def test_backup_restore_with_volume_existing(self):
         arglist = [
@@ -876,7 +897,7 @@ class TestBackupShow(volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
-        self.volume_sdk_client.get_backup.return_value = self.backup
+        self.volume_sdk_client.find_backup.return_value = self.backup
         # Get the command object to test
         self.cmd = volume_backup.ShowVolumeBackup(self.app, None)
 
@@ -886,7 +907,7 @@ class TestBackupShow(volume_fakes.TestVolume):
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
-        self.volume_sdk_client.get_backup.assert_called_with(self.backup.id)
+        self.volume_sdk_client.find_backup.assert_called_with(self.backup.id)
 
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, data)