python-openstackclient 7.1.2__py3-none-any.whl → 7.2.0__py3-none-any.whl

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

@@ -32,40 +32,39 @@ class NetworkQosRuleTestsMinimumBandwidth(NetworkQosTests):
     def setUp(self):
         super().setUp()
 
-        self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
+        self.QOS_POLICY_NAME = f'qos_policy_{uuid.uuid4().hex}'
 
-        self.openstack('network qos policy create %s' % self.QOS_POLICY_NAME)
+        self.openstack(f'network qos policy create {self.QOS_POLICY_NAME}')
         self.addCleanup(
             self.openstack,
-            'network qos policy delete %s' % self.QOS_POLICY_NAME,
+            f'network qos policy delete {self.QOS_POLICY_NAME}',
         )
         cmd_output = self.openstack(
             'network qos rule create '
             '--type minimum-bandwidth '
             '--min-kbps 2800 '
-            '--egress %s' % self.QOS_POLICY_NAME,
+            f'--egress {self.QOS_POLICY_NAME}',
             parse_output=True,
         )
         self.RULE_ID = cmd_output['id']
         self.addCleanup(
             self.openstack,
-            'network qos rule delete %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule delete {self.QOS_POLICY_NAME} {self.RULE_ID}',
         )
         self.assertTrue(self.RULE_ID)
 
     def test_qos_rule_create_delete(self):
         # This is to check the output of qos rule delete
         policy_name = uuid.uuid4().hex
-        self.openstack('network qos policy create %s' % policy_name)
+        self.openstack(f'network qos policy create {policy_name}')
         self.addCleanup(
-            self.openstack, 'network qos policy delete %s' % policy_name
+            self.openstack, f'network qos policy delete {policy_name}'
         )
         rule = self.openstack(
             'network qos rule create '
             '--type minimum-bandwidth '
             '--min-kbps 2800 '
-            '--egress %s' % policy_name,
+            f'--egress {policy_name}',
             parse_output=True,
         )
         raw_output = self.openstack(
@@ -75,27 +74,24 @@ class NetworkQosRuleTestsMinimumBandwidth(NetworkQosTests):
 
     def test_qos_rule_list(self):
         cmd_output = self.openstack(
-            'network qos rule list %s' % self.QOS_POLICY_NAME,
+            f'network qos rule list {self.QOS_POLICY_NAME}',
             parse_output=True,
         )
         self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output])
 
     def test_qos_rule_show(self):
         cmd_output = self.openstack(
-            'network qos rule show %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule show {self.QOS_POLICY_NAME} {self.RULE_ID}',
             parse_output=True,
         )
         self.assertEqual(self.RULE_ID, cmd_output['id'])
 
     def test_qos_rule_set(self):
         self.openstack(
-            'network qos rule set --min-kbps 7500 %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID)
+            f'network qos rule set --min-kbps 7500 {self.QOS_POLICY_NAME} {self.RULE_ID}'
         )
         cmd_output = self.openstack(
-            'network qos rule show %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule show {self.QOS_POLICY_NAME} {self.RULE_ID}',
             parse_output=True,
         )
         self.assertEqual(7500, cmd_output['min_kbps'])
@@ -107,40 +103,39 @@ class NetworkQosRuleTestsMinimumPacketRate(NetworkQosTests):
     def setUp(self):
         super().setUp()
 
-        self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
+        self.QOS_POLICY_NAME = f'qos_policy_{uuid.uuid4().hex}'
 
-        self.openstack('network qos policy create %s' % self.QOS_POLICY_NAME)
+        self.openstack(f'network qos policy create {self.QOS_POLICY_NAME}')
         self.addCleanup(
             self.openstack,
-            'network qos policy delete %s' % self.QOS_POLICY_NAME,
+            f'network qos policy delete {self.QOS_POLICY_NAME}',
         )
         cmd_output = self.openstack(
             'network qos rule create '
             '--type minimum-packet-rate '
             '--min-kpps 2800 '
-            '--egress %s' % self.QOS_POLICY_NAME,
+            f'--egress {self.QOS_POLICY_NAME}',
             parse_output=True,
         )
         self.RULE_ID = cmd_output['id']
         self.addCleanup(
             self.openstack,
-            'network qos rule delete %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule delete {self.QOS_POLICY_NAME} {self.RULE_ID}',
         )
         self.assertTrue(self.RULE_ID)
 
     def test_qos_rule_create_delete(self):
         # This is to check the output of qos rule delete
         policy_name = uuid.uuid4().hex
