From 9955eb0ed1577ff43aa74c751402a6e2aafc5258 Mon Sep 17 00:00:00 2001 From: venkatamahesh Date: Mon, 9 Nov 2015 20:58:53 +0530 Subject: [PATCH] OpenStack typo Change Openstack to OpenStack as per standard Change-Id: I1ecdbdf529a7c12c0a72869f95984db1fe4e2023 --- cinder/api/contrib/volume_replication.py | 2 +- cinder/volume/drivers/dothill/dothill_fc.py | 2 +- cinder/volume/drivers/dothill/dothill_iscsi.py | 2 +- cinder/volume/drivers/emc/emc_vmax_masking.py | 2 +- cinder/volume/drivers/nimble.py | 8 ++++---- cinder/volume/drivers/violin/v6000_common.py | 2 +- cinder/volume/drivers/violin/v6000_fcp.py | 10 +++++----- cinder/volume/drivers/violin/v6000_iscsi.py | 4 ++-- cinder/volume/drivers/xio.py | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cinder/api/contrib/volume_replication.py b/cinder/api/contrib/volume_replication.py index 13939bc9e..996a844c7 100644 --- a/cinder/api/contrib/volume_replication.py +++ b/cinder/api/contrib/volume_replication.py @@ -32,7 +32,7 @@ authorize = extensions.soft_extension_authorizer('volume', 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): super(VolumeReplicationController, self).__init__(*args, **kwargs) diff --git a/cinder/volume/drivers/dothill/dothill_fc.py b/cinder/volume/drivers/dothill/dothill_fc.py index 7c332d99f..529b31aa4 100644 --- a/cinder/volume/drivers/dothill/dothill_fc.py +++ b/cinder/volume/drivers/dothill/dothill_fc.py @@ -25,7 +25,7 @@ LOG = logging.getLogger(__name__) class DotHillFCDriver(cinder.volume.driver.FibreChannelDriver): - """Openstack Fibre Channel cinder drivers for DotHill Arrays. + """OpenStack Fibre Channel cinder drivers for DotHill Arrays. Version history: 0.1 - Base version developed for HPMSA FC drivers: diff --git a/cinder/volume/drivers/dothill/dothill_iscsi.py b/cinder/volume/drivers/dothill/dothill_iscsi.py index 7aa7803cd..2b78c0ed9 100644 --- a/cinder/volume/drivers/dothill/dothill_iscsi.py +++ b/cinder/volume/drivers/dothill/dothill_iscsi.py @@ -28,7 +28,7 @@ LOG = logging.getLogger(__name__) class DotHillISCSIDriver(cinder.volume.driver.ISCSIDriver): - """Openstack iSCSI cinder drivers for DotHill Arrays. + """OpenStack iSCSI cinder drivers for DotHill Arrays. Version history: 0.1 - Base structure for DotHill iSCSI drivers based on HPMSA FC diff --git a/cinder/volume/drivers/emc/emc_vmax_masking.py b/cinder/volume/drivers/emc/emc_vmax_masking.py index c62ba5c26..f62a141ee 100644 --- a/cinder/volume/drivers/emc/emc_vmax_masking.py +++ b/cinder/volume/drivers/emc/emc_vmax_masking.py @@ -867,7 +867,7 @@ class EMCVMAXMasking(object): name = 'world wide port names' else: msg = (_("FC is the protocol but wwpns are " - "not supplied by Openstack.")) + "not supplied by OpenStack.")) LOG.error(msg) raise exception.VolumeBackendAPIException(data=msg) diff --git a/cinder/volume/drivers/nimble.py b/cinder/volume/drivers/nimble.py index 190ccbc0f..801e87306 100644 --- a/cinder/volume/drivers/nimble.py +++ b/cinder/volume/drivers/nimble.py @@ -365,9 +365,9 @@ class NimbleISCSIDriver(san.SanISCSIDriver): # Get vol info from the volume name obtained from the reference 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: - msg = (_('Volume %s is already managed by Openstack.') + msg = (_('Volume %s is already managed by OpenStack.') % target_vol_name) raise exception.ManageExistingAlreadyManaged( volume_ref=volume['id']) @@ -381,7 +381,7 @@ class NimbleISCSIDriver(san.SanISCSIDriver): if vol_info['online']: 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) # edit the volume @@ -421,7 +421,7 @@ class NimbleISCSIDriver(san.SanISCSIDriver): # check agent type vol_info = self.APIExecutor.get_vol_info(vol_name) 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) # update the agent-type to None diff --git a/cinder/volume/drivers/violin/v6000_common.py b/cinder/volume/drivers/violin/v6000_common.py index 3dfe14d65..aac9b8118 100644 --- a/cinder/volume/drivers/violin/v6000_common.py +++ b/cinder/volume/drivers/violin/v6000_common.py @@ -14,7 +14,7 @@ # 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 V6000 series flash arrays. diff --git a/cinder/volume/drivers/violin/v6000_fcp.py b/cinder/volume/drivers/violin/v6000_fcp.py index 096aeee11..5054f6c05 100644 --- a/cinder/volume/drivers/violin/v6000_fcp.py +++ b/cinder/volume/drivers/violin/v6000_fcp.py @@ -14,7 +14,7 @@ # 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 arrays. @@ -494,13 +494,13 @@ class V6000FCDriver(driver.FibreChannelDriver): return self._convert_wwns_vmem_to_openstack(active_gw_fcp_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 'wwn.50:01:43:80:18:6b:3f:65'. Arguments: - wwns -- list of Openstack-based WWN strings. + wwns -- list of OpenStack-based WWN strings. Returns: output -- list of VMEM-based WWN strings. @@ -512,7 +512,7 @@ class V6000FCDriver(driver.FibreChannelDriver): return output 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 is '50014380186b3f65'. @@ -521,7 +521,7 @@ class V6000FCDriver(driver.FibreChannelDriver): wwns -- list of VMEM-based WWN strings. Returns: - output -- list of Openstack-based WWN strings. + output -- list of OpenStack-based WWN strings. """ output = [] for w in wwns: diff --git a/cinder/volume/drivers/violin/v6000_iscsi.py b/cinder/volume/drivers/violin/v6000_iscsi.py index adad1150b..726d29400 100644 --- a/cinder/volume/drivers/violin/v6000_iscsi.py +++ b/cinder/volume/drivers/violin/v6000_iscsi.py @@ -14,7 +14,7 @@ # 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. @@ -266,7 +266,7 @@ class V6000ISCSIDriver(driver.ISCSIDriver): """Get a random target IP for OpenStack to connect to. 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 cluster. """ diff --git a/cinder/volume/drivers/xio.py b/cinder/volume/drivers/xio.py index 13ea346f0..08b5ca96b 100644 --- a/cinder/volume/drivers/xio.py +++ b/cinder/volume/drivers/xio.py @@ -150,7 +150,7 @@ class XIOISEDriver(object): support['thin-clones'] = True # Make sure ISE support necessary features 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() # set up thin provisioning support self.configuration.san_thin_provision = support['thin-clones'] @@ -802,7 +802,7 @@ class XIOISEDriver(object): # Log host creation. LOG.debug("Create host %(host)s; %(endpoint)s", {'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 = {'name': hostname, 'endpoint': endpoint_str, 'os': 'openstack'} @@ -1335,7 +1335,7 @@ class XIOISEDriver(object): LOG.error(_LE("Host could not be found!")) RaiseXIODriverException() 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'} resp = self._send_cmd('PUT', host['locator'], params) status = resp['status'] -- 2.45.2