openstack/cinder
Code Issues Proposed changes

Merge "Fix typos in Cinder files"

Browse Source
This commit is contained in:
Jenkins 2016-04-05 21:40:53 +00:00 committed by Gerrit Code Review
commit 281ddeb03f
9 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/unit/volume/drivers/test_hgst.py
View File

@ -444,7 +444,7 @@ class HGSTTestCase(test.TestCase):
'storageserver': 'stor1:gbd0,stor2:gbd0,', 'storageserver': 'stor1:gbd0,stor2:gbd0,',
'size': '12'} 'size': '12'}
self.assertDictMatch(expected, self.created) 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'} expected_pid = {'provider_id': 'volume10'}
self.assertDictMatch(expected_pid, ret) self.assertDictMatch(expected_pid, ret)

4
cinder/volume/driver.py
View File

@ -1532,7 +1532,7 @@ class BaseVD(object):
def get_pool(self, volume): def get_pool(self, volume):
"""Return pool name where volume reside on. """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. :returns: name of the pool where given volume is in.
""" """
return None return None
@ -2279,7 +2279,7 @@ class VolumeDriver(ConsistencyGroupVD, TransferVD, ManageableVD, ExtendVD,
def get_pool(self, volume): def get_pool(self, volume):
"""Return pool name where volume reside on. """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. :returns: name of the pool where given volume is in.
""" """
return None return None

4
cinder/volume/drivers/dell/dell_storagecenter_api.py
View File

@ -333,7 +333,7 @@ class StorageCenterApi(object):
If the JSON blob is a list then it will be searched for the attribute 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 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 will be returned so long as the dict matches the attribute and value
combination or attribute is None. combination or attribute is None.
@ -1112,7 +1112,7 @@ class StorageCenterApi(object):
return scserver return scserver
def create_server(self, wwnoriscsiname, isfc=False): 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. Adds the first HBA identified by wwnoriscsiname to it.

26
cinder/volume/drivers/emc/emc_vmax_masking.py
View File

@ -738,7 +738,7 @@ class EMCVMAXMasking(object):
Will not handle any exception in this method it will be handled Will not handle any exception in this method it will be handled
up the stack. up the stack.
:param conn: connection the ecom server :param conn: connection to the ecom server
:param maskingViewDict: the masking view dictionary :param maskingViewDict: the masking view dictionary
:param defaultStorageGroupInstanceName: the default storage group :param defaultStorageGroupInstanceName: the default storage group
instance name (Can be None) instance name (Can be None)
@ -1352,7 +1352,7 @@ class EMCVMAXMasking(object):
def _find_new_initiator_group(self, conn, maskingGroupDict): def _find_new_initiator_group(self, conn, maskingGroupDict):
"""After creating an new initiator group find it and return it. """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 :param maskingGroupDict: the maskingGroupDict dict
:returns: instance name foundInitiatorGroupInstanceName :returns: instance name foundInitiatorGroupInstanceName
""" """
@ -1367,7 +1367,7 @@ class EMCVMAXMasking(object):
self, conn, maskingViewName, storageSystemName): self, conn, maskingViewName, storageSystemName):
"""Given the masking view name get the initiator group from it. """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 maskingViewName: the name of the masking view
:param storageSystemName: the storage system name :param storageSystemName: the storage system name
:returns: instance name foundInitiatorMaskingGroupInstanceName :returns: instance name foundInitiatorMaskingGroupInstanceName
@ -1404,7 +1404,7 @@ class EMCVMAXMasking(object):
NOTE: EMC does not support ModifyMaskingView so we must first NOTE: EMC does not support ModifyMaskingView so we must first
delete the masking view and recreate it. 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 controllerConfigService: the controller configuration service
:param maskingViewName: maskingview name (String) :param maskingViewName: maskingview name (String)
:param connector: the connector dict :param connector: the connector dict
@ -1489,7 +1489,7 @@ class EMCVMAXMasking(object):
Given a list of hardwareId Instance name create a new Given a list of hardwareId Instance name create a new
initiator group. initiator group.
:param conn: connection the ecom server :param conn: connection to the ecom server
:param controllerConfigService: the controller configuration service :param controllerConfigService: the controller configuration service
:param igGroupName: the initiator group name (String) :param igGroupName: the initiator group name (String)
:param hardwareIdinstanceNames: one or more hardware id instance names :param hardwareIdinstanceNames: one or more hardware id instance names
@ -1548,7 +1548,7 @@ class EMCVMAXMasking(object):
self, conn, maskingViewName, storageSystemName): self, conn, maskingViewName, storageSystemName):
"""Given the masking view name get the port group from it. """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 maskingViewName: the name of the masking view
:param storageSystemName: the storage system name :param storageSystemName: the storage system name
:returns: instance name foundPortMaskingGroupInstanceName :returns: instance name foundPortMaskingGroupInstanceName
@ -1576,7 +1576,7 @@ class EMCVMAXMasking(object):
maskingViewInstanceName, extraSpecs): maskingViewInstanceName, extraSpecs):
"""Delete a masking view. """Delete a masking view.
:param conn: connection the ecom server :param conn: connection to the ecom server
:param controllerConfigService: the controller configuration service :param controllerConfigService: the controller configuration service
:param maskingViewName: maskingview name (String) :param maskingViewName: maskingview name (String)
:param maskingViewInstanceName: the masking view instance name :param maskingViewInstanceName: the masking view instance name
@ -1608,7 +1608,7 @@ class EMCVMAXMasking(object):
Given storage group instance name, get the associated masking Given storage group instance name, get the associated masking
view instance name. view instance name.
:param conn: connection the ecom server :param conn: connection to the ecom server
:param storageGroupInstanceName: the storage group instance name :param storageGroupInstanceName: the storage group instance name
:returns: instance name foundMaskingViewInstanceName :returns: instance name foundMaskingViewInstanceName
""" """
@ -1732,7 +1732,7 @@ class EMCVMAXMasking(object):
Given the storage group instance name get the associated volume Given the storage group instance name get the associated volume
Instance names. Instance names.
:param conn: connection the the ecom server :param conn: connection to the ecom server
:param storageGroupInstanceName: the storage group instance name :param storageGroupInstanceName: the storage group instance name
:returns: list -- volumeInstanceNames list of volume instance names :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 Given the volume instance name get the associated storage group
instance names. instance names.
:param conn: connection the the ecom server :param conn: connection to the ecom server
:param volumeInstanceName: the volume instance name :param volumeInstanceName: the volume instance name
:returns: list -- list of storage group instance names :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 If the connector is not None get the associated SG and remove volume
from the storage group, otherwise it is a VMAX3 deletion. 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 controllerConfigService: the controller configuration service
:param volumeInstance: the volume Instance :param volumeInstance: the volume Instance
:param volumeName: the volume name :param volumeName: the volume name
@ -1965,7 +1965,7 @@ class EMCVMAXMasking(object):
volumeInstance, volumeName, extraSpecs): volumeInstance, volumeName, extraSpecs):
"""Delete the Masking view, the storage Group and the initiator group. """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 controllerConfigService: the controller configuration service
:param mvInstanceName: masking view instance name :param mvInstanceName: masking view instance name
:param maskingViewName: masking view name :param maskingViewName: masking view name
@ -2019,7 +2019,7 @@ class EMCVMAXMasking(object):
Moving the volume to the default SG for VMAX3 and Moving the volume to the default SG for VMAX3 and
FAST for VMAX2. FAST for VMAX2.
:param conn: connection the the ecom server :param conn: connection to the ecom server
:param controllerConfigService: the controller configuration service :param controllerConfigService: the controller configuration service
:param volumeInstance: the volume Instance :param volumeInstance: the volume Instance
:param volumeName: the volume name :param volumeName: the volume name