-        self.openstack('network qos policy create %s' % policy_name)
+        self.openstack(f'network qos policy create {policy_name}')
         self.addCleanup(
-            self.openstack, 'network qos policy delete %s' % policy_name
+            self.openstack, f'network qos policy delete {policy_name}'
         )
         rule = self.openstack(
             'network qos rule create '
             '--type minimum-packet-rate '
             '--min-kpps 2800 '
-            '--egress %s' % policy_name,
+            f'--egress {policy_name}',
             parse_output=True,
         )
         raw_output = self.openstack(
@@ -150,27 +145,24 @@ class NetworkQosRuleTestsMinimumPacketRate(NetworkQosTests):
 
     def test_qos_rule_list(self):
         cmd_output = self.openstack(
-            'network qos rule list %s' % self.QOS_POLICY_NAME,
+            f'network qos rule list {self.QOS_POLICY_NAME}',
             parse_output=True,
         )
         self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output])
 
     def test_qos_rule_show(self):
         cmd_output = self.openstack(
-            'network qos rule show %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule show {self.QOS_POLICY_NAME} {self.RULE_ID}',
             parse_output=True,
         )
         self.assertEqual(self.RULE_ID, cmd_output['id'])
 
     def test_qos_rule_set(self):
         self.openstack(
-            'network qos rule set --min-kpps 7500 --any %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID)
+            f'network qos rule set --min-kpps 7500 --any {self.QOS_POLICY_NAME} {self.RULE_ID}'
         )
         cmd_output = self.openstack(
-            'network qos rule show %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule show {self.QOS_POLICY_NAME} {self.RULE_ID}',
             parse_output=True,
         )
         self.assertEqual(7500, cmd_output['min_kpps'])
@@ -183,37 +175,36 @@ class NetworkQosRuleTestsDSCPMarking(NetworkQosTests):
     def setUp(self):
         super().setUp()
 
-        self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
-        self.openstack('network qos policy create %s' % self.QOS_POLICY_NAME)
+        self.QOS_POLICY_NAME = f'qos_policy_{uuid.uuid4().hex}'
+        self.openstack(f'network qos policy create {self.QOS_POLICY_NAME}')
         self.addCleanup(
             self.openstack,
-            'network qos policy delete %s' % self.QOS_POLICY_NAME,
+            f'network qos policy delete {self.QOS_POLICY_NAME}',
         )
         cmd_output = self.openstack(
             'network qos rule create '
             '--type dscp-marking '
-            '--dscp-mark 8 %s' % self.QOS_POLICY_NAME,
+            f'--dscp-mark 8 {self.QOS_POLICY_NAME}',
             parse_output=True,
         )
         self.RULE_ID = cmd_output['id']
         self.addCleanup(
             self.openstack,
-            'network qos rule delete %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule delete {self.QOS_POLICY_NAME} {self.RULE_ID}',
         )
         self.assertTrue(self.RULE_ID)
 
     def test_qos_rule_create_delete(self):
         # This is to check the output of qos rule delete
         policy_name = uuid.uuid4().hex
