Fix typo in cinder/cinder/volume/drivers/emc_vmax

Change-Id: I0eff3be00a267a2ddbdc0e72d7c8da35d158cee8

diff --git a/cinder/volume/drivers/emc/emc_vmax_common.py b/cinder/volume/drivers/emc/emc_vmax_common.py
index 0bbe269f17bcc8b850a9870d958812043ebd4a71..a2d818fb1efddc4c11681a32b8507f070cfbcc9b 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vmax_common.py
+++ b/cinder/volume/drivers/emc/emc_vmax_common.py
@@ -369,7 +369,7 @@ class EMCVMAXCommon(object):
         portGroupName = OS-<target>-PG  The portGroupName will come from
                         the EMC configuration xml file.
                         These are precreated. If the portGroup does not exist
-                        then a error will be returned to the user
+                        then an error will be returned to the user
         maskingView  = OS-<shortHostName>-<poolName>-<shortProtocol>-MV
                        e.g OS-myShortHost-SATA_BRONZ1-I-MV
 
@@ -634,7 +634,7 @@ class EMCVMAXCommon(object):
         :param diff: Unused parameter.
         :param host: The host dict holding the relevant target(destination)
             information
-        :returns: boolean -- True if retype succeeded, Fasle if error
+        :returns: boolean -- True if retype succeeded, False if error
         """
 
         volumeName = volume['name']
@@ -911,7 +911,7 @@ class EMCVMAXCommon(object):
         LOG.debug("sourceFastPolicyName is : %(sourceFastPolicyName)s.",
                   {'sourceFastPolicyName': sourceFastPolicyName})
 
-        # If the source volume is is FAST enabled it must first be removed
+        # If the source volume is FAST enabled it must first be removed
         # from the default storage group for that policy.
         if sourceFastPolicyName is not None:
             self.remove_from_default_SG(
@@ -926,7 +926,7 @@ class EMCVMAXCommon(object):
             self.conn, targetPoolName, storageSystemName)
         if targetPoolInstanceName is None:
             LOG.error(_LE(
-                "Error finding targe pool instance name for pool: "
+                "Error finding target pool instance name for pool: "
                 "%(targetPoolName)s."),
                 {'targetPoolName': targetPoolName})
             return falseRet
@@ -1163,7 +1163,7 @@ class EMCVMAXCommon(object):
                  'targetArraySerialNumber': targetArraySerialNumber})
             return falseRet
 
-        # Get the pool from the source array and check that is is different
+        # Get the pool from the source array and check that is different
         # to the pool in the target array.
         assocPoolInstanceName = self.utils.get_assoc_pool_from_volume(
             self.conn, volumeInstanceName)
@@ -1496,7 +1496,7 @@ class EMCVMAXCommon(object):
             if targetEndpoints:
                 endpoints = targetEndpoints['TargetEndpoints']
 
-                LOG.debug("There are  %(len)lu endpoints.",
+                LOG.debug("There are %(len)lu endpoints.",
                           {'len': len(endpoints)})
                 for targetendpoint in endpoints:
                     wwn = targetendpoint['Name']
@@ -1657,7 +1657,7 @@ class EMCVMAXCommon(object):
                 "Unable to get configuration information necessary to create "
                 "a volume. Please check that there is a configuration file "
                 "for each config group, if multi-backend is enabled. "
-                "The should be in the following format "
+                "The file should be in the following format "
                 "/etc/cinder/cinder_emc_config_<CONFIG_GROUP>.xml."))
             raise exception.VolumeBackendAPIException(data=exceptionMessage)
 
@@ -2113,7 +2113,7 @@ class EMCVMAXCommon(object):
     def _remove_device_from_storage_group(
             self, controllerConfigurationService, volumeInstanceName,
             volumeName, extraSpecs):
-        """Check is volume is part of a storage group prior to delete.
+        """Check if volume is part of a storage group prior to delete.
 
         Log a warning if volume is part of storage group.
 
@@ -2983,7 +2983,7 @@ class EMCVMAXCommon(object):
             targetWorkload, storageSystemName, newType, extraSpecs):
         """Migrate from one slo/workload combination to another (V3).
 
-        This requires moving the volume from it's current SG to a
+        This requires moving the volume from its current SG to a
         new or existing SG that has the target attributes.
 
         :param volume: the volume object
@@ -3204,8 +3204,8 @@ class EMCVMAXCommon(object):
             raise exception.VolumeBackendAPIException(
                 data=exceptionMessage)
 
-        # Get the FAST policy from the file this value can be None if the
-        # user doesnt want to associate with any FAST policy.
+        # Get the FAST policy from the file. This value can be None if the
+        # user doesn't want to associate with any FAST policy.
         fastPolicyName = self.utils.parse_fast_policy_name_from_file(
             configurationFile)
         if fastPolicyName is not None:

diff --git a/cinder/volume/drivers/emc/emc_vmax_fc.py b/cinder/volume/drivers/emc/emc_vmax_fc.py
index 9a50d49e10350f0c60cdc88311b8c50a57b4ad28..f52b2e7916bbf16698d1e563d09d377268e071be 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vmax_fc.py
+++ b/cinder/volume/drivers/emc/emc_vmax_fc.py
@@ -297,7 +297,7 @@ class EMCVMAXFCDriver(driver.FibreChannelDriver):
         :param diff: Unused parameter.
         :param host: the host dict holding the relevant
             target(destination) information
-        :returns: boolean -- True if retype succeeded, Fasle if error
+        :returns: boolean -- True if retype succeeded, False if error
         """
         return self.common.retype(ctxt, volume, new_type, diff, host)
 

diff --git a/cinder/volume/drivers/emc/emc_vmax_iscsi.py b/cinder/volume/drivers/emc/emc_vmax_iscsi.py
index 421c5a0ed6d20c85097207117c3f29b80b071fae..eda1de19e8f8df19945c8af00a9090be38ce9d44 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vmax_iscsi.py
+++ b/cinder/volume/drivers/emc/emc_vmax_iscsi.py
@@ -291,7 +291,7 @@ class EMCVMAXISCSIDriver(driver.ISCSIDriver):
         :param new_type: the new volume type.
         :param diff: Unused parameter in common.retype
         :param host: the host dict holding the relevant target information
-        :returns: boolean -- True if retype succeeded, Fasle if error
+        :returns: boolean -- True if retype succeeded, False if error
         """
         return self.common.retype(ctxt, volume, new_type, diff, host)
 

diff --git a/cinder/volume/drivers/emc/emc_vmax_utils.py b/cinder/volume/drivers/emc/emc_vmax_utils.py
index b6e9bfd76c9bbb353d500994ae87d45f44ab6b16..9afe209b27e597ca5d75c3a34133ce035a2cef1e 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vmax_utils.py
+++ b/cinder/volume/drivers/emc/emc_vmax_utils.py
@@ -1550,7 +1550,7 @@ class EMCVMAXUtils(object):
         return totalCapacityGb, remainingCapacityGb
 
     def isArrayV3(self, conn, arrayName):
-        """Check is the array is V2 or V3.
+        """Check if the array is V2 or V3.
 
         :param conn: the connection to the ecom server
         :param arrayName: the array name