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

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

@@ -218,17 +218,39 @@ class ImageTests(base.BaseImageTests):
                 'image remove project ' + self.name + ' ' + my_project_id
             )
 
-        # else:
-        #     # Test not shared
-        #     self.assertRaises(
-        #         image_exceptions.HTTPForbidden,
-        #         self.openstack,
-        #         'image add project ' +
-        #         self.name + ' ' +
-        #         my_project_id
-        #     )
-        #     self.openstack(
-        #         'image set ' +
-        #         '--share ' +
-        #         self.name
-        #     )
+    def test_image_hidden(self):
+        # Test image is shown in list
+        output = self.openstack(
+            'image list',
+            parse_output=True,
+        )
+        self.assertIn(
+            self.name,
+            [img['Name'] for img in output],
+        )
+
+        # Hide the image and test image not show in the list
+        self.openstack('image set ' + '--hidden ' + self.name)
+        output = self.openstack(
+            'image list',
+            parse_output=True,
+        )
+        self.assertNotIn(self.name, [img['Name'] for img in output])
+
+        # Test image show in the list with flag
+        output = self.openstack(
+            'image list',
+            parse_output=True,
+        )
+        self.assertNotIn(self.name, [img['Name'] for img in output])
+
+        # Unhide the image and test image is again visible in regular list
+        self.openstack('image set ' + '--unhidden ' + self.name)
+        output = self.openstack(
+            'image list',
+            parse_output=True,
+        )
+        self.assertIn(
+            self.name,
+            [img['Name'] for img in output],
+        )

openstackclient/tests/functional/image/v2/test_metadef_resource_type.py

@@ -0,0 +1,55 @@
+# 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.
+
+import uuid
+
+from openstackclient.tests.functional.image import base
+
+
+class ImageMetadefResourceTypeTests(base.BaseImageTests):
+    """Functional tests for image metadef resource type commands."""
+
+    def setUp(self):
+        super().setUp()
+
+        # Create unique namespace name using UUID
+        self.namespace_name = 'test-mdef-ns-' + uuid.uuid4().hex
+        self.resource_type_name = 'test-mdef-rt-' + uuid.uuid4().hex
+
+        # Create namespace
+        self.openstack('image metadef namespace create ' + self.namespace_name)
+        self.addCleanup(
+            self.openstack,
+            'image metadef namespace delete ' + self.namespace_name,
+        )
+
+    def test_metadef_resource_type(self):
+        """Test image metadef resource type commands"""
+
+        self.openstack(
+            'image metadef resource type association create '
+            f'{self.namespace_name} {self.resource_type_name}',
+        )
+        self.addCleanup(
+            self.openstack,
+            'image metadef resource type association delete '
+            f'{self.namespace_name} {self.resource_type_name}',
+        )
+
+        output = self.openstack(
+            'image metadef resource type list',
+            parse_output=True,
+        )
+
+        self.assertIn(
+            self.resource_type_name, [item['Name'] for item in output]
+        )

openstackclient/tests/functional/volume/v2/test_volume.py

@@ -171,7 +171,7 @@ class VolumeTests(common.BaseVolumeTests):
             cmd_output["volume_image_metadata"],
         )
         self.assertEqual(
-            'true',
+            True,
             cmd_output["bootable"],
         )
 

openstackclient/tests/functional/volume/v3/test_volume.py

@@ -124,7 +124,7 @@ class VolumeTests(common.BaseVolumeTests):
             cmd_output["properties"],
         )
         self.assertEqual(
-            'false',
+            False,
             cmd_output["bootable"],
         )
         self.wait_for_status("volume", name, "available")
@@ -172,7 +172,7 @@ class VolumeTests(common.BaseVolumeTests):
             cmd_output["volume_image_metadata"],
         )
         self.assertEqual(
-            'true',
+            True,
             cmd_output["bootable"],
         )
 

openstackclient/tests/unit/api/test_volume_v2.py

