#1976

added f{} strings

Author: Ramkishor Chaladi

SoftLayer/CLI/block/snapshot/get_notify_status.py

@@ -15,6 +15,7 @@ def cli(env, volume_id):
     enabled = block_manager.get_volume_snapshot_notification_status(volume_id)
 
     if enabled == 0:
-        click.echo("Disabled: Snapshots space usage threshold is disabled for volume {}".format(volume_id))
+        click.echo(f"Disabled: Snapshots space usage threshold is disabled for volume {volume_id}")
     else:
-        click.echo("Enabled: Snapshots space usage threshold is enabled for volume {}".format(volume_id))
+        click.echo(f"Enabled: Snapshots space usage threshold is enabled for volume {volume_id}")
+

SoftLayer/CLI/block/snapshot/list.py

@@ -32,8 +32,7 @@
               default='created')
 @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, volume_id, sortby, columns):

SoftLayer/CLI/block/snapshot/order.py

@@ -53,8 +53,7 @@ def cli(env, volume_id, size, tier, upgrade, iops):
         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'])
         if 'status' in order['placedOrder'].keys():

SoftLayer/CLI/block/subnets/assign.py

@@ -24,14 +24,14 @@ def cli(env, access_id, subnet_id):
         assigned_subnets = block_manager.assign_subnets_to_acl(access_id, subnet_ids)
 
         for subnet in assigned_subnets:
-            message = "Successfully assigned subnet id: {} to allowed host id: {}".format(subnet, access_id)
+            message = f"Successfully assigned subnet id: {subnet} to allowed host id: {access_id}"
             click.echo(message)
 
         failed_to_assign_subnets = list(set(subnet_ids) - set(assigned_subnets))
         for subnet in failed_to_assign_subnets:
-            message = "Failed to assign subnet id: {} to allowed host id: {}".format(subnet, access_id)
+            message = f"Failed to assign subnet id: {subnet} to allowed host id: {access_id}"
             click.echo(message)
 
     except SoftLayer.SoftLayerAPIError as ex:
-        message = "Unable to assign subnets.\nReason: {}".format(ex.faultString)
+        message = f"Unable to assign subnets.\nReason: {ex.faultString}"
         click.echo(message)

SoftLayer/CLI/block/subnets/list.py

@@ -31,9 +31,9 @@ def cli(env, access_id):
 
         table = formatting.Table(COLUMNS)
         for subnet in subnets:
-            row = ["{0}".format(subnet['id']),
-                   "{0}".format(subnet['networkIdentifier']),
-                   "{0}".format(subnet['cidr'])]
+            row = [f"{subnet['id']}",
+                   f"{subnet['networkIdentifier']}",
+                   f"{subnet['cidr']}"]
             table.add_row(row)
 
         env.fout(table)

SoftLayer/CLI/block/subnets/remove.py

@@ -24,14 +24,14 @@ def cli(env, access_id, subnet_id):
         removed_subnets = block_manager.remove_subnets_from_acl(access_id, subnet_ids)
 
         for subnet in removed_subnets:
-            message = "Successfully removed subnet id: {} for allowed host id: {}".format(subnet, access_id)
+            message = f"Successfully removed subnet id: {subnet} for allowed host id: {access_id}"
             click.echo(message)
 
         failed_to_remove_subnets = list(set(subnet_ids) - set(removed_subnets))
         for subnet in failed_to_remove_subnets:
-            message = "Failed to remove subnet id: {} for allowed host id: {}".format(subnet, access_id)
+            message = f"Failed to remove subnet id: {subnet} for allowed host id: {access_id}"
             click.echo(message)
 
     except SoftLayer.SoftLayerAPIError as ex:
-        message = "Unable to remove subnets.\nReason: {}".format(ex.faultString)
+        message = f"Unable to remove subnets.\nReason: {ex.faultString}"
         click.echo(message)