python-openstackclient 6.6.1__py3-none-any.whl → 7.1.0__py3-none-any.whl

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

@@ -91,27 +91,25 @@ class NetworkTagTests(NetworkTests):
 
     def _create_resource_for_tag_test(self, name, args):
         return self.openstack(
-            '{} create {} {}'.format(self.base_command, args, name),
+            f'{self.base_command} create {args} {name}',
             parse_output=True,
         )
 
     def _create_resource_and_tag_check(self, args, expected):
         name = uuid.uuid4().hex
         cmd_output = self._create_resource_for_tag_test(name, args)
-        self.addCleanup(
-            self.openstack, '{} delete {}'.format(self.base_command, name)
-        )
+        self.addCleanup(self.openstack, f'{self.base_command} delete {name}')
         self.assertIsNotNone(cmd_output["id"])
         self.assertEqual(set(expected), set(cmd_output['tags']))
         return name
 
     def _set_resource_and_tag_check(self, command, name, args, expected):
         cmd_output = self.openstack(
-            '{} {} {} {}'.format(self.base_command, command, args, name)
+            f'{self.base_command} {command} {args} {name}'
         )
         self.assertFalse(cmd_output)
         cmd_output = self.openstack(
-            '{} show {}'.format(self.base_command, name),
+            f'{self.base_command} show {name}',
             parse_output=True,
         )
         self.assertEqual(set(expected), set(cmd_output['tags']))

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

@@ -192,7 +192,7 @@ class NetworkTests(common.NetworkTagTests):
             cmd_output["description"],
         )
 
-        del_output = self.openstack('network delete %s %s' % (name1, name2))
+        del_output = self.openstack(f'network delete {name1} {name2}')
         self.assertOutput('', del_output)
 
     def test_network_list(self):
@@ -237,7 +237,7 @@ class NetworkTests(common.NetworkTagTests):
         else:
             network_options = '--subnet 4.5.6.7/28 '
         cmd_output = self.openstack(
-            'network create --share %s%s' % (network_options, name2),
+            f'network create --share {network_options}{name2}',
             parse_output=True,
         )
         self.addCleanup(self.openstack, 'network delete ' + name2)
@@ -353,7 +353,9 @@ class NetworkTests(common.NetworkTagTests):
 
         # Add Agent to Network
         self.openstack(
-            'network agent add network --dhcp %s %s' % (agent_id, network_id)
+            'network agent add network --dhcp {} {}'.format(
+                agent_id, network_id
+            )
         )
 
         # Test network list --agent

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

@@ -123,7 +123,9 @@ class TestAgentList(common.NetworkTests):
 
         # Add Agent to Network
         self.openstack(
-            'network agent add network --dhcp %s %s' % (agent_id, network_id)
+            'network agent add network --dhcp {} {}'.format(
+                agent_id, network_id
+            )
         )
 
         # Test network agent list --network
@@ -169,9 +171,7 @@ class TestAgentList(common.NetworkTests):
         agent_id = cmd_output[0]['ID']
 
         # Add router to agent
-        self.openstack(
-            'network agent add router --l3 %s %s' % (agent_id, router_id)
-        )
+        self.openstack(f'network agent add router --l3 {agent_id} {router_id}')
 
         # Test router list --agent
         cmd_output = self.openstack(
@@ -184,7 +184,9 @@ class TestAgentList(common.NetworkTests):
 
         # Remove router from agent
         self.openstack(
-            'network agent remove router --l3 %s %s' % (agent_id, router_id)
+            'network agent remove router --l3 {} {}'.format(
+                agent_id, router_id
+            )
         )
         cmd_output = self.openstack(
             'network agent list --router %s' % router_id,

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

@@ -69,7 +69,7 @@ class NetworkQosRuleTestsMinimumBandwidth(NetworkQosTests):
             parse_output=True,
         )
         raw_output = self.openstack(
-            'network qos rule delete %s %s' % (policy_name, rule['id'])
+            'network qos rule delete {} {}'.format(policy_name, rule['id'])
         )
         self.assertEqual('', raw_output)
 
@@ -144,7 +144,7 @@ class NetworkQosRuleTestsMinimumPacketRate(NetworkQosTests):
             parse_output=True,
         )
         raw_output = self.openstack(
-            'network qos rule delete %s %s' % (policy_name, rule['id'])
+            'network qos rule delete {} {}'.format(policy_name, rule['id'])
         )
         self.assertEqual('', raw_output)
 
