openstack/nova
Code Issues Proposed changes

XenAPI: Refactor message strings to remove locals

Browse Source 
This commit is a small refactor to the XenAPI glance plugin removing
the use of locals() to improve the readability.

Change-Id: I5de095ac1f7f38fd37cc9d6010a876995f0f8841
This commit is contained in:
Nikhil Komawar
2015-01-05 16:20:22 -05:00
parent 9f99234b62
commit 43e89abeb2
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
View File

@@ -91,13 +91,13 @@ def _download_tarball_and_verify(request, staging_path):
if etag is None: if etag is None:
msg = "No ETag found for comparison to checksum %(checksum)s" msg = "No ETag found for comparison to checksum %(checksum)s"
logging.info(msg % locals()) logging.info(msg % {'checksum': checksum})
elif checksum != etag: elif checksum != etag:
msg = 'ETag %(etag)s does not match computed md5sum %(checksum)s' msg = 'ETag %(etag)s does not match computed md5sum %(checksum)s'
raise RetryableError(msg % locals()) raise RetryableError(msg % {'checksum': checksum, 'etag': etag})
else: else:
msg = "Verified image checksum %(checksum)s" msg = "Verified image checksum %(checksum)s"
logging.info(msg % locals()) logging.info(msg % {'checksum': checksum})
def _download_tarball(sr_path, staging_path, image_id, glance_host, def _download_tarball(sr_path, staging_path, image_id, glance_host,
@@ -111,14 +111,16 @@ def _download_tarball(sr_path, staging_path, image_id, glance_host,
scheme = 'http' scheme = 'http'
url = ("%(scheme)s://%(glance_host)s:%(glance_port)d/v1/images/" url = ("%(scheme)s://%(glance_host)s:%(glance_port)d/v1/images/"
"%(image_id)s" % locals()) "%(image_id)s" % {'scheme': scheme, 'glance_host': glance_host,
'glance_port': glance_port,
'image_id': image_id})
logging.info("Downloading %s" % url) logging.info("Downloading %s" % url)
request = urllib2.Request(url, headers=extra_headers) request = urllib2.Request(url, headers=extra_headers)
try: try:
_download_tarball_and_verify(request, staging_path) _download_tarball_and_verify(request, staging_path)
except Exception: except Exception:
logging.exception('Failed to retrieve %(url)s' % locals()) logging.exception('Failed to retrieve %(url)s' % {'url': url})
raise raise
@@ -151,7 +153,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port,
conn = httplib.HTTPConnection(glance_host, glance_port) conn = httplib.HTTPConnection(glance_host, glance_port)
conn.connect() conn.connect()
except Exception, error: except Exception, error:
logging.exception('Failed to connect %(url)s' % locals()) logging.exception('Failed to connect %(url)s' % {'url': url})
raise RetryableError(error) raise RetryableError(error)
try: try:
@@ -191,7 +193,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port,
conn.putheader(header, value) conn.putheader(header, value)
conn.endheaders() conn.endheaders()
except Exception, error: except Exception, error:
logging.exception('Failed to upload %(url)s' % locals()) logging.exception('Failed to upload %(url)s' % {'url': url})
raise RetryableError(error) raise RetryableError(error)
callback_data = {'bytes_written': 0} callback_data = {'bytes_written': 0}