Merge "Fix some typos"

cinder/backup/manager.py

@@ -323,8 +323,8 @@ class BackupManager(manager.SchedulerDependentManager):
                 ctxt, backup.temp_snapshot_id)
             volume = objects.Volume.get_by_id(
                 ctxt, backup.volume_id)
-            # The temp snapshot should be deleted directly thru the
+            # The temp snapshot should be deleted directly through the
-            # volume driver, not thru the volume manager.
+            # volume driver, not through the volume manager.
             self.volume_rpcapi.delete_snapshot(ctxt, temp_snapshot,
                                                volume.host)
         except exception.SnapshotNotFound:

cinder/image/glance.py

@@ -256,7 +256,7 @@ class GlanceImageService(object):
 
         # NOTE(geguileo): We set is_public default value for v1 because we want
         # to retrieve all images by default.  We don't need to send v2
-        # equivalent - "visible" - because its default value when omited is
+        # equivalent - "visible" - because its default value when omitted is
         # "public, private, shared", which will return all.
         if CONF.glance_api_version <= 1:
             # ensure filters is a dict

cinder/tests/unit/api/contrib/test_quotas.py

@@ -537,7 +537,7 @@ class QuotaSetControllerValidateNestedQuotaSetup(QuotaSetsControllerTestBase):
         # Get B's subtree up to date with this change
         self.B.subtree[self.D.id] = self.D.subtree
 
-        # Quota heirarchy now is
+        # Quota hierarchy now is
         #   / B - D - E - F
         # A
         #   \ C

cinder/tests/unit/test_coho.py

@@ -359,7 +359,7 @@ class CohoDriverTest(test.TestCase):
              mock.call().connect((ADDR, RPC_PORT))])
 
     def test_rpc_client_error_in_receive_fragment(self):
-        """Ensure exception is raised when malformed packet is recieved."""
+        """Ensure exception is raised when malformed packet is received."""
         mock_sendrcd = self.mock_object(coho.Client, '_sendrecord')
         mock_socket = self.mock_object(socket, 'socket')
         mock_socket.return_value.recv.return_value = INVALID_HEADER_BIN

cinder/tests/unit/test_hpelefthand.py

@@ -2906,7 +2906,7 @@ class TestHPELeftHandISCSIDriver(HPELeftHandBaseDriver, test.TestCase):
         # set up driver with default config
         self.setup_driver()
 
-        # Ensure creating a replication client works without specifiying
+        # Ensure creating a replication client works without specifying
         # ssh_conn_timeout or san_private_key.
         remote_array = {
             'hpelefthand_api_url': 'https://1.1.1.1:8080/lhos',

cinder/volume/drivers/dell/dell_storagecenter_api.py

@@ -172,7 +172,7 @@ class HttpClient(object):
             except Exception:
                 methodname = asyncTask.get('methodName')
                 objectTypeName = asyncTask.get('objectTypeName')
-                msg = (_('Async error: Unable to retreive %(obj)s '
+                msg = (_('Async error: Unable to retrieve %(obj)s '
                          'method %(method)s result')
                        % {'obj': objectTypeName, 'method': methodname})
                 raise exception.VolumeBackendAPIException(message=msg)
@@ -2459,7 +2459,7 @@ class StorageCenterApi(object):
 
          This checks a few things. The volume has to exist.  There can
          only be one volume by that name.  Since cinder manages volumes
-         by the GB it has to be defined on a GB boundry.
+         by the GB it has to be defined on a GB boundary.
 
          This renames existing to newname.  newname is the guid from
          the cinder volume['id'].  The volume is moved to the defined

cinder/volume/drivers/ibm/storwize_svc/storwize_svc_common.py

@@ -2288,12 +2288,12 @@ class StorwizeSVCCommonDriver(san.SanDriver,
                                   opts, True, pool=pool)
 
         # The source volume size is equal to target volume size
-        # in most of the cases. But in some scenario, the target
+        # in most of the cases. But in some scenarios, the target
         # volume size may be bigger than the source volume size.
         # SVC does not support flashcopy between two volumes
-        # with two different size. So use source volume size to
+        # with two different sizes. So use source volume size to
         # create target volume first and then extend target
-        # volume to orginal size.
+        # volume to original size.
         if tgt_volume['size'] > src_volume['size']:
             # extend the new created target volume to expected size.
             self._extend_volume_op(tgt_volume, tgt_volume['size'],

cinder/volume/drivers/kaminario/kaminario_iscsi.py

@@ -58,7 +58,7 @@ class KaminarioISCSIDriver(common.KaminarioCinderDriver):
         if hasattr(iscsi_ip_rs, 'hits') and iscsi_ip_rs.total != 0:
             iscsi_ip = iscsi_ip_rs.hits[0].ip_address
         if not iscsi_ip:
-            msg = _("Unable to get ISCSI IP addres from K2.")
+            msg = _("Unable to get ISCSI IP address from K2.")
             LOG.error(msg)
             raise exception.KaminarioCinderDriverException(reason=msg)
         iscsi_portal = "{0}:{1}".format(iscsi_ip, ISCSI_TCP_PORT)

cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py

@@ -71,7 +71,7 @@ class BrcdFCZoneDriver(fc_zone_driver.FCZoneDriver):
         1.2 - Added support for friendly zone name
         1.3 - Added HTTP connector support
         1.4 - Adds support to zone in Virtual Fabrics
-        1.5 - Initiator zoning updates thru zoneadd/zoneremove
+        1.5 - Initiator zoning updates through zoneadd/zoneremove
     """
 
     VERSION = "1.5"