Merge pull request #1982 from ramkishor-ch/issue_1981

F-Strings - hardware / image / lb

Author: allmightyspiff

SoftLayer/CLI/hardware/create.py

@@ -104,7 +104,7 @@ def cli(env, **args):
     if do_create:
         for pod in pods:
             if args.get('datacenter') in pod['name']:
-                click.secho('Warning: Closed soon: {}'.format(pod['name']), fg='yellow')
+                click.secho(f"Warning: Closed soon: {pod['name']}", fg='yellow')
         if not (env.skip_confirmations or formatting.confirm(
                 "This action will incur charges on your account. Continue?")):
             raise exceptions.CLIAbort('Aborting dedicated server order.')

SoftLayer/CLI/hardware/detail.py

@@ -66,8 +66,8 @@ def cli(env, identifier, passwords, price, components):
     table.add_row(['created', result['provisionDate'] or formatting.blank()])
     table.add_row(['owner', owner or formatting.blank()])
 
-    last_transaction = "{} ({})".format(utils.lookup(result, 'lastTransaction', 'transactionGroup', 'name'),
-                                        utils.clean_time(utils.lookup(result, 'lastTransaction', 'modifyDate')))
+    last_transaction = f"{utils.lookup(result, 'lastTransaction', 'transactionGroup', 'name')} \
+        ({utils.clean_time(utils.lookup(result, 'lastTransaction', 'modifyDate'))})"
 
     table.add_row(['last_transaction', last_transaction])
     table.add_row(['billing', 'Hourly' if result['hourlyBillingFlag'] else 'Monthly'])

SoftLayer/CLI/hardware/dns.py

@@ -61,5 +61,5 @@ def cli(env, identifier, a_record, aaaa_record, ptr, ttl):
             ipv6 = instance['primaryNetworkComponent']['primaryVersion6IpAddressRecord']['ipAddress']
             dns.sync_host_record(zone_id, instance['hostname'], ipv6, 'aaaa', ttl)
         except KeyError as ex:
-            message = "{} does not have an ipv6 address".format(instance['fullyQualifiedDomainName'])
+            message = f"{instance['fullyQualifiedDomainName']} does not have an ipv6 address"
             raise exceptions.CLIAbort(message) from ex

SoftLayer/CLI/hardware/notification_add.py

@@ -30,5 +30,5 @@ def cli(env, identifier, users):
                            notification['user']['username'], notification['user']['email'],
                            notification['user']['firstName'], notification['user']['lastName']])
         else:
-            raise exceptions.CLIAbort("User not found: {}.".format(user))
+            raise exceptions.CLIAbort(f"User not found: {user}.")
     env.fout(table)

SoftLayer/CLI/hardware/notification_delete.py

@@ -18,4 +18,4 @@ def cli(env, identifier):
     result = hardware.remove_notification(identifier)
 
     if result:
-        env.fout("The hardware notification instance: {} was deleted.".format(identifier))
+        env.fout(f"The hardware notification instance: {identifier} was deleted.")

SoftLayer/CLI/image/share.py

@@ -20,4 +20,4 @@ def cli(env, identifier, account_id):
     shared_image = image_mgr.share_image(image_id, account_id)
 
     if shared_image:
-        env.fout("Image template {} was shared to account {}.".format(identifier, account_id))
+        env.fout(f"Image template {identifier} was shared to account {account_id}.")

SoftLayer/CLI/image/share_deny.py

@@ -20,4 +20,4 @@ def cli(env, identifier, account_id):
     shared_image = image_mgr.deny_share_image(image_id, account_id)
 
     if shared_image:
-        env.fout("Image template {} was deny shared to account {}.".format(identifier, account_id))
+        env.fout(f"Image template {identifier} was deny shared to account {account_id}.")

SoftLayer/CLI/licenses/cancel.py

@@ -19,4 +19,4 @@ def cli(env, key, immediate):
     item = licenses.cancel_item(key, immediate)
 
     if item:
-        env.fout("License key: {} was cancelled.".format(key))
+        env.fout(f"License key: {key} was cancelled.")

SoftLayer/CLI/loadbal/detail.py

@@ -34,7 +34,7 @@ def lbaas_table(this_lb):
     table.add_row(['Type', SoftLayer.LoadBalancerManager.TYPE.get(this_lb.get('type'))])
     table.add_row(['Location', utils.lookup(this_lb, 'datacenter', 'longName')])
     table.add_row(['Description', this_lb.get('description')])
-    table.add_row(['Status', "{} / {}".format(this_lb.get('provisioningStatus'), this_lb.get('operatingStatus'))])
+    table.add_row(['Status', f"{this_lb.get('provisioningStatus')} / {this_lb.get('operatingStatus')}"])
 
     listener_table, pools = get_listener_table(this_lb)
     table.add_row(['Protocols', listener_table])
@@ -122,9 +122,9 @@ def get_listener_table(this_lb):
     listener_table = formatting.Table(['UUID', 'Max Connection', 'Mapping', 'Balancer', 'Modify', 'Active'])
     for listener in this_lb.get('listeners', []):
         pool = listener.get('defaultPool')
-        priv_map = "{}:{}".format(pool['protocol'], pool['protocolPort'])
+        priv_map = f"{pool['protocol']}:{pool['protocolPort']}"
         pools[pool['uuid']] = priv_map
-        mapping = "{}:{} -> {}".format(listener.get('protocol'), listener.get('protocolPort'), priv_map)
+        mapping = f"{listener.get('protocol')}:{listener.get('protocolPort')} -> {priv_map}"
         listener_table.add_row([
             listener.get('uuid'),
             listener.get('connectionLimit', 'None'),

SoftLayer/CLI/loadbal/health.py

@@ -31,7 +31,7 @@ def cli(env, identifier, uuid, interval, retry, timeout, url):
     mgr = SoftLayer.LoadBalancerManager(env.client)
     # Need to get the LBaaS uuid if it wasn't supplied
     lb_uuid, lb_id = mgr.get_lbaas_uuid_id(identifier)
-    print("UUID: {}, ID: {}".format(lb_uuid, lb_id))
+    print(f"UUID: {lb_uuid}, ID: {lb_id}")
 
     # Get the current health checks, and find the one we are updating.
     mask = "mask[healthMonitors, listeners[uuid,defaultPool[healthMonitor]]]"
@@ -58,7 +58,7 @@ def cli(env, identifier, uuid, interval, retry, timeout, url):
 
     try:
         mgr.update_lb_health_monitors(lb_uuid, [check])
-        click.secho('Health Check {} updated successfully'.format(uuid), fg='green')
+        click.secho(f'Health Check {uuid} updated successfully', fg='green')
     except SoftLayerAPIError as exception:
-        click.secho('Failed to update {}'.format(uuid), fg='red')
-        click.secho("ERROR: {}".format(exception.faultString), fg='red')
+        click.secho(f'Failed to update {uuid}', fg='red')
+        click.secho(f"ERROR: {exception.faultString}", fg='red')