Merge branch 'master' into issue1969

Author: edsonarios

SoftLayer/CLI/account/billing_items.py

@@ -42,7 +42,7 @@ def item_table(items, ordered=None):
     table.align['Category Code'] = 'l'
     for item in items:
         description = item.get('description')
-        fqdn = "{}.{}".format(item.get('hostName', ''), item.get('domainName', ''))
+        fqdn = f"{item.get('hostName', '')}.{item.get('domainName', '')}"
         if fqdn != ".":
             description = fqdn
         user = utils.lookup(item, 'orderItem', 'order', 'userRecord')

SoftLayer/CLI/account/cancel_item.py

@@ -17,4 +17,4 @@ def cli(env, identifier):
     item = manager.cancel_item(identifier)
 
     if item:
-        env.fout("Item: {} was cancelled.".format(identifier))
+        env.fout(f"Item: {identifier} was cancelled.")

SoftLayer/CLI/account/item_detail.py

@@ -23,13 +23,13 @@ def item_table(item):
     """Formats a table for billing items"""
 
     date_format = '%Y-%m-%d'
-    table = formatting.Table(["Key", "Value"], title="{}".format(item.get('description', 'Billing Item')))
+    table = formatting.Table(["Key", "Value"], title=f"{item.get('description', 'Billing Item')}")
     table.add_row(['createDate', utils.clean_time(item.get('createDate'), date_format, date_format)])
     table.add_row(['cycleStartDate', utils.clean_time(item.get('cycleStartDate'), date_format, date_format)])
     table.add_row(['cancellationDate', utils.clean_time(item.get('cancellationDate'), date_format, date_format)])
     table.add_row(['description', item.get('description')])
     table.align = 'l'
-    fqdn = "{}.{}".format(item.get('hostName', ''), item.get('domainName', ''))
+    fqdn = f"{item.get('hostName', '')}.{item.get('domainName', '')}"
     if fqdn != ".":
         table.add_row(['FQDN', fqdn])
 
@@ -43,7 +43,7 @@ def item_table(item):
     ordered_by = "IBM"
     user = utils.lookup(item, 'orderItem', 'order', 'userRecord')
     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(['Notes', item.get('notes')])
     table.add_row(['Location', utils.lookup(item, 'location', 'name')])

SoftLayer/CLI/bandwidth/pools.py

@@ -39,19 +39,19 @@ def cli(env):
         name = item.get('name')
         region = utils.lookup(item, 'locationGroup', 'name')
         servers = manager.get_bandwidth_pool_counts(identifier=item.get('id'))
-        allocation = "{} GB".format(item.get('totalBandwidthAllocated', 0))
+        allocation = f"{item.get('totalBandwidthAllocated', 0)} GB"
 
         current = utils.lookup(item, 'billingCyclePublicBandwidthUsage', 'amountOut')
         if current is not None:
-            current = "{} GB".format(current)
+            current = f"{current} GB"
         else:
             current = "0 GB"
 
-        projected = "{} GB".format(item.get('projectedPublicBandwidthUsage', 0))
+        projected = f"{item.get('projectedPublicBandwidthUsage', 0)} GB"
 
         cost = utils.lookup(item, 'billingItem', 'nextInvoiceTotalRecurringAmount')
         if cost is not None:
-            cost = "${}".format(cost)
+            cost = f"${cost}"
         else:
             cost = "$0.0"
 

SoftLayer/CLI/bandwidth/pools_detail.py

@@ -24,15 +24,15 @@ def cli(env, identifier):
     table.add_row(['Id', bandwidths['id']])
     table.add_row(['Name', bandwidths['name']])
     table.add_row(['Create Date', utils.clean_time(bandwidths.get('createDate'), '%Y-%m-%d')])
-    current = "{} GB".format(utils.lookup(bandwidths, 'billingCyclePublicBandwidthUsage', 'amountOut'))
+    current = f"{utils.lookup(bandwidths, 'billingCyclePublicBandwidthUsage', 'amountOut')} GB"
     if current is None:
         current = '-'
     table.add_row(['Current Usage', current])
-    projected = "{} GB".format(bandwidths.get('projectedPublicBandwidthUsage', 0))
+    projected = f"{bandwidths.get('projectedPublicBandwidthUsage', 0)} GB"
     if projected is None:
         projected = '-'
     table.add_row(['Projected  Usage', projected])
-    inbound = "{} GB".format(bandwidths.get('inboundPublicBandwidthUsage', 0))
+    inbound = f"{bandwidths.get('inboundPublicBandwidthUsage', 0)} GB"
     if inbound is None:
         inbound = '-'
     table.add_row(['Inbound   Usage', inbound])
