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

openstackclient/tests/functional/image/v2/test_image.py

@@ -30,9 +30,7 @@ class ImageTests(base.BaseImageTests):
         self.image_tag = 'my_tag'
         self.image_tag1 = 'random'
         output = self.openstack(
-            'image create --tag {tag} {name}'.format(
-                tag=self.image_tag, name=self.name
-            ),
+            f'image create --tag {self.image_tag} {self.name}',
             parse_output=True,
         )
         self.image_id = output["id"]

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

@@ -80,9 +80,7 @@ class NetworkTagTests(NetworkTests):
 
     def _list_tag_check(self, project_id, expected):
         cmd_output = self.openstack(
-            '{} list --long --project {}'.format(
-                self.base_command, project_id
-            ),
+            f'{self.base_command} list --long --project {project_id}',
             parse_output=True,
         )
         for name, tags in expected:

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

@@ -30,14 +30,9 @@ class SecurityGroupRuleTests(common.NetworkTests):
         # Create the default security group rule.
         cmd_output = self.openstack(
             'default security group rule create '
-            '--protocol %(protocol)s '
-            '--dst-port %(port)s:%(port)s '
-            '--%(direction)s --ethertype IPv4 '
-            % {
-                'protocol': self.protocol,
-                'port': self.port,
-                'direction': self.direction,
-            },
+            f'--protocol {self.protocol} '
+            f'--dst-port {self.port}:{self.port} '
+            f'--{self.direction} --ethertype IPv4 ',
             parse_output=True,
         )
         self.addCleanup(

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

@@ -41,15 +41,14 @@ class L3ConntrackHelperTests(common.NetworkTests):
         created_helpers = []
         for helper in helpers:
             output = self.openstack(
-                'network l3 conntrack helper create %(router)s '
-                '--helper %(helper)s --protocol %(protocol)s '
-                '--port %(port)s '
-                % {
-                    'router': router_id,
-                    'helper': helper['helper'],
-                    'protocol': helper['protocol'],
-                    'port': helper['port'],
-                },
+                'network l3 conntrack helper create {router} '
+                '--helper {helper} --protocol {protocol} '
+                '--port {port} '.format(
+                    router=router_id,
+                    helper=helper['helper'],
+                    protocol=helper['protocol'],
+                    port=helper['port'],
+                ),
                 parse_output=True,
             )
             self.assertEqual(helper['helper'], output['helper'])
@@ -70,8 +69,8 @@ class L3ConntrackHelperTests(common.NetworkTests):
         ct_ids = " ".join([ct['id'] for ct in created_helpers])
 
         raw_output = self.openstack(
-            '--debug network l3 conntrack helper delete %(router)s '
-            '%(ct_ids)s' % {'router': router_id, 'ct_ids': ct_ids}
+            f'--debug network l3 conntrack helper delete {router_id} '
+            f'{ct_ids}'
         )
         self.assertOutput('', raw_output)
 
@@ -87,7 +86,7 @@ class L3ConntrackHelperTests(common.NetworkTests):
         router_id = self._create_router()
         self._create_helpers(router_id, helpers)
         output = self.openstack(
-            'network l3 conntrack helper list %s ' % router_id,
+            f'network l3 conntrack helper list {router_id} ',
             parse_output=True,
         )
         for ct in output:
@@ -100,12 +99,11 @@ class L3ConntrackHelperTests(common.NetworkTests):
         router_id = self._create_router()
         created_helper = self._create_helpers(router_id, [helper])[0]
         output = self.openstack(
-            'network l3 conntrack helper show %(router_id)s %(ct_id)s '
-            '-f json'
-            % {
-                'router_id': router_id,
-                'ct_id': created_helper['id'],
-            },
+            'network l3 conntrack helper show {router_id} {ct_id} '
+            '-f json'.format(
+                router_id=router_id,
+                ct_id=created_helper['id'],
+            ),
             parse_output=True,
         )
         self.assertEqual(helper['helper'], output['helper'])
@@ -113,23 +111,21 @@ class L3ConntrackHelperTests(common.NetworkTests):
         self.assertEqual(helper['port'], output['port'])
 
         raw_output = self.openstack(
-            'network l3 conntrack helper set %(router_id)s %(ct_id)s '
-            '--port %(port)s '
-            % {
-                'router_id': router_id,
-                'ct_id': created_helper['id'],
-                'port': helper['port'] + 1,
-            }
+            'network l3 conntrack helper set {router_id} {ct_id} '
+            '--port {port} '.format(
+                router_id=router_id,
+                ct_id=created_helper['id'],
+                port=helper['port'] + 1,
+            )
         )
         self.assertOutput('', raw_output)
 
         output = self.openstack(
-            'network l3 conntrack helper show %(router_id)s %(ct_id)s '
-            '-f json'
-            % {
-                'router_id': router_id,
-                'ct_id': created_helper['id'],
-            },
+            'network l3 conntrack helper show {router_id} {ct_id} '
+            '-f json'.format(
+                router_id=router_id,
+                ct_id=created_helper['id'],
+            ),
             parse_output=True,
         )
         self.assertEqual(helper['port'] + 1, output['port'])

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

@@ -206,7 +206,7 @@ class NetworkTests(common.NetworkTagTests):
             'network create ' + network_options + name1,
             parse_output=True,
         )
