Merge pull request #1980 from JayasilanJibm/issue_1979

f-string changes for order, storage_utils, subnet, tags module

Author: allmightyspiff

SoftLayer/CLI/order/lookup.py

@@ -36,22 +36,22 @@ def cli(env, identifier, details):
 def get_order_table(order):
     """Formats a table for billing order"""
 
-    title = "Order {id}".format(id=order.get('id'))
+    title = f"Order {order.get('id')}"
     date_format = '%Y-%m-%d'
     table = formatting.Table(["Key", "Value"], title=title)
     table.align = 'l'
 
     ordered_by = "IBM"
     user = order.get('userRecord', None)
     if user:
-        ordered_by = "{} ({})".format(user.get('displayName'), utils.lookup(user, 'userStatus', 'name'))
+        ordered_by = f"{user.get('displayName')} ({utils.lookup(user, 'userStatus', 'name')})"
     table.add_row(['Ordered By', ordered_by])
 
     table.add_row(['Create Date', utils.clean_time(order.get('createDate'), date_format, date_format)])
     table.add_row(['Modify Date', utils.clean_time(order.get('modifyDate'), date_format, date_format)])
     table.add_row(['Order Approval Date', utils.clean_time(order.get('orderApprovalDate'), date_format, date_format)])
     table.add_row(['Status', order.get('status')])
-    table.add_row(['Order Total Amount', "{price:.2f}".format(price=float(order.get('orderTotalAmount', '0')))])
+    table.add_row(['Order Total Amount', f'{float(order.get("orderTotalAmount","0")):.2f}'])
     table.add_row(['Invoice Total Amount', "{price:.2f}".
                   format(price=float(order.get('initialInvoice', {}).get('invoiceTotalAmount', '0')))])
 

SoftLayer/CLI/order/place.py

@@ -66,13 +66,13 @@ def cli(env, package_keyname, location, preset, verify, billing, complex_type,
     location_dc = network.get_datacenter_by_keyname(location)
     for pod in pods:
         if location_dc.get('name') in pod.get('name'):
-            click.secho('Warning: Closed soon: {}'.format(pod.get('name')), fg='yellow')
+            click.secho(f"Warning: Closed soon: {pod.get('name')}", fg='yellow')
 
     if extras:
         try:
             extras = json.loads(extras)
         except ValueError as err:
-            raise exceptions.CLIAbort("There was an error when parsing the --extras value: {}".format(err))
+            raise exceptions.CLIAbort(f"There was an error when parsing the --extras value: {err}")
 
     args = (package_keyname, location, order_items)
     kwargs = {'preset_keyname': preset,

SoftLayer/CLI/order/place_quote.py

@@ -73,7 +73,7 @@ def cli(env, package_keyname, location, preset, name, send_email, complex_type,
         try:
             extras = json.loads(extras)
         except ValueError as err:
-            raise exceptions.CLIAbort("There was an error when parsing the --extras value: {}".format(err))
+            raise exceptions.CLIAbort(f"There was an error when parsing the --extras value: {err}")
 
     args = (package_keyname, location, order_items)
     kwargs = {'preset_keyname': preset,

SoftLayer/CLI/order/quote.py

@@ -37,7 +37,7 @@ def _parse_create_args(client, args):
         try:
             data['extras'] = args.get('extras')
         except ValueError as err:
-            raise exceptions.CLIAbort("There was an error when parsing the --extras value: {}".format(err))
+            raise exceptions.CLIAbort(f"There was an error when parsing the --extras value: {err}")
     if args.get('image'):
         if args.get('image').isdigit():
             image_mgr = ImageManager(client)

SoftLayer/CLI/order/quote_detail.py

@@ -19,7 +19,7 @@ def cli(env, quote):
     result = manager.get_quote_details(quote)
 
     package = result['order']['items'][0]['package']
-    title = "{} - Package: {}, Id {}".format(result.get('name'), package['keyName'], package['id'])
+    title = f"{result.get('name')} - Package: {package['keyName']}, Id {package['id']}"
     table = formatting.Table([
         'Category', 'Description', 'Quantity', 'Recurring', 'One Time'
     ], title=title)

SoftLayer/CLI/storage_utils.py

@@ -43,25 +43,22 @@ def build_output_table(env, volumes, columns, sortby):
 
 def _format_name(obj):
     if obj['type'] == 'VIRTUAL':
-        return "{0}.{1}".format(obj['hostname'], obj['domain'])
+        return f"{obj['hostname']}.{obj['domain']}"
 
     elif obj['type'] == 'HARDWARE':
-        return "{0}.{1}".format(obj['hostname'], obj['domain'])
+        return f"{obj['hostname']}.{obj['domain']}"
 
     elif obj['type'] == 'SUBNET':
-        name = "{0}/{1}".format(
-            obj['networkIdentifier'],
-            obj['cidr']
-        )
+        name = f"{obj['networkIdentifier']}/{obj['cidr']}"
         if 'note' in obj.keys():
-            name = "{0} ({1})".format(name, obj['note'])
+            name = f"{name} ({obj['note']})"
 
         return name
 
     elif obj['type'] == 'IP':
         name = obj['ipAddress']
         if 'note' in obj.keys():
-            name = "{0} ({1})".format(name, obj['note'])
+            name = f"{name} ({obj['note']})"
 
         return name
     else:

SoftLayer/CLI/subnet/create.py

@@ -54,10 +54,7 @@ def cli(env, network, quantity, endpoint_id, ipv6, test):
         result = mgr.add_subnet(network, quantity=quantity, endpoint_id=endpoint_id, version=version, test_order=test)
 
     except SoftLayer.SoftLayerAPIError as error:
-        raise exceptions.CLIAbort('Unable to order {} {} ipv{} , error: {}'.format(quantity,
-                                                                                   network,
-                                                                                   version,
-                                                                                   error.faultString))
+        raise exceptions.CLIAbort(f"Unable to order {quantity} {network} ipv{version} , error: {error.faultString}")
 
     table = formatting.Table(['Item', 'cost'])
     table.align['Item'] = 'r'

SoftLayer/CLI/subnet/edit.py

@@ -34,6 +34,6 @@ def cli(env, identifier, tags, note):
 def print_result(result, detail):
     """Prints a successfully or Failed message."""
     if result:
-        click.secho("{} successfully".format(detail), fg='green')
+        click.secho(f"{detail} successfully", fg='green')
     else:
-        click.secho("Failed to {}".format(detail.lower()), fg='red')
+        click.secho(f"Failed to {detail.lower()}", fg='red')

SoftLayer/CLI/tags/cleanup.py

@@ -20,8 +20,8 @@ def cli(env, dry_run):
 
     for tag in empty_tags:
         if dry_run:
-            click.secho("(Dry Run) Removing {}".format(tag.get('name')), fg='yellow')
+            click.secho(f"(Dry Run) Removing {tag.get('name')}", fg='yellow')
         else:
             result = tag_manager.delete_tag(tag.get('name'))
             color = 'green' if result else 'red'
-            click.secho("Removing {}".format(tag.get('name')), fg=color)
+            click.secho(f"Removing {tag.get('name')}", fg=color)

SoftLayer/CLI/tags/delete.py

@@ -25,6 +25,6 @@ def cli(env, identifier, name):
 
     result = tag_manager.delete_tag(tag_name)
     if result:
-        click.secho("Tag {} has been removed".format(tag_name), fg='green')
+        click.secho(f"Tag {tag_name} has been removed", fg='green')
     else:
-        click.secho("Failed to remove tag {}".format(tag_name), fg='red')
+        click.secho(f"Failed to remove tag {tag_name}", fg='red')