From e5f457d66f53281770c0e151b616ca55724676bb Mon Sep 17 00:00:00 2001 From: Takashi NATSUME Date: Tue, 4 Aug 2015 09:58:45 +0900 Subject: [PATCH] Fix a few typos adress => address curent => current concurent => concurrent a instance => an instance optinally => optionally Change-Id: I08e38d8418c2133475e4631bfaef17e34dd1c5bc Closes-Bug: #1481123 --- nova/compute/manager.py | 2 +- nova/pci/manager.py | 9 +++++---- nova/tests/unit/compute/test_compute_api.py | 2 +- nova/tests/unit/db/test_db_api.py | 2 +- nova/tests/unit/virt/vmwareapi/fake.py | 2 +- nova/virt/hardware.py | 2 +- nova/virt/hyperv/hostops.py | 2 +- nova/virt/libvirt/volume/iscsi.py | 2 +- nova/virt/vmwareapi/driver.py | 2 +- plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index ae53984a13ab..4cb601c5a80f 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -665,7 +665,7 @@ class ComputeManager(manager.Manager): target = messaging.Target(version='4.4') # How long to wait in seconds before re-issuing a shutdown - # signal to a instance during power off. The overall + # signal to an instance during power off. The overall # time to wait is set by CONF.shutdown_timeout. SHUTDOWN_RETRY_INTERVAL = 10 diff --git a/nova/pci/manager.py b/nova/pci/manager.py index 4d3eeacaeb3f..9b0f30efdf73 100644 --- a/nova/pci/manager.py +++ b/nova/pci/manager.py @@ -151,9 +151,10 @@ class PciDevTracker(object): # hotplug or config changes. Although normally this should # not happen. - # As the devices have been assigned to a instance, we defer - # the change till the instance is destroyed. We will - # not sync the new properties with database before that. + # As the devices have been assigned to an instance, + # we defer the change till the instance is destroyed. + # We will not sync the new properties with database + # before that. # TODO(yjiang5): Not sure if this is a right policy, but # at least it avoids some confusion and, if needed, @@ -224,7 +225,7 @@ class PciDevTracker(object): self.stats.add_device(dev) def _free_instance(self, instance): - # Note(yjiang5): When a instance is resized, the devices in the + # Note(yjiang5): When an instance is resized, the devices in the # destination node are claimed to the instance in prep_resize stage. # However, the instance contains only allocated devices # information, not the claimed one. So we can't use diff --git a/nova/tests/unit/compute/test_compute_api.py b/nova/tests/unit/compute/test_compute_api.py index fc3e461b0e9d..3b612af6a892 100644 --- a/nova/tests/unit/compute/test_compute_api.py +++ b/nova/tests/unit/compute/test_compute_api.py @@ -1244,7 +1244,7 @@ class _ComputeAPIUnitTestMixIn(object): def test_revert_resize(self): self._test_revert_resize() - def test_revert_resize_concurent_fail(self): + def test_revert_resize_concurrent_fail(self): params = dict(vm_state=vm_states.RESIZED) fake_inst = self._create_instance_obj(params=params) fake_mig = objects.Migration._from_db_object( diff --git a/nova/tests/unit/db/test_db_api.py b/nova/tests/unit/db/test_db_api.py index cb50c1f10950..b96b9922c87d 100644 --- a/nova/tests/unit/db/test_db_api.py +++ b/nova/tests/unit/db/test_db_api.py @@ -5597,7 +5597,7 @@ class VolumeUsageDBApiTestCase(test.TestCase): def test_vol_usage_update_totals_update_when_blockdevicestats_reset(self): # This is unlikely to happen, but could when a volume is detached - # right after a instance has rebooted / recovered and before + # right after an instance has rebooted / recovered and before # the system polled and updated the volume usage cache table. ctxt = context.get_admin_context() now = timeutils.utcnow() diff --git a/nova/tests/unit/virt/vmwareapi/fake.py b/nova/tests/unit/virt/vmwareapi/fake.py index 2945a0699ba8..2e07a20334dc 100644 --- a/nova/tests/unit/virt/vmwareapi/fake.py +++ b/nova/tests/unit/virt/vmwareapi/fake.py @@ -1287,7 +1287,7 @@ class FakeVim(object): return task_mdo.obj def _extend_disk(self, method, size): - """Extend disk size when create a instance.""" + """Extend disk size when create an instance.""" task_mdo = create_task(method, "success") return task_mdo.obj diff --git a/nova/virt/hardware.py b/nova/virt/hardware.py index 443306bad4f7..b67a8c6e0518 100644 --- a/nova/virt/hardware.py +++ b/nova/virt/hardware.py @@ -754,7 +754,7 @@ def _numa_fit_instance_cell_with_pinning(host_cell, instance_cell): def _numa_fit_instance_cell(host_cell, instance_cell, limit_cell=None): - """Check if a instance cell can fit and set it's cell id + """Check if an instance cell can fit and set it's cell id :param host_cell: host cell to fit the instance cell onto :param instance_cell: instance cell we want to fit diff --git a/nova/virt/hyperv/hostops.py b/nova/virt/hyperv/hostops.py index 3f5d4986dd77..8877ee858479 100644 --- a/nova/virt/hyperv/hostops.py +++ b/nova/virt/hyperv/hostops.py @@ -172,7 +172,7 @@ class HostOps(object): # format the string to match libvirt driver uptime # Libvirt uptime returns a combination of the following - # - curent host time + # - current host time # - time since host is up # - number of logged in users # - cpu load diff --git a/nova/virt/libvirt/volume/iscsi.py b/nova/virt/libvirt/volume/iscsi.py index 7fc77e139540..147607fe72b3 100644 --- a/nova/virt/libvirt/volume/iscsi.py +++ b/nova/virt/libvirt/volume/iscsi.py @@ -33,7 +33,7 @@ volume_opts = [ 'case offload support is desired. Default format is of ' 'the form . where ' ' is one of (be2iscsi, bnx2i, cxgb3i, ' - 'cxgb4i, qla4xxx, ocs) and is the MAC address ' + 'cxgb4i, qla4xxx, ocs) and is the MAC address ' 'of the interface and can be generated via the ' 'iscsiadm -m iface command. Do not confuse the ' 'iscsi_iface parameter to be provided here with the ' diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 07885608bf43..bd047d60117f 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -442,7 +442,7 @@ class VMwareVCDriver(driver.ComputeDriver): # the instance state. self._vmops.power_off(instance) # TODO(garyk): update the volumeops to read the state form the - # VM instead of relying on a instance flag + # VM instead of relying on an instance flag instance.vm_state = vm_states.STOPPED for disk in block_device_mapping: connection_info = disk['connection_info'] diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py index 1e84b6384d8a..bec7e2a621e3 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py @@ -85,7 +85,7 @@ def record_exists(arg_dict): def read_record(self, arg_dict): """Returns the value stored at the given path for the given dom_id. These must be encoded as key/value pairs in arg_dict. You can - optinally include a key 'ignore_missing_path'; if this is present + optionally include a key 'ignore_missing_path'; if this is present and boolean True, attempting to read a non-existent path will return the string 'None' instead of raising an exception. """