diff --git a/api-ref/source/v2/volumes-v2-volumes-actions.inc b/api-ref/source/v2/volumes-v2-volumes-actions.inc index a036c8e1551..3041274e000 100644 --- a/api-ref/source/v2/volumes-v2-volumes-actions.inc +++ b/api-ref/source/v2/volumes-v2-volumes-actions.inc @@ -312,7 +312,7 @@ Retype volume Change type of existing volume. Specify the ``os-retype`` action in the request body. -Change the volume type of exisiting volume, Cinder may migrate the volume to +Change the volume type of existing volume, Cinder may migrate the volume to proper volume host according to the new volume type. Normal response codes: 202 diff --git a/api-ref/source/v3/volumes-v3-volumes-actions.inc b/api-ref/source/v3/volumes-v3-volumes-actions.inc index e1cc3dbbfc9..15252246520 100644 --- a/api-ref/source/v3/volumes-v3-volumes-actions.inc +++ b/api-ref/source/v3/volumes-v3-volumes-actions.inc @@ -309,7 +309,7 @@ Retype a volume Change type of existing volume. Specify the ``os-retype`` action in the request body. -Change the volume type of exisiting volume, Cinder may migrate the volume to +Change the volume type of existing volume, Cinder may migrate the volume to proper volume host according to the new volume type. Normal response codes: 202 diff --git a/cinder/objects/volume_attachment.py b/cinder/objects/volume_attachment.py index 7a206bbf9ad..99e2568e3b8 100644 --- a/cinder/objects/volume_attachment.py +++ b/cinder/objects/volume_attachment.py @@ -163,7 +163,7 @@ class VolumeAttachment(base.CinderPersistentObject, base.CinderObject, @base.CinderObjectRegistry.register class VolumeAttachmentList(base.ObjectListBase, base.CinderObject): - # Versoin 1.0: Iniitial version + # Version 1.0: Initial version # Version 1.1: Remove volume_id in get_by_host|instance VERSION = '1.1' diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index a1d6e332a15..3ac07ffadb5 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -1783,7 +1783,7 @@ class MigrateVD(object): Returns a boolean indicating whether the migration occurred, as well as model_update. - :param ctxt: Context + :param context: Context :param volume: A dictionary describing the volume to migrate :param host: A dictionary describing the host to migrate to, where host['host'] is its name, and host['capabilities'] is a diff --git a/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py b/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py index bc8c7418121..97a7d70faa0 100644 --- a/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py +++ b/cinder/volume/drivers/dell_emc/sc/storagecenter_api.py @@ -134,7 +134,7 @@ class HttpClient(object): except IndexError: url = asyncTask.get('returnValue') except AttributeError: - LOG.debug('_get_async_url: Atttribute Error. (%r)', asyncTask) + LOG.debug('_get_async_url: Attribute Error. (%r)', asyncTask) url = 'api/rest/ApiConnection/AsyncTask/' # Blank URL diff --git a/cinder/volume/drivers/dell_emc/vmax/common.py b/cinder/volume/drivers/dell_emc/vmax/common.py index c2ceb7e557c..98cca8187bf 100644 --- a/cinder/volume/drivers/dell_emc/vmax/common.py +++ b/cinder/volume/drivers/dell_emc/vmax/common.py @@ -2030,7 +2030,7 @@ class VMAXCommon(object): def get_target_wwns_list(self, storage_system, volume, connector): """Find target WWN list. - :param storageSystem: the storage system name + :param storage_system: the storage system name :param connector: the connector dict :returns: list -- targetWwns, the target WWN list :raises: VolumeBackendAPIException diff --git a/cinder/volume/drivers/dell_emc/vmax/provision_v3.py b/cinder/volume/drivers/dell_emc/vmax/provision_v3.py index 06cf39a35e4..6c312b19671 100644 --- a/cinder/volume/drivers/dell_emc/vmax/provision_v3.py +++ b/cinder/volume/drivers/dell_emc/vmax/provision_v3.py @@ -917,7 +917,7 @@ class VMAXProvisionV3(object): """Extend a volume instance. :param conn: connection to the ecom server - :param storageConfigservice: the storage configuration service + :param storageConfigService: the storage configuration service :param volumeInstanceName: the volume instance name :param volumeName: the volume name (String) :param volumeSize: the volume size diff --git a/cinder/volume/drivers/dell_emc/vmax/utils.py b/cinder/volume/drivers/dell_emc/vmax/utils.py index 8b31c59de1c..37d7a626863 100644 --- a/cinder/volume/drivers/dell_emc/vmax/utils.py +++ b/cinder/volume/drivers/dell_emc/vmax/utils.py @@ -649,7 +649,7 @@ class VMAXUtils(object): def convert_gb_to_bits(self, strGbSize): """Convert GB(string) to bytes(string). - :param strGB: string -- The size in GB + :param strGbSize: string -- The size in GB :returns: string -- The size in bytes """ strBitsSize = six.text_type(int(strGbSize) * units.Gi) @@ -2011,8 +2011,8 @@ class VMAXUtils(object): def get_random_pg_from_list(portgroupnames): """From list of portgroup, choose one randomly - :param portGroupNames: list of available portgroups - :returns: portGroupName - the random portgroup + :param portgroupnames: list of available portgroups + :returns: portgroupname - the random portgroup """ portgroupname = ( portgroupnames[random.randint(0, len(portgroupnames) - 1)]) @@ -2676,7 +2676,7 @@ class VMAXUtils(object): :param conn: connection to the ecom server :param storagegroup: the storagegroup instance name - :param extraSpecs: extra specifications + :param extraspecs: extra specifications """ modifiedInstance = None if type(storagegroup) is pywbem.cim_obj.CIMInstance: @@ -2802,7 +2802,7 @@ class VMAXUtils(object): def change_compression_type(self, isSourceCompressionDisabled, newType): """Check if volume type have different compression types. - :param isCompressionDisabled: from source + :param isSourceCompressionDisabled: from source :param newType: from target :returns: boolean """ diff --git a/cinder/volume/drivers/nexenta/iscsi.py b/cinder/volume/drivers/nexenta/iscsi.py index 8013023b0e5..0240f22d23e 100644 --- a/cinder/volume/drivers/nexenta/iscsi.py +++ b/cinder/volume/drivers/nexenta/iscsi.py @@ -396,7 +396,7 @@ class NexentaISCSIDriver(driver.ISCSIDriver): def retype(self, context, volume, new_type, diff, host): """Convert the volume to be of the new type. - :param ctxt: Context + :param context: Context :param volume: A dictionary describing the volume to migrate :param new_type: A dictionary describing the volume type to convert to :param diff: A dictionary with the difference between the two types diff --git a/cinder/volume/drivers/nexenta/nfs.py b/cinder/volume/drivers/nexenta/nfs.py index 5a98419198e..598a3dafee0 100644 --- a/cinder/volume/drivers/nexenta/nfs.py +++ b/cinder/volume/drivers/nexenta/nfs.py @@ -245,7 +245,7 @@ class NexentaNfsDriver(nfs.NfsDriver): # pylint: disable=R0921 def retype(self, context, volume, new_type, diff, host): """Convert the volume to be of the new type. - :param ctxt: Context + :param context: Context :param volume: A dictionary describing the volume to migrate :param new_type: A dictionary describing the volume type to convert to :param diff: A dictionary with the difference between the two types diff --git a/cinder/zonemanager/drivers/brocade/brcd_http_fc_zone_client.py b/cinder/zonemanager/drivers/brocade/brcd_http_fc_zone_client.py index 5e29834c041..ea53350dd77 100644 --- a/cinder/zonemanager/drivers/brocade/brcd_http_fc_zone_client.py +++ b/cinder/zonemanager/drivers/brocade/brcd_http_fc_zone_client.py @@ -227,7 +227,7 @@ class BrcdHTTPFCZoneClient(object): raise exception.BrocadeZoningHttpException(reason=msg) return response - def get_parsed_data(self, data, delim1, demil2): + def get_parsed_data(self, data, delim1, delim2): """Return the sub string between the delimiters. :param data: String to manipulate @@ -238,7 +238,7 @@ class BrcdHTTPFCZoneClient(object): try: start = data.index(delim1) start = start + len(delim1) - end = data.index(demil2) + end = data.index(delim2) return data[start:end] except ValueError as e: msg = (_("Error while parsing the data: %s.") % six.text_type(e))