python-openstackclient 7.1.3__py3-none-any.whl → 7.2.1__py3-none-any.whl

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

@@ -275,17 +275,16 @@ class RouterTests(common.NetworkTagTests):
         subnet_name = uuid.uuid4().hex
         router_name = uuid.uuid4().hex
 
-        self.openstack('network create %s' % network_name)
-        self.addCleanup(self.openstack, 'network delete %s' % network_name)
+        self.openstack(f'network create {network_name}')
+        self.addCleanup(self.openstack, f'network delete {network_name}')
 
         self.openstack(
-            'subnet create %s '
-            '--network %s --subnet-range 10.0.0.0/24'
-            % (subnet_name, network_name)
+            f'subnet create {subnet_name} '
+            f'--network {network_name} --subnet-range 10.0.0.0/24'
         )
 
-        self.openstack('router create %s' % router_name)
-        self.addCleanup(self.openstack, 'router delete %s' % router_name)
+        self.openstack(f'router create {router_name}')
+        self.addCleanup(self.openstack, f'router delete {router_name}')
 
         self.openstack(f'router add subnet {router_name} {subnet_name}')
         self.addCleanup(
@@ -295,24 +294,20 @@ class RouterTests(common.NetworkTagTests):
 
         out1 = (
             self.openstack(
-                'router add route %s '
-                '--route destination=10.0.10.0/24,gateway=10.0.0.10'
-                % router_name,
+                f'router add route {router_name} '
+                '--route destination=10.0.10.0/24,gateway=10.0.0.10',
                 parse_output=True,
             ),
         )
         self.assertEqual(1, len(out1[0]['routes']))
 
-        self.addCleanup(
-            self.openstack, 'router set %s --no-route' % router_name
-        )
+        self.addCleanup(self.openstack, f'router set {router_name} --no-route')
 
         out2 = (
             self.openstack(
-                'router add route %s '
+                f'router add route {router_name} '
                 '--route destination=10.0.10.0/24,gateway=10.0.0.10 '
-                '--route destination=10.0.11.0/24,gateway=10.0.0.11'
-                % router_name,
+                '--route destination=10.0.11.0/24,gateway=10.0.0.11',
                 parse_output=True,
             ),
         )
@@ -320,10 +315,9 @@ class RouterTests(common.NetworkTagTests):
 
         out3 = (
             self.openstack(
-                'router remove route %s '
+                f'router remove route {router_name} '
                 '--route destination=10.0.11.0/24,gateway=10.0.0.11 '
-                '--route destination=10.0.12.0/24,gateway=10.0.0.12'
-                % router_name,
+                '--route destination=10.0.12.0/24,gateway=10.0.0.12',
                 parse_output=True,
             ),
         )

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

@@ -59,7 +59,7 @@ class ObjectTests(common.ObjectStoreTests):
         items = self.parse_listing(raw_output)
         self.assert_show_fields(items, OBJECT_FIELDS)
 
-        raw_output = self.openstack('object list %s' % self.CONTAINER_NAME)
+        raw_output = self.openstack(f'object list {self.CONTAINER_NAME}')
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, BASIC_LIST_HEADERS)
 
@@ -69,15 +69,12 @@ class ObjectTests(common.ObjectStoreTests):
         tmp_file = 'tmp.txt'
         self.addCleanup(os.remove, tmp_file)
         self.openstack(
-            'object save %s %s --file %s'
-            % (self.CONTAINER_NAME, object_file, tmp_file)
+            f'object save {self.CONTAINER_NAME} {object_file} --file {tmp_file}'
         )
         # TODO(stevemar): Assert returned fields
 
         raw_output = self.openstack(
-            'object save {} {} --file -'.format(
-                self.CONTAINER_NAME, object_file
-            )
+            f'object save {self.CONTAINER_NAME} {object_file} --file -'
         )
         self.assertEqual(raw_output, 'test content')
 
