openstack/python-openstackclient
Code Issues Proposed changes

Handle log message interpolation by the logger in identity/

Browse Source 
According to OpenStack Guideline[1], logged string message should be
interpolated by the logger.

[1]: http://docs.openstack.org/developer/oslo.i18n/guidelines.html#adding-variables-to-log-messages

Change-Id: I1d6588093616099a9eef0947c09e038b9e53493a
Related-Bug: #1596829
This commit is contained in:
Gábor Antal
2017-02-13 17:36:56 +01:00
parent 30fdb488a8
commit 335c8d3ef3
15 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/identity/v2_0/ec2creds.py
View File

@@ -122,8 +122,8 @@ class DeleteEC2Creds(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete EC2 credentials with "
"access key '%(access_key)s': %(e)s")
% {'access_key': access_key, 'e': e})
"access key '%(access_key)s': %(e)s"),
{'access_key': access_key, 'e': e})
if result > 0:
total = len(parsed_args.access_keys)

4
openstackclient/identity/v2_0/endpoint.py
View File

@@ -102,8 +102,8 @@ class DeleteEndpoint(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete endpoint with "
"ID '%(endpoint)s': %(e)s")
% {'endpoint': endpoint, 'e': e})
"ID '%(endpoint)s': %(e)s"),
{'endpoint': endpoint, 'e': e})
if result > 0:
total = len(parsed_args.endpoints)

4
openstackclient/identity/v2_0/service.py
View File

@@ -114,8 +114,8 @@ class DeleteService(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete service with "
"name or ID '%(service)s': %(e)s")
% {'service': service, 'e': e})
"name or ID '%(service)s': %(e)s"),
{'service': service, 'e': e})
if result > 0:
total = len(parsed_args.services)

3
openstackclient/identity/v3/consumer.py
View File

@@ -73,8 +73,7 @@ class DeleteConsumer(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete consumer with name or "
"ID '%(consumer)s': %(e)s")
% {'consumer': i, 'e': e})
"ID '%(consumer)s': %(e)s"), {'consumer': i, 'e': e})
if result > 0:
total = len(parsed_args.consumer)

4
openstackclient/identity/v3/credential.py
View File

@@ -99,8 +99,8 @@ class DeleteCredential(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete credentials with "
"ID '%(credential)s': %(e)s")
% {'credential': i, 'e': e})
"ID '%(credential)s': %(e)s"),
{'credential': i, 'e': e})
if result > 0:
total = len(parsed_args.credential)

3
openstackclient/identity/v3/domain.py
View File

@@ -111,8 +111,7 @@ class DeleteDomain(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete domain with name or "
"ID '%(domain)s': %(e)s")
% {'domain': i, 'e': e})
"ID '%(domain)s': %(e)s"), {'domain': i, 'e': e})
if result > 0:
total = len(parsed_args.domain)

4
openstackclient/identity/v3/ec2creds.py
View File

@@ -140,8 +140,8 @@ class DeleteEC2Creds(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete EC2 credentials with "
"access key '%(access_key)s': %(e)s")
% {'access_key': i, 'e': e})
"access key '%(access_key)s': %(e)s"),
{'access_key': i, 'e': e})
if result > 0:
total = len(parsed_args.access_key)

3
openstackclient/identity/v3/endpoint.py
View File

@@ -122,8 +122,7 @@ class DeleteEndpoint(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete endpoint with "
"ID '%(endpoint)s': %(e)s")
% {'endpoint': i, 'e': e})
"ID '%(endpoint)s': %(e)s"), {'endpoint': i, 'e': e})
if result > 0:
total = len(parsed_args.endpoint)

4
openstackclient/identity/v3/federation_protocol.py
View File

@@ -102,8 +102,8 @@ class DeleteProtocol(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete federation protocol "
"with name or ID '%(protocol)s': %(e)s")
% {'protocol': i, 'e': e})
"with name or ID '%(protocol)s': %(e)s"),
{'protocol': i, 'e': e})
if result > 0:
total = len(parsed_args.federation_protocol)

4
openstackclient/identity/v3/identity_provider.py
View File

@@ -115,8 +115,8 @@ class DeleteIdentityProvider(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete identity providers with "
"name or ID '%(provider)s': %(e)s")
% {'provider': i, 'e': e})
"name or ID '%(provider)s': %(e)s"),
{'provider': i, 'e': e})
if result > 0:
total = len(parsed_args.identity_provider)

3
openstackclient/identity/v3/mapping.py
View File

@@ -132,8 +132,7 @@ class DeleteMapping(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete mapping with name or "
"ID '%(mapping)s': %(e)s")
% {'mapping': i, 'e': e})
"ID '%(mapping)s': %(e)s"), {'mapping': i, 'e': e})
if result > 0:
total = len(parsed_args.mapping)

3
openstackclient/identity/v3/policy.py
View File

@@ -82,8 +82,7 @@ class DeletePolicy(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete policy with name or "
"ID '%(policy)s': %(e)s")
% {'policy': i, 'e': e})
"ID '%(policy)s': %(e)s"), {'policy': i, 'e': e})
if result > 0:
total = len(parsed_args.policy)

3
openstackclient/identity/v3/region.py
View File

@@ -87,8 +87,7 @@ class DeleteRegion(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete region with "
"ID '%(region)s': %(e)s")
% {'region': i, 'e': e})
"ID '%(region)s': %(e)s"), {'region': i, 'e': e})
if result > 0:
total = len(parsed_args.region)

4
openstackclient/identity/v3/service.py
View File

@@ -103,8 +103,8 @@ class DeleteService(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete consumer with type, "
"name or ID '%(service)s': %(e)s")
% {'service': i, 'e': e})
"name or ID '%(service)s': %(e)s"),
{'service': i, 'e': e})
if result > 0:
total = len(parsed_args.service)

4
openstackclient/identity/v3/service_provider.py
View File

@@ -108,8 +108,8 @@ class DeleteServiceProvider(command.Command):
except Exception as e:
result += 1
LOG.error(_("Failed to delete service provider with "
"name or ID '%(provider)s': %(e)s")
% {'provider': i, 'e': e})
"name or ID '%(provider)s': %(e)s"),
{'provider': i, 'e': e})
if result > 0:
total = len(parsed_args.service_provider)