-        self.openstack('network qos policy create %s' % policy_name)
+        self.openstack(f'network qos policy create {policy_name}')
         self.addCleanup(
-            self.openstack, 'network qos policy delete %s' % policy_name
+            self.openstack, f'network qos policy delete {policy_name}'
         )
         rule = self.openstack(
             'network qos rule create '
             '--type dscp-marking '
-            '--dscp-mark 8 %s' % policy_name,
+            f'--dscp-mark 8 {policy_name}',
             parse_output=True,
         )
         raw_output = self.openstack(
@@ -223,27 +214,24 @@ class NetworkQosRuleTestsDSCPMarking(NetworkQosTests):
 
     def test_qos_rule_list(self):
         cmd_output = self.openstack(
-            'network qos rule list %s' % self.QOS_POLICY_NAME,
+            f'network qos rule list {self.QOS_POLICY_NAME}',
             parse_output=True,
         )
         self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output])
 
     def test_qos_rule_show(self):
         cmd_output = self.openstack(
-            'network qos rule show %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule show {self.QOS_POLICY_NAME} {self.RULE_ID}',
             parse_output=True,
         )
         self.assertEqual(self.RULE_ID, cmd_output['id'])
 
     def test_qos_rule_set(self):
         self.openstack(
-            'network qos rule set --dscp-mark 32 %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID)
+            f'network qos rule set --dscp-mark 32 {self.QOS_POLICY_NAME} {self.RULE_ID}'
         )
         cmd_output = self.openstack(
-            'network qos rule show %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule show {self.QOS_POLICY_NAME} {self.RULE_ID}',
             parse_output=True,
         )
         self.assertEqual(32, cmd_output['dscp_mark'])
@@ -255,40 +243,39 @@ class NetworkQosRuleTestsBandwidthLimit(NetworkQosTests):
     def setUp(self):
         super().setUp()
 
-        self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
-        self.openstack('network qos policy create %s' % self.QOS_POLICY_NAME)
+        self.QOS_POLICY_NAME = f'qos_policy_{uuid.uuid4().hex}'
+        self.openstack(f'network qos policy create {self.QOS_POLICY_NAME}')
         self.addCleanup(
             self.openstack,
-            'network qos policy delete %s' % self.QOS_POLICY_NAME,
+            f'network qos policy delete {self.QOS_POLICY_NAME}',
         )
         cmd_output = self.openstack(
             'network qos rule create '
             '--type bandwidth-limit '
             '--max-kbps 10000 '
-            '--egress %s' % self.QOS_POLICY_NAME,
+            f'--egress {self.QOS_POLICY_NAME}',
             parse_output=True,
         )
         self.RULE_ID = cmd_output['id']
         self.addCleanup(
             self.openstack,
-            'network qos rule delete %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule delete {self.QOS_POLICY_NAME} {self.RULE_ID}',
         )
         self.assertTrue(self.RULE_ID)
 
     def test_qos_rule_create_delete(self):
         # This is to check the output of qos rule delete
         policy_name = uuid.uuid4().hex
-        self.openstack('network qos policy create %s' % policy_name)
+        self.openstack(f'network qos policy create {policy_name}')
         self.addCleanup(
-            self.openstack, 'network qos policy delete %s' % policy_name
+            self.openstack, f'network qos policy delete {policy_name}'
         )
         rule = self.openstack(
             'network qos rule create '
             '--type bandwidth-limit '
             '--max-kbps 10000 '
             '--max-burst-kbits 1400 '
-            '--egress %s' % policy_name,
+            f'--egress {policy_name}',
             parse_output=True,
         )
         raw_output = self.openstack(
@@ -298,15 +285,14 @@ class NetworkQosRuleTestsBandwidthLimit(NetworkQosTests):
 
     def test_qos_rule_list(self):
         cmd_output = self.openstack(
-            'network qos rule list %s' % self.QOS_POLICY_NAME,
+            f'network qos rule list {self.QOS_POLICY_NAME}',
             parse_output=True,
         )
         self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output])
 
     def test_qos_rule_show(self):
         cmd_output = self.openstack(
-            'network qos rule show %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule show {self.QOS_POLICY_NAME} {self.RULE_ID}',
             parse_output=True,
         )
         self.assertEqual(self.RULE_ID, cmd_output['id'])
@@ -315,11 +301,10 @@ class NetworkQosRuleTestsBandwidthLimit(NetworkQosTests):
         self.openstack(
             'network qos rule set --max-kbps 15000 '
             '--max-burst-kbits 1800 '
-            '--ingress %s %s' % (self.QOS_POLICY_NAME, self.RULE_ID)
+            f'--ingress {self.QOS_POLICY_NAME} {self.RULE_ID}'
         )
         cmd_output = self.openstack(
-            'network qos rule show %s %s'
-            % (self.QOS_POLICY_NAME, self.RULE_ID),
+            f'network qos rule show {self.QOS_POLICY_NAME} {self.RULE_ID}',
             parse_output=True,
         )
         self.assertEqual(15000, cmd_output['max_kbps'])

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