@@ -91,6 +88,6 @@ class ObjectTests(common.ObjectStoreTests):
 
         self.openstack(f'object create {self.CONTAINER_NAME} {object_file}')
         raw_output = self.openstack(
-            'container delete -r %s' % self.CONTAINER_NAME
+            f'container delete -r {self.CONTAINER_NAME}'
         )
         self.assertEqual(0, len(raw_output))

openstackclient/tests/functional/volume/base.py

@@ -40,21 +40,15 @@ class BaseVolumeTests(base.TestCase):
             current_status = output['status']
             if current_status == desired_status:
                 print(
-                    '{} {} now has status {}'.format(
-                        check_type, check_name, current_status
-                    )
+                    f'{check_type} {check_name} now has status {current_status}'
                 )
                 return
             print(
-                'Checking {} {} Waiting for {} current status: {}'.format(
-                    check_type, check_name, desired_status, current_status
-                )
+                f'Checking {check_type} {check_name} Waiting for {desired_status} current status: {current_status}'
             )
             if current_status in failures:
                 raise Exception(
-                    'Current status {} of {} {} is one of failures {}'.format(
-                        current_status, check_type, check_name, failures
-                    )
+                    f'Current status {current_status} of {check_type} {check_name} is one of failures {failures}'
                 )
             time.sleep(interval)
             total_sleep += interval
@@ -72,15 +66,9 @@ class BaseVolumeTests(base.TestCase):
             if check_name not in names:
                 print(f'{check_type} {check_name} is now deleted')
                 return
-            print(
-                'Checking {} {} Waiting for deleted'.format(
-                    check_type, check_name
-                )
-            )
+            print(f'Checking {check_type} {check_name} Waiting for deleted')
             time.sleep(interval)
             total_sleep += interval
         raise Exception(
-            'Timeout: {} {} was not deleted in {} seconds'.format(
-                check_type, check_name, wait
-            )
+            f'Timeout: {check_type} {check_name} was not deleted in {wait} seconds'
         )

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

@@ -32,7 +32,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.assertEqual(name, cmd_output['name'])
 
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual(self.NAME, cmd_output['name'])
@@ -57,19 +57,19 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.assertEqual(name, cmd_output['name'])
 
         raw_output = self.openstack(
-            'volume type set --property a=b --property c=d %s' % name
+            f'volume type set --property a=b --property c=d {name}'
         )
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties'])
 
-        raw_output = self.openstack('volume type unset --property a %s' % name)
+        raw_output = self.openstack(f'volume type unset --property a {name}')
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({'c': 'd'}, cmd_output['properties'])
@@ -84,21 +84,21 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.assertEqual(name, cmd_output['name'])
 
         raw_output = self.openstack(
-            'volume type set --property a=b --property c=d %s' % name
+            f'volume type set --property a=b --property c=d {name}'
         )
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties'])
 
         raw_output = self.openstack(
-            'volume type unset --property a --property c %s' % name
+            f'volume type unset --property a --property c {name}'
         )
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({}, cmd_output['properties'])
@@ -106,9 +106,9 @@ class VolumeTypeTests(common.BaseVolumeTests):
     def test_multi_delete(self):
         vol_type1 = uuid.uuid4().hex
         vol_type2 = uuid.uuid4().hex
-        self.openstack('volume type create %s' % vol_type1)
+        self.openstack(f'volume type create {vol_type1}')
         time.sleep(5)
-        self.openstack('volume type create %s' % vol_type2)
+        self.openstack(f'volume type create {vol_type2}')
         time.sleep(5)
         cmd = f'volume type delete {vol_type1} {vol_type2}'
         raw_output = self.openstack(cmd)

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

@@ -56,4 +56,4 @@ class VolumeBackupTests(common.BaseVolumeTests):
         self.wait_for_status(
             "volume", backup_restored['volume_id'], "available"
         )
