Merge "Fix a few typos"

nova/compute/manager.py

@@ -668,7 +668,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
 

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

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(

nova/tests/unit/db/test_db_api.py

@@ -5619,7 +5619,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()

nova/tests/unit/virt/vmwareapi/fake.py

@@ -1288,7 +1288,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
 

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

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

nova/virt/libvirt/volume/iscsi.py

@@ -33,7 +33,7 @@ volume_opts = [
                     'case offload support is desired. Default format is of '
                     'the form <transport_name>.<hwaddress> where '
                     '<transport_name> is one of (be2iscsi, bnx2i, cxgb3i, '
-                    'cxgb4i, qla4xxx, ocs) and <hwadress> is the MAC address '
+                    'cxgb4i, qla4xxx, ocs) and <hwaddress> 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 '

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']

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.
     """