@@ -217,7 +217,7 @@ class NetworkQosRuleTestsDSCPMarking(NetworkQosTests):
             parse_output=True,
         )
         raw_output = self.openstack(
-            'network qos rule delete %s %s' % (policy_name, rule['id'])
+            'network qos rule delete {} {}'.format(policy_name, rule['id'])
         )
         self.assertEqual('', raw_output)
 
@@ -292,7 +292,7 @@ class NetworkQosRuleTestsBandwidthLimit(NetworkQosTests):
             parse_output=True,
         )
         raw_output = self.openstack(
-            'network qos rule delete %s %s' % (policy_name, rule['id'])
+            'network qos rule delete {} {}'.format(policy_name, rule['id'])
         )
         self.assertEqual('', raw_output)
 

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

@@ -47,7 +47,7 @@ class PortTests(common.NetworkTagTests):
     def test_port_delete(self):
         """Test create, delete multiple"""
         json_output = self.openstack(
-            'port create --network %s %s' % (self.NETWORK_NAME, self.NAME),
+            f'port create --network {self.NETWORK_NAME} {self.NAME}',
             parse_output=True,
         )
         id1 = json_output.get('id')
@@ -56,7 +56,9 @@ class PortTests(common.NetworkTagTests):
         self.assertEqual(self.NAME, json_output.get('name'))
 
         json_output = self.openstack(
-            'port create --network %s %sx' % (self.NETWORK_NAME, self.NAME),
+            'port create --network {} {}x'.format(
+                self.NETWORK_NAME, self.NAME
+            ),
             parse_output=True,
         )
         id2 = json_output.get('id')
@@ -65,13 +67,13 @@ class PortTests(common.NetworkTagTests):
         self.assertEqual(self.NAME + 'x', json_output.get('name'))
 
         # Clean up after ourselves
-        raw_output = self.openstack('port delete %s %s' % (id1, id2))
+        raw_output = self.openstack(f'port delete {id1} {id2}')
         self.assertOutput('', raw_output)
 
     def test_port_list(self):
         """Test create defaults, list, delete"""
         json_output = self.openstack(
-            'port create --network %s %s' % (self.NETWORK_NAME, self.NAME),
+            f'port create --network {self.NETWORK_NAME} {self.NAME}',
             parse_output=True,
         )
         id1 = json_output.get('id')
@@ -82,7 +84,9 @@ class PortTests(common.NetworkTagTests):
         self.assertEqual(self.NAME, json_output.get('name'))
 
         json_output = self.openstack(
-            'port create --network %s %sx' % (self.NETWORK_NAME, self.NAME),
+            'port create --network {} {}x'.format(
+                self.NETWORK_NAME, self.NAME
+            ),
             parse_output=True,
         )
         id2 = json_output.get('id')
@@ -169,7 +173,7 @@ class PortTests(common.NetworkTagTests):
         self.assertIsNotNone(json_output.get('mac_address'))
 
         raw_output = self.openstack(
-            'port unset --security-group %s %s' % (sg_id, id1)
+            f'port unset --security-group {sg_id} {id1}'
         )
         self.assertOutput('', raw_output)
 
@@ -247,7 +251,7 @@ class PortTests(common.NetworkTagTests):
         )
 
         raw_output = self.openstack(
-            'port unset --security-group %s %s' % (sg_id1, id1)
+            f'port unset --security-group {sg_id1} {id1}'
         )
         self.assertOutput('', raw_output)
 

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

