Merge "Fix typos"

Author: Zuul

nova/block_device.py

@@ -612,7 +612,7 @@ def get_bdm_local_disk_num(block_device_mappings):
 
 def get_bdm_image_metadata(context, image_api, volume_api,
                            block_device_mapping, legacy_bdm=True):
-    """Attempt to retrive image metadata from a given block_device_mapping.
+    """Attempt to retrieve image metadata from a given block_device_mapping.
 
     If we are booting from a volume, we need to get the volume details from
     Cinder and make sure we pass the metadata back accordingly.

nova/compute/manager.py

@@ -8782,7 +8782,7 @@ def _live_migration_cleanup_flags(self, migrate_data, migr_ctxt=None):
             # must be deleted for preparing next block migration
             # must be deleted for preparing next live migration w/o shared
             # storage
-            # vpmem must be cleanped
+            # vpmem must be cleaned
             do_cleanup = not migrate_data.is_shared_instance_path or has_vpmem
             destroy_disks = not migrate_data.is_shared_block_storage
         elif isinstance(migrate_data, migrate_data_obj.HyperVLiveMigrateData):

nova/conductor/tasks/cross_cell_migrate.py

@@ -1163,7 +1163,7 @@ def _update_source_obj_from_target_cell(source_obj, target_obj):
                 setattr(source_obj, field, getattr(target_obj, field))
 
     def _update_bdms_in_source_cell(self, source_cell_context):
-        """Update BlockDeviceMapppings in the source cell database.
+        """Update BlockDeviceMappings in the source cell database.
 
         It is possible to attach/detach volumes to/from a resized instance,
         which would create/delete BDM records in the target cell, so we have

nova/console/websocketproxy.py

@@ -305,7 +305,7 @@ def __init__(self, *args, **kwargs):
         # ssl_options unset to default to the underlying system defaults.
         # We do this to avoid using websockify's behaviour for 'default'
         # in select_ssl_version(), which hardcodes the versions to be
-        # quite relaxed and prevents us from using sytem crypto policies.
+        # quite relaxed and prevents us from using system crypto policies.
         ssl_min_version = kwargs.pop('ssl_minimum_version', None)
         if ssl_min_version and ssl_min_version != 'default':
             kwargs['ssl_options'] = websockify.websocketproxy. \

nova/objects/service.py

@@ -36,7 +36,7 @@
 
 # NOTE(danms): This is our SERVICE_VERSION history. The idea is that any
 # time we bump the version, we will put an entry here to record the change,
-# along with any pertinent data. For things that we can programatically
+# along with any pertinent data. For things that we can programmatically
 # detect that need a bump, we put something in _collect_things() below to
 # assemble a dict of things we can check. For example, we pretty much always
 # want to consider the compute RPC API version a thing that requires a service

nova/tests/fixtures/nova.py

@@ -1455,7 +1455,7 @@ class AvailabilityZoneFixture(fixtures.Fixture):
     ``get_availability_zones``.
 
     ``get_instance_availability_zone`` will return the availability_zone
-    requested when creating a server otherwise the instance.availabilty_zone
+    requested when creating a server otherwise the instance.availability_zone
     or default_availability_zone is returned.
     """
 

nova/tests/fixtures/policy.py

@@ -65,7 +65,7 @@ def set_rules(self, rules, overwrite=True):
     def add_missing_default_rules(self, rules):
         """Adds default rules and their values to the given rules dict.
 
-        The given rulen dict may have an incomplete set of policy rules.
+        The given rules dict may have an incomplete set of policy rules.
         This method will add the default policy rules and their values to
         the dict. It will not override the existing rules.
         """
@@ -141,7 +141,7 @@ class OverridePolicyFixture(RealPolicyFixture):
     not used. One example is when policy rules are deprecated. In that case
     tests can use this fixture and verify if deprecated rules are overridden
     then does nova code enforce the overridden rules not only defaults.
-    As per oslo.policy deprecattion feature, if deprecated rule is overridden
+    As per oslo.policy deprecation feature, if deprecated rule is overridden
     in policy file then, overridden check is used to verify the policy.
     Example of usage:
 

nova/tests/functional/db/test_compute_node.py

@@ -267,7 +267,7 @@ def test_migrate_none_or_zero_ratio_with_none_ratio_conf(self):
         self.assertEqual(res, (1, 1))
 
         # the ratio is refreshed to CONF.initial_xxx_allocation_ratio
-        # beacause CONF.xxx_allocation_ratio is None
+        # because CONF.xxx_allocation_ratio is None
         cns = db.compute_node_get_all(self.context)
         # the ratio is refreshed to CONF.xxx_allocation_ratio
         for cn in cns:

nova/tests/functional/libvirt/test_numa_servers.py

@@ -731,7 +731,7 @@ def test_resize_vcpu_to_pcpu(self):
         for host, compute_rp_uuid in self.compute_rp_uuids.items():
             if host == original_host:
                 # the host that had the instance should no longer have
-                # alocations since the resize has been confirmed
+                # allocations since the resize has been confirmed
                 expected_usage = {'VCPU': 0, 'PCPU': 0, 'DISK_GB': 0,
                                   'MEMORY_MB': 0}
             else:

nova/tests/functional/libvirt/test_pci_sriov_servers.py

@@ -994,7 +994,7 @@ def test_shelve(self):
     def test_suspend(self):
         self._test_common(self._suspend_server)
 
-    def test_evacute(self):
+    def test_evacuate(self):
         self._test_common(self._evacuate_server)
 
     def test_resize(self):
@@ -1303,7 +1303,7 @@ def _test_policy(self, pci_numa_node, status, policy):
             num_pci=1, numa_node=pci_numa_node)
         self.start_compute(pci_info=pci_info)
 
-        # request cpu pinning to create a numa toplogy and allow the test to
+        # request cpu pinning to create a numa topology and allow the test to
         # force which numa node the vm would have to be pinned too.
         extra_spec = {
             'hw:cpu_policy': 'dedicated',
@@ -1514,7 +1514,7 @@ def _test_policy(self, pci_numa_node, status, policy):
             num_pfs=1, num_vfs=2, numa_node=pci_numa_node)
         self.start_compute(pci_info=pci_info)
 
-        # request cpu pinning to create a numa toplogy and allow the test to
+        # request cpu pinning to create a numa topology and allow the test to
         # force which numa node the vm would have to be pinned too.
         extra_spec = {
             'hw:cpu_policy': 'dedicated',