python-openstackclient 9.0.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

openstackclient/tests/functional/identity/v3/test_user.py

@@ -22,7 +22,7 @@ class UserTests(common.IdentityTests):
     def test_user_delete(self):
         username = self._create_dummy_user(add_clean_up=False)
         raw_output = self.openstack(
-            f'user delete --domain {self.domain_name} {username}'
+            f'user delete --domain {self.DOMAIN_NAME} {username}'
         )
         self.assertEqual(0, len(raw_output))
 
@@ -34,7 +34,7 @@ class UserTests(common.IdentityTests):
     def test_user_set(self):
         username = self._create_dummy_user()
         raw_output = self.openstack(
-            f'user show --domain {self.domain_name} {username}'
+            f'user show --domain {self.DOMAIN_NAME} {username}'
         )
         user = self.parse_show_as_object(raw_output)
         new_username = data_utils.rand_name('NewTestUser')
@@ -46,7 +46,7 @@ class UserTests(common.IdentityTests):
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(
-            f'user show --domain {self.domain_name} {new_username}'
+            f'user show --domain {self.DOMAIN_NAME} {new_username}'
         )
         updated_user = self.parse_show_as_object(raw_output)
         self.assertEqual(user['id'], updated_user['id'])
@@ -57,7 +57,7 @@ class UserTests(common.IdentityTests):
         project_name = self._create_dummy_project()
         # get original user details
         raw_output = self.openstack(
-            f'user show --domain {self.domain_name} {username}'
+            f'user show --domain {self.DOMAIN_NAME} {username}'
         )
         user = self.parse_show_as_object(raw_output)
         # update user
@@ -67,19 +67,19 @@ class UserTests(common.IdentityTests):
             '--project-domain {project_domain} '
             '{id}'.format(
                 project=project_name,
-                project_domain=self.domain_name,
+                project_domain=self.DOMAIN_NAME,
                 id=user['id'],
             )
         )
         self.assertEqual(0, len(raw_output))
         # get updated user details
         raw_output = self.openstack(
-            f'user show --domain {self.domain_name} {username}'
+            f'user show --domain {self.DOMAIN_NAME} {username}'
         )
         updated_user = self.parse_show_as_object(raw_output)
         # get project details
         raw_output = self.openstack(
-            f'project show --domain {self.domain_name} {project_name}'
+            f'project show --domain {self.DOMAIN_NAME} {project_name}'
         )
         project = self.parse_show_as_object(raw_output)
         # check updated user details
@@ -89,7 +89,7 @@ class UserTests(common.IdentityTests):
     def test_user_show(self):
         username = self._create_dummy_user()
         raw_output = self.openstack(
-            f'user show --domain {self.domain_name} {username}'
+            f'user show --domain {self.DOMAIN_NAME} {username}'
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.USER_FIELDS)

openstackclient/tests/functional/image/base.py

@@ -16,9 +16,4 @@ from openstackclient.tests.functional import base
 class BaseImageTests(base.TestCase):
     """Functional tests for Image commands"""
 
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        # TODO(dtroyer): maybe do image API discovery here to determine
-        #                what is available, it isn't in the service catalog
-        cls.haz_v1_api = False
+    ...

openstackclient/tests/functional/network/v2/common.py

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional import base
@@ -18,6 +19,8 @@ from openstackclient.tests.functional import base
 class NetworkTests(base.TestCase):
     """Functional tests for Network commands"""
 
+    haz_network: ClassVar[bool]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -33,7 +36,7 @@ class NetworkTests(base.TestCase):
 class NetworkTagTests(NetworkTests):
     """Functional tests with tag operation"""
 
-    base_command: str
+    base_command: ClassVar[str]
 
     def test_tag_operation(self):
         # Get project IDs
@@ -84,7 +87,7 @@ class NetworkTagTests(NetworkTests):
             parse_output=True,
         )
         for name, tags in expected:
-            net = [n for n in cmd_output if n['Name'] == name][0]
+            net = next(n for n in cmd_output if n['Name'] == name)
             self.assertEqual(set(tags), set(net['Tags']))
 
     def _create_resource_for_tag_test(self, name, args):

