From 39870b603d802fc01667ac154847a9ca39c192c9 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Fri, 7 Feb 2014 11:44:22 +0800 Subject: [PATCH] Fix misspellings in nova Fix misspellings detected by: * pip install misspellings * git ls-files | grep -v locale | misspellings -f - Change-Id: I4e60889368b5e83275d59562613623c417a8e03f Closes-Bug: #1257295 --- doc/source/devref/development.environment.rst | 2 +- doc/source/images/rpc/arch.svg | 2 +- nova/api/ec2/__init__.py | 2 +- nova/api/openstack/compute/contrib/baremetal_nodes.py | 2 +- nova/compute/manager.py | 2 +- nova/db/sqlalchemy/api.py | 2 +- nova/network/security_group/neutron_driver.py | 4 ++-- nova/tests/api/openstack/compute/contrib/test_aggregates.py | 2 +- nova/tests/api/openstack/compute/contrib/test_flavor_swap.py | 2 +- nova/tests/api/openstack/compute/contrib/test_floating_ips.py | 4 ++-- nova/tests/api/openstack/compute/contrib/test_hosts.py | 4 ++-- .../api/openstack/compute/plugins/v3/test_console_output.py | 2 +- nova/tests/compute/test_compute.py | 4 ++-- nova/tests/db/test_migrations.py | 2 +- nova/tests/scheduler/test_scheduler_utils.py | 2 +- nova/tests/test_exception.py | 4 ++-- nova/virt/disk/api.py | 2 +- nova/virt/event.py | 2 +- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/source/devref/development.environment.rst b/doc/source/devref/development.environment.rst index 5699315e8dc6..686d215a62fc 100644 --- a/doc/source/devref/development.environment.rst +++ b/doc/source/devref/development.environment.rst @@ -35,7 +35,7 @@ Virtual environments -------------------- Nova development uses a set of shell scripts in DevStack. Virtual -enviroments with venv are also available with the source code. +environments with venv are also available with the source code. The easiest way to build a fully functional development environment is with DevStack. Create a machine (such as a VM or Vagrant box) running a diff --git a/doc/source/images/rpc/arch.svg b/doc/source/images/rpc/arch.svg index efed6e981400..f95624d1cb30 100644 --- a/doc/source/images/rpc/arch.svg +++ b/doc/source/images/rpc/arch.svg @@ -176,7 +176,7 @@ x="4" dy="1.2em" class="st3">NetworkVPN Sheet.16 - VM instance Security group Volume Snapshot VM image IP addres... + VM instance Security group Volume Snapshot VM image IP address... diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 474ba46a5221..f17eb2c7f54c 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -480,7 +480,7 @@ def ec2_error_ex(ex, req, code=None, message=None, unexpected=False): status codes are always returned for them. Unexpected 5xx errors may contain sensitive information, - supress their messages for security. + suppress their messages for security. """ if not code: code = exception_to_ec2code(ex) diff --git a/nova/api/openstack/compute/contrib/baremetal_nodes.py b/nova/api/openstack/compute/contrib/baremetal_nodes.py index 8cca163ad1cb..4510ba8b1c6d 100644 --- a/nova/api/openstack/compute/contrib/baremetal_nodes.py +++ b/nova/api/openstack/compute/contrib/baremetal_nodes.py @@ -57,7 +57,7 @@ def _make_interface_elem(elem): def is_valid_mac(address): - """Verify the format of a MAC addres.""" + """Verify the format of a MAC address.""" class mac_dialect(netaddr.mac_eui48): word_fmt = '%.02x' diff --git a/nova/compute/manager.py b/nova/compute/manager.py index a9d6c1415931..8f7b2327dbdb 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2470,7 +2470,7 @@ class ComputeManager(manager.Manager): instance.save( expected_task_state=task_states.IMAGE_SNAPSHOT_PENDING) except exception.InstanceNotFound: - # possiblity instance no longer exists, no point in continuing + # possibility instance no longer exists, no point in continuing LOG.debug(_("Instance not found, could not set state %s " "for instance."), task_states.IMAGE_SNAPSHOT, instance=instance) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index ef47998f0a99..d7f397868fa0 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -5591,7 +5591,7 @@ def archive_deleted_rows_for_table(context, tablename, max_rows): column = table.c.id column_name = "id" # NOTE(guochbo): Use InsertFromSelect and DeleteFromSelect to avoid - # database's limit of maximum parameter in one SQL statment. + # database's limit of maximum parameter in one SQL statement. query_insert = select([table], table.c.deleted != default_deleted_value).\ order_by(column).limit(max_rows) diff --git a/nova/network/security_group/neutron_driver.py b/nova/network/security_group/neutron_driver.py index 14fafbe19b58..a2ce308cce80 100644 --- a/nova/network/security_group/neutron_driver.py +++ b/nova/network/security_group/neutron_driver.py @@ -194,7 +194,7 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase): Note: the Nova security group API doesn't support adding muliple security group rules at once but the EC2 one does. Therefore, - this function is writen to support both. Multiple rules are + this function is written to support both. Multiple rules are installed to a security group in neutron using bulk support. """ @@ -308,7 +308,7 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase): return ports def _get_secgroups_from_port_list(self, ports, neutron): - """Returns a dict of security groups keyed by thier ids.""" + """Returns a dict of security groups keyed by their ids.""" def _chunk_by_ids(sg_ids, limit): sg_id_list = [] diff --git a/nova/tests/api/openstack/compute/contrib/test_aggregates.py b/nova/tests/api/openstack/compute/contrib/test_aggregates.py index 775447ccf181..f64eff171824 100644 --- a/nova/tests/api/openstack/compute/contrib/test_aggregates.py +++ b/nova/tests/api/openstack/compute/contrib/test_aggregates.py @@ -301,7 +301,7 @@ class AggregateTestCase(test.NoDBTestCase): self.stubs.Set(self.controller.api, "add_host_to_aggregate", stub_add_host_to_aggregate) #NOTE(mtreinish) The check for a KeyError here is to ensure that - # if add_host_to_aggregate() raises a KeyError it propogates. At + # if add_host_to_aggregate() raises a KeyError it propagates. At # one point the api code would mask the error as a HTTPBadRequest. # This test is to ensure that this doesn't occur again. self.assertRaises(KeyError, self.controller.action, self.req, "1", diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py index cd6031088e48..1136facec519 100644 --- a/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py +++ b/nova/tests/api/openstack/compute/contrib/test_flavor_swap.py @@ -38,7 +38,7 @@ FAKE_FLAVORS = { } -#TOD(jogo) dedup these accross nova.api.openstack.contrib.test_flavor* +#TOD(jogo) dedup these across nova.api.openstack.contrib.test_flavor* def fake_flavor_get_by_flavor_id(flavorid, ctxt=None): return FAKE_FLAVORS['flavor %s' % flavorid] diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py index 8151f42db162..a83765288604 100644 --- a/nova/tests/api/openstack/compute/contrib/test_floating_ips.py +++ b/nova/tests/api/openstack/compute/contrib/test_floating_ips.py @@ -318,9 +318,9 @@ class FloatingIpTest(test.TestCase): req = fakes.HTTPRequest.blank('/v2/fake/os-floating-ips') ex = self.assertRaises(webob.exc.HTTPNotFound, - self.controller.create, req, {'pool': 'non_existant_pool'}) + self.controller.create, req, {'pool': 'non_existent_pool'}) - self.assertIn('No more floating ips in pool non_existant_pool', + self.assertIn('No more floating ips in pool non_existent_pool', ex.explanation) def test_floating_ip_allocate(self): diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py index aac7100b579c..e4977fdaff57 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hosts.py +++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py @@ -381,7 +381,7 @@ class HostSerializerTest(test.TestCase): for key, value in exemplar.items(): self.assertEqual(value, tree.get(key)) - def test_update_serializer_with_maintainance_mode(self): + def test_update_serializer_with_maintenance_mode(self): exemplar = dict(host='host_c1', maintenance_mode='enabled') serializer = os_hosts.HostUpdateTemplate() text = serializer.serialize(exemplar) @@ -392,7 +392,7 @@ class HostSerializerTest(test.TestCase): for key, value in exemplar.items(): self.assertEqual(value, tree.get(key)) - def test_update_serializer_with_maintainance_mode_and_status(self): + def test_update_serializer_with_maintenance_mode_and_status(self): exemplar = dict(host='host_c1', maintenance_mode='enabled', status='enabled') diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_console_output.py b/nova/tests/api/openstack/compute/plugins/v3/test_console_output.py index 5f5b5282adc4..bb7790099b46 100644 --- a/nova/tests/api/openstack/compute/plugins/v3/test_console_output.py +++ b/nova/tests/api/openstack/compute/plugins/v3/test_console_output.py @@ -133,7 +133,7 @@ class ConsoleOutputExtensionTest(test.NoDBTestCase): res = req.get_response(self.app) self.assertEqual(res.status_int, 409) - def test_get_console_output_with_lenght_as_float(self): + def test_get_console_output_with_length_as_float(self): req = self._create_request(length_dict={'length': 2.5}) res = req.get_response(self.app) self.assertEqual(res.status_int, 400) diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 7e9b63f7293b..505bf4b7a091 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -3591,7 +3591,7 @@ class ComputeTestCase(BaseTestCase): self.mox.ReplayAll() return reservations - def test_quotas_succesful_delete(self): + def test_quotas_successful_delete(self): instance = jsonutils.to_primitive(self._create_fake_instance()) resvs = self._ensure_quota_reservations_committed(True, True) self.compute.terminate_instance(self.context, @@ -3612,7 +3612,7 @@ class ComputeTestCase(BaseTestCase): self.context, self._objectify(instance), bdms=[], reservations=resvs) - def test_quotas_succesful_soft_delete(self): + def test_quotas_successful_soft_delete(self): instance = self._objectify(self._create_fake_instance( params=dict(task_state=task_states.SOFT_DELETING))) resvs = self._ensure_quota_reservations_committed(True, True) diff --git a/nova/tests/db/test_migrations.py b/nova/tests/db/test_migrations.py index 0d9e49698627..940ebbf47c0b 100644 --- a/nova/tests/db/test_migrations.py +++ b/nova/tests/db/test_migrations.py @@ -728,7 +728,7 @@ class TestBaremetalMigrations(BaseWalkMigrationTestCase, CommonTestsMixIn): def _pre_upgrade_006(self, engine): nodes = db_utils.get_table(engine, 'bm_nodes') ifs = db_utils.get_table(engine, 'bm_interfaces') - # node 1 has two diffrent addresses in bm_nodes and bm_interfaces + # node 1 has two different addresses in bm_nodes and bm_interfaces engine.execute(nodes.insert(), [{'id': 1, 'prov_mac_address': 'aa:aa:aa:aa:aa:aa'}]) diff --git a/nova/tests/scheduler/test_scheduler_utils.py b/nova/tests/scheduler/test_scheduler_utils.py index d7a24f34686e..fdbd27407e10 100644 --- a/nova/tests/scheduler/test_scheduler_utils.py +++ b/nova/tests/scheduler/test_scheduler_utils.py @@ -208,7 +208,7 @@ class SchedulerUtilsTestCase(test.NoDBTestCase): '=', float, [('bar', -2.1)]) - # check seperator missing + # check separator missing self._check_parse_options(['foo', 'bar=-2.1'], '=', float, diff --git a/nova/tests/test_exception.py b/nova/tests/test_exception.py index b7d5ce937c5e..b92eac7a5edf 100644 --- a/nova/tests/test_exception.py +++ b/nova/tests/test_exception.py @@ -84,9 +84,9 @@ class NovaExceptionTestCase(test.NoDBTestCase): def test_error_msg_exception_with_kwargs(self): class FakeNovaException(exception.NovaException): - msg_fmt = "default message: %(mispelled_code)s" + msg_fmt = "default message: %(misspelled_code)s" - exc = FakeNovaException(code=500, mispelled_code='blah') + exc = FakeNovaException(code=500, misspelled_code='blah') self.assertEqual(unicode(exc), 'default message: blah') self.assertEqual(exc.message, 'default message: blah') diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index f7a20c52f5a7..f6ccfd7a8827 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -125,7 +125,7 @@ def resize2fs(image, check_exit_code=False, run_as_root=False): check_exit_code=[0, 1, 2], run_as_root=run_as_root) except processutils.ProcessExecutionError as exc: - LOG.debug(_("Checking the file sytem with e2fsck has failed, " + LOG.debug(_("Checking the file system with e2fsck has failed, " "the resize will be aborted. (%s)"), exc) else: utils.execute('resize2fs', diff --git a/nova/virt/event.py b/nova/virt/event.py index bf7fa3fcfca0..357e54b3299b 100644 --- a/nova/virt/event.py +++ b/nova/virt/event.py @@ -16,7 +16,7 @@ Asynchronous event notifications from virtualization drivers. This module defines a set of classes representing data for -various asynchronous events that can occurr in a virtualization +various asynchronous events that can occur in a virtualization driver. """