openstack/cinder
Code Issues Proposed changes

Fixed inconsistent naming conventions

Browse Source 
Change-Id: Ide2ce0d82b61001a18304747d1ca62ee4e53956b
This commit is contained in:
lijunbo
2017-03-22 14:52:25 +08:00
parent 0464cb1122
commit d64b0a6dfb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/volume/drivers/falconstor/rest_proxy.py
View File

@@ -981,7 +981,7 @@ class FSSRestCommon(object):
if response.status == 200: if response.status == 200:
return json_data return json_data
elif response.status == 404: elif response.status == 404:
msg = (_('FSS rest api return failed, method=%(method)s, ' msg = (_('FSS REST API return failed, method=%(method)s, '
'uri=%(url)s, response=%(response)s') % { 'uri=%(url)s, response=%(response)s') % {
"method": method, "method": method,
"url": url, "url": url,

4
cinder/volume/drivers/kaminario/kaminario_common.py
View File

@@ -157,13 +157,13 @@ class KaminarioCinderDriver(cinder.volume.driver.ISCSIDriver):
ver_exist = versionutils.convert_version_to_int(ver) ver_exist = versionutils.convert_version_to_int(ver)
ver_min = versionutils.convert_version_to_int(K2_MIN_VERSION) ver_min = versionutils.convert_version_to_int(K2_MIN_VERSION)
if ver_exist < ver_min: if ver_exist < ver_min:
msg = _("K2 rest api version should be " msg = _("K2 REST API version should be "
">= %s.") % K2_MIN_VERSION ">= %s.") % K2_MIN_VERSION
LOG.error(msg) LOG.error(msg)
raise exception.KaminarioCinderDriverException(reason=msg) raise exception.KaminarioCinderDriverException(reason=msg)
else: else:
msg = _("K2 rest api version search failed.") msg = _("K2 REST API version search failed.")
LOG.error(msg) LOG.error(msg)
raise exception.KaminarioCinderDriverException(reason=msg) raise exception.KaminarioCinderDriverException(reason=msg)

2
cinder/volume/drivers/zfssa/restclient.py
View File

@@ -285,7 +285,7 @@ class RestClientURL(object):
if context: if context:
# only schemes that can be used will be http or https if it # only schemes that can be used will be http or https if it
# is given in the path variable, or the path will begin # is given in the path variable, or the path will begin
# with the rest API location meaning invalid or unwanted # with the REST API location meaning invalid or unwanted
# schemes cannot be used # schemes cannot be used
response = urllib.request.urlopen(req, # nosec response = urllib.request.urlopen(req, # nosec
timeout=self.timeout, timeout=self.timeout,