From 1985790eb100bbee900bee358d74d1312958244f Mon Sep 17 00:00:00 2001 From: yanghuichan Date: Fri, 14 Jul 2017 12:20:25 +0800 Subject: [PATCH] Fix grammatical mistake, Changed character from "a" to "an" Change-Id: Idbf80945316a15c3fc2993a78bd6d4e2f5ec03fe --- manila/share/drivers/dell_emc/plugins/vmax/object_manager.py | 4 ++-- manila/share/drivers/dell_emc/plugins/vnx/object_manager.py | 4 ++-- manila/tests/db_utils.py | 2 +- .../notes/emc-unity-manila-support-d4f5a410501cfdae.yaml | 4 ++-- tools/test-setup.sh | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manila/share/drivers/dell_emc/plugins/vmax/object_manager.py b/manila/share/drivers/dell_emc/plugins/vmax/object_manager.py index 8fdb10ae8c..6f8f4dbde4 100644 --- a/manila/share/drivers/dell_emc/plugins/vmax/object_manager.py +++ b/manila/share/drivers/dell_emc/plugins/vmax/object_manager.py @@ -166,7 +166,7 @@ class StorageObject(object): """Execute NAS command via SSH. :param retry_patterns: list of tuples,where each tuple contains a reg - expression and a exception. + expression and an exception. :param check_exit_code: Boolean. Raise processutils.ProcessExecutionError if the command failed to execute and this parameter is set to True. @@ -1191,7 +1191,7 @@ class MoverInterface(StorageObject): elif self._response_validation( response, constants.MSG_INTERFACE_INVALID_VLAN_ID): # When fail to create a mover interface with the specified - # vlan id, VMAX will leave a interface with vlan id 0 in the + # vlan id, VMAX will leave an interface with vlan id 0 in the # backend. So we should explicitly remove the interface. try: self.delete(six.text_type(ip_addr), mover_name) diff --git a/manila/share/drivers/dell_emc/plugins/vnx/object_manager.py b/manila/share/drivers/dell_emc/plugins/vnx/object_manager.py index a0d31b8974..b7c9655d18 100644 --- a/manila/share/drivers/dell_emc/plugins/vnx/object_manager.py +++ b/manila/share/drivers/dell_emc/plugins/vnx/object_manager.py @@ -166,7 +166,7 @@ class StorageObject(object): """Execute NAS command via SSH. :param retry_patterns: list of tuples,where each tuple contains a reg - expression and a exception. + expression and an exception. :param check_exit_code: Boolean. Raise processutils.ProcessExecutionError if the command failed to execute and this parameter is set to True. @@ -1193,7 +1193,7 @@ class MoverInterface(StorageObject): elif self._response_validation( response, constants.MSG_INTERFACE_INVALID_VLAN_ID): # When fail to create a mover interface with the specified - # vlan id, VNX will leave a interface with vlan id 0 in the + # vlan id, VNX will leave an interface with vlan id 0 in the # backend. So we should explicitly remove the interface. try: self.delete(six.text_type(ip_addr), mover_name) diff --git a/manila/tests/db_utils.py b/manila/tests/db_utils.py index f33cf63a82..206205b3b6 100644 --- a/manila/tests/db_utils.py +++ b/manila/tests/db_utils.py @@ -178,7 +178,7 @@ def create_snapshot_instance_export_locations(snapshot_id, **kwargs): def create_access(**kwargs): - """Create a access rule object.""" + """Create an access rule object.""" state = kwargs.pop('state', constants.ACCESS_STATE_QUEUED_TO_APPLY) access = { 'access_type': 'fake_type', diff --git a/releasenotes/notes/emc-unity-manila-support-d4f5a410501cfdae.yaml b/releasenotes/notes/emc-unity-manila-support-d4f5a410501cfdae.yaml index e2c47bfc6f..d63ccd9e52 100644 --- a/releasenotes/notes/emc-unity-manila-support-d4f5a410501cfdae.yaml +++ b/releasenotes/notes/emc-unity-manila-support-d4f5a410501cfdae.yaml @@ -1,11 +1,11 @@ --- prelude: > Add a new EMC Unity plugin in manila which allows user to create NFS/CIFS - share with a EMC Unity backend. + share with an EMC Unity backend. features: - | Add a new Unity plugin in manila which allows user to create NFS/CIFS - share with a EMC Unity backend. This plugin performs the operations on + share with an EMC Unity backend. This plugin performs the operations on Unity by REST API. issues: - EMC Unity does not support the same IP in different VLANs. diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 07a078547b..4eb14cd970 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -18,7 +18,7 @@ DB_PW=openstack_citest sudo -H mysqladmin -u root password $DB_ROOT_PW # It's best practice to remove anonymous users from the database. If -# a anonymous user exists, then it matches first for connections and +# an anonymous user exists, then it matches first for connections and # other connections from that host will not work. sudo -H mysql -u root -p$DB_ROOT_PW -h localhost -e " DELETE FROM mysql.user WHERE User='';