-        self.addCleanup(self.openstack, 'volume delete %s' % vol_id)
+        self.addCleanup(self.openstack, f'volume delete {vol_id}')

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

@@ -32,7 +32,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.assertEqual(name, cmd_output['name'])
 
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual(name, cmd_output['name'])
@@ -57,19 +57,19 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.assertEqual(name, cmd_output['name'])
 
         raw_output = self.openstack(
-            'volume type set --property a=b --property c=d %s' % name
+            f'volume type set --property a=b --property c=d {name}'
         )
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties'])
 
-        raw_output = self.openstack('volume type unset --property a %s' % name)
+        raw_output = self.openstack(f'volume type unset --property a {name}')
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({'c': 'd'}, cmd_output['properties'])
@@ -84,21 +84,21 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.assertEqual(name, cmd_output['name'])
 
         raw_output = self.openstack(
-            'volume type set --property a=b --property c=d %s' % name
+            f'volume type set --property a=b --property c=d {name}'
         )
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties'])
 
         raw_output = self.openstack(
-            'volume type unset --property a --property c %s' % name
+            f'volume type unset --property a --property c {name}'
         )
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({}, cmd_output['properties'])
@@ -112,22 +112,20 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.addCleanup(self.openstack, 'volume type delete ' + name)
         self.assertEqual(name, cmd_output['name'])
 
-        raw_output = self.openstack(
-            'volume type set --project admin %s' % name
-        )
+        raw_output = self.openstack(f'volume type set --project admin {name}')
         self.assertEqual("", raw_output)
 
         raw_output = self.openstack(
-            'volume type unset --project admin %s' % name
+            f'volume type unset --project admin {name}'
         )
         self.assertEqual("", raw_output)
 
     def test_multi_delete(self):
         vol_type1 = uuid.uuid4().hex
         vol_type2 = uuid.uuid4().hex
-        self.openstack('volume type create %s' % vol_type1)
+        self.openstack(f'volume type create {vol_type1}')
         time.sleep(5)
-        self.openstack('volume type create %s' % vol_type2)
+        self.openstack(f'volume type create {vol_type2}')
         time.sleep(5)
         cmd = f'volume type delete {vol_type1} {vol_type2}'
         raw_output = self.openstack(cmd)

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

@@ -32,7 +32,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.assertEqual(name, cmd_output['name'])
 
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual(name, cmd_output['name'])
@@ -57,19 +57,19 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.assertEqual(name, cmd_output['name'])
 
         raw_output = self.openstack(
-            'volume type set --property a=b --property c=d %s' % name
+            f'volume type set --property a=b --property c=d {name}'
         )
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties'])
 
-        raw_output = self.openstack('volume type unset --property a %s' % name)
+        raw_output = self.openstack(f'volume type unset --property a {name}')
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({'c': 'd'}, cmd_output['properties'])
@@ -84,21 +84,21 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.assertEqual(name, cmd_output['name'])
 
         raw_output = self.openstack(
-            'volume type set --property a=b --property c=d %s' % name
+            f'volume type set --property a=b --property c=d {name}'
         )
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({'a': 'b', 'c': 'd'}, cmd_output['properties'])
 
         raw_output = self.openstack(
-            'volume type unset --property a --property c %s' % name
+            f'volume type unset --property a --property c {name}'
         )
         self.assertEqual("", raw_output)
         cmd_output = self.openstack(
-            'volume type show %s' % name,
+            f'volume type show {name}',
             parse_output=True,
         )
         self.assertEqual({}, cmd_output['properties'])
@@ -112,22 +112,20 @@ class VolumeTypeTests(common.BaseVolumeTests):
         self.addCleanup(self.openstack, 'volume type delete ' + name)
         self.assertEqual(name, cmd_output['name'])
 
