python-openstackclient 8.1.0__py3-none-any.whl → 8.2.0__py3-none-any.whl

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

@@ -77,8 +77,7 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('parent', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('tags', []),
         ]
@@ -134,8 +133,7 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('description', 'new desc'),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -172,8 +170,7 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -210,8 +207,7 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -243,8 +239,7 @@ class TestProjectCreate(TestProject):
             self.project.name,
         ]
         verifylist = [
-            ('enable', True),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -279,8 +274,7 @@ class TestProjectCreate(TestProject):
             self.project.name,
         ]
         verifylist = [
-            ('enable', False),
-            ('disable', True),
+            ('enabled', False),
             ('name', self.project.name),
             ('parent', None),
         ]
@@ -317,7 +311,7 @@ class TestProjectCreate(TestProject):
             self.project.name,
         ]
         verifylist = [
-            ('property', {'fee': 'fi', 'fo': 'fum'}),
+            ('properties', {'fee': 'fi', 'fo': 'fum'}),
             ('name', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -354,11 +348,10 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('parent', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('tags', []),
-            ('property', {'is_domain': 'false'}),
+            ('properties', {'is_domain': 'false'}),
             ('name', self.project.name),
         ]
 
@@ -393,11 +386,10 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('parent', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('tags', []),
-            ('property', {'is_domain': 'true'}),
+            ('properties', {'is_domain': 'true'}),
             ('name', self.project.name),
         ]
 
@@ -432,11 +424,10 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('parent', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('tags', []),
-            ('property', {'is_domain': 'none'}),
+            ('properties', {'is_domain': 'none'}),
             ('name', self.project.name),
         ]
 
@@ -481,8 +472,7 @@ class TestProjectCreate(TestProject):
         verifylist = [
             ('domain', self.project.domain_id),
             ('parent', self.parent.name),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('tags', []),
         ]
@@ -544,8 +534,7 @@ class TestProjectCreate(TestProject):
         verifylist = [
             ('domain', self.project.domain_id),
             ('parent', 'invalid'),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -566,8 +555,7 @@ class TestProjectCreate(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', ['foo']),
@@ -602,8 +590,7 @@ class TestProjectCreate(TestProject):
         verifylist = [
             ('immutable', True),
             ('description', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -638,10 +625,9 @@ class TestProjectCreate(TestProject):
             self.project.name,
         ]
         verifylist = [
-            ('no_immutable', True),
+            ('immutable', False),
             ('description', None),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', True),
             ('name', self.project.name),
             ('parent', None),
             ('tags', []),
@@ -981,8 +967,7 @@ class TestProjectSet(TestProject):
         ]
         verifylist = [
             ('project', self.project.name),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -1001,8 +986,7 @@ class TestProjectSet(TestProject):
         verifylist = [
             ('name', 'qwerty'),
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1029,8 +1013,7 @@ class TestProjectSet(TestProject):
         verifylist = [
             ('domain', self.project.domain_id),
             ('description', 'new desc'),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1053,8 +1036,7 @@ class TestProjectSet(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('enable', True),
-            ('disable', False),
+            ('enabled', True),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1077,8 +1059,7 @@ class TestProjectSet(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', True),
+            ('enabled', False),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1104,7 +1085,7 @@ class TestProjectSet(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('property', {'fee': 'fi', 'fo': 'fum'}),
+            ('properties', {'fee': 'fi', 'fo': 'fum'}),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1132,8 +1113,7 @@ class TestProjectSet(TestProject):
         verifylist = [
             ('name', 'qwerty'),
             ('domain', self.project.domain_id),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
             ('project', self.project.name),
             ('tags', ['foo']),
         ]
@@ -1160,8 +1140,7 @@ class TestProjectSet(TestProject):
             self.project.name,
         ]
         verifylist = [
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
             ('project', self.project.name),
             ('remove_tag', ['tag1', 'tag2']),
         ]
@@ -1183,8 +1162,7 @@ class TestProjectSet(TestProject):
         verifylist = [
             ('domain', self.project.domain_id),
             ('immutable', True),
-            ('enable', False),
-            ('disable', False),
+            ('enabled', None),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1207,9 +1185,8 @@ class TestProjectSet(TestProject):
         ]
         verifylist = [
             ('domain', self.project.domain_id),
-            ('no_immutable', True),
-            ('enable', False),
-            ('disable', False),
+            ('immutable', False),
+            ('enabled', None),
             ('project', self.project.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)

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

@@ -494,7 +494,6 @@ class TestRoleCreate(identity_fakes.TestIdentityv3):
         # Set expected values
         kwargs = {
             'name': self.role.name,
-            'options': {},
         }
 
         self.identity_sdk_client.create_role.assert_called_with(**kwargs)
@@ -533,7 +532,6 @@ class TestRoleCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'domain_id': self.domain.id,
             'name': self.role_with_domain.name,
-            'options': {},
         }
 
         self.identity_sdk_client.create_role.assert_called_with(**kwargs)
@@ -572,7 +570,6 @@ class TestRoleCreate(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': self.role_with_description.name,
             'description': self.role_with_description.description,
-            'options': {},
         }
 
         self.identity_sdk_client.create_role.assert_called_with(**kwargs)
@@ -629,7 +626,7 @@ class TestRoleCreate(identity_fakes.TestIdentityv3):
             self.role.name,
         ]
         verifylist = [
-            ('no_immutable', True),
+            ('immutable', False),
             ('name', self.role.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1437,7 +1434,6 @@ class TestRoleSet(identity_fakes.TestIdentityv3):
         kwargs = {
             'name': 'over',
             'role': self.role.id,
-            'options': {},
         }
         self.identity_sdk_client.update_role.assert_called_with(**kwargs)
         self.assertIsNone(result)
@@ -1472,7 +1468,6 @@ class TestRoleSet(identity_fakes.TestIdentityv3):
             'name': 'over',
             'role': self.role_with_domain.id,
             'domain_id': self.domain2.id,
-            'options': {},
         }
         self.identity_sdk_client.update_role.assert_called_with(**kwargs)
         self.assertIsNone(result)
@@ -1501,7 +1496,6 @@ class TestRoleSet(identity_fakes.TestIdentityv3):
             'name': 'over',
             'description': 'role description',
             'role': self.role_with_domain.id,
-            'options': {},
         }
         self.identity_sdk_client.update_role.assert_called_with(**kwargs)
         self.assertIsNone(result)
@@ -1544,7 +1538,7 @@ class TestRoleSet(identity_fakes.TestIdentityv3):
         ]
         verifylist = [
             ('name', 'over'),
-            ('no_immutable', True),
+            ('immutable', False),
             ('role', self.role_with_domain.name),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)

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

@@ -757,3 +757,50 @@ class TestImageShow(image_fakes.TestImagev1):
 
         size_index = columns.index('size')
         self.assertEqual(data[size_index].human_readable(), '2K')
+
+
+class TestImageSave(image_fakes.TestImagev1):
+    image = image_fakes.create_one_image({})
+
+    def setUp(self):
+        super().setUp()
+
+        self.image_client.find_image.return_value = self.image
+        self.image_client.download_image.return_value = self.image
+
+        # Get the command object to test
+        self.cmd = image.SaveImage(self.app, None)
+
+    def test_save_data(self):
+        arglist = ['--file', '/path/to/file', self.image.id]
+
+        verifylist = [('file', '/path/to/file'), ('image', self.image.id)]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.image_client.download_image.assert_called_once_with(
+            self.image.id, output='/path/to/file', stream=True, chunk_size=1024
+        )
+
+    def test_save_data_with_chunk_size(self):
+        arglist = [
+            '--file',
+            '/path/to/file',
+            '--chunk-size',
+            '2048',
+            self.image.id,
+        ]
+
+        verifylist = [
+            ('file', '/path/to/file'),
+            ('chunk_size', 2048),
+            ('image', self.image.id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.image_client.download_image.assert_called_once_with(
+            self.image.id, output='/path/to/file', stream=True, chunk_size=2048
+        )

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

@@ -822,6 +822,8 @@ class TestImageList(TestImage):
             'Visibility',
             'Protected',
             'Project',
+            'Hash Algorithm',
+            'Hash Value',
             'Tags',
         )
 
@@ -830,14 +832,16 @@ class TestImageList(TestImage):
             (
                 self._image.id,
                 self._image.name,
-                None,
-                None,
-                None,
-                None,
-                None,
+                self._image.disk_format,
+                self._image.container_format,
+                self._image.size,
+                self._image.checksum,
+                self._image.status,
                 self._image.visibility,
                 self._image.is_protected,
                 self._image.owner_id,
+                self._image.hash_algo,
+                self._image.hash_value,
                 format_columns.ListColumn(self._image.tags),
             ),
         )
@@ -1356,15 +1360,17 @@ class TestImageSet(TestImage):
             exceptions.CommandError, self.cmd.take_action, parsed_args
         )
 
-    def test_image_set_bools1(self):
+    def test_image_set_bools_true(self):
         arglist = [
             '--protected',
             '--private',
+            '--hidden',
             'graven',
         ]
         verifylist = [
             ('is_protected', True),
             ('visibility', 'private'),
+            ('is_hidden', True),
             ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1374,6 +1380,7 @@ class TestImageSet(TestImage):
         kwargs = {
             'is_protected': True,
             'visibility': 'private',
+            'is_hidden': True,
         }
         # ImageManager.update(image, **kwargs)
         self.image_client.update_image.assert_called_with(
@@ -1381,15 +1388,17 @@ class TestImageSet(TestImage):
         )
         self.assertIsNone(result)
 
-    def test_image_set_bools2(self):
+    def test_image_set_bools_false(self):
         arglist = [
             '--unprotected',
             '--public',
+            '--unhidden',
             'graven',
         ]
         verifylist = [
             ('is_protected', False),
             ('visibility', 'public'),
+            ('is_hidden', False),
             ('image', 'graven'),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -1399,6 +1408,7 @@ class TestImageSet(TestImage):
         kwargs = {
             'is_protected': False,
             'visibility': 'public',
+            'is_hidden': False,
         }
         # ImageManager.update(image, **kwargs)
         self.image_client.update_image.assert_called_with(
@@ -1779,6 +1789,7 @@ class TestImageUnset(TestImage):
         attrs['hw_rng_model'] = 'virtio'
         attrs['prop'] = 'test'
         attrs['prop2'] = 'fake'
+        attrs['os_secure_boot'] = 'required'
         self.image = image_fakes.create_one_image(attrs)
 
         self.image_client.find_image.return_value = self.image
@@ -1822,11 +1833,18 @@ class TestImageUnset(TestImage):
             'hw_rng_model',
             '--property',
             'prop',
+            '--property',
+            'os_secure_boot',
             self.image.id,
         ]
 
+        # openstacksdk translates 'os_secure_boot' property to
+        # 'needs_secure_boot' Image attribute. This is true for
+        # all IMAGE_ATTRIBUTES_CUSTOM_NAMES keys
+        self.assertEqual(self.image.needs_secure_boot, 'required')
+        self.assertFalse(hasattr(self.image, 'os_secure_boot'))
         verifylist = [
-            ('properties', ['hw_rng_model', 'prop']),
+            ('properties', ['hw_rng_model', 'prop', 'os_secure_boot']),
             ('image', self.image.id),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -2039,6 +2057,36 @@ class TestImageImport(TestImage):
 
         self.image_client.import_image.assert_not_called()
 
+    def test_import_image__web_download_invalid_url(self):
+        arglist = [
+            self.image.name,
+            '--method',
+            'web-download',
+            '--uri',
+            'invalid:1234',
+        ]
+
+        verifylist = [
+            ('image', self.image.name),
+            ('import_method', 'web-download'),
+            ('uri', 'invalid:1234'),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        exc = self.assertRaises(
+            exceptions.CommandError,
+            self.cmd.take_action,
+            parsed_args,
+        )
+
+        self.assertIn(
+            "'invalid:1234' is not a valid url",
+            str(exc),
+        )
+
+        self.image_client.import_image.assert_not_called()
+
     def test_import_image__web_download_invalid_image_state(self):
         self.image.status = 'uploading'  # != 'queued'
         arglist = [
@@ -2190,7 +2238,29 @@ class TestImageSave(TestImage):
         self.cmd.take_action(parsed_args)
 
         self.image_client.download_image.assert_called_once_with(
-            self.image.id, stream=True, output='/path/to/file'
+            self.image.id, output='/path/to/file', stream=True, chunk_size=1024
+        )
+
+    def test_save_data_with_chunk_size(self):
+        arglist = [
+            '--file',
+            '/path/to/file',
+            '--chunk-size',
+            '2048',
+            self.image.id,
+        ]
+
+        verifylist = [
+            ('filename', '/path/to/file'),
+            ('chunk_size', 2048),
+            ('image', self.image.id),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.image_client.download_image.assert_called_once_with(
+            self.image.id, output='/path/to/file', stream=True, chunk_size=2048
         )
 
 

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

@@ -113,6 +113,7 @@ class TestMetadefObjectDelete(fakes.TestImagev2):
         super().setUp()
 
         self.image_client.delete_metadef_object.return_value = None
+        self.image_client.delete_all_metadef_objects.return_value = None
         self.cmd = metadef_objects.DeleteMetadefObject(self.app, None)
 
     def test_object_delete(self):
@@ -126,8 +127,29 @@ class TestMetadefObjectDelete(fakes.TestImagev2):
 
         result = self.cmd.take_action(parsed_args)
 
+        self.image_client.delete_metadef_object.assert_called_once_with(
+            self.image_client.get_metadef_object(),
+            self._metadef_namespace.namespace,
+        )
+        self.image_client.delete_all_metadef_objects.assert_not_called()
         self.assertIsNone(result)
 
+    def test_object_delete_all(self):
+        arglist = [
+            self._metadef_namespace.namespace,
+        ]
+
+        verifylist = []
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.assertIsNone(result)
+        self.image_client.delete_all_metadef_objects.assert_called_with(
+            self._metadef_namespace.namespace,
+        )
+        self.image_client.delete_metadef_object.assert_not_called()
+
 
 class TestMetadefObjectList(fakes.TestImagev2):
     _metadef_namespace = fakes.create_one_metadef_namespace()

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

@@ -91,6 +91,7 @@ class TestMetadefPropertyDelete(image_fakes.TestImagev2):
         super().setUp()
 
         self.cmd = metadef_properties.DeleteMetadefProperty(self.app, None)
+        self.image_client.delete_all_metadef_properties.return_value = None
 
     def test_metadef_property_delete(self):
         arglist = ['namespace', 'property']
@@ -100,6 +101,10 @@ class TestMetadefPropertyDelete(image_fakes.TestImagev2):
         result = self.cmd.take_action(parsed_args)
 
         self.assertIsNone(result)
+        self.image_client.delete_metadef_property.assert_called_with(
+            'property', 'namespace', ignore_missing=False
+        )
+        self.image_client.delete_all_metadef_properties.assert_not_called()
 
     def test_metadef_property_delete_missing_arguments(self):
         arglist = []
@@ -110,21 +115,13 @@ class TestMetadefPropertyDelete(image_fakes.TestImagev2):
             arglist,
             [],
         )
-
-        arglist = ['namespace']
-        self.assertRaises(
-            tests_utils.ParserException,
-            self.check_parser,
-            self.cmd,
-            arglist,
-            [],
-        )
+        self.image_client.delete_all_metadef_properties.assert_not_called()
+        self.image_client.delete_metadef_property.assert_not_called()
 
     def test_metadef_property_delete_exception(self):
         arglist = ['namespace', 'property']
         verifylist = []
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
         self.image_client.delete_metadef_property.side_effect = (
             sdk_exceptions.ResourceNotFound
         )
@@ -132,6 +129,23 @@ class TestMetadefPropertyDelete(image_fakes.TestImagev2):
         self.assertRaises(
             exceptions.CommandError, self.cmd.take_action, parsed_args
         )
+        self.image_client.delete_metadef_property.assert_called_with(
+            'property', 'namespace', ignore_missing=False
+        )
+        self.image_client.delete_all_metadef_properties.assert_not_called()
+
+    def test_metadef_property_delete_all(self):
+        arglist = ['namespace']
+        verifylist = []
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        result = self.cmd.take_action(parsed_args)
+
+        self.assertIsNone(result)
+        self.image_client.delete_all_metadef_properties.assert_called_with(
+            'namespace'
+        )
+        self.image_client.delete_metadef_property.assert_not_called()
 
 
 class TestMetadefPropertyList(image_fakes.TestImagev2):

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

@@ -1412,6 +1412,7 @@ def create_one_security_group(attrs=None):
         'security_group_rules': [],
         'tags': [],
         'location': 'MUNCHMUNCHMUNCH',
+        'is_shared': False,
     }
 
     # Overwrite default attributes.

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

@@ -311,7 +311,7 @@ class TestListNDPProxy(TestNDPProxy):
             **{'project_id': project.id}
         )
         self.assertEqual(self.columns, columns)
-        self.assertItemsEqual(self.data, list(data))
+        self.assertCountEqual(self.data, list(data))
 
     def test_ndp_proxy_list_project_domain(self):
         project = identity_fakes_v3.FakeProject.create_one_project()
@@ -332,7 +332,7 @@ class TestListNDPProxy(TestNDPProxy):
 
         self.network_client.ndp_proxies.assert_called_once_with(**filters)
         self.assertEqual(self.columns, columns)
-        self.assertItemsEqual(self.data, list(data))
+        self.assertCountEqual(self.data, list(data))
 
 
 class TestSetNDPProxy(TestNDPProxy):