openstack
/
magnum-tempest-plugin
Code Issues Proposed changes

Modify variable's using method in Log Messages 

String interpolation should be delayed to be handled by the logging code,
rather than being done at the point of the logging call.
Ref:http://docs.openstack.org/developer/oslo.i18n/guidelines.html#log-translation
For example:
LOG.info(_LI('some message: variable=%s') % variable)
LOG.info(_LI('some message: variable=%s'), variable)

Change-Id: Ifaf1dfe589615732e412c4e640cf46679abc9023
Closes-Bug: #1643463
This commit is contained in:
melissaml 2017-01-04 15:11:33 +08:00
parent 8d94f5cc32
commit 4de1c7b637
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
magnum/tests/functional/api/v1/clients/bay_client.py
View File

@ -123,7 +123,7 @@ class BayClient(client.MagnumClient):
lambda: self.does_bay_exist(bay_id), 10, 1800)
except Exception:
# In error state. Clean up the bay id if desired
self.LOG.error(_LE('Bay %s entered an exception state.') % bay_id)
self.LOG.error(_LE('Bay %s entered an exception state.'), bay_id)
if delete_on_error:
self.LOG.error(_LE('We will attempt to delete bays now.'))
self.delete_bay(bay_id)
@ -139,35 +139,35 @@ class BayClient(client.MagnumClient):
resp, model = self.get_bay(bay_id)
if model.status in ['CREATED', 'CREATE_COMPLETE',
'ERROR', 'CREATE_FAILED']:
self.LOG.info(_LI('Bay %s succeeded.') % bay_id)
self.LOG.info(_LI('Bay %s succeeded.'), bay_id)
return True
else:
return False
except exceptions.NotFound:
self.LOG.warning(_LW('Bay %s is not found.') % bay_id)
self.LOG.warning(_LW('Bay %s is not found.'), bay_id)
return False
def does_bay_exist(self, bay_id):
try:
resp, model = self.get_bay(bay_id)
if model.status in ['CREATED', 'CREATE_COMPLETE']:
self.LOG.info(_LI('Bay %s is created.') % bay_id)
self.LOG.info(_LI('Bay %s is created.'), bay_id)
return True
elif model.status in ['ERROR', 'CREATE_FAILED']:
self.LOG.error(_LE('Bay %s is in fail state.') % bay_id)
self.LOG.error(_LE('Bay %s is in fail state.'), bay_id)
raise exceptions.ServerFault(
"Got into an error condition: %s for %s" %
(model.status, bay_id))
else:
return False
except exceptions.NotFound:
self.LOG.warning(_LW('Bay %s is not found.') % bay_id)
self.LOG.warning(_LW('Bay %s is not found.'), bay_id)
return False
def does_bay_not_exist(self, bay_id):
try:
self.get_bay(bay_id)
except exceptions.NotFound:
self.LOG.warning(_LW('Bay %s is not found.') % bay_id)
self.LOG.warning(_LW('Bay %s is not found.'), bay_id)
return True
return False

14
magnum/tests/functional/api/v1/clients/cluster_client.py
View File

@ -124,7 +124,7 @@ class ClusterClient(client.MagnumClient):
lambda: self.does_cluster_exist(cluster_id), 10, 1800)
except Exception:
# In error state. Clean up the cluster id if desired
self.LOG.error(_LE('Cluster %s entered an exception state.') %
self.LOG.error(_LE('Cluster %s entered an exception state.'),
cluster_id)
if delete_on_error:
self.LOG.error(_LE('We will attempt to delete clusters now.'))
@ -141,22 +141,22 @@ class ClusterClient(client.MagnumClient):
resp, model = self.get_cluster(cluster_id)
if model.status in ['CREATED', 'CREATE_COMPLETE',
'ERROR', 'CREATE_FAILED']:
self.LOG.info(_LI('Cluster %s succeeded.') % cluster_id)
self.LOG.info(_LI('Cluster %s succeeded.'), cluster_id)
return True
else:
return False
except exceptions.NotFound:
self.LOG.warning(_LW('Cluster %s is not found.') % cluster_id)
self.LOG.warning(_LW('Cluster %s is not found.'), cluster_id)
return False
def does_cluster_exist(self, cluster_id):
try:
resp, model = self.get_cluster(cluster_id)
if model.status in ['CREATED', 'CREATE_COMPLETE']:
self.LOG.info(_LI('Cluster %s is created.') % cluster_id)
self.LOG.info(_LI('Cluster %s is created.'), cluster_id)
return True
elif model.status in ['ERROR', 'CREATE_FAILED']:
self.LOG.error(_LE('Cluster %s is in fail state.') %
self.LOG.error(_LE('Cluster %s is in fail state.'),
cluster_id)
raise exceptions.ServerFault(
"Got into an error condition: %s for %s" %
@ -164,13 +164,13 @@ class ClusterClient(client.MagnumClient):
else:
return False
except exceptions.NotFound:
self.LOG.warning(_LW('Cluster %s is not found.') % cluster_id)
self.LOG.warning(_LW('Cluster %s is not found.'), cluster_id)
return False
def does_cluster_not_exist(self, cluster_id):
try:
self.get_cluster(cluster_id)
except exceptions.NotFound:
self.LOG.warning(_LW('Cluster %s is not found.') % cluster_id)
self.LOG.warning(_LW('Cluster %s is not found.'), cluster_id)
return True
return False