-        self.addCleanup(self.openstack, 'network delete %s' % name1)
+        self.addCleanup(self.openstack, f'network delete {name1}')
         self.assertIsNotNone(cmd_output["id"])
         if self.haz_network:
             self.assertEqual(
@@ -342,33 +342,30 @@ class NetworkTests(common.NetworkTagTests):
 
         name1 = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'network create --description aaaa %s' % name1,
+            f'network create --description aaaa {name1}',
             parse_output=True,
         )
 
-        self.addCleanup(self.openstack, 'network delete %s' % name1)
+        self.addCleanup(self.openstack, f'network delete {name1}')
 
         # Get network ID
         network_id = cmd_output['id']
 
         # Add Agent to Network
         self.openstack(
-            'network agent add network --dhcp {} {}'.format(
-                agent_id, network_id
-            )
+            f'network agent add network --dhcp {agent_id} {network_id}'
         )
 
         # Test network list --agent
         cmd_output = self.openstack(
-            'network list --agent %s' % agent_id,
+            f'network list --agent {agent_id}',
             parse_output=True,
         )
 
         # Cleanup
         # Remove Agent from Network
         self.openstack(
-            'network agent remove network --dhcp %s %s'
-            % (agent_id, network_id)
+            f'network agent remove network --dhcp {agent_id} {network_id}'
         )
 
         # Assert
@@ -388,10 +385,10 @@ class NetworkTests(common.NetworkTagTests):
             '--no-share '
             '--internal '
             '--no-default '
-            '--enable-port-security %s' % name,
+            f'--enable-port-security {name}',
             parse_output=True,
         )
-        self.addCleanup(self.openstack, 'network delete %s' % name)
+        self.addCleanup(self.openstack, f'network delete {name}')
         self.assertIsNotNone(cmd_output["id"])
         self.assertEqual(
             'aaaa',
@@ -416,7 +413,7 @@ class NetworkTests(common.NetworkTagTests):
             '--disable '
             '--share '
             '--external '
-            '--disable-port-security %s' % name
+            f'--disable-port-security {name}'
         )
         self.assertOutput('', raw_output)
 

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