-        raw_output = self.openstack(
-            'volume type set --project admin %s' % name
-        )
+        raw_output = self.openstack(f'volume type set --project admin {name}')
         self.assertEqual("", raw_output)
 
         raw_output = self.openstack(
-            'volume type unset --project admin %s' % name
+            f'volume type unset --project admin {name}'
         )
         self.assertEqual("", raw_output)
 
     def test_multi_delete(self):
         vol_type1 = uuid.uuid4().hex
         vol_type2 = uuid.uuid4().hex
-        self.openstack('volume type create %s' % vol_type1)
+        self.openstack(f'volume type create {vol_type1}')
         time.sleep(5)
-        self.openstack('volume type create %s' % vol_type2)
+        self.openstack(f'volume type create {vol_type2}')
         time.sleep(5)
         cmd = f'volume type delete {vol_type1} {vol_type2}'
         raw_output = self.openstack(cmd)

openstackclient/tests/unit/api/test_compute_v2.py

@@ -26,7 +26,6 @@ from openstackclient.tests.unit import utils
 
 
 class TestSecurityGroup(utils.TestCase):
-
     def setUp(self):
         super().setUp()
 
@@ -227,7 +226,6 @@ class TestSecurityGroup(utils.TestCase):
 
 
 class TestSecurityGroupRule(utils.TestCase):
-
     def setUp(self):
         super().setUp()
 
@@ -290,7 +288,6 @@ class TestSecurityGroupRule(utils.TestCase):
 
 
 class TestNetwork(utils.TestCase):
-
     def setUp(self):
         super().setUp()
 
@@ -457,7 +454,6 @@ class TestNetwork(utils.TestCase):
 
 
 class TestFloatingIP(utils.TestCase):
-
     def setUp(self):
         super().setUp()
 
@@ -547,7 +543,6 @@ class TestFloatingIP(utils.TestCase):
 
 
 class TestFloatingIPPool(utils.TestCase):
-
     def setUp(self):
         super().setUp()
 

openstackclient/tests/unit/api/test_object_store_v1.py

@@ -135,16 +135,18 @@ class TestContainer(TestObjectAPIv1):
         self.requests_mock.register_uri(
             'GET',
             FAKE_URL
-            + '?marker=%s&limit=1&format=json'
-            % LIST_CONTAINER_RESP[0]['name'],
+            + '?marker={}&limit=1&format=json'.format(
+                LIST_CONTAINER_RESP[0]['name']
+            ),
             json=[LIST_CONTAINER_RESP[1]],
             status_code=200,
         )
         self.requests_mock.register_uri(
             'GET',
             FAKE_URL
-            + '?marker=%s&limit=1&format=json'
-            % LIST_CONTAINER_RESP[1]['name'],
+            + '?marker={}&limit=1&format=json'.format(
+                LIST_CONTAINER_RESP[1]['name']
+            ),
             json=[],
             status_code=200,
         )

openstackclient/tests/unit/common/test_extension.py

@@ -14,7 +14,6 @@ from unittest import mock
 
 from openstackclient.common import extension
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
-from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes
 from openstackclient.tests.unit.network.v2 import fakes as network_fakes
 from openstackclient.tests.unit import utils
@@ -22,23 +21,13 @@ from openstackclient.tests.unit import utils as tests_utils
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 
 
-class TestExtension(network_fakes.FakeClientMixin, utils.TestCommand):
-    def setUp(self):
-        super().setUp()
-
-        identity_client = identity_fakes.FakeIdentityv2Client(
-            endpoint=fakes.AUTH_URL,
-            token=fakes.AUTH_TOKEN,
-        )
-        self.app.client_manager.identity = identity_client
-        self.identity_extensions_mock = identity_client.extensions
-        self.identity_extensions_mock.reset_mock()
-
-        sdk_connection = self.app.client_manager.sdk_connection
-        self.compute_extensions_mock = sdk_connection.compute.extensions
-        self.compute_extensions_mock.reset_mock()
-        self.volume_extensions_mock = sdk_connection.volume.extensions
-        self.volume_extensions_mock.reset_mock()
+class TestExtension(
+    network_fakes.FakeClientMixin,
+    compute_fakes.FakeClientMixin,
+    volume_fakes.FakeClientMixin,
+    identity_fakes.FakeClientMixin,
+    utils.TestCommand,
+): ...
 
 
 class TestExtensionList(TestExtension):
