From d64b0a6dfb65beadf68a1004374dfb68a42337dc Mon Sep 17 00:00:00 2001 From: lijunbo Date: Wed, 22 Mar 2017 14:52:25 +0800 Subject: [PATCH] Fixed inconsistent naming conventions Change-Id: Ide2ce0d82b61001a18304747d1ca62ee4e53956b --- cinder/volume/drivers/falconstor/rest_proxy.py | 2 +- cinder/volume/drivers/kaminario/kaminario_common.py | 4 ++-- cinder/volume/drivers/zfssa/restclient.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cinder/volume/drivers/falconstor/rest_proxy.py b/cinder/volume/drivers/falconstor/rest_proxy.py index 2d11837a410..bd11cfa1f7e 100644 --- a/cinder/volume/drivers/falconstor/rest_proxy.py +++ b/cinder/volume/drivers/falconstor/rest_proxy.py @@ -981,7 +981,7 @@ class FSSRestCommon(object): if response.status == 200: return json_data 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') % { "method": method, "url": url, diff --git a/cinder/volume/drivers/kaminario/kaminario_common.py b/cinder/volume/drivers/kaminario/kaminario_common.py index 62952ed01d3..d37d0f89e23 100644 --- a/cinder/volume/drivers/kaminario/kaminario_common.py +++ b/cinder/volume/drivers/kaminario/kaminario_common.py @@ -157,13 +157,13 @@ class KaminarioCinderDriver(cinder.volume.driver.ISCSIDriver): ver_exist = versionutils.convert_version_to_int(ver) ver_min = versionutils.convert_version_to_int(K2_MIN_VERSION) if ver_exist < ver_min: - msg = _("K2 rest api version should be " + msg = _("K2 REST API version should be " ">= %s.") % K2_MIN_VERSION LOG.error(msg) raise exception.KaminarioCinderDriverException(reason=msg) else: - msg = _("K2 rest api version search failed.") + msg = _("K2 REST API version search failed.") LOG.error(msg) raise exception.KaminarioCinderDriverException(reason=msg) diff --git a/cinder/volume/drivers/zfssa/restclient.py b/cinder/volume/drivers/zfssa/restclient.py index 50aeeddcfcb..d55e02acf49 100644 --- a/cinder/volume/drivers/zfssa/restclient.py +++ b/cinder/volume/drivers/zfssa/restclient.py @@ -285,7 +285,7 @@ class RestClientURL(object): if context: # only schemes that can be used will be http or https if it # 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 response = urllib.request.urlopen(req, # nosec timeout=self.timeout,