openstack/cinder
Code Issues Proposed changes

Merge "OpenStack typo"

Browse Source
This commit is contained in:
Jenkins 2015-11-12 20:25:00 +00:00 committed by Gerrit Code Review
commit 94f21f8020
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/api/contrib/volume_replication.py
View File

@ -32,7 +32,7 @@ authorize = extensions.soft_extension_authorizer('volume',
class VolumeReplicationController(wsgi.Controller): class VolumeReplicationController(wsgi.Controller):
"""The Volume Replication API controller for the Openstack API.""" """The Volume Replication API controller for the OpenStack API."""
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(VolumeReplicationController, self).__init__(*args, **kwargs) super(VolumeReplicationController, self).__init__(*args, **kwargs)

2
cinder/volume/drivers/dothill/dothill_fc.py
View File

@ -25,7 +25,7 @@ LOG = logging.getLogger(__name__)
class DotHillFCDriver(cinder.volume.driver.FibreChannelDriver): class DotHillFCDriver(cinder.volume.driver.FibreChannelDriver):
"""Openstack Fibre Channel cinder drivers for DotHill Arrays. """OpenStack Fibre Channel cinder drivers for DotHill Arrays.
Version history: Version history:
0.1 - Base version developed for HPMSA FC drivers: 0.1 - Base version developed for HPMSA FC drivers:

2
cinder/volume/drivers/dothill/dothill_iscsi.py
View File

@ -28,7 +28,7 @@ LOG = logging.getLogger(__name__)
class DotHillISCSIDriver(cinder.volume.driver.ISCSIDriver): class DotHillISCSIDriver(cinder.volume.driver.ISCSIDriver):
"""Openstack iSCSI cinder drivers for DotHill Arrays. """OpenStack iSCSI cinder drivers for DotHill Arrays.
Version history: Version history:
0.1 - Base structure for DotHill iSCSI drivers based on HPMSA FC 0.1 - Base structure for DotHill iSCSI drivers based on HPMSA FC

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

@ -867,7 +867,7 @@ class EMCVMAXMasking(object):
name = 'world wide port names' name = 'world wide port names'
else: else:
msg = (_("FC is the protocol but wwpns are " msg = (_("FC is the protocol but wwpns are "
"not supplied by Openstack.")) "not supplied by OpenStack."))
LOG.error(msg) LOG.error(msg)
raise exception.VolumeBackendAPIException(data=msg) raise exception.VolumeBackendAPIException(data=msg)

8
cinder/volume/drivers/nimble.py
View File

@ -365,9 +365,9 @@ class NimbleISCSIDriver(san.SanISCSIDriver):
# Get vol info from the volume name obtained from the reference # Get vol info from the volume name obtained from the reference
vol_info = self.APIExecutor.get_vol_info(target_vol_name) vol_info = self.APIExecutor.get_vol_info(target_vol_name)
# Check if volume is already managed by Openstack # Check if volume is already managed by OpenStack
if vol_info['agent-type'] == AGENT_TYPE_OPENSTACK: if vol_info['agent-type'] == AGENT_TYPE_OPENSTACK:
msg = (_('Volume %s is already managed by Openstack.') msg = (_('Volume %s is already managed by OpenStack.')
% target_vol_name) % target_vol_name)
raise exception.ManageExistingAlreadyManaged( raise exception.ManageExistingAlreadyManaged(
volume_ref=volume['id']) volume_ref=volume['id'])
@ -381,7 +381,7 @@ class NimbleISCSIDriver(san.SanISCSIDriver):
if vol_info['online']: if vol_info['online']:
msg = (_('Volume %s is online. Set volume to offline for ' msg = (_('Volume %s is online. Set volume to offline for '
'managing using Openstack.') % target_vol_name) 'managing using OpenStack.') % target_vol_name)
raise exception.InvalidVolume(reason=msg) raise exception.InvalidVolume(reason=msg)
# edit the volume # edit the volume
@ -421,7 +421,7 @@ class NimbleISCSIDriver(san.SanISCSIDriver):
# check agent type # check agent type
vol_info = self.APIExecutor.get_vol_info(vol_name) vol_info = self.APIExecutor.get_vol_info(vol_name)
if vol_info['agent-type'] != AGENT_TYPE_OPENSTACK: if vol_info['agent-type'] != AGENT_TYPE_OPENSTACK:
msg = (_('Only volumes managed by Openstack can be unmanaged.')) msg = (_('Only volumes managed by OpenStack can be unmanaged.'))
raise exception.InvalidVolume(reason=msg) raise exception.InvalidVolume(reason=msg)
# update the agent-type to None # update the agent-type to None

2
cinder/volume/drivers/violin/v6000_common.py
View File

@ -14,7 +14,7 @@
# under the License. # under the License.
""" """
Violin Memory 6000 Series All-Flash Array Common Driver for Openstack Cinder Violin Memory 6000 Series All-Flash Array Common Driver for OpenStack Cinder
Provides common (ie., non-protocol specific) management functions for Provides common (ie., non-protocol specific) management functions for
V6000 series flash arrays. V6000 series flash arrays.

10
cinder/volume/drivers/violin/v6000_fcp.py
View File

@ -14,7 +14,7 @@
# under the License. # under the License.
""" """
Violin Memory Fibre Channel Driver for Openstack Cinder Violin Memory Fibre Channel Driver for OpenStack Cinder
Provides fibre channel specific LUN services for V6000 series flash Provides fibre channel specific LUN services for V6000 series flash
arrays. arrays.
@ -494,13 +494,13 @@ class V6000FCDriver(driver.FibreChannelDriver):
return self._convert_wwns_vmem_to_openstack(active_gw_fcp_wwns) return self._convert_wwns_vmem_to_openstack(active_gw_fcp_wwns)
def _convert_wwns_openstack_to_vmem(self, wwns): def _convert_wwns_openstack_to_vmem(self, wwns):
"""Convert a list of Openstack WWNs to VMEM compatible WWN strings. """Convert a list of OpenStack WWNs to VMEM compatible WWN strings.
Input format is '50014380186b3f65', output format is Input format is '50014380186b3f65', output format is
'wwn.50:01:43:80:18:6b:3f:65'. 'wwn.50:01:43:80:18:6b:3f:65'.
Arguments: Arguments:
wwns -- list of Openstack-based WWN strings. wwns -- list of OpenStack-based WWN strings.
Returns: Returns:
output -- list of VMEM-based WWN strings. output -- list of VMEM-based WWN strings.
@ -512,7 +512,7 @@ class V6000FCDriver(driver.FibreChannelDriver):
return output return output
def _convert_wwns_vmem_to_openstack(self, wwns): def _convert_wwns_vmem_to_openstack(self, wwns):
"""Convert a list of VMEM WWNs to Openstack compatible WWN strings. """Convert a list of VMEM WWNs to OpenStack compatible WWN strings.
Input format is 'wwn.50:01:43:80:18:6b:3f:65', output format Input format is 'wwn.50:01:43:80:18:6b:3f:65', output format
is '50014380186b3f65'. is '50014380186b3f65'.
@ -521,7 +521,7 @@ class V6000FCDriver(driver.FibreChannelDriver):
wwns -- list of VMEM-based WWN strings. wwns -- list of VMEM-based WWN strings.
Returns: Returns:
output -- list of Openstack-based WWN strings. output -- list of OpenStack-based WWN strings.
""" """
output = [] output = []
for w in wwns: for w in wwns:

4
cinder/volume/drivers/violin/v6000_iscsi.py
View File

@ -14,7 +14,7 @@
# under the License. # under the License.
""" """
Violin Memory iSCSI Driver for Openstack Cinder Violin Memory iSCSI Driver for OpenStack Cinder
Provides iSCSI specific LUN services for V6000 series flash arrays. Provides iSCSI specific LUN services for V6000 series flash arrays.
@ -266,7 +266,7 @@ class V6000ISCSIDriver(driver.ISCSIDriver):
"""Get a random target IP for OpenStack to connect to. """Get a random target IP for OpenStack to connect to.
For the non-multipath case we pick a single random target for For the non-multipath case we pick a single random target for
the Openstack infrastructure to use. This at least allows us the OpenStack infrastructure to use. This at least allows us
to evenly distribute LUN connections across the storage to evenly distribute LUN connections across the storage
cluster. cluster.
""" """

6
cinder/volume/drivers/xio.py
View File

@ -150,7 +150,7 @@ class XIOISEDriver(object):
support['thin-clones'] = True support['thin-clones'] = True
# Make sure ISE support necessary features # Make sure ISE support necessary features
if not support['clones']: if not support['clones']:
LOG.error(_LE("ISE FW version is not compatible with Openstack!")) LOG.error(_LE("ISE FW version is not compatible with OpenStack!"))
RaiseXIODriverException() RaiseXIODriverException()
# set up thin provisioning support # set up thin provisioning support
self.configuration.san_thin_provision = support['thin-clones'] self.configuration.san_thin_provision = support['thin-clones']
@ -802,7 +802,7 @@ class XIOISEDriver(object):
# Log host creation. # Log host creation.
LOG.debug("Create host %(host)s; %(endpoint)s", LOG.debug("Create host %(host)s; %(endpoint)s",
{'host': hostname, 'endpoint': endpoint_str}) {'host': hostname, 'endpoint': endpoint_str})
# Issue REST call to create host entry of Openstack type. # Issue REST call to create host entry of OpenStack type.
params = {} params = {}
params = {'name': hostname, 'endpoint': endpoint_str, params = {'name': hostname, 'endpoint': endpoint_str,
'os': 'openstack'} 'os': 'openstack'}
@ -1335,7 +1335,7 @@ class XIOISEDriver(object):
LOG.error(_LE("Host could not be found!")) LOG.error(_LE("Host could not be found!"))
RaiseXIODriverException() RaiseXIODriverException()
elif string.upper(host['type']) != 'OPENSTACK': elif string.upper(host['type']) != 'OPENSTACK':
# Make sure host type is marked as Openstack host # Make sure host type is marked as OpenStack host
params = {'os': 'openstack'} params = {'os': 'openstack'}
resp = self._send_cmd('PUT', host['locator'], params) resp = self._send_cmd('PUT', host['locator'], params)
status = resp['status'] status = resp['status']