@@ -0,0 +1,124 @@
+#   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.
+#
+
+"""Volume v2 API Library Tests"""
+
+import http
+from unittest import mock
+import uuid
+
+from openstack.block_storage.v2 import _proxy
+from osc_lib import exceptions as osc_lib_exceptions
+
+from openstackclient.api import volume_v2 as volume
+from openstackclient.tests.unit import fakes
+from openstackclient.tests.unit import utils
+
+
+class TestConsistencyGroup(utils.TestCase):
+    def setUp(self):
+        super().setUp()
+
+        self.volume_sdk_client = mock.Mock(_proxy.Proxy)
+
+    def test_find_consistency_group_by_id(self):
+        cg_id = uuid.uuid4().hex
+        cg_name = 'name-' + uuid.uuid4().hex
+        data = {
+            'consistencygroup': {
+                'id': cg_id,
+                'name': cg_name,
+                'status': 'available',
+                'availability_zone': 'az1',
+                'created_at': '2015-09-16T09:28:52.000000',
+                'description': 'description-' + uuid.uuid4().hex,
+                'volume_types': ['123456'],
+            }
+        }
+        self.volume_sdk_client.get.side_effect = [
+            fakes.FakeResponse(data=data),
+        ]
+
+        result = volume.find_consistency_group(self.volume_sdk_client, cg_id)
+
+        self.volume_sdk_client.get.assert_has_calls(
+            [
+                mock.call(f'/consistencygroups/{cg_id}'),
+            ]
+        )
+        self.assertEqual(data['consistencygroup'], result)
+
+    def test_find_consistency_group_by_name(self):
+        cg_id = uuid.uuid4().hex
+        cg_name = 'name-' + uuid.uuid4().hex
+        data = {
+            'consistencygroups': [
+                {
+                    'id': cg_id,
+                    'name': cg_name,
+                }
+            ],
+        }
+        self.volume_sdk_client.get.side_effect = [
+            fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND),
+            fakes.FakeResponse(data=data),
+        ]
+
+        result = volume.find_consistency_group(self.volume_sdk_client, cg_name)
+
+        self.volume_sdk_client.get.assert_has_calls(
+            [
+                mock.call(f'/consistencygroups/{cg_name}'),
+                mock.call('/consistencygroups'),
+            ]
+        )
+        self.assertEqual(data['consistencygroups'][0], result)
+
+    def test_find_consistency_group_not_found(self):
+        data = {'consistencygroups': []}
+        self.volume_sdk_client.get.side_effect = [
+            fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND),
+            fakes.FakeResponse(data=data),
+        ]
+        self.assertRaises(
+            osc_lib_exceptions.NotFound,
+            volume.find_consistency_group,
+            self.volume_sdk_client,
+            'invalid-cg',
+        )
+
+    def test_find_consistency_group_by_name_duplicate(self):
+        cg_name = 'name-' + uuid.uuid4().hex
+        data = {
+            'consistencygroups': [
+                {
+                    'id': uuid.uuid4().hex,
+                    'name': cg_name,
+                },
+                {
+                    'id': uuid.uuid4().hex,
+                    'name': cg_name,
+                },
+            ],
+        }
+        self.volume_sdk_client.get.side_effect = [
+            fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND),
+            fakes.FakeResponse(data=data),
+        ]
+
+        self.assertRaises(
+            osc_lib_exceptions.NotFound,
+            volume.find_consistency_group,
+            self.volume_sdk_client,
+            cg_name,
+        )

openstackclient/tests/unit/api/test_volume_v3.py

@@ -0,0 +1,124 @@
+#   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.
+#
+
+"""Volume v3 API Library Tests"""
+
+import http
+from unittest import mock
+import uuid
+
+from openstack.block_storage.v3 import _proxy
+from osc_lib import exceptions as osc_lib_exceptions
+
+from openstackclient.api import volume_v3 as volume
+from openstackclient.tests.unit import fakes
+from openstackclient.tests.unit import utils
+
+
+class TestConsistencyGroup(utils.TestCase):
+    def setUp(self):
+        super().setUp()
+
+        self.volume_sdk_client = mock.Mock(_proxy.Proxy)
+
+    def test_find_consistency_group_by_id(self):
+        cg_id = uuid.uuid4().hex
+        cg_name = 'name-' + uuid.uuid4().hex
+        data = {
+            'consistencygroup': {
+                'id': cg_id,
+                'name': cg_name,
+                'status': 'available',
+                'availability_zone': 'az1',
+                'created_at': '2015-09-16T09:28:52.000000',
+                'description': 'description-' + uuid.uuid4().hex,
+                'volume_types': ['123456'],
+            }
+        }
+        self.volume_sdk_client.get.side_effect = [
+            fakes.FakeResponse(data=data),
+        ]
+
+        result = volume.find_consistency_group(self.volume_sdk_client, cg_id)
+
+        self.volume_sdk_client.get.assert_has_calls(
+            [
+                mock.call(f'/consistencygroups/{cg_id}'),
+            ]
+        )
+        self.assertEqual(data['consistencygroup'], result)
+
+    def test_find_consistency_group_by_name(self):
+        cg_id = uuid.uuid4().hex
+        cg_name = 'name-' + uuid.uuid4().hex
+        data = {
+            'consistencygroups': [
+                {
+                    'id': cg_id,
+                    'name': cg_name,
+                }
+            ],
+        }
+        self.volume_sdk_client.get.side_effect = [
+            fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND),
+            fakes.FakeResponse(data=data),
+        ]
+
+        result = volume.find_consistency_group(self.volume_sdk_client, cg_name)
+
+        self.volume_sdk_client.get.assert_has_calls(
+            [
+                mock.call(f'/consistencygroups/{cg_name}'),
+                mock.call('/consistencygroups'),
+            ]
+        )
+        self.assertEqual(data['consistencygroups'][0], result)
+
+    def test_find_consistency_group_not_found(self):
+        data = {'consistencygroups': []}
+        self.volume_sdk_client.get.side_effect = [
+            fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND),
+            fakes.FakeResponse(data=data),
+        ]
+        self.assertRaises(
+            osc_lib_exceptions.NotFound,
+            volume.find_consistency_group,
+            self.volume_sdk_client,
+            'invalid-cg',
+        )
+
+    def test_find_consistency_group_by_name_duplicate(self):
+        cg_name = 'name-' + uuid.uuid4().hex
+        data = {
+            'consistencygroups': [
+                {
+                    'id': uuid.uuid4().hex,
+                    'name': cg_name,
+                },
+                {
+                    'id': uuid.uuid4().hex,
+                    'name': cg_name,
+                },
+            ],
+        }
+        self.volume_sdk_client.get.side_effect = [
+            fakes.FakeResponse(status_code=http.HTTPStatus.NOT_FOUND),
+            fakes.FakeResponse(data=data),
+        ]
+
+        self.assertRaises(
+            osc_lib_exceptions.NotFound,
+            volume.find_consistency_group,
+            self.volume_sdk_client,
+            cg_name,
+        )

