Merge pull request #1984 from JayasilanJibm/issue_1983

f-string changes for user, virt, vlan and vpn module

Author: allmightyspiff

SoftLayer/CLI/user/create.py

@@ -61,7 +61,7 @@ def cli(env, username, email, password, from_user, template):
             for key in template_object:
                 user_template[key] = template_object[key]
         except ValueError as ex:
-            raise exceptions.ArgumentError("Unable to parse --template. %s" % ex)
+            raise exceptions.ArgumentError(f"Unable to parse --template. {ex}")
 
     user_template['username'] = username
     if password == 'generate':

SoftLayer/CLI/user/delete.py

@@ -28,6 +28,6 @@ def cli(env, identifier):
 
     result = mgr.edit_user(user_id, user_template)
     if result:
-        click.secho("%s deleted successfully" % identifier, fg='green')
+        click.secho(f"{identifier} deleted successfully", fg='green')
     else:
-        click.secho("Failed to delete %s" % identifier, fg='red')
+        click.secho(f"Failed to delete {identifier}", fg='red')

SoftLayer/CLI/user/detail.py

@@ -73,12 +73,12 @@ def basic_info(user, keys):
         table.add_row(['APIKEY', 'Yes'])
     else:
         table.add_row(['APIKEY', 'No'])
-    table.add_row(['Name', "%s %s" % (user.get('firstName', '-'), user.get('lastName', '-'))])
+    table.add_row(['Name', f"{user.get('firstName', '-')} {user.get('lastName', '-')}"])
+    table.add_row(['Name', f"{user.get('firstName', '-')} {user.get('lastName', '-')}"])
     table.add_row(['Email', user.get('email')])
     table.add_row(['OpenID', user.get('openIdConnectUserName')])
-    address = "%s %s %s %s %s %s" % (
-        user.get('address1'), user.get('address2'), user.get('city'), user.get('state'),
-        user.get('country'), user.get('postalCode'))
+    address = f"{user.get('address1')} \
+        {user.get('address2')} {user.get('city')} {user.get('state')} {user.get('country')} {user.get('postalCode')}"
     table.add_row(['Address', address])
     table.add_row(['Company', user.get('companyName')])
     table.add_row(['Created', user.get('createDate')])
@@ -89,11 +89,11 @@ def basic_info(user, keys):
         ['Status', utils.lookup(user, 'userStatus', 'name')])
     table.add_row(['SSL VPN', user.get('sslVpnAllowedFlag', 'No')])
     for login in user.get('unsuccessfulLogins', {}):
-        login_string = "%s From: %s" % (login.get('createDate'), login.get('ipAddress'))
+        login_string = f"{login.get('createDate')} From: {login.get('ipAddress')}"
         table.add_row(['Last Failed Login', login_string])
         break
     for login in user.get('successfulLogins', {}):
-        login_string = "%s From: %s" % (login.get('createDate'), login.get('ipAddress'))
+        login_string = f"{login.get('createDate')} From: {login.get('ipAddress')}"
         table.add_row(['Last Login', login_string])
         break
 

SoftLayer/CLI/user/edit_details.py

@@ -37,10 +37,10 @@ def cli(env, user, template):
             for key in template_object:
                 user_template[key] = template_object[key]
         except ValueError as ex:
-            raise exceptions.ArgumentError("Unable to parse --template. %s" % ex)
+            raise exceptions.ArgumentError(f"Unable to parse --template. {ex}")
 
     result = mgr.edit_user(user_id, user_template)
     if result:
-        click.secho("%s updated successfully" % (user), fg='green')
+        click.secho(f"{user} updated successfully", fg='green')
     else:
-        click.secho("Failed to update %s" % (user), fg='red')
+        click.secho(f"Failed to update {user}", fg='red')

SoftLayer/CLI/user/edit_notifications.py

@@ -30,6 +30,6 @@ def cli(env, enable, notification):
         result = mgr.disable_notifications(notification)
 
     if result:
-        click.secho("Notifications updated successfully: %s" % ", ".join(notification), fg='green')
+        click.secho(f"Notifications updated successfully: {', '.join(notification)}", fg='green')
     else:
-        click.secho("Failed to update notifications: %s" % ", ".join(notification), fg='red')
+        click.secho(f"Failed to update notifications: {', '.join(notification)}", fg='red')

SoftLayer/CLI/user/edit_permissions.py

@@ -34,6 +34,6 @@ def cli(env, identifier, enable, permission, from_user):
         result = mgr.remove_permissions(user_id, permission)
 
     if result:
-        click.secho("Permissions updated successfully: %s" % ", ".join(permission), fg='green')
+        click.secho(f"Permissions updated successfully: {', '.join(permission)}", fg='green')
     else:
-        click.secho("Failed to update permissions: %s" % ", ".join(permission), fg='red')
+        click.secho(f"Failed to update permissions: {', '.join(permission)}", fg='red')

SoftLayer/CLI/user/list.py

@@ -36,7 +36,7 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.option('--columns',
               callback=column_helper.get_formatter(COLUMNS),
-              help='Columns to display. [options: %s]' % ', '.join(column.name for column in COLUMNS),
+              help=f"Columns to display. [options: {', '.join(column.name for column in COLUMNS)}]",
               default=','.join(DEFAULT_COLUMNS),
               show_default=True)
 @environment.pass_env

SoftLayer/CLI/user/vpn_manual.py

@@ -20,9 +20,9 @@ def cli(env, user, enable):
     user_id = helpers.resolve_id(mgr.resolve_ids, user, 'username')
 
     result = mgr.vpn_manual(user_id, enable)
-    message = "{} vpn manual config {}".format(user, 'enable' if enable else 'disable')
+    message = f"{user} vpn manual config {'enable' if enable else 'disable'}"
 
     if result:
         click.secho(message, fg='green')
     else:
-        click.secho("Failed to update {}".format(user), fg='red')
+        click.secho(f"Failed to update {user}", fg='red')

SoftLayer/CLI/user/vpn_subnet.py

@@ -25,6 +25,6 @@ def cli(env, user, add, subnet):
         result = mgr.vpn_subnet_remove(user_id, subnet)
 
     if result:
-        click.secho("%s updated successfully" % (user), fg='green')
+        click.secho(f"{user} updated successfully", fg='green')
     else:
-        click.secho("Failed to update %s" % (user), fg='red')
+        click.secho(f"Failed to update {user}", fg='red')

SoftLayer/CLI/virt/authorize_storage.py

@@ -28,12 +28,12 @@ def cli(env, identifier, username_storage, portable_id):
     if username_storage:
         if not virtual.authorize_storage(virtual_id, username_storage):
             raise exceptions.CLIAbort('Authorize Volume Failed')
-        env.fout('Successfully Volume: %s was Added.' % username_storage)
+        env.fout(f'Successfully Volume: {username_storage} was Added.')
     if portable_id:
         portable_id = helpers.resolve_id(virtual.resolve_ids, portable_id, 'storage')
         portable_result = virtual.attach_portable_storage(virtual_id, portable_id)
 
-        env.fout('Successfully Portable Storage: %i was Added.' % portable_id)
+        env.fout(f'Successfully Portable Storage: {portable_id} was Added.')
 
         table.add_row(['Id', portable_result['id']])
         table.add_row(['createDate', portable_result['createDate']])