@@ -60,11 +49,15 @@ class TestExtensionList(TestExtension):
     def setUp(self):
         super().setUp()
 
-        self.identity_extensions_mock.list.return_value = [
+        self.identity_client.extensions.list.return_value = [
             self.identity_extension
         ]
-        self.compute_extensions_mock.return_value = [self.compute_extension]
-        self.volume_extensions_mock.return_value = [self.volume_extension]
+        self.compute_sdk_client.extensions.return_value = [
+            self.compute_extension
+        ]
+        self.volume_sdk_client.extensions.return_value = [
+            self.volume_extension
+        ]
         self.network_client.extensions.return_value = [self.network_extension]
 
         # Get the command object to test
@@ -112,9 +105,9 @@ class TestExtensionList(TestExtension):
             ),
         )
         self._test_extension_list_helper(arglist, verifylist, datalist)
-        self.identity_extensions_mock.list.assert_called_with()
-        self.compute_extensions_mock.assert_called_with()
-        self.volume_extensions_mock.assert_called_with()
+        self.identity_client.extensions.list.assert_called_with()
+        self.compute_sdk_client.extensions.assert_called_with()
+        self.volume_sdk_client.extensions.assert_called_with()
         self.network_client.extensions.assert_called_with()
 
     def test_extension_list_long(self):
@@ -159,9 +152,9 @@ class TestExtensionList(TestExtension):
             ),
         )
         self._test_extension_list_helper(arglist, verifylist, datalist, True)
-        self.identity_extensions_mock.list.assert_called_with()
-        self.compute_extensions_mock.assert_called_with()
-        self.volume_extensions_mock.assert_called_with()
+        self.identity_client.extensions.list.assert_called_with()
+        self.compute_sdk_client.extensions.assert_called_with()
+        self.volume_sdk_client.extensions.assert_called_with()
         self.network_client.extensions.assert_called_with()
 
     def test_extension_list_identity(self):
@@ -179,7 +172,7 @@ class TestExtensionList(TestExtension):
             ),
         )
         self._test_extension_list_helper(arglist, verifylist, datalist)
-        self.identity_extensions_mock.list.assert_called_with()
+        self.identity_client.extensions.list.assert_called_with()
 
     def test_extension_list_network(self):
         arglist = [
@@ -237,7 +230,7 @@ class TestExtensionList(TestExtension):
             ),
         )
         self._test_extension_list_helper(arglist, verifylist, datalist)
-        self.compute_extensions_mock.assert_called_with()
+        self.compute_sdk_client.extensions.assert_called_with()
 
     def test_extension_list_compute_and_network(self):
         arglist = [
@@ -261,7 +254,7 @@ class TestExtensionList(TestExtension):
             ),
         )
         self._test_extension_list_helper(arglist, verifylist, datalist)
-        self.compute_extensions_mock.assert_called_with()
+        self.compute_sdk_client.extensions.assert_called_with()
         self.network_client.extensions.assert_called_with()
 
     def test_extension_list_volume(self):
@@ -279,7 +272,7 @@ class TestExtensionList(TestExtension):
             ),
         )
         self._test_extension_list_helper(arglist, verifylist, datalist)
-        self.volume_extensions_mock.assert_called_with()
+        self.volume_sdk_client.extensions.assert_called_with()
 
 
 class TestExtensionShow(TestExtension):

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

@@ -59,7 +59,6 @@ def _generate_fake_host():
 
 
 class TestHostList(compute_fakes.TestComputev2):
-
     def setUp(self):
         super().setUp()