Merge pull request #1988 from JayasilanJibm/issue_1987

F-string changes for managers, transports, test module and few other files

Author: allmightyspiff

SoftLayer/CLI/user/detail.py

@@ -74,7 +74,6 @@ def basic_info(user, keys):
     else:
         table.add_row(['APIKEY', 'No'])
     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 = f"{user.get('address1')} \

SoftLayer/auth.py

@@ -131,9 +131,9 @@ def __init__(self, username, token, r_token=None):
 
     def get_request(self, request):
         """Sets token-based auth headers."""
-        request.transport_headers['Authorization'] = 'Bearer {}'.format(self.api_key)
+        request.transport_headers['Authorization'] = f'Bearer {self.api_key}'
         request.transport_user = self.username
         return request
 
     def __repr__(self):
-        return "BearerAuthentication(username={}, token={})".format(self.username, self.api_key)
+        return f"BearerAuthentication(username={self.username}, token={self.api_key})"

SoftLayer/exceptions.py

@@ -26,10 +26,10 @@ def __init__(self, fault_code, fault_string, url=None):
         self.url = url
 
     def __repr__(self):
-        return "{} ({}): {}".format(self.url, self.faultCode, self.faultString)
+        return f"{self.url} ({self.faultCode}): {self.faultString}"
 
     def __str__(self):
-        return "{} ({}): {}".format(self.url, self.faultCode, self.faultString)
+        return f"{self.url} ({self.faultCode}): {self.faultString}"
 
 
 class SoftLayerAPIError(SoftLayerError):

SoftLayer/managers/account.py

@@ -293,7 +293,7 @@ def cancel_item(self, identifier, reason="No longer needed", note=None):
 
         if note is None:
             user = self.client.call('Account', 'getCurrentUser', mask="mask[id,displayName,email,username]")
-            note = "Cancelled by {} with the SLCLI".format(user.get('username'))
+            note = f"Cancelled by {user.get('username')} with the SLCLI"
 
         return self.client.call('Billing_Item', 'cancelItem', False, True, reason, note, id=identifier)
 

SoftLayer/managers/hardware.py

@@ -400,7 +400,7 @@ def get_create_options(self, datacenter=None):
             _mask = "mask[priceGroups]"
             dc_details = self.client.call('SoftLayer_Location', 'getDatacenters', mask=_mask, filter=_filter, limit=1)
             if not dc_details:
-                raise SoftLayerError("Unable to find a datacenter named {}".format(datacenter))
+                raise SoftLayerError(f"Unable to find a datacenter named {datacenter}")
             # A DC will have several price groups, no good way to deal with this other than checking each.
             # An item should only belong to one type of price group.
             for group in dc_details[0].get('priceGroups', []):

SoftLayer/managers/ipsec.py

@@ -120,8 +120,7 @@ def get_tunnel_context(self, context_id, **kwargs):
         contexts = self.account.getNetworkTunnelContexts(**kwargs)
         if len(contexts) == 0:
             raise SoftLayerAPIError('SoftLayer_Exception_ObjectNotFound',
-                                    'Unable to find object with id of \'{}\''
-                                    .format(context_id))
+                                    f'Unable to find object with id of \'{context_id}\'')
         return contexts[0]
 
     def get_translation(self, context_id, translation_id):
@@ -137,8 +136,7 @@ def get_translation(self, context_id, translation_id):
                             if x['id'] == translation_id), None)
         if translation is None:
             raise SoftLayerAPIError('SoftLayer_Exception_ObjectNotFound',
-                                    'Unable to find object with id of \'{}\''
-                                    .format(translation_id))
+                                    f'Unable to find object with id of \'{translation_id}\'')
         return translation
 
     def get_translations(self, context_id):

SoftLayer/managers/license.py

@@ -47,7 +47,7 @@ def cancel_item(self, key, cancel_immediately=False):
 
         if not vm_ware_find:
             raise exceptions.CLIAbort(
-                "Unable to find license key: {}".format(key))
+                f"Unable to find license key: {key}")
         return vm_ware_find
 
     def create(self, datacenter, item_package):

SoftLayer/managers/load_balancer.py

@@ -121,7 +121,7 @@ def get_lbaas_by_name(self, name, mask=None):
         object_filter = {'name': {'operation': name}}
         this_lbs = self.lbaas.getAllObjects(filter=object_filter, mask=mask)
         if not this_lbs:
-            raise exceptions.SoftLayerError("Unable to find LBaaS with name: {}".format(name))
+            raise exceptions.SoftLayerError(f"Unable to find LBaaS with name: {name}")
 
         return this_lbs[0]
 

SoftLayer/managers/object_storage.py

@@ -97,6 +97,6 @@ def _get_id_from_username(self, username):
         if len(account) == 1:
             return [account[0]['id']]
         elif len(account) > 1:
-            raise SoftLayerError("Multiple object storage accounts found with the name: {}".format(username))
+            raise SoftLayerError(f"Multiple object storage accounts found with the name: {username}")
         else:
-            raise SoftLayerError("Unable to find object storage account id for: {}".format(username))
+            raise SoftLayerError(f"Unable to find object storage account id for: {username}")

SoftLayer/managers/ordering.py

@@ -266,7 +266,7 @@ def get_package_by_key(self, package_keyname, mask=None):
 
         packages = self.package_svc.getAllObjects(mask=mask, filter=_filter)
         if len(packages) == 0:
-            raise exceptions.SoftLayerError("Package {} does not exist".format(package_keyname))
+            raise exceptions.SoftLayerError(f"Package {package_keyname} does not exist")
 
         return packages.pop()
 
@@ -352,8 +352,7 @@ def get_preset_by_key(self, package_keyname, preset_keyname, mask=None):
 
         if len(presets) == 0:
             raise exceptions.SoftLayerError(
-                "Preset {} does not exist in package {}".format(preset_keyname,
-                                                                package_keyname))
+                f"Preset {preset_keyname} does not exist in package {package_keyname}")
 
         return presets[0]
 
@@ -385,8 +384,7 @@ def get_price_id_list(self, package_keyname, item_keynames, core=None):
                 matching_item = [i for i in items
                                  if i['keyName'] == item_keyname][0]
             except IndexError as ex:
-                message = "Item {} does not exist for package {}".format(item_keyname,
-                                                                         package_keyname)
+                message = f"Item {item_keyname} does not exist for package {package_keyname}"
                 raise exceptions.SoftLayerError(message) from ex
 
             # we want to get the price ID that has no location attached to it,
@@ -704,7 +702,7 @@ def resolve_location_name(self, location_key):
 
         default_region_keyname = 'unknown'
         if not location_key or location_key == default_region_keyname:
-            raise exceptions.SoftLayerError("Invalid location {}".format(location_key))
+            raise exceptions.SoftLayerError(f"Invalid location {location_key}")
 
         default_regions = [{'keyname': default_region_keyname}]
         index_first = 0
@@ -716,7 +714,7 @@ def resolve_location_name(self, location_key):
                 return location_key
             if location.get('regions', default_regions)[index_first].get('keyname') == location_key:
                 return location_name
-        raise exceptions.SoftLayerError("Location {} does not exist".format(location_key))
+        raise exceptions.SoftLayerError(f"Location {location_key} does not exist")
 
     def get_items(self, package_id, storage_filter=None, mask=None):
         """"Returns the items .