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

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_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,169 +19,82 @@ 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 volume for all tests to create snapshot
+        # 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()
 
-    def test_volume_snapshot_delete(self):
-        """Test create, delete multiple"""
-        name1 = uuid.uuid4().hex
-        cmd_output = self.openstack(
-            'volume snapshot create ' + name1 + ' --volume ' + self.VOLLY,
-            parse_output=True,
-        )
-        self.assertEqual(
-            name1,
-            cmd_output["name"],
-        )
+    def test_volume_snapshot(self):
+        # create volume snapshot
+        name = uuid.uuid4().hex
 
-        name2 = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'volume snapshot create ' + name2 + ' --volume ' + self.VOLLY,
+            'volume snapshot create '
+            + '--volume '
+            + self.VOLUME_NAME
+            + ' --description aaaa '
+            + '--property Alpha=a '
+            + name,
             parse_output=True,
         )
-        self.assertEqual(
-            name2,
-            cmd_output["name"],
-        )
+        snap_id = cmd_output['id']
 
-        self.wait_for_status('volume snapshot', name1, 'available')
-        self.wait_for_status('volume snapshot', name2, 'available')
-
-        del_output = self.openstack(
-            'volume snapshot delete ' + name1 + ' ' + name2
+        self.addCleanup(self.wait_for_delete, 'volume snapshot', snap_id)
+        # delete volume snapshot
+        self.addCleanup(
+            self.openstack,
+            'volume snapshot delete ' + snap_id,
         )
-        self.assertOutput('', del_output)
-        self.wait_for_delete('volume snapshot', name1)
-        self.wait_for_delete('volume snapshot', name2)
+        self.wait_for_status('volume snapshot', snap_id, 'available')
 
-    def test_volume_snapshot_list(self):
-        """Test create, list filter"""
-        name1 = uuid.uuid4().hex
-        cmd_output = self.openstack(
-            'volume snapshot create ' + name1 + ' --volume ' + self.VOLLY,
+        # show volume snapshot
+        snapshot_info = self.openstack(
+            'volume snapshot show ' + name,
             parse_output=True,
         )
-        self.addCleanup(self.wait_for_delete, 'volume snapshot', name1)
-        self.addCleanup(self.openstack, 'volume snapshot delete ' + name1)
-        self.assertEqual(
-            name1,
-            cmd_output["name"],
-        )
-        self.assertEqual(
-            self.VOLUME_ID,
-            cmd_output["volume_id"],
-        )
-        self.assertEqual(
-            1,
-            cmd_output["size"],
-        )
-        self.wait_for_status('volume snapshot', name1, 'available')
 
-        name2 = uuid.uuid4().hex
-        cmd_output = self.openstack(
-            'volume snapshot create ' + name2 + ' --volume ' + self.VOLLY,
-            parse_output=True,
-        )
-        self.addCleanup(self.wait_for_delete, 'volume snapshot', name2)
-        self.addCleanup(self.openstack, 'volume snapshot delete ' + name2)
-        self.assertEqual(
-            name2,
-            cmd_output["name"],
-        )
-        self.assertEqual(
-            self.VOLUME_ID,
-            cmd_output["volume_id"],
-        )
-        self.assertEqual(
-            1,
-            cmd_output["size"],
-        )
-        self.wait_for_status('volume snapshot', name2, 'available')
-        raw_output = self.openstack(
-            'volume snapshot set ' + '--state error ' + name2
-        )
-        self.assertOutput('', raw_output)
+        self.assertEqual(name, snapshot_info['name'])
+        self.assertEqual('aaaa', snapshot_info["description"])
+        self.assertEqual({'Alpha': 'a'}, snapshot_info["properties"])
 
-        # Test list --long, --status
+        # list volume snapshot --name
         cmd_output = self.openstack(
-            'volume snapshot list ' + '--long ' + '--status error',
+            'volume snapshot list --name ' + name,
             parse_output=True,
         )
-        names = [x["Name"] for x in cmd_output]
-        self.assertNotIn(name1, names)
-        self.assertIn(name2, names)
+        names = [x['Name'] for x in cmd_output]
+        self.assertIn(name, names)
 
-        # Test list --volume
+        # 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]
-        self.assertIn(name1, names)
-        self.assertIn(name2, names)
+        self.assertIn(name, names)
 
-        # Test list --name
-        cmd_output = self.openstack(
-            'volume snapshot list ' + '--name ' + name1,
-            parse_output=True,
-        )
-        names = [x["Name"] for x in cmd_output]
-        self.assertIn(name1, names)
-        self.assertNotIn(name2, names)
-
-    def test_volume_snapshot_set(self):
-        """Test create, set, unset, show, delete volume snapshot"""
-        name = uuid.uuid4().hex
+        # set volume snapshot
         new_name = name + "_"
-        cmd_output = self.openstack(
-            'volume snapshot create '
-            + '--volume '
-            + self.VOLLY
-            + ' --description aaaa '
-            + '--property Alpha=a '
-            + name,
-            parse_output=True,
-        )
-        self.addCleanup(self.wait_for_delete, 'volume snapshot', new_name)
-        self.addCleanup(self.openstack, 'volume snapshot delete ' + new_name)
-        self.assertEqual(
-            name,
-            cmd_output["name"],
-        )
-        self.assertEqual(
-            1,
-            cmd_output["size"],
-        )
-        self.assertEqual(
-            'aaaa',
-            cmd_output["description"],
-        )
-        self.assertEqual(
-            {'Alpha': 'a'},
-            cmd_output["properties"],
-        )
-        self.wait_for_status('volume snapshot', name, 'available')
-
-        # Test volume snapshot set
         raw_output = self.openstack(
             'volume snapshot set '
             + '--name '
@@ -188,11 +102,10 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             + ' --description bbbb '
             + '--property Alpha=c '
             + '--property Beta=b '
-            + name,
+            + snap_id,
         )
         self.assertOutput('', raw_output)
 
-        # Show snapshot set result
         cmd_output = self.openstack(
             'volume snapshot show ' + new_name,
             parse_output=True,
@@ -201,10 +114,6 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             new_name,
             cmd_output["name"],
         )
-        self.assertEqual(
-            1,
-            cmd_output["size"],
-        )
         self.assertEqual(
             'bbbb',
             cmd_output["description"],
@@ -214,7 +123,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             cmd_output["properties"],
         )
 
-        # Test volume snapshot unset
+        # unset volume snapshot
         raw_output = self.openstack(
             'volume snapshot unset ' + '--property Alpha ' + new_name,
         )
@@ -229,16 +138,25 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             cmd_output["properties"],
         )
 
-        # Test volume snapshot set --no-property
+        # set volume snapshot --no-property, --state error
         raw_output = self.openstack(
-            'volume snapshot set ' + '--no-property ' + new_name,
+            'volume snapshot set '
+            + '--no-property '
+            + '--state error '
+            + new_name,
         )
         self.assertOutput('', raw_output)
+
         cmd_output = self.openstack(
             'volume snapshot show ' + new_name,
             parse_output=True,
         )
-        self.assertNotIn(
-            {'Beta': 'b'},
-            cmd_output["properties"],
+        self.assertEqual({}, cmd_output["properties"])
+
+        # list volume snapshot --long --status
+        cmd_output = self.openstack(
+            'volume snapshot list ' + '--long ' + '--status error',
+            parse_output=True,
         )
+        names = [x["Name"] for x in cmd_output]
+        self.assertIn(new_name, names)

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',

openstackclient/tests/unit/common/test_availability_zone.py

@@ -38,18 +38,15 @@ def _build_compute_az_datalist(compute_az, long_datalist=False):
     return (datalist,)
 
 
-def _build_volume_az_datalist(volume_az, long_datalist=False):
+def _build_network_az_datalist(network_az, long_datalist=False):
     datalist = ()
     if not long_datalist:
-        datalist = (
-            volume_az.name,
-            'available',
-        )
+        datalist = (network_az.name, network_az.state)
     else:
         datalist = (
-            volume_az.name,
-            'available',
-            '',
+            network_az.name,
+            network_az.state,
+            network_az.resource,
             '',
             '',
             '',
@@ -57,22 +54,12 @@ def _build_volume_az_datalist(volume_az, long_datalist=False):
     return (datalist,)
 
 
-def _build_network_az_datalist(network_az, long_datalist=False):
+def _build_volume_az_datalist(volume_az, long_datalist=False):
     datalist = ()
     if not long_datalist:
-        datalist = (
-            network_az.name,
-            network_az.state,
-        )
+        datalist = (volume_az.name, 'available')
     else:
-        datalist = (
-            network_az.name,
-            network_az.state,
-            network_az.resource,
-            '',
-            '',
-            '',
-        )
+        datalist = (volume_az.name, 'available', '', '', '', '')
     return (datalist,)
 
 
@@ -82,10 +69,6 @@ class TestAvailabilityZoneList(
     compute_fakes.FakeClientMixin,
     utils.TestCommand,
 ):
-    compute_azs = compute_fakes.create_availability_zones()
-    volume_azs = volume_fakes.create_availability_zones(count=1)
-    network_azs = network_fakes.create_availability_zones()
-
     short_columnslist = ('Zone Name', 'Zone Status')
     long_columnslist = (
         'Zone Name',
@@ -99,11 +82,14 @@ class TestAvailabilityZoneList(
     def setUp(self):
         super().setUp()
 
+        self.compute_azs = compute_fakes.create_availability_zones()
         self.compute_client.availability_zones.return_value = self.compute_azs
+        self.network_azs = network_fakes.create_availability_zones()
+        self.network_client.availability_zones.return_value = self.network_azs
+        self.volume_azs = volume_fakes.create_availability_zones(count=1)
         self.volume_sdk_client.availability_zones.return_value = (
             self.volume_azs
         )
-        self.network_client.availability_zones.return_value = self.network_azs
 
         # Get the command object to test
         self.cmd = availability_zone.ListAvailabilityZone(self.app, None)
@@ -119,17 +105,17 @@ class TestAvailabilityZoneList(
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_sdk_client.availability_zones.assert_called_with()
         self.network_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
         for compute_az in self.compute_azs:
             datalist += _build_compute_az_datalist(compute_az)
-        for volume_az in self.volume_azs:
-            datalist += _build_volume_az_datalist(volume_az)
         for network_az in self.network_azs:
             datalist += _build_network_az_datalist(network_az)
+        for volume_az in self.volume_azs:
+            datalist += _build_volume_az_datalist(volume_az)
         self.assertEqual(datalist, tuple(data))
 
     def test_availability_zone_list_long(self):
@@ -147,8 +133,8 @@ class TestAvailabilityZoneList(
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_sdk_client.availability_zones.assert_called_with()
         self.network_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.long_columnslist, columns)
         datalist = ()
@@ -156,14 +142,14 @@ class TestAvailabilityZoneList(
             datalist += _build_compute_az_datalist(
                 compute_az, long_datalist=True
             )
-        for volume_az in self.volume_azs:
-            datalist += _build_volume_az_datalist(
-                volume_az, long_datalist=True
-            )
         for network_az in self.network_azs:
             datalist += _build_network_az_datalist(
                 network_az, long_datalist=True
             )
+        for volume_az in self.volume_azs:
+            datalist += _build_volume_az_datalist(
+                volume_az, long_datalist=True
+            )
         self.assertEqual(datalist, tuple(data))
 
     def test_availability_zone_list_compute(self):
@@ -181,8 +167,8 @@ class TestAvailabilityZoneList(
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_called_with(details=True)
-        self.volume_sdk_client.availability_zones.assert_not_called()
         self.network_client.availability_zones.assert_not_called()
+        self.volume_sdk_client.availability_zones.assert_not_called()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
@@ -190,12 +176,12 @@ class TestAvailabilityZoneList(
             datalist += _build_compute_az_datalist(compute_az)
         self.assertEqual(datalist, tuple(data))
 
-    def test_availability_zone_list_volume(self):
+    def test_availability_zone_list_network(self):
         arglist = [
-            '--volume',
+            '--network',
         ]
         verifylist = [
-            ('volume', True),
+            ('network', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -205,21 +191,21 @@ class TestAvailabilityZoneList(
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_not_called()
-        self.volume_sdk_client.availability_zones.assert_called_with()
-        self.network_client.availability_zones.assert_not_called()
+        self.network_client.availability_zones.assert_called_with()
+        self.volume_sdk_client.availability_zones.assert_not_called()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
-        for volume_az in self.volume_azs:
-            datalist += _build_volume_az_datalist(volume_az)
+        for network_az in self.network_azs:
+            datalist += _build_network_az_datalist(network_az)
         self.assertEqual(datalist, tuple(data))
 
-    def test_availability_zone_list_network(self):
+    def test_availability_zone_list_volume(self):
         arglist = [
-            '--network',
+            '--volume',
         ]
         verifylist = [
-            ('network', True),
+            ('volume', True),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -229,11 +215,11 @@ class TestAvailabilityZoneList(
         columns, data = self.cmd.take_action(parsed_args)
 
         self.compute_client.availability_zones.assert_not_called()
-        self.volume_sdk_client.availability_zones.assert_not_called()
-        self.network_client.availability_zones.assert_called_with()
+        self.network_client.availability_zones.assert_not_called()
+        self.volume_sdk_client.availability_zones.assert_called_with()
 
         self.assertEqual(self.short_columnslist, columns)
         datalist = ()
-        for network_az in self.network_azs:
-            datalist += _build_network_az_datalist(network_az)
+        for volume_az in self.volume_azs:
+            datalist += _build_volume_az_datalist(volume_az)
         self.assertEqual(datalist, tuple(data))

openstackclient/tests/unit/common/test_extension.py

@@ -294,7 +294,7 @@ class TestExtensionShow(TestExtension):
 
         self.cmd = extension.ShowExtension(self.app, None)
 
-        self.app.client_manager.network.find_extension.return_value = (
+        self.network_client.find_extension.return_value = (
             self.extension_details
         )
 
@@ -322,7 +322,7 @@ class TestExtensionShow(TestExtension):
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.app.client_manager.network.find_extension.assert_called_with(
+        self.network_client.find_extension.assert_called_with(
             self.extension_details.alias, ignore_missing=False
         )