@@ -42,7 +42,7 @@ class TestAgent(common.NetworkTests):
 
         # agent show
         cmd_output = self.openstack(
-            'network agent show %s' % agent_ids[0],
+            f'network agent show {agent_ids[0]}',
             parse_output=True,
         )
         self.assertEqual(
@@ -57,12 +57,12 @@ class TestAgent(common.NetworkTests):
 
         # agent set
         raw_output = self.openstack(
-            'network agent set --disable %s' % agent_ids[0]
+            f'network agent set --disable {agent_ids[0]}'
         )
         self.assertOutput('', raw_output)
 
         cmd_output = self.openstack(
-            'network agent show %s' % agent_ids[0],
+            f'network agent show {agent_ids[0]}',
             parse_output=True,
         )
         self.assertEqual(
@@ -71,12 +71,12 @@ class TestAgent(common.NetworkTests):
         )
 
         raw_output = self.openstack(
-            'network agent set --enable %s' % agent_ids[0]
+            f'network agent set --enable {agent_ids[0]}'
         )
         self.assertOutput('', raw_output)
 
         cmd_output = self.openstack(
-            'network agent show %s' % agent_ids[0],
+            f'network agent show {agent_ids[0]}',
             parse_output=True,
         )
         self.assertEqual(
@@ -112,33 +112,30 @@ class TestAgentList(common.NetworkTests):
 
         name1 = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'network create --description aaaa %s' % name1,
+            f'network create --description aaaa {name1}',
             parse_output=True,
         )
 
-        self.addCleanup(self.openstack, 'network delete %s' % name1)
+        self.addCleanup(self.openstack, f'network delete {name1}')
 
         # Get network ID
         network_id = cmd_output['id']
 
         # Add Agent to Network
         self.openstack(
-            'network agent add network --dhcp {} {}'.format(
-                agent_id, network_id
-            )
+            f'network agent add network --dhcp {agent_id} {network_id}'
         )
 
         # Test network agent list --network
         cmd_output = self.openstack(
-            'network agent list --network %s' % network_id,
+            f'network agent list --network {network_id}',
             parse_output=True,
         )
 
         # Cleanup
         # Remove Agent from Network
         self.openstack(
-            'network agent remove network --dhcp %s %s'
-            % (agent_id, network_id)
+            f'network agent remove network --dhcp {agent_id} {network_id}'
         )
 
         # Assert
@@ -153,11 +150,11 @@ class TestAgentList(common.NetworkTests):
 
         name = uuid.uuid4().hex
         cmd_output = self.openstack(
-            'router create %s' % name,
+            f'router create {name}',
             parse_output=True,
         )
 
-        self.addCleanup(self.openstack, 'router delete %s' % name)
+        self.addCleanup(self.openstack, f'router delete {name}')
         # Get router ID
         router_id = cmd_output['id']
         # Get l3 agent id
@@ -175,7 +172,7 @@ class TestAgentList(common.NetworkTests):
 
         # Test router list --agent
         cmd_output = self.openstack(
-            'network agent list --router %s' % router_id,
+            f'network agent list --router {router_id}',
             parse_output=True,
         )
 
@@ -184,12 +181,10 @@ class TestAgentList(common.NetworkTests):
 
         # Remove router from agent
         self.openstack(
-            'network agent remove router --l3 {} {}'.format(
-                agent_id, router_id
-            )
+            f'network agent remove router --l3 {agent_id} {router_id}'
         )
         cmd_output = self.openstack(
-            'network agent list --router %s' % router_id,
+            f'network agent list --router {router_id}',
             parse_output=True,
         )
         agent_ids = [x['ID'] for x in cmd_output]

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

@@ -37,10 +37,10 @@ class NetworkFlavorTests(common.NetworkTests):
         )
         service_profile_id = cmd_output2.get('id')
 
