From 4774c005cafe6e47b7a9beb5c2877ccd87095990 Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Tue, 9 Jun 2015 09:00:12 +0800 Subject: [PATCH] Fix typos Change-Id: Iccf09ae6010828b351a56a0ef52517a0e7d24d9c --- .../drivers/haproxy/synchronous_namespace_driver.py | 2 +- neutron_lbaas/drivers/radware/v2_driver.py | 6 +++--- neutron_lbaas/tests/tempest/lib/common/accounts.py | 2 +- neutron_lbaas/tests/tempest/lib/common/glance_http.py | 2 +- neutron_lbaas/tests/tempest/lib/common/ssh.py | 2 +- neutron_lbaas/tests/tempest/lib/common/waiters.py | 2 +- neutron_lbaas/tests/tempest/lib/test.py | 2 +- .../tests/tempest/v2/api/test_load_balancers_non_admin.py | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/neutron_lbaas/drivers/haproxy/synchronous_namespace_driver.py b/neutron_lbaas/drivers/haproxy/synchronous_namespace_driver.py index 6436adcf2..20175b2b3 100644 --- a/neutron_lbaas/drivers/haproxy/synchronous_namespace_driver.py +++ b/neutron_lbaas/drivers/haproxy/synchronous_namespace_driver.py @@ -350,7 +350,7 @@ class HaproxyNSDriver(driver_base.LoadBalancerBaseDriver): if ip_lib.device_exists(device.name): self.vif_driver.unplug(device.name, namespace=namespace) except RuntimeError as re: - LOG.warn(_LW('An error happend on namespace cleanup: ' + LOG.warn(_LW('An error happened on namespace cleanup: ' '%s') % re.message) ns.garbage_collect_namespace() diff --git a/neutron_lbaas/drivers/radware/v2_driver.py b/neutron_lbaas/drivers/radware/v2_driver.py index 127c28f24..eb6ba8ac0 100644 --- a/neutron_lbaas/drivers/radware/v2_driver.py +++ b/neutron_lbaas/drivers/radware/v2_driver.py @@ -70,12 +70,12 @@ class RadwareLBaaSV2Driver(base_v2_driver.RadwareLBaaSBaseV2Driver): # # Assumptions: # 1) We have only one worflow that takes care of l2-l4 and service creation - # 2) The workflow template exsists on the vDirect server + # 2) The workflow template exists on the vDirect server # 3) The workflow expose one operaion named 'update' (plus ctor and dtor) # 4) The 'update' operation gets the loadbalancer object graph as input # 5) The object graph is enehanced by our code before it is sent to the # workflow - # 6) Async operations are handled by a diffrent thread + # 6) Async operations are handled by a different thread # def __init__(self, plugin): super(RadwareLBaaSV2Driver, self).__init__(plugin) @@ -234,7 +234,7 @@ class RadwareLBaaSV2Driver(base_v2_driver.RadwareLBaaSBaseV2Driver): # is necessary. # Get subnet id of any member located on different than # loadbalancer's network. If returned subnet id is the subnet id - # of loadbalancer - all members are accesssible from loadbalancer's + # of loadbalancer - all members are accessible from loadbalancer's # network, meaning no second leg or static routes are required. # Otherwise, create proxy port on found member's subnet and get its # address as a proxy address for loadbalancer instance diff --git a/neutron_lbaas/tests/tempest/lib/common/accounts.py b/neutron_lbaas/tests/tempest/lib/common/accounts.py index 7fde98aab..3b8a9ad66 100644 --- a/neutron_lbaas/tests/tempest/lib/common/accounts.py +++ b/neutron_lbaas/tests/tempest/lib/common/accounts.py @@ -102,7 +102,7 @@ class Accounts(cred_provider.CredentialProvider): if resource == 'network': hash_dict['networks'][temp_hash_key] = resources[resource] else: - LOG.warning('Unkown resource type %s, ignoring this field' + LOG.warning('Unknown resource type %s, ignoring this field' % resource) return hash_dict diff --git a/neutron_lbaas/tests/tempest/lib/common/glance_http.py b/neutron_lbaas/tests/tempest/lib/common/glance_http.py index d03617c16..e704553e1 100644 --- a/neutron_lbaas/tests/tempest/lib/common/glance_http.py +++ b/neutron_lbaas/tests/tempest/lib/common/glance_http.py @@ -248,7 +248,7 @@ class VerifiedHTTPSConnection(httplib.HTTPSConnection): @staticmethod def host_matches_cert(host, x509): """ - Verify that the the x509 certificate we have received + Verify that the x509 certificate we have received from 'host' correctly identifies the server we are connecting to, ie that the certificate's Common Name or a Subject Alternative Name matches 'host'. diff --git a/neutron_lbaas/tests/tempest/lib/common/ssh.py b/neutron_lbaas/tests/tempest/lib/common/ssh.py index eaec506ed..50025c84b 100644 --- a/neutron_lbaas/tests/tempest/lib/common/ssh.py +++ b/neutron_lbaas/tests/tempest/lib/common/ssh.py @@ -74,7 +74,7 @@ class Client(object): look_for_keys=self.look_for_keys, key_filename=self.key_filename, timeout=self.channel_timeout, pkey=self.pkey) - LOG.info("ssh connection to %s@%s successfuly created", + LOG.info("ssh connection to %s@%s successfully created", self.username, self.host) return ssh except (socket.error, diff --git a/neutron_lbaas/tests/tempest/lib/common/waiters.py b/neutron_lbaas/tests/tempest/lib/common/waiters.py index 795111e5d..9e5883008 100644 --- a/neutron_lbaas/tests/tempest/lib/common/waiters.py +++ b/neutron_lbaas/tests/tempest/lib/common/waiters.py @@ -50,7 +50,7 @@ def wait_for_server_status(client, server_id, status, ready_wait=True, return # NOTE(afazekas): The instance is in "ready for action state" # when no task in progress - # NOTE(afazekas): Converted to string bacuse of the XML + # NOTE(afazekas): Converted to string because of the XML # responses if str(task_state) == "None": # without state api extension 3 sec usually enough diff --git a/neutron_lbaas/tests/tempest/lib/test.py b/neutron_lbaas/tests/tempest/lib/test.py index 4f20cc3ed..8e62c3b28 100644 --- a/neutron_lbaas/tests/tempest/lib/test.py +++ b/neutron_lbaas/tests/tempest/lib/test.py @@ -131,7 +131,7 @@ def services(*args, **kwargs): def stresstest(*args, **kwargs): """Add stress test decorator - For all functions with this decorator a attr stress will be + For all functions with this decorator an attr stress will be set automatically. @param class_setup_per: allowed values are application, process, action diff --git a/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py b/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py index 77617754a..ef4fa58e7 100644 --- a/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py +++ b/neutron_lbaas/tests/tempest/v2/api/test_load_balancers_non_admin.py @@ -159,7 +159,7 @@ class LoadBalancersTestJSON(base.BaseTestCase): @test.attr(type='smoke') def test_create_load_balancer_empty_name(self): - """Test create load balancer with a empty name field""" + """Test create load balancer with an empty name field""" load_balancer = self.load_balancers_client.create_load_balancer( vip_subnet_id=self.subnet['id'], name="") self.assertEqual(load_balancer.get('name'), "")