openstackclient/tests/functional/network/v2/test_floating_ip.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 import random
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.network.v2 import common
@@ -19,6 +20,11 @@ from openstackclient.tests.functional.network.v2 import common
 class FloatingIpTests(common.NetworkTests):
     """Functional tests for floating ip"""
 
+    EXTERNAL_NETWORK_NAME: ClassVar[str]
+    EXTERNAL_NETWORK_ID: ClassVar[str]
+    PRIVATE_NETWORK_NAME: ClassVar[str]
+    PRIVATE_NETWORK_ID: ClassVar[str]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -32,14 +38,14 @@ class FloatingIpTests(common.NetworkTests):
                 'network create ' + '--external ' + cls.EXTERNAL_NETWORK_NAME,
                 parse_output=True,
             )
-            cls.external_network_id = json_output["id"]
+            cls.EXTERNAL_NETWORK_ID = json_output["id"]
 
             # Create a private network for the port
             json_output = cls.openstack(
                 'network create ' + cls.PRIVATE_NETWORK_NAME,
                 parse_output=True,
             )
-            cls.private_network_id = json_output["id"]
+            cls.PRIVATE_NETWORK_ID = json_output["id"]
 
     @classmethod
     def tearDownClass(cls):
@@ -59,8 +65,8 @@ class FloatingIpTests(common.NetworkTests):
         super().setUp()
 
         # Verify setup
-        self.assertIsNotNone(self.external_network_id)
-        self.assertIsNotNone(self.private_network_id)
+        self.assertIsNotNone(self.EXTERNAL_NETWORK_ID)
+        self.assertIsNotNone(self.PRIVATE_NETWORK_ID)
 
     def _create_subnet(self, network_name, subnet_name):
         subnet_id = None

openstackclient/tests/functional/network/v2/test_ip_availability.py

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.network.v2 import common
@@ -18,6 +19,9 @@ from openstackclient.tests.functional.network.v2 import common
 class IPAvailabilityTests(common.NetworkTests):
     """Functional tests for IP availability"""
 
+    NAME: ClassVar[str]
+    NETWORK_NAME: ClassVar[str]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

openstackclient/tests/functional/network/v2/test_network_meter_rule.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import unittest
 import uuid
 
@@ -22,8 +23,8 @@ from openstackclient.tests.functional.network.v2 import common
 class TestMeterRule(common.NetworkTests):
     """Functional tests for meter rule"""
 
-    METER_ID: str
-    METER_RULE_ID: str
+    METER_ID: ClassVar[str]
+    METER_NAME: ClassVar[str]
 
     @classmethod
     def setUpClass(cls):

openstackclient/tests/functional/network/v2/test_network_segment.py

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.network.v2 import common
@@ -18,6 +19,10 @@ from openstackclient.tests.functional.network.v2 import common
 class NetworkSegmentTests(common.NetworkTests):
     """Functional tests for network segment"""
 
+    NETWORK_NAME: ClassVar[str]
+    NETWORK_ID: ClassVar[str]
+    PHYSICAL_NETWORK_NAME: ClassVar[str]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

openstackclient/tests/functional/network/v2/test_subnet.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 import random
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.network.v2 import common
@@ -21,19 +22,22 @@ class SubnetTests(common.NetworkTagTests):
 
     base_command = 'subnet'
 
+    NETWORK_NAME: ClassVar[str]
+    NETWORK_ID: ClassVar[str]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        if cls.haz_network:
-            cls.NETWORK_NAME = uuid.uuid4().hex
 
-            # Create a network for the all subnet tests
-            cmd_output = cls.openstack(
-                'network create ' + cls.NETWORK_NAME,
-                parse_output=True,
-            )
-            # Get network_id for assertEqual
-            cls.NETWORK_ID = cmd_output["id"]
+        cls.NETWORK_NAME = uuid.uuid4().hex
+
+        # Create a network for the all subnet tests
+        cmd_output = cls.openstack(
+            'network create ' + cls.NETWORK_NAME,
+            parse_output=True,
+        )
+        # Get network_id for assertEqual
+        cls.NETWORK_ID = cmd_output["id"]
 
     @classmethod
     def tearDownClass(cls):

