From 6cf076779d91a73bdba2e30a71acc1b21e8dce7a Mon Sep 17 00:00:00 2001 From: Anh Tran Date: Thu, 24 Mar 2016 17:59:15 +0700 Subject: [PATCH] Fix typos in Cinder files Change-Id: I10ddf4a771a11527f977f9829ff353157d742f8e --- cinder/tests/unit/volume/drivers/test_hgst.py | 2 +- cinder/volume/driver.py | 4 +-- .../drivers/dell/dell_storagecenter_api.py | 4 +-- cinder/volume/drivers/emc/emc_vmax_masking.py | 26 +++++++++---------- .../volume/drivers/emc/emc_vmax_provision.py | 10 +++---- .../drivers/emc/emc_vmax_provision_v3.py | 4 +-- cinder/volume/drivers/emc/xtremio.py | 2 +- .../volume/drivers/netapp/eseries/client.py | 2 +- doc/source/devref/migration.rst | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cinder/tests/unit/volume/drivers/test_hgst.py b/cinder/tests/unit/volume/drivers/test_hgst.py index 4711f0f7f0f..f5367235194 100644 --- a/cinder/tests/unit/volume/drivers/test_hgst.py +++ b/cinder/tests/unit/volume/drivers/test_hgst.py @@ -444,7 +444,7 @@ class HGSTTestCase(test.TestCase): 'storageserver': 'stor1:gbd0,stor2:gbd0,', 'size': '12'} self.assertDictMatch(expected, self.created) - # Check the returned provider, note the the provider_id is hashed + # Check the returned provider, note that provider_id is hashed expected_pid = {'provider_id': 'volume10'} self.assertDictMatch(expected_pid, ret) diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py index 8eac6e29951..0171195ff21 100644 --- a/cinder/volume/driver.py +++ b/cinder/volume/driver.py @@ -1532,7 +1532,7 @@ class BaseVD(object): def get_pool(self, volume): """Return pool name where volume reside on. - :param volume: The volume hosted by the the driver. + :param volume: The volume hosted by the driver. :returns: name of the pool where given volume is in. """ return None @@ -2279,7 +2279,7 @@ class VolumeDriver(ConsistencyGroupVD, TransferVD, ManageableVD, ExtendVD, def get_pool(self, volume): """Return pool name where volume reside on. - :param volume: The volume hosted by the the driver. + :param volume: The volume hosted by the driver. :returns: name of the pool where given volume is in. """ return None diff --git a/cinder/volume/drivers/dell/dell_storagecenter_api.py b/cinder/volume/drivers/dell/dell_storagecenter_api.py index b11a7dc52e1..5eca1efabb4 100644 --- a/cinder/volume/drivers/dell/dell_storagecenter_api.py +++ b/cinder/volume/drivers/dell/dell_storagecenter_api.py @@ -333,7 +333,7 @@ class StorageCenterApi(object): If the JSON blob is a list then it will be searched for the attribute and value combination. If attribute and value are not specified then - the the first item is returned. If the JSON blob is a dict then it + the first item is returned. If the JSON blob is a dict then it will be returned so long as the dict matches the attribute and value combination or attribute is None. @@ -1112,7 +1112,7 @@ class StorageCenterApi(object): return scserver def create_server(self, wwnoriscsiname, isfc=False): - """Creates a Dell server object on the the Storage Center. + """Creates a Dell server object on the Storage Center. Adds the first HBA identified by wwnoriscsiname to it. diff --git a/cinder/volume/drivers/emc/emc_vmax_masking.py b/cinder/volume/drivers/emc/emc_vmax_masking.py index 762f3322632..86fd743ee91 100644 --- a/cinder/volume/drivers/emc/emc_vmax_masking.py +++ b/cinder/volume/drivers/emc/emc_vmax_masking.py @@ -738,7 +738,7 @@ class EMCVMAXMasking(object): Will not handle any exception in this method it will be handled up the stack. - :param conn: connection the ecom server + :param conn: connection to the ecom server :param maskingViewDict: the masking view dictionary :param defaultStorageGroupInstanceName: the default storage group instance name (Can be None) @@ -1352,7 +1352,7 @@ class EMCVMAXMasking(object): def _find_new_initiator_group(self, conn, maskingGroupDict): """After creating an new initiator group find it and return it. - :param conn: connection the ecom server + :param conn: connection to the ecom server :param maskingGroupDict: the maskingGroupDict dict :returns: instance name foundInitiatorGroupInstanceName """ @@ -1367,7 +1367,7 @@ class EMCVMAXMasking(object): self, conn, maskingViewName, storageSystemName): """Given the masking view name get the initiator group from it. - :param conn: connection the the ecom server + :param conn: connection to the ecom server :param maskingViewName: the name of the masking view :param storageSystemName: the storage system name :returns: instance name foundInitiatorMaskingGroupInstanceName @@ -1404,7 +1404,7 @@ class EMCVMAXMasking(object): NOTE: EMC does not support ModifyMaskingView so we must first delete the masking view and recreate it. - :param conn: connection the ecom server + :param conn: connection to the ecom server :param controllerConfigService: the controller configuration service :param maskingViewName: maskingview name (String) :param connector: the connector dict @@ -1489,7 +1489,7 @@ class EMCVMAXMasking(object): Given a list of hardwareId Instance name create a new initiator group. - :param conn: connection the ecom server + :param conn: connection to the ecom server :param controllerConfigService: the controller configuration service :param igGroupName: the initiator group name (String) :param hardwareIdinstanceNames: one or more hardware id instance names @@ -1548,7 +1548,7 @@ class EMCVMAXMasking(object): self, conn, maskingViewName, storageSystemName): """Given the masking view name get the port group from it. - :param conn: connection the the ecom server + :param conn: connection to the ecom server :param maskingViewName: the name of the masking view :param storageSystemName: the storage system name :returns: instance name foundPortMaskingGroupInstanceName @@ -1576,7 +1576,7 @@ class EMCVMAXMasking(object): maskingViewInstanceName, extraSpecs): """Delete a masking view. - :param conn: connection the ecom server + :param conn: connection to the ecom server :param controllerConfigService: the controller configuration service :param maskingViewName: maskingview name (String) :param maskingViewInstanceName: the masking view instance name @@ -1608,7 +1608,7 @@ class EMCVMAXMasking(object): Given storage group instance name, get the associated masking view instance name. - :param conn: connection the ecom server + :param conn: connection to the ecom server :param storageGroupInstanceName: the storage group instance name :returns: instance name foundMaskingViewInstanceName """ @@ -1732,7 +1732,7 @@ class EMCVMAXMasking(object): Given the storage group instance name get the associated volume Instance names. - :param conn: connection the the ecom server + :param conn: connection to the ecom server :param storageGroupInstanceName: the storage group instance name :returns: list -- volumeInstanceNames list of volume instance names """ @@ -1749,7 +1749,7 @@ class EMCVMAXMasking(object): Given the volume instance name get the associated storage group instance names. - :param conn: connection the the ecom server + :param conn: connection to the ecom server :param volumeInstanceName: the volume instance name :returns: list -- list of storage group instance names """ @@ -1772,7 +1772,7 @@ class EMCVMAXMasking(object): If the connector is not None get the associated SG and remove volume from the storage group, otherwise it is a VMAX3 deletion. - :param conn: connection the the ecom server + :param conn: connection to the ecom server :param controllerConfigService: the controller configuration service :param volumeInstance: the volume Instance :param volumeName: the volume name @@ -1965,7 +1965,7 @@ class EMCVMAXMasking(object): volumeInstance, volumeName, extraSpecs): """Delete the Masking view, the storage Group and the initiator group. - :param conn: connection the the ecom server + :param conn: connection to the ecom server :param controllerConfigService: the controller configuration service :param mvInstanceName: masking view instance name :param maskingViewName: masking view name @@ -2019,7 +2019,7 @@ class EMCVMAXMasking(object): Moving the volume to the default SG for VMAX3 and FAST for VMAX2. - :param conn: connection the the ecom server + :param conn: connection to the ecom server :param controllerConfigService: the controller configuration service :param volumeInstance: the volume Instance :param volumeName: the volume name diff --git a/cinder/volume/drivers/emc/emc_vmax_provision.py b/cinder/volume/drivers/emc/emc_vmax_provision.py index c38174a06ea..0895a62aa65 100644 --- a/cinder/volume/drivers/emc/emc_vmax_provision.py +++ b/cinder/volume/drivers/emc/emc_vmax_provision.py @@ -50,7 +50,7 @@ class EMCVMAXProvision(object): extraSpecs): """Given the volume instance remove it from the pool. - :param conn: connection the the ecom server + :param conn: connection to the ecom server :param storageConfigservice: volume created from job :param volumeInstanceName: the volume instance name :param volumeName: the volume name (String) @@ -191,7 +191,7 @@ class EMCVMAXProvision(object): self, conn, controllerConfigService, groupName, extraSpecs): """Create a new storage group that has no members. - :param conn: connection the ecom server + :param conn: connection to the ecom server :param controllerConfigService: the controller configuration service :param groupName: the proposed group name :param extraSpecs: additional info @@ -233,7 +233,7 @@ class EMCVMAXProvision(object): self, conn, maskingGroupDict, storageGroupName): """After creating a new storage group find it and return it. - :param conn: connection the ecom server + :param conn: connection to the ecom server :param maskingGroupDict: the maskingGroupDict dict :param storageGroupName: storage group name (String) :returns: maskingGroupDict['MaskingGroup'] @@ -427,7 +427,7 @@ class EMCVMAXProvision(object): poolInstanceName, compositeType, numMembers, extraSpecs): """Create a new volume using the auto meta feature. - :param conn: the connection the the ecom server + :param conn: connection to the ecom server :param elementCompositionService: the element composition service :param volumeSize: the size of the volume :param volumeName: user friendly name @@ -503,7 +503,7 @@ class EMCVMAXProvision(object): Given a bound composite head and an unbound composite member create a new composite volume. - :param conn: the connection the the ecom server + :param conn: connection to the ecom server :param elementCompositionService: the element composition service :param compositeHeadInstanceName: the composite head. This can be bound :param compositeMemberInstanceName: the composite member. This must be diff --git a/cinder/volume/drivers/emc/emc_vmax_provision_v3.py b/cinder/volume/drivers/emc/emc_vmax_provision_v3.py index 1cf058c5ea6..f09020f03c2 100644 --- a/cinder/volume/drivers/emc/emc_vmax_provision_v3.py +++ b/cinder/volume/drivers/emc/emc_vmax_provision_v3.py @@ -51,7 +51,7 @@ class EMCVMAXProvisionV3(object): extraSpecs): """Given the volume instance remove it from the pool. - :param conn: connection the the ecom server + :param conn: connection to the ecom server :param storageConfigservice: volume created from job :param volumeInstanceName: the volume instance name :param volumeName: the volume name (String) @@ -758,7 +758,7 @@ class EMCVMAXProvisionV3(object): volumeName, volumeSize, extraSpecs): """Extend a volume instance. - :param conn: connection the the ecom server + :param conn: connection to the ecom server :param storageConfigservice: the storage configuration service :param volumeInstanceName: the volume instance name :param volumeName: the volume name (String) diff --git a/cinder/volume/drivers/emc/xtremio.py b/cinder/volume/drivers/emc/xtremio.py index d85b8763d22..6de251569a8 100644 --- a/cinder/volume/drivers/emc/xtremio.py +++ b/cinder/volume/drivers/emc/xtremio.py @@ -838,7 +838,7 @@ class XtremIOISCSIDriver(XtremIOVolumeDriver, driver.ISCSIDriver): discovery_passwd) = self._create_initiator(connector, login_chap, discovery_chap) - # if CHAP was enabled after the the initiator was created + # if CHAP was enabled after the initiator was created if login_chap and not login_passwd: LOG.info(_LI('initiator has no password while using chap,' 'adding it')) diff --git a/cinder/volume/drivers/netapp/eseries/client.py b/cinder/volume/drivers/netapp/eseries/client.py index 0d869f9d567..e2f7fd1dde8 100644 --- a/cinder/volume/drivers/netapp/eseries/client.py +++ b/cinder/volume/drivers/netapp/eseries/client.py @@ -992,7 +992,7 @@ class RestClient(WebserviceClient): return api_operating_mode, about_response_dict['version'] def list_backend_store(self, key): - """Retrieve data by key from the the persistent store on the backend. + """Retrieve data by key from the persistent store on the backend. Example response: {"key": "cinder-snapshots", "value": "[]"} diff --git a/doc/source/devref/migration.rst b/doc/source/devref/migration.rst index abfdeaf9340..1a89f47e776 100644 --- a/doc/source/devref/migration.rst +++ b/doc/source/devref/migration.rst @@ -236,7 +236,7 @@ If your storage driver in Cinder provides iSCSI support, it should naturally work under the generic host-assisted migration, when --force-host-copy is set to True from the API request. Normally you do not need to change any code, unless you need to transfer the volume -from your driver via a different way from the the block-based transfer +from your driver via a different way from the block-based transfer or the file-based transfer. If your driver uses a network connection to communicate the block data