10
cinder/volume/drivers/emc/emc_vmax_provision.py
View File

@ -50,7 +50,7 @@ class EMCVMAXProvision(object):
extraSpecs): extraSpecs):
"""Given the volume instance remove it from the pool. """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 storageConfigservice: volume created from job
:param volumeInstanceName: the volume instance name :param volumeInstanceName: the volume instance name
:param volumeName: the volume name (String) :param volumeName: the volume name (String)
@ -191,7 +191,7 @@ class EMCVMAXProvision(object):
self, conn, controllerConfigService, groupName, extraSpecs): self, conn, controllerConfigService, groupName, extraSpecs):
"""Create a new storage group that has no members. """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 controllerConfigService: the controller configuration service
:param groupName: the proposed group name :param groupName: the proposed group name
:param extraSpecs: additional info :param extraSpecs: additional info
@ -233,7 +233,7 @@ class EMCVMAXProvision(object):
self, conn, maskingGroupDict, storageGroupName): self, conn, maskingGroupDict, storageGroupName):
"""After creating a new storage group find it and return it. """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 maskingGroupDict: the maskingGroupDict dict
:param storageGroupName: storage group name (String) :param storageGroupName: storage group name (String)
:returns: maskingGroupDict['MaskingGroup'] :returns: maskingGroupDict['MaskingGroup']
@ -427,7 +427,7 @@ class EMCVMAXProvision(object):
poolInstanceName, compositeType, numMembers, extraSpecs): poolInstanceName, compositeType, numMembers, extraSpecs):
"""Create a new volume using the auto meta feature. """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 elementCompositionService: the element composition service
:param volumeSize: the size of the volume :param volumeSize: the size of the volume
:param volumeName: user friendly name :param volumeName: user friendly name
@ -503,7 +503,7 @@ class EMCVMAXProvision(object):
Given a bound composite head and an unbound composite member Given a bound composite head and an unbound composite member
create a new composite volume. 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 elementCompositionService: the element composition service
:param compositeHeadInstanceName: the composite head. This can be bound :param compositeHeadInstanceName: the composite head. This can be bound
:param compositeMemberInstanceName: the composite member. This must be :param compositeMemberInstanceName: the composite member. This must be