openstackclient/tests/functional/object/v1/common.py

@@ -10,12 +10,16 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
+
 from openstackclient.tests.functional import base
 
 
 class ObjectStoreTests(base.TestCase):
     """Functional tests for Object Store commands"""
 
+    haz_object_store: ClassVar[bool]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

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

@@ -10,6 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
+
 import fixtures
 
 from openstackclient.tests.functional.volume import base
@@ -18,6 +20,8 @@ from openstackclient.tests.functional.volume import base
 class BaseVolumeTests(base.BaseVolumeTests):
     """Base class for Volume functional tests."""
 
+    haz_volume_v2: ClassVar[bool]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

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

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.volume.v2 import common
@@ -18,24 +19,27 @@ from openstackclient.tests.functional.volume.v2 import common
 class VolumeSnapshotTests(common.BaseVolumeTests):
     """Functional tests for volume snapshot."""
 
-    VOLLY = uuid.uuid4().hex
+    VOLUME_NAME = uuid.uuid4().hex
+    VOLUME_ID: ClassVar[str]
 
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
         # create a volume for all tests to create snapshot
         cmd_output = cls.openstack(
-            'volume create ' + '--size 1 ' + cls.VOLLY,
+            'volume create ' + '--size 1 ' + cls.VOLUME_NAME,
             parse_output=True,
         )
-        cls.wait_for_status('volume', cls.VOLLY, 'available')
+        cls.wait_for_status('volume', cls.VOLUME_NAME, 'available')
         cls.VOLUME_ID = cmd_output['id']
 
     @classmethod
     def tearDownClass(cls):
         try:
-            cls.wait_for_status('volume', cls.VOLLY, 'available')
-            raw_output = cls.openstack('volume delete --force ' + cls.VOLLY)
+            cls.wait_for_status('volume', cls.VOLUME_NAME, 'available')
+            raw_output = cls.openstack(
+                'volume delete --force ' + cls.VOLUME_NAME
+            )
             cls.assertOutput('', raw_output)
         finally:
             super().tearDownClass()
@@ -44,7 +48,10 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
         """Test create, delete multiple"""
         name1 = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'volume snapshot create ' + name1 + ' --volume ' + self.VOLLY,
+            'volume snapshot create '
+            + name1
+            + ' --volume '
+            + self.VOLUME_NAME,
             parse_output=True,
         )
         self.assertEqual(
@@ -54,7 +61,10 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
 
         name2 = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'volume snapshot create ' + name2 + ' --volume ' + self.VOLLY,
+            'volume snapshot create '
+            + name2
+            + ' --volume '
+            + self.VOLUME_NAME,
             parse_output=True,
         )
         self.assertEqual(
@@ -76,7 +86,10 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
         """Test create, list filter"""
         name1 = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'volume snapshot create ' + name1 + ' --volume ' + self.VOLLY,
+            'volume snapshot create '
+            + name1
+            + ' --volume '
+            + self.VOLUME_NAME,
             parse_output=True,
         )
         self.addCleanup(self.wait_for_delete, 'volume snapshot', name1)
@@ -97,7 +110,10 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
 
         name2 = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'volume snapshot create ' + name2 + ' --volume ' + self.VOLLY,
+            'volume snapshot create '
+            + name2
+            + ' --volume '
+            + self.VOLUME_NAME,
             parse_output=True,
         )
         self.addCleanup(self.wait_for_delete, 'volume snapshot', name2)
@@ -146,7 +162,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
 
         # Test list --volume
         cmd_output = self.openstack(
-            'volume snapshot list ' + '--volume ' + self.VOLLY,
+            'volume snapshot list ' + '--volume ' + self.VOLUME_NAME,
             parse_output=True,
         )
         names = [x["Name"] for x in cmd_output]