openstackclient/tests/unit/common/test_command.py

@@ -14,9 +14,9 @@
 
 from unittest import mock
 
-from osc_lib.command import command
 from osc_lib import exceptions
 
+from openstackclient import command
 from openstackclient.tests.unit import fakes as test_fakes
 from openstackclient.tests.unit import utils as test_utils
 

openstackclient/tests/unit/common/test_extension.py

@@ -10,7 +10,6 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from unittest import mock
 
 from openstackclient.common import extension
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
@@ -295,8 +294,8 @@ class TestExtensionShow(TestExtension):
 
         self.cmd = extension.ShowExtension(self.app, None)
 
-        self.app.client_manager.network.find_extension = mock.Mock(
-            return_value=self.extension_details
+        self.app.client_manager.network.find_extension.return_value = (
+            self.extension_details
         )
 
     def test_show_no_options(self):

openstackclient/tests/unit/common/test_module.py

@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 """Test module module"""
 
@@ -19,10 +18,18 @@ import sys
 from unittest import mock
 
 from openstackclient.common import module as osc_module
-from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit import utils
 
 
+class FakeModule:
+    def __init__(self, name, version):
+        self.name = name
+        self.__version__ = version
+        # Workaround for openstacksdk case
+        self.version = mock.Mock()
+        self.version.__version__ = version
+
+
 # NOTE(dtroyer): module_1 must match the version list filter (not --all)
 #                currently == '*client*'
 module_name_1 = 'fakeclient'
@@ -45,11 +52,11 @@ module_version_5 = '0.0.1'
 
 MODULES = {
     'sys': sys,
-    module_name_1: fakes.FakeModule(module_name_1, module_version_1),
-    module_name_2: fakes.FakeModule(module_name_2, module_version_2),
-    module_name_3: fakes.FakeModule(module_name_3, module_version_3),
-    module_name_4: fakes.FakeModule(module_name_4, module_version_4),
-    module_name_5: fakes.FakeModule(module_name_5, module_version_5),
+    module_name_1: FakeModule(module_name_1, module_version_1),
+    module_name_2: FakeModule(module_name_2, module_version_2),
+    module_name_3: FakeModule(module_name_3, module_version_3),
+    module_name_4: FakeModule(module_name_4, module_version_4),
+    module_name_5: FakeModule(module_name_5, module_version_5),
 }
 
 

openstackclient/tests/unit/common/test_quota.py

@@ -1041,6 +1041,26 @@ class TestQuotaShow(TestQuota):
         )
         self.assertNotCalled(self.network_client.get_quota_default)
 
+    def test_quota_show__missing_services(self):
+        self.app.client_manager.compute_endpoint_enabled = False
+        self.app.client_manager.volume_endpoint_enabled = False
+        self.app.client_manager.network_endpoint_enabled = False
+
+        arglist = [
+            self.projects[0].name,
+        ]
+        verifylist = [
+            ('service', 'all'),
+            ('project', self.projects[0].name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.compute_client.get_quota_set.assert_not_called()
+        self.volume_sdk_client.get_quota_set.assert_not_called()
+        self.network_client.get_quota.assert_not_called()
+
     def test_quota_show__with_compute(self):
         arglist = [
             '--compute',

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

@@ -165,9 +165,11 @@ class TestAggregateDelete(TestAggregate):
             sdk_fakes.generate_fake_resources(_aggregate.Aggregate, 2)
         )
 
-        self.compute_client.find_aggregate = mock.Mock(
-            side_effect=[self.fake_ags[0], self.fake_ags[1]]
-        )
+        self.compute_client.find_aggregate.side_effect = [
+            self.fake_ags[0],
+            self.fake_ags[1],
+        ]
+
         self.cmd = aggregate.DeleteAggregate(self.app, None)
 
     def test_aggregate_delete(self):

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

@@ -13,7 +13,6 @@
 #   under the License.
 #
 
-from unittest import mock
 
 from openstack.compute.v2 import server as _server
 from openstack.test import fakes as sdk_fakes
@@ -90,9 +89,7 @@ class TestConsoleUrlShow(compute_fakes.TestComputev2):
             'protocol': 'fake_protocol',
             'type': 'fake_type',
         }
-        self.compute_client.create_console = mock.Mock(
-            return_value=fake_console_data
-        )
+        self.compute_client.create_console.return_value = fake_console_data
 
         self.columns = (
             'protocol',