@@ -287,10 +287,10 @@ class RouterTests(common.NetworkTagTests):
         self.openstack('router create %s' % router_name)
         self.addCleanup(self.openstack, 'router delete %s' % router_name)
 
-        self.openstack('router add subnet %s %s' % (router_name, subnet_name))
+        self.openstack(f'router add subnet {router_name} {subnet_name}')
         self.addCleanup(
             self.openstack,
-            'router remove subnet %s %s' % (router_name, subnet_name),
+            f'router remove subnet {router_name} {subnet_name}',
         )
 
         out1 = (

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

@@ -18,5 +18,5 @@ class ObjectStoreTests(base.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        super(ObjectStoreTests, cls).setUpClass()
+        super().setUpClass()
         cls.haz_object_store = cls.is_service_enabled('object-store')

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

@@ -23,7 +23,7 @@ class ContainerTests(common.ObjectStoreTests):
 
     @classmethod
     def setUpClass(cls):
-        super(ContainerTests, cls).setUpClass()
+        super().setUpClass()
         if cls.haz_object_store:
             opts = cls.get_opts(['container'])
             raw_output = cls.openstack('container create ' + cls.NAME + opts)
@@ -36,10 +36,10 @@ class ContainerTests(common.ObjectStoreTests):
                 raw_output = cls.openstack('container delete ' + cls.NAME)
                 cls.assertOutput('', raw_output)
         finally:
-            super(ContainerTests, cls).tearDownClass()
+            super().tearDownClass()
 
     def setUp(self):
-        super(ContainerTests, self).setUp()
+        super().setUp()
         # Skip tests if no object-store is present
         if not self.haz_object_store:
             self.skipTest("No object-store service present")

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

@@ -27,7 +27,7 @@ class ObjectTests(common.ObjectStoreTests):
     CONTAINER_NAME = uuid.uuid4().hex
 
     def setUp(self):
-        super(ObjectTests, self).setUp()
+        super().setUp()
         # Skip tests if no object-store is present
         if not self.haz_object_store:
             self.skipTest("No object-store service present")
@@ -54,7 +54,7 @@ class ObjectTests(common.ObjectStoreTests):
         # TODO(stevemar): Assert returned fields
 
         raw_output = self.openstack(
-            'object create %s %s' % (self.CONTAINER_NAME, object_file)
+            f'object create {self.CONTAINER_NAME} {object_file}'
         )
         items = self.parse_listing(raw_output)
         self.assert_show_fields(items, OBJECT_FIELDS)
@@ -63,9 +63,7 @@ class ObjectTests(common.ObjectStoreTests):
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, BASIC_LIST_HEADERS)
 
-        self.openstack(
-            'object save %s %s' % (self.CONTAINER_NAME, object_file)
-        )
+        self.openstack(f'object save {self.CONTAINER_NAME} {object_file}')
         # TODO(stevemar): Assert returned fields
 
         tmp_file = 'tmp.txt'
@@ -77,23 +75,21 @@ class ObjectTests(common.ObjectStoreTests):
         # TODO(stevemar): Assert returned fields
 
         raw_output = self.openstack(
-            'object save %s %s --file -' % (self.CONTAINER_NAME, object_file)
+            'object save {} {} --file -'.format(
+                self.CONTAINER_NAME, object_file
+            )
         )
         self.assertEqual(raw_output, 'test content')
 
-        self.openstack(
-            'object show %s %s' % (self.CONTAINER_NAME, object_file)
-        )
+        self.openstack(f'object show {self.CONTAINER_NAME} {object_file}')
         # TODO(stevemar): Assert returned fields
 
         raw_output = self.openstack(
-            'object delete %s %s' % (self.CONTAINER_NAME, object_file)
+            f'object delete {self.CONTAINER_NAME} {object_file}'
         )
         self.assertEqual(0, len(raw_output))
 
-        self.openstack(
-            'object create %s %s' % (self.CONTAINER_NAME, object_file)
-        )
+        self.openstack(f'object create {self.CONTAINER_NAME} {object_file}')
         raw_output = self.openstack(
             'container delete -r %s' % self.CONTAINER_NAME
         )

openstackclient/tests/functional/volume/base.py

@@ -70,7 +70,7 @@ class BaseVolumeTests(base.TestCase):
             result = cls.openstack(check_type + ' list', parse_output=True)
             names = [x[name_field] for x in result]
             if check_name not in names:
-                print('{} {} is now deleted'.format(check_type, check_name))
+                print(f'{check_type} {check_name} is now deleted')
                 return
             print(
                 'Checking {} {} Waiting for deleted'.format(

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

@@ -20,7 +20,7 @@ class VolumeServiceTests(common.BaseVolumeTests):
         cmd_output = self.openstack('volume service list', parse_output=True)
 
         # Get the nonredundant services and hosts
-        services = list(set([x['Binary'] for x in cmd_output]))
+        services = list({x['Binary'] for x in cmd_output})
 
         # Test volume service list --service
         cmd_output = self.openstack(

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

@@ -22,7 +22,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
 
     @classmethod
     def setUpClass(cls):
-        super(VolumeSnapshotTests, cls).setUpClass()
+        super().setUpClass()
         # create a volume for all tests to create snapshot
         cmd_output = cls.openstack(
             'volume create ' + '--size 1 ' + cls.VOLLY,
@@ -38,7 +38,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             raw_output = cls.openstack('volume delete --force ' + cls.VOLLY)
             cls.assertOutput('', raw_output)
         finally:
-            super(VolumeSnapshotTests, cls).tearDownClass()
+            super().tearDownClass()
 
     def test_volume_snapshot_delete(self):
         """Test create, delete multiple"""

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

@@ -23,7 +23,7 @@ class TransferRequestTests(common.BaseVolumeTests):
 
     @classmethod
     def setUpClass(cls):
-        super(TransferRequestTests, cls).setUpClass()
+        super().setUpClass()
         cmd_output = cls.openstack(
             'volume create --size 1 ' + cls.VOLUME_NAME,
             parse_output=True,
@@ -40,7 +40,7 @@ class TransferRequestTests(common.BaseVolumeTests):
             )
             cls.assertOutput('', raw_output_volume)
         finally:
-            super(TransferRequestTests, cls).tearDownClass()
+            super().tearDownClass()
 
     def test_volume_transfer_request_accept(self):
         volume_name = uuid.uuid4().hex

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

@@ -110,7 +110,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         time.sleep(5)
         self.openstack('volume type create %s' % vol_type2)
         time.sleep(5)
-        cmd = 'volume type delete %s %s' % (vol_type1, vol_type2)
+        cmd = f'volume type delete {vol_type1} {vol_type2}'
         raw_output = self.openstack(cmd)
         self.assertOutput('', raw_output)
 

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

@@ -20,8 +20,8 @@ class VolumeServiceTests(common.BaseVolumeTests):
         cmd_output = self.openstack('volume service list', parse_output=True)
 
         # Get the nonredundant services and hosts
-        services = list(set([x['Binary'] for x in cmd_output]))
-        hosts = list(set([x['Host'] for x in cmd_output]))
+        services = list({x['Binary'] for x in cmd_output})
+        hosts = list({x['Host'] for x in cmd_output})
 
         # Test volume service list --service
         cmd_output = self.openstack(

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

@@ -19,7 +19,7 @@ class VolumeBackupTests(common.BaseVolumeTests):
     """Functional tests for volume backups."""
 
     def setUp(self):
-        super(VolumeBackupTests, self).setUp()
+        super().setUp()
         self.backup_enabled = False
         serv_list = self.openstack('volume service list', parse_output=True)
         for service in serv_list:
@@ -48,7 +48,7 @@ class VolumeBackupTests(common.BaseVolumeTests):
 
         # restore the backup
         backup_restored = self.openstack(
-            'volume backup restore %s %s' % (backup['id'], vol_id),
+            'volume backup restore {} {}'.format(backup['id'], vol_id),
             parse_output=True,
         )
         self.assertEqual(backup_restored['backup_id'], backup['id'])

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

@@ -22,7 +22,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
 
     @classmethod
     def setUpClass(cls):
-        super(VolumeSnapshotTests, cls).setUpClass()
+        super().setUpClass()
         # create a volume for all tests to create snapshot
         cmd_output = cls.openstack(
             'volume create ' + '--size 1 ' + cls.VOLLY,
@@ -38,7 +38,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             raw_output = cls.openstack('volume delete --force ' + cls.VOLLY)
             cls.assertOutput('', raw_output)
         finally:
-            super(VolumeSnapshotTests, cls).tearDownClass()
+            super().tearDownClass()
 
     def test_volume_snapshot_delete(self):
         """Test create, delete multiple"""

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

@@ -129,7 +129,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         time.sleep(5)
         self.openstack('volume type create %s' % vol_type2)
         time.sleep(5)
-        cmd = 'volume type delete %s %s' % (vol_type1, vol_type2)
+        cmd = f'volume type delete {vol_type1} {vol_type2}'
         raw_output = self.openstack(cmd)
         self.assertOutput('', raw_output)
 

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

@@ -22,7 +22,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
 
     @classmethod
     def setUpClass(cls):
-        super(VolumeSnapshotTests, cls).setUpClass()
+        super().setUpClass()
         # create a volume for all tests to create snapshot
         cmd_output = cls.openstack(
             'volume create ' + '--size 1 ' + cls.VOLLY,
@@ -38,7 +38,7 @@ class VolumeSnapshotTests(common.BaseVolumeTests):
             raw_output = cls.openstack('volume delete --force ' + cls.VOLLY)
             cls.assertOutput('', raw_output)
         finally:
-            super(VolumeSnapshotTests, cls).tearDownClass()
+            super().tearDownClass()
 
     def test_volume_snapshot_delete(self):
         """Test create, delete multiple"""

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

@@ -129,7 +129,7 @@ class VolumeTypeTests(common.BaseVolumeTests):
         time.sleep(5)
         self.openstack('volume type create %s' % vol_type2)
         time.sleep(5)
-        cmd = 'volume type delete %s %s' % (vol_type1, vol_type2)
+        cmd = f'volume type delete {vol_type1} {vol_type2}'
         raw_output = self.openstack(cmd)
         self.assertOutput('', raw_output)
 

openstackclient/tests/unit/api/fakes.py

@@ -50,6 +50,6 @@ class TestSession(utils.TestCase):
     BASE_URL = 'https://api.example.com:1234/vX'
 
     def setUp(self):
-        super(TestSession, self).setUp()
+        super().setUp()
         self.sess = session.Session()
         self.requests_mock = self.useFixture(fixture.Fixture())

openstackclient/tests/unit/api/test_api.py

@@ -21,7 +21,7 @@ from openstackclient.tests.unit.api import fakes as api_fakes
 
 class TestKeystoneSession(api_fakes.TestSession):
     def setUp(self):
-        super(TestKeystoneSession, self).setUp()
+        super().setUp()
         self.api = api.KeystoneSession(
             session=self.sess,
             endpoint=self.BASE_URL,
@@ -40,7 +40,7 @@ class TestKeystoneSession(api_fakes.TestSession):
 
 class TestBaseAPI(api_fakes.TestSession):
     def setUp(self):
-        super(TestBaseAPI, self).setUp()
+        super().setUp()
         self.api = api.BaseAPI(
             session=self.sess,
             endpoint=self.BASE_URL,