4
cinder/volume/drivers/emc/emc_vmax_provision_v3.py
View File

@ -51,7 +51,7 @@ class EMCVMAXProvisionV3(object):
extraSpecs): extraSpecs):
"""Given the volume instance remove it from the pool. """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 storageConfigservice: volume created from job
:param volumeInstanceName: the volume instance name :param volumeInstanceName: the volume instance name
:param volumeName: the volume name (String) :param volumeName: the volume name (String)
@ -758,7 +758,7 @@ class EMCVMAXProvisionV3(object):
volumeName, volumeSize, extraSpecs): volumeName, volumeSize, extraSpecs):
"""Extend a volume instance. """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 storageConfigservice: the storage configuration service
:param volumeInstanceName: the volume instance name :param volumeInstanceName: the volume instance name
:param volumeName: the volume name (String) :param volumeName: the volume name (String)

2
cinder/volume/drivers/emc/xtremio.py
View File

@ -838,7 +838,7 @@ class XtremIOISCSIDriver(XtremIOVolumeDriver, driver.ISCSIDriver):
discovery_passwd) = self._create_initiator(connector, discovery_passwd) = self._create_initiator(connector,
login_chap, login_chap,
discovery_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: if login_chap and not login_passwd:
LOG.info(_LI('initiator has no password while using chap,' LOG.info(_LI('initiator has no password while using chap,'
'adding it')) 'adding it'))

2
cinder/volume/drivers/netapp/eseries/client.py
View File

@ -992,7 +992,7 @@ class RestClient(WebserviceClient):
return api_operating_mode, about_response_dict['version'] return api_operating_mode, about_response_dict['version']
def list_backend_store(self, key): 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": "[]"} Example response: {"key": "cinder-snapshots", "value": "[]"}

2
doc/source/devref/migration.rst
View File

@ -236,7 +236,7 @@ If your storage driver in Cinder provides iSCSI support, it should
naturally work under the generic host-assisted migration, when naturally work under the generic host-assisted migration, when
--force-host-copy is set to True from the API request. Normally you --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 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. or the file-based transfer.
If your driver uses a network connection to communicate the block data If your driver uses a network connection to communicate the block data