-        self.addCleanup(self.openstack, 'network flavor delete %s' % flavor_id)
+        self.addCleanup(self.openstack, f'network flavor delete {flavor_id}')
         self.addCleanup(
             self.openstack,
-            'network flavor profile delete %s' % service_profile_id,
+            f'network flavor profile delete {service_profile_id}',
         )
         # Add flavor to service profile
         self.openstack(

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

@@ -31,20 +31,15 @@ class L3NDPProxyTests(common.NetworkTests):
         self.created_ndp_proxies = []
 
         json_output = self.openstack(
-            'address scope create --ip-version 6 '
-            '%(address_s_name)s' % {'address_s_name': self.ADDR_SCOPE_NAME},
+            'address scope create --ip-version 6 ' f'{self.ADDR_SCOPE_NAME}',
             parse_output=True,
         )
         self.assertIsNotNone(json_output['id'])
         self.ADDRESS_SCOPE_ID = json_output['id']
         json_output = self.openstack(
-            'subnet pool create %(subnet_p_name)s '
-            '--address-scope %(address_scope)s '
-            '--pool-prefix 2001:db8::/96 --default-prefix-length 112'
-            % {
-                'subnet_p_name': self.SUBNET_P_NAME,
-                'address_scope': self.ADDRESS_SCOPE_ID,
-            },
+            f'subnet pool create {self.SUBNET_P_NAME} '
+            f'--address-scope {self.ADDRESS_SCOPE_ID} '
+            '--pool-prefix 2001:db8::/96 --default-prefix-length 112',
             parse_output=True,
         )
         self.assertIsNotNone(json_output['id'])
@@ -57,12 +52,7 @@ class L3NDPProxyTests(common.NetworkTests):
         self.EXT_NET_ID = json_output['id']
         json_output = self.openstack(
             'subnet create --ip-version 6 --subnet-pool '
-            '%(subnet_pool)s --network %(net_id)s %(sub_name)s'
-            % {
-                'subnet_pool': self.SUBNET_POOL_ID,
-                'net_id': self.EXT_NET_ID,
-                'sub_name': self.EXT_SUB_NAME,
-            },
+            f'{self.SUBNET_POOL_ID} --network {self.EXT_NET_ID} {self.EXT_SUB_NAME}',
             parse_output=True,
         )
         self.assertIsNotNone(json_output['id'])
@@ -74,8 +64,7 @@ class L3NDPProxyTests(common.NetworkTests):
         self.assertIsNotNone(json_output['id'])
         self.ROT_ID = json_output['id']
         output = self.openstack(
-            'router set %(router_id)s --external-gateway %(net_id)s'
-            % {'router_id': self.ROT_ID, 'net_id': self.EXT_NET_ID}
+            f'router set {self.ROT_ID} --external-gateway {self.EXT_NET_ID}'
         )
         self.assertEqual('', output)
         output = self.openstack('router set --enable-ndp-proxy ' + self.ROT_ID)
@@ -93,23 +82,14 @@ class L3NDPProxyTests(common.NetworkTests):
         self.INT_NET_ID = json_output['id']
         json_output = self.openstack(
             'subnet create --ip-version 6 --subnet-pool '
-            '%(subnet_pool)s --network %(net_id)s %(sub_name)s'
-            % {
-                'subnet_pool': self.SUBNET_POOL_ID,
-                'net_id': self.INT_NET_ID,
-                'sub_name': self.INT_SUB_NAME,
-            },
+            f'{self.SUBNET_POOL_ID} --network {self.INT_NET_ID} {self.INT_SUB_NAME}',
             parse_output=True,
         )
         self.assertIsNotNone(json_output['id'])
         self.INT_SUB_ID = json_output['id']
         json_output = self.openstack(
-            'port create --network %(net_id)s '
-            '%(port_name)s'
-            % {
-                'net_id': self.INT_NET_ID,
-                'port_name': self.INT_PORT_NAME,
-            },
+            f'port create --network {self.INT_NET_ID} '
+            f'{self.INT_PORT_NAME}',
             parse_output=True,
         )
         self.assertIsNotNone(json_output['id'])
@@ -161,14 +141,13 @@ class L3NDPProxyTests(common.NetworkTests):
     def _create_ndp_proxies(self, ndp_proxies):
         for ndp_proxy in ndp_proxies:
             output = self.openstack(
-                'router ndp proxy create %(router)s --name %(name)s '
-                '--port %(port)s --ip-address %(address)s'
-                % {
-                    'router': ndp_proxy['router_id'],
-                    'name': ndp_proxy['name'],
-                    'port': ndp_proxy['port_id'],
-                    'address': ndp_proxy['address'],
-                },
+                'router ndp proxy create {router} --name {name} '
+                '--port {port} --ip-address {address}'.format(
+                    router=ndp_proxy['router_id'],
+                    name=ndp_proxy['name'],
+                    port=ndp_proxy['port_id'],
+                    address=ndp_proxy['address'],
+                ),
                 parse_output=True,
             )
             self.assertEqual(ndp_proxy['router_id'], output['router_id'])
@@ -214,8 +193,7 @@ class L3NDPProxyTests(common.NetworkTests):
         self._create_ndp_proxies([ndp_proxies])
         ndp_proxy_id = self.created_ndp_proxies[0]['id']
         output = self.openstack(
-            'router ndp proxy set --description %s %s'
-            % (description, ndp_proxy_id)
+            f'router ndp proxy set --description {description} {ndp_proxy_id}'
         )
         self.assertEqual('', output)
         json_output = self.openstack(