@@ -67,7 +67,7 @@ class NetworkQosRuleTypeTests(common.NetworkTests):
     def test_qos_rule_type_details(self):
         for rule_type in self.AVAILABLE_RULE_TYPES:
             cmd_output = self.openstack(
-                'network qos rule type show %s -f json' % rule_type,
+                f'network qos rule type show {rule_type} -f json',
                 parse_output=True,
             )
             self.assertEqual(rule_type, cmd_output['rule_type_name'])

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

@@ -128,8 +128,8 @@ class NetworkSegmentRangeTests(common.NetworkTests):
         new_minimum = 2020
         new_maximum = 2029
         cmd_output = self.openstack(
-            'network segment range set --minimum {min} --maximum {max} '
-            '{name}'.format(min=new_minimum, max=new_maximum, name=name)
+            f'network segment range set --minimum {new_minimum} --maximum {new_maximum} '
+            f'{name}'
         )
         self.assertOutput('', cmd_output)
 

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

@@ -32,33 +32,27 @@ class NetworkTrunkTests(common.NetworkTests):
         self.parent_port_name = uuid.uuid4().hex
         self.sub_port_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(
-            'port create %s --network %s'
-            % (self.parent_port_name, network_name)
-        )
-        self.addCleanup(
-            self.openstack, 'port delete %s' % self.parent_port_name
+            f'port create {self.parent_port_name} --network {network_name}'
         )
+        self.addCleanup(self.openstack, f'port delete {self.parent_port_name}')
         json_out = self.openstack(
-            'port create %s --network %s -f json'
-            % (self.sub_port_name, network_name)
+            f'port create {self.sub_port_name} --network {network_name} -f json'
         )
         self.sub_port_id = json.loads(json_out)['id']
-        self.addCleanup(self.openstack, 'port delete %s' % self.sub_port_name)
+        self.addCleanup(self.openstack, f'port delete {self.sub_port_name}')
 
     def test_network_trunk_create_delete(self):
         trunk_name = uuid.uuid4().hex
         self.openstack(
-            'network trunk create %s --parent-port %s -f json '
-            % (trunk_name, self.parent_port_name)
+            f'network trunk create {trunk_name} --parent-port {self.parent_port_name} -f json '
         )
         raw_output = self.openstack('network trunk delete ' + trunk_name)
         self.assertEqual('', raw_output)
@@ -67,8 +61,7 @@ class NetworkTrunkTests(common.NetworkTests):
         trunk_name = uuid.uuid4().hex
         json_output = json.loads(
             self.openstack(
-                'network trunk create %s --parent-port %s -f json '
-                % (trunk_name, self.parent_port_name)
+                f'network trunk create {trunk_name} --parent-port {self.parent_port_name} -f json '
             )
         )
         self.addCleanup(self.openstack, 'network trunk delete ' + trunk_name)
@@ -81,8 +74,7 @@ class NetworkTrunkTests(common.NetworkTests):
         trunk_name = uuid.uuid4().hex
         json_output = json.loads(
             self.openstack(
-                'network trunk create %s --parent-port %s -f json '
-                % (trunk_name, self.parent_port_name)
+                f'network trunk create {trunk_name} --parent-port {self.parent_port_name} -f json '
             )
         )
         self.addCleanup(self.openstack, 'network trunk delete ' + trunk_name)
