From: Zhiteng Huang <zhithuang@ebaysf.com>
Date: Thu, 15 Jan 2015 03:12:05 +0000 (+0800)
Subject: Fixes misspelled words in Cinder
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=cd13a341656eb5ec7aed9e625b3969c46214bf21;p=openstack-build%2Fcinder-build.git

Fixes misspelled words in Cinder

Fixes misspelled words found by 'misspellings' in one shot

* pip install misspellings
* git ls-files | grep -v locale | misspellings -f -

Change-Id: I2b74c7f19f17ba566cfb734c012a8904f3e35e84
---

diff --git a/cinder/volume/drivers/emc/emc_vmax_utils.py b/cinder/volume/drivers/emc/emc_vmax_utils.py
index 82fc6b07f..20b2de58a 100644
--- a/cinder/volume/drivers/emc/emc_vmax_utils.py
+++ b/cinder/volume/drivers/emc/emc_vmax_utils.py
@@ -1259,7 +1259,7 @@ class EMCVMAXUtils(object):
             # Something else that we cannot recover from has happened
             LOG.error(_LE("Exception: %s"), six.text_type(desc))
             exceptionMessage = (_(
-                "Cannot verify the existance of object:"
+                "Cannot verify the existence of object:"
                 "%(instanceName)s.")
                 % {'instanceName': instanceName})
             LOG.error(exceptionMessage)
diff --git a/cinder/volume/drivers/huawei/rest_common.py b/cinder/volume/drivers/huawei/rest_common.py
index 7069268a3..44509f85d 100644
--- a/cinder/volume/drivers/huawei/rest_common.py
+++ b/cinder/volume/drivers/huawei/rest_common.py
@@ -614,8 +614,8 @@ class RestCommon():
         except Exception:
             with excutils.save_and_reraise_exception():
                 err_msg = (_LE(
-                    'Error occured when adding hostgroup and lungroup to view.'
-                    ' Remove lun from lungroup now.'))
+                    'Error occurred when adding hostgroup and lungroup to '
+                    'view. Remove lun from lungroup now.'))
                 LOG.error(err_msg)
                 self._remove_lun_from_lungroup(lungroup_id, lun_id)
 
diff --git a/cinder/volume/drivers/remotefs.py b/cinder/volume/drivers/remotefs.py
index 5b00c1bcc..77d7755a8 100644
--- a/cinder/volume/drivers/remotefs.py
+++ b/cinder/volume/drivers/remotefs.py
@@ -900,7 +900,7 @@ class RemoteFSSnapDriver(RemoteFSDriver):
                         'to be deleted.') % snapshot_path
                 LOG.warn(msg)
 
-                # Snapshot may be stale, so just delete it and update ther
+                # Snapshot may be stale, so just delete it and update the
                 # info file instead of blocking
                 return self._delete_stale_snapshot(snapshot)
 
diff --git a/cinder/volume/drivers/srb.py b/cinder/volume/drivers/srb.py
index 7e1a43d24..20451fc67 100644
--- a/cinder/volume/drivers/srb.py
+++ b/cinder/volume/drivers/srb.py
@@ -246,7 +246,7 @@ def handle_process_execution_error(message, info_message, reraise=True):
     the command string, exit code, standard output and error output of the
     process will be logged at `logging.DEBUG` level.
 
-    The `reraise` argument specifies what should happend when a
+    The `reraise` argument specifies what should happen when a
     `putils.ProcessExecutionError` is caught. If it's equal to `True`, the
     exception will be re-raised. If it's some other non-`False` object, this
     object will be raised instead (so you most likely want it to be some
diff --git a/cinder/volume/drivers/xio.py b/cinder/volume/drivers/xio.py
index 9a4f4967d..1db7af3f5 100644
--- a/cinder/volume/drivers/xio.py
+++ b/cinder/volume/drivers/xio.py
@@ -119,7 +119,7 @@ class XIOISEDriver(object):
             msg = _LE("Array query failed - No response (%d)!") % status
             LOG.error(msg)
             RaiseXIODriverException()
-        # succesfully fetched QUERY info. Parse out globalid along with
+        # Successfully fetched QUERY info. Parse out globalid along with
         # ipaddress for Controller 1 and Controller 2. We assign primary
         # ipaddress to use based on controller rank
         xml_tree = etree.fromstring(resp['content'])
@@ -830,7 +830,7 @@ class XIOISEDriver(object):
             msg = _LE("POST for host create failed (%s)!") % status
             LOG.error(msg)
             RaiseXIODriverException()
-        # succesfully created host entry. Return host name.
+        # Successfully created host entry. Return host name.
         return hostname
 
     def _create_clone(self, volume, clone, clone_type):
diff --git a/cinder/volume/targets/iser.py b/cinder/volume/targets/iser.py
index a01951e50..ec730d605 100644
--- a/cinder/volume/targets/iser.py
+++ b/cinder/volume/targets/iser.py
@@ -42,7 +42,7 @@ class ISERTgtAdm(TgtAdm):
         self.volumes_dir = self.configuration.safe_get('volumes_dir')
         self.protocol = 'iSER'
 
-        # backward compatability mess
+        # backwards compatibility mess
         self.configuration.num_volume_device_scan_tries = \
             self.configuration.num_iser_scan_tries
         self.configuration.iscsi_num_targets = \