@@ -169,7 +185,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
         cmd_output = self.openstack(
             'volume snapshot create '
             + '--volume '
-            + self.VOLLY
+            + self.VOLUME_NAME
             + ' --description aaaa '
             + '--property Alpha=a '
             + name,

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

@@ -173,9 +173,9 @@ class VolumeTypeTests(common.BaseVolumeTests):
             'volume type list --encryption-type',
             parse_output=True,
         )
-        encryption_output = [
+        encryption_output = next(
             t['Encryption'] for t in cmd_output if t['Name'] == encryption_type
-        ][0]
+        )
         expected = {
             'provider': 'LuksEncryptor',
             'cipher': 'aes-xts-plain64',

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

@@ -10,6 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
+
 import fixtures
 
 from openstackclient.tests.functional.volume import base
@@ -18,6 +20,8 @@ from openstackclient.tests.functional.volume import base
 class BaseVolumeTests(base.BaseVolumeTests):
     """Base class for Volume functional tests."""
 
+    haz_volume_v3: ClassVar[bool]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

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

@@ -0,0 +1,163 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from typing import ClassVar
+import uuid
+
+from openstackclient.tests.functional.volume.v3 import common
+
+
+class VolumeGroupTests(common.BaseVolumeTests):
+    """Functional tests for volume group."""
+
+    API_VERSION = '3.13'
+    GROUP_TYPE_NAME = uuid.uuid4().hex
+    GROUP_TYPE_ID: ClassVar[str]
+    VOLUME_TYPE_ID: ClassVar[str]
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cmd_output = cls.openstack(
+            '--os-volume-api-version '
+            + cls.API_VERSION
+            + ' volume group type create '
+            + cls.GROUP_TYPE_NAME,
+            parse_output=True,
+        )
+        cls.GROUP_TYPE_ID = cmd_output['ID']
+
+        volume_type_name = uuid.uuid4().hex
+        cmd_output = cls.openstack(
+            'volume type create ' + volume_type_name,
+            parse_output=True,
+        )
+        cls.VOLUME_TYPE_ID = cmd_output['id']
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            raw_output = cls.openstack(
+                'volume type delete ' + cls.VOLUME_TYPE_ID
+            )
+            cls.assertOutput('', raw_output)
+            raw_output = cls.openstack(
+                '--os-volume-api-version '
+                + cls.API_VERSION
+                + ' volume group type delete '
+                + cls.GROUP_TYPE_NAME
+            )
+            cls.assertOutput('', raw_output)
+        finally:
+            super().tearDownClass()
+
+    def test_volume_group(self):
+        # create volume group
+        name = uuid.uuid4().hex
+        description = 'description-' + uuid.uuid4().hex
+        cmd_output = self.openstack(
+            '--os-volume-api-version '
+            + self.API_VERSION
+            + ' volume group create '
+            + '--volume-group-type '
+            + self.GROUP_TYPE_NAME
+            + ' --volume-type '
+            + self.VOLUME_TYPE_ID
+            + ' --name '
+            + name
+            + ' --description '
+            + description,
+            parse_output=True,
+        )
+        group_id = cmd_output['ID']
+        self.addCleanup(
+            self.wait_for_delete,
+            '--os-volume-api-version ' + self.API_VERSION + ' volume group',
+            group_id,
+            name_field='ID',
+        )
+        self.addCleanup(
+            self.openstack,
+            '--os-volume-api-version '
+            + self.API_VERSION
+            + ' volume group delete '
+            + group_id,
+            fail_ok=True,
+        )
+        self.assertIsNotNone(group_id)
+        self.assertEqual(name, cmd_output['Name'])
+        self.assertEqual(description, cmd_output['Description'])
+        self.assertEqual(self.GROUP_TYPE_ID, cmd_output['Group Type'])
+        self.assertIn(self.VOLUME_TYPE_ID, cmd_output['Volume Types'])
+
+        # show volume group
+        cmd_output = self.openstack(
+            '--os-volume-api-version '
+            + self.API_VERSION
+            + ' volume group show '
+            + group_id,
+            parse_output=True,
+        )
+        self.assertEqual(group_id, cmd_output['ID'])
+        self.assertEqual(name, cmd_output['Name'])
+        self.assertEqual(description, cmd_output['Description'])
+
+        # list volume group
+        cmd_output = self.openstack(
+            '--os-volume-api-version '
+            + self.API_VERSION
+            + ' volume group list',
+            parse_output=True,
+        )
+        self.assertIn(group_id, [group['ID'] for group in cmd_output])
+        self.assertIn(name, [group['Name'] for group in cmd_output])
+
+        # set volume group
+        new_name = uuid.uuid4().hex
+        new_description = 'description-' + uuid.uuid4().hex
+        self.openstack(
+            '--os-volume-api-version '
+            + self.API_VERSION
+            + ' volume group set '
+            + '--name '
+            + new_name
+            + ' --description '
+            + new_description
+            + ' '
+            + group_id,
+        )
+
+        # show updated volume group
+        cmd_output = self.openstack(
+            '--os-volume-api-version '
+            + self.API_VERSION
+            + ' volume group show '
+            + group_id,
+            parse_output=True,
+        )
+        self.assertEqual(group_id, cmd_output['ID'])
+        self.assertEqual(new_name, cmd_output['Name'])
+        self.assertEqual(new_description, cmd_output['Description'])
+
+        # delete volume group
+        raw_output = self.openstack(
+            '--os-volume-api-version '
+            + self.API_VERSION
+            + ' volume group delete '
+            + group_id,
+        )
+        self.assertOutput('', raw_output)
+        self.wait_for_delete(
+            '--os-volume-api-version ' + self.API_VERSION + ' volume group',
+            group_id,
+            name_field='ID',
+        )

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

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.volume.v3 import common
@@ -18,24 +19,27 @@ from openstackclient.tests.functional.volume.v3 import common
 class VolumeSnapshotTests(common.BaseVolumeTests):
     """Functional tests for volume snapshot."""
 
-    VOLLY = uuid.uuid4().hex
+    VOLUME_NAME = uuid.uuid4().hex
+    VOLUME_ID: ClassVar[str]
 
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
         # create a test volume used by all snapshot tests
         cmd_output = cls.openstack(
-            'volume create ' + '--size 1 ' + cls.VOLLY,
+            'volume create ' + '--size 1 ' + cls.VOLUME_NAME,
             parse_output=True,
         )
-        cls.wait_for_status('volume', cls.VOLLY, 'available')
+        cls.wait_for_status('volume', cls.VOLUME_NAME, 'available')
         cls.VOLUME_ID = cmd_output['id']
 
     @classmethod
     def tearDownClass(cls):
         try:
-            cls.wait_for_status('volume', cls.VOLLY, 'available')
-            raw_output = cls.openstack('volume delete --force ' + cls.VOLLY)
+            cls.wait_for_status('volume', cls.VOLUME_NAME, 'available')
+            raw_output = cls.openstack(
+                'volume delete --force ' + cls.VOLUME_NAME
+            )
             cls.assertOutput('', raw_output)
         finally:
             super().tearDownClass()
@@ -47,7 +51,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
         cmd_output = self.openstack(
             'volume snapshot create '
             + '--volume '
-            + self.VOLLY
+            + self.VOLUME_NAME
             + ' --description aaaa '
             + '--property Alpha=a '
             + name,
@@ -83,7 +87,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
 
         # list volume snapshot --volume
         cmd_output = self.openstack(
-            'volume snapshot list ' + '--volume ' + self.VOLLY,
+            'volume snapshot list ' + '--volume ' + self.VOLUME_NAME,
             parse_output=True,
         )
         names = [x["Name"] for x in cmd_output]

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

@@ -173,9 +173,9 @@ class VolumeTypeTests(common.BaseVolumeTests):
             'volume type list --encryption-type',
             parse_output=True,
         )
-        encryption_output = [
+        encryption_output = next(
             t['Encryption'] for t in cmd_output if t['Name'] == encryption_type
-        ][0]
+        )
         expected = {
             'provider': 'LuksEncryptor',
             'cipher': 'aes-xts-plain64',