@@ -98,8 +90,7 @@ class NetworkTrunkTests(common.NetworkTests):
         # Add subport to trunk
         self.openstack(
             'network trunk set '
-            + '--subport port=%s,segmentation-type=vlan,segmentation-id=42 '
-            % (self.sub_port_name)
+            + f'--subport port={self.sub_port_name},segmentation-type=vlan,segmentation-id=42 '
             + trunk_name
         )
         json_output = json.loads(
@@ -132,10 +123,9 @@ class NetworkTrunkTests(common.NetworkTests):
         trunk_name = uuid.uuid4().hex
         json_output = json.loads(
             self.openstack(
-                'network trunk create %s --parent-port %s '
-                '--subport port=%s,segmentation-type=vlan,segmentation-id=42 '
+                f'network trunk create {trunk_name} --parent-port {self.parent_port_name} '
+                f'--subport port={self.sub_port_name},segmentation-type=vlan,segmentation-id=42 '
                 '-f json '
-                % (trunk_name, self.parent_port_name, self.sub_port_name)
             )
         )
         self.addCleanup(self.openstack, 'network trunk delete ' + trunk_name)
@@ -143,7 +133,7 @@ class NetworkTrunkTests(common.NetworkTests):
 
         json_output = json.loads(
             self.openstack(
-                'network subport list --trunk %s -f json' % trunk_name
+                f'network subport list --trunk {trunk_name} -f json'
             )
         )
         self.assertEqual(

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

@@ -31,14 +31,14 @@ class PortTests(common.NetworkTagTests):
             cls.NETWORK_NAME = uuid.uuid4().hex
 
             # Create a network for the port tests
-            cls.openstack('network create %s' % cls.NETWORK_NAME)
+            cls.openstack(f'network create {cls.NETWORK_NAME}')
 
     @classmethod
     def tearDownClass(cls):
         try:
             if cls.haz_network:
                 raw_output = cls.openstack(
-                    'network delete %s' % cls.NETWORK_NAME
+                    f'network delete {cls.NETWORK_NAME}'
                 )
                 cls.assertOutput('', raw_output)
         finally:
@@ -56,9 +56,7 @@ class PortTests(common.NetworkTagTests):
         self.assertEqual(self.NAME, json_output.get('name'))
 
         json_output = self.openstack(
-            'port create --network {} {}x'.format(
-                self.NETWORK_NAME, self.NAME
-            ),
+            f'port create --network {self.NETWORK_NAME} {self.NAME}x',
             parse_output=True,
         )
         id2 = json_output.get('id')
@@ -80,20 +78,18 @@ class PortTests(common.NetworkTagTests):
         self.assertIsNotNone(id1)
         mac1 = json_output.get('mac_address')
         self.assertIsNotNone(mac1)
-        self.addCleanup(self.openstack, 'port delete %s' % id1)
+        self.addCleanup(self.openstack, f'port delete {id1}')
         self.assertEqual(self.NAME, json_output.get('name'))
 
         json_output = self.openstack(
-            'port create --network {} {}x'.format(
-                self.NETWORK_NAME, self.NAME
-            ),
+            f'port create --network {self.NETWORK_NAME} {self.NAME}x',
             parse_output=True,
         )
         id2 = json_output.get('id')
         self.assertIsNotNone(id2)
         mac2 = json_output.get('mac_address')
         self.assertIsNotNone(mac2)
-        self.addCleanup(self.openstack, 'port delete %s' % id2)
+        self.addCleanup(self.openstack, f'port delete {id2}')
         self.assertEqual(self.NAME + 'x', json_output.get('name'))
 
         # Test list
@@ -120,7 +116,7 @@ class PortTests(common.NetworkTagTests):
 
         # Test list --mac-address
         json_output = self.openstack(
-            'port list --mac-address %s' % mac2,
+            f'port list --mac-address {mac2}',
             parse_output=True,
         )
         item_map = {
@@ -147,22 +143,22 @@ class PortTests(common.NetworkTagTests):
         name = uuid.uuid4().hex
         json_output = self.openstack(
             'port create '
-            '--network %s '
+            f'--network {self.NETWORK_NAME} '
             '--description xyzpdq '
-            '--disable %s' % (self.NETWORK_NAME, name),
+            f'--disable {name}',
             parse_output=True,
         )
         id1 = json_output.get('id')
-        self.addCleanup(self.openstack, 'port delete %s' % id1)
+        self.addCleanup(self.openstack, f'port delete {id1}')
         self.assertEqual(name, json_output.get('name'))
         self.assertEqual('xyzpdq', json_output.get('description'))
         self.assertEqual(False, json_output.get('admin_state_up'))
 
-        raw_output = self.openstack('port set --enable %s' % name)
+        raw_output = self.openstack(f'port set --enable {name}')
         self.assertOutput('', raw_output)
 
         json_output = self.openstack(
-            'port show %s' % name,
+            f'port show {name}',
             parse_output=True,
         )
         sg_id = json_output.get('security_group_ids')[0]
@@ -178,7 +174,7 @@ class PortTests(common.NetworkTagTests):
         self.assertOutput('', raw_output)
 
         json_output = self.openstack(
-            'port show %s' % name,
+            f'port show {name}',
             parse_output=True,
         )
         self.assertEqual([], json_output.get('security_group_ids'))
@@ -186,19 +182,19 @@ class PortTests(common.NetworkTagTests):
     def test_port_admin_set(self):
         """Test create, set (as admin), show, delete"""
         json_output = self.openstack(
-            'port create ' '--network %s %s' % (self.NETWORK_NAME, self.NAME),
+            'port create ' f'--network {self.NETWORK_NAME} {self.NAME}',
             parse_output=True,
         )
         id_ = json_output.get('id')
-        self.addCleanup(self.openstack, 'port delete %s' % id_)
+        self.addCleanup(self.openstack, f'port delete {id_}')
 
         raw_output = self.openstack(
             '--os-username admin '
-            'port set --mac-address 11:22:33:44:55:66 %s' % self.NAME
+            f'port set --mac-address 11:22:33:44:55:66 {self.NAME}'
         )
         self.assertOutput('', raw_output)
         json_output = self.openstack(
-            'port show %s' % self.NAME,
+            f'port show {self.NAME}',
             parse_output=True,
         )
         self.assertEqual(json_output.get('mac_address'), '11:22:33:44:55:66')
@@ -207,39 +203,39 @@ class PortTests(common.NetworkTagTests):
         """Test create, set, show, delete"""
         sg_name1 = uuid.uuid4().hex
         json_output = self.openstack(
-            'security group create %s' % sg_name1,
+            f'security group create {sg_name1}',
             parse_output=True,
         )
         sg_id1 = json_output.get('id')
-        self.addCleanup(self.openstack, 'security group delete %s' % sg_id1)
+        self.addCleanup(self.openstack, f'security group delete {sg_id1}')
 
         sg_name2 = uuid.uuid4().hex
         json_output = self.openstack(
-            'security group create %s' % sg_name2,
+            f'security group create {sg_name2}',
             parse_output=True,
         )
         sg_id2 = json_output.get('id')
-        self.addCleanup(self.openstack, 'security group delete %s' % sg_id2)
+        self.addCleanup(self.openstack, f'security group delete {sg_id2}')
 
         name = uuid.uuid4().hex
         json_output = self.openstack(
             'port create '
-            '--network %s '
-            '--security-group %s %s' % (self.NETWORK_NAME, sg_name1, name),
+            f'--network {self.NETWORK_NAME} '
+            f'--security-group {sg_name1} {name}',
             parse_output=True,
         )
         id1 = json_output.get('id')
-        self.addCleanup(self.openstack, 'port delete %s' % id1)
+        self.addCleanup(self.openstack, f'port delete {id1}')
         self.assertEqual(name, json_output.get('name'))
         self.assertEqual([sg_id1], json_output.get('security_group_ids'))
 
         raw_output = self.openstack(
-            'port set ' '--security-group %s %s' % (sg_name2, name)
+            'port set ' f'--security-group {sg_name2} {name}'
         )
         self.assertOutput('', raw_output)
 
         json_output = self.openstack(
-            'port show %s' % name,
+            f'port show {name}',
             parse_output=True,
         )
         self.assertEqual(name, json_output.get('name'))
@@ -256,15 +252,13 @@ class PortTests(common.NetworkTagTests):
         self.assertOutput('', raw_output)
 
         json_output = self.openstack(
-            'port show %s' % name,
+            f'port show {name}',
             parse_output=True,
         )
         self.assertEqual([sg_id2], json_output.get('security_group_ids'))
 
     def _create_resource_for_tag_test(self, name, args):
         return self.openstack(
-            '{} create --network {} {} {}'.format(
-                self.base_command, self.NETWORK_NAME, args, name
-            ),
+            f'{self.base_command} create --network {self.NETWORK_NAME} {args} {name}',
             parse_output=True,
         )