@@ -58,8 +58,8 @@ def _bw_table(bw_data):
     """Generates a bandwidth useage table"""
     table_data = formatting.Table(['Id', 'HostName', "IP Address", 'Amount', "Current Usage"])
     for bw_point in bw_data:
-        amount = "{} GB".format(utils.lookup(bw_point, 'bandwidthAllotmentDetail', 'allocation', 'amount'))
-        current = "{} GB".format(bw_point.get('outboundBandwidthUsage', 0))
+        amount = f"{utils.lookup(bw_point, 'bandwidthAllotmentDetail', 'allocation', 'amount')} GB"
+        current = f"{bw_point.get('outboundBandwidthUsage', 0)} GB"
         ip_address = bw_point.get('primaryIpAddress')
         if ip_address is None:
             ip_address = '-'
@@ -71,8 +71,8 @@ def _virtual_table(bw_data):
     """Generates a virtual bandwidth usage table"""
     table_data = formatting.Table(['Id', 'HostName', "IP Address", 'Amount', "Current Usage"])
     for bw_point in bw_data:
-        amount = "{} GB".format(utils.lookup(bw_point, 'bandwidthAllotmentDetail', 'allocation', 'amount'))
-        current = "{} GB".format(bw_point.get('outboundBandwidthUsage', 0))
+        amount = f"{utils.lookup(bw_point, 'bandwidthAllotmentDetail', 'allocation', 'amount')} GB"
+        current = f"{bw_point.get('outboundBandwidthUsage', 0)} GB"
         ip_address = bw_point.get('primaryIpAddress')
         if ip_address is None:
             ip_address = '-'

SoftLayer/CLI/block/access/list.py

@@ -14,12 +14,10 @@
 @click.argument('volume_id')
 @click.option('--columns',
               callback=column_helper.get_formatter(storage_utils.COLUMNS),
-              help='Columns to display. Options are: {0}.'.format(
-                  ', '.join(column.name for column in storage_utils.COLUMNS)),
+              help=f"Columns to display. Options are: { ', '.join(column.name for column in storage_utils.COLUMNS)}.",
               default=','.join(storage_utils.DEFAULT_COLUMNS))
 @click.option('--sortby',
-              help='Column to sort by. Options are: {0}.'.format(
-                  ', '.join(column.name for column in storage_utils.COLUMNS)),
+              help=f"Column to sort by. Options are: { ', '.join(column.name for column in storage_utils.COLUMNS)}.",
               default='name')
 @environment.pass_env
 def cli(env, columns, sortby, volume_id):

SoftLayer/CLI/block/detail.py

@@ -112,7 +112,7 @@ def cli(env, volume_id):
             original_volume_info.add_row(['Original Snapshot Name', block_volume['originalSnapshotName']])
         table.add_row(['Original Volume Properties', original_volume_info])
 
-    notes = '{}'.format(block_volume.get('notes', ''))
+    notes = f"{block_volume.get('notes', '')}"
     table.add_row(['Notes', notes])
 
     env.fout(table)

SoftLayer/CLI/block/duplicate.py

@@ -89,8 +89,7 @@ def cli(env, origin_volume_id, origin_snapshot_id, duplicate_size,
         raise exceptions.ArgumentError(str(ex))
 
     if 'placedOrder' in order.keys():
-        click.echo("Order #{0} placed successfully!".format(
-            order['placedOrder']['id']))
+        click.echo(f"Order #{order['placedOrder']['id']} placed successfully!")
         for item in order['placedOrder']['items']:
             click.echo(" > %s" % item['description'])
     else:

SoftLayer/CLI/block/list.py

@@ -60,8 +60,7 @@
 @click.option('--sortby', help='Column to sort by', default='username')
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help='Columns to display. Options: {0}'.format(
-                  ', '.join(column.name for column in COLUMNS)),
+              help=f"Columns to display. Options: { ', '.join(column.name for column in COLUMNS)}",
               default=','.join(DEFAULT_COLUMNS))
 @environment.pass_env
 def cli(env, sortby, columns, datacenter, username, storage_type, order):

SoftLayer/CLI/block/modify.py

@@ -50,7 +50,7 @@ def cli(env, volume_id, new_size, new_iops, new_tier):
         raise exceptions.ArgumentError(str(ex))
 
     if 'placedOrder' in order.keys():
-        click.echo("Order #{0} placed successfully!".format(order['placedOrder']['id']))
+        click.echo(f"Order #{order['placedOrder']['id']} placed successfully!")
         for item in order['placedOrder']['items']:
             click.echo(" > %s" % item['description'])
     else: