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

nova/tests/functional/notification_sample_tests/test_instance.py

@@ -193,7 +193,7 @@ def _test_live_migration_abort(self, server):
         self.admin_api.delete_migration(server['id'], migrations[0]['id'])
         self._wait_for_notification('instance.live_migration_abort.start')
         self._wait_for_state_change(server, 'ACTIVE')
-        # NOTE(gibi): the intance.live_migration_rollback notification emitted
+        # NOTE(gibi): the instance.live_migration_rollback notification emitted
         # after the instance.live_migration_abort notification so we have to
         # wait for the rollback to ensure we can assert both notifications
         # below
@@ -1500,8 +1500,8 @@ def _detach_volume_from_server(self, server, volume_id):
         self.api.delete_server_volume(server['id'], volume_id)
         self._wait_for_notification('instance.volume_detach.end')
 
-    def _volume_swap_server(self, server, attachement_id, volume_id):
-        self.api.put_server_volume(server['id'], attachement_id, volume_id)
+    def _volume_swap_server(self, server, attachment_id, volume_id):
+        self.api.put_server_volume(server['id'], attachment_id, volume_id)
 
     def test_volume_swap_server(self):
         server = self._boot_a_server(

nova/tests/functional/regressions/test_bug_1893284.py

@@ -25,7 +25,7 @@ class TestServersPerUserQuota(test.TestCase,
     tracking usages in a separate database table. As part of that change,
     per-user quota functionality was broken for server creates.
 
-    When mulitple users in the same project have per-user quota, they are meant
+    When multiple users in the same project have per-user quota, they are meant
     to be allowed to create resources such that may not exceed their
     per-user quota nor their project quota.
 

nova/tests/functional/test_policy.py

@@ -60,7 +60,7 @@ def _setup_host_status_unknown_only_test(self, networks=None):
             overwrite=False)
         # Create a server as a normal non-admin user.
         # In microversion 2.36 the /images proxy API was deprecated, so
-        # specifiy the image_uuid directly.
+        # specify the image_uuid directly.
         kwargs = {'image_uuid': self.image_uuid}
         if networks:
             # Starting with microversion 2.37 the networks field is required.

nova/tests/functional/test_servers.py

@@ -764,7 +764,7 @@ def test_attach_vol_maximum_disk_devices_exceeded(self):
         LOG.info('Attaching volume %s to server %s', volume_id, server_id)
 
         # The fake driver doesn't implement get_device_name_for_instance, so
-        # we'll just raise the exception directly here, instead of simuluating
+        # we'll just raise the exception directly here, instead of simulating
         # an instance with 26 disk devices already attached.
         with mock.patch.object(self.compute.driver,
                                'get_device_name_for_instance') as mock_get:

nova/tests/unit/accelerator/test_cyborg.py

@@ -190,7 +190,7 @@ def _get_bound_arqs(self):
             },
             "attach_handle_type": "PCI",
             "state": "Bound",
-            # Devic eprofile name is common to all bound ARQs
+            # Device profile name is common to all bound ARQs
             "device_profile_name": arqs[0]["device_profile_name"],
             **common
         }
@@ -367,7 +367,7 @@ def test_get_arqs_for_instance_some_resolved(self, mock_cyborg_get):
         # If only some ARQs are resolved, return just the resolved ones
         unbound_arqs, _ = self._get_arqs_and_request_groups()
         _, bound_arqs = self._get_bound_arqs()
-        # Create a amixture of unbound and bound ARQs
+        # Create a mixture of unbound and bound ARQs
         arqs = [unbound_arqs[0], bound_arqs[0]]
         instance_uuid = bound_arqs[0]['instance_uuid']
 
@@ -487,7 +487,7 @@ def test_get_arq_uuids_for_instance(self, mock_cyborg_get):
         self.assertEqual(bound_arqs, ret_arqs)
 
     def test_get_arq_pci_device_profile(self):
-        """Test extractin arq pci device info"""
+        """Test extracting arq pci device info"""
         arq = {'uuid': uuids.arq_uuid,
                     'device_profile_name': "smart_nic",
                     'device_profile_group_id': '5',

nova/tests/unit/api/openstack/compute/test_limits.py

@@ -254,7 +254,7 @@ def test_admin_can_fetch_used_limits_with_negative_int(self):
         req_get = {'tenant_id': -1}
         self._test_admin_can_fetch_used_limits_for_own_project(req_get)
 
-    def test_admin_can_fetch_used_limits_with_unkown_param(self):
+    def test_admin_can_fetch_used_limits_with_unknown_param(self):
         req_get = {'tenant_id': '123', 'unknown': 'unknown'}
         self._test_admin_can_fetch_used_limits_for_own_project(req_get)
 
@@ -462,7 +462,7 @@ def test_index_additional_query_param_old_version(self):
         absolute_limits = {
             "metadata_items": 1,
         }
-        req = fakes.HTTPRequest.blank("/?unkown=fake",
+        req = fakes.HTTPRequest.blank("/?unknown=fake",
                                        version='2.74')
 
         def _get_project_quotas(context, project_id, usages=True):
@@ -475,7 +475,7 @@ def _get_project_quotas(context, project_id, usages=True):
             self.controller.index(req)
 
     def test_index_additional_query_param(self):
-        req = fakes.HTTPRequest.blank("/?unkown=fake",
+        req = fakes.HTTPRequest.blank("/?unknown=fake",
                                       version='2.75')
         self.assertRaises(
             exception.ValidationError,

nova/tests/unit/api/openstack/compute/test_lock_server.py

@@ -114,7 +114,7 @@ def test_lock_with_reason_in_invalid_format(self):
             self.controller._lock, self.req, instance.uuid, body=body)
         self.assertIn("256 is not of type 'string'", str(exp))
 
-    def test_lock_with_invalid_paramater(self):
+    def test_lock_with_invalid_parameter(self):
         # This will fail from 2.73 since we have a schema check that allows
         # only locked_reason
         instance = fake_instance.fake_instance_obj(

nova/tests/unit/api/openstack/compute/test_networks.py

@@ -26,7 +26,7 @@
 from nova.tests.unit.api.openstack import fakes
 
 
-# NOTE(stephenfin): obviously these aren't complete reponses, but this is all
+# NOTE(stephenfin): obviously these aren't complete responses, but this is all
 # we care about
 FAKE_NETWORKS = [
     {

nova/tests/unit/api/openstack/compute/test_remote_consoles.py

@@ -446,7 +446,7 @@ def test_create_console_unavailable(self):
                           self.req, fakes.FAKE_UUID, body=body)
         self.assertTrue(mock_handler.called)
 
-    def test_create_console_not_found(self,):
+    def test_create_console_not_found(self):
         mock_handler = mock.MagicMock()
         mock_handler.side_effect = exception.InstanceNotFound(
             instance_id='xxx')

nova/tests/unit/api/openstack/compute/test_server_external_events.py

@@ -192,7 +192,7 @@ def test_create_bad_body(self):
                           self.api.create, self.req, body=body)
 
     def test_create_unknown_events(self):
-        self.event_1['name'] = 'unkown_event'
+        self.event_1['name'] = 'unknown_event'
         body = {'events': self.event_1}
         self.assertRaises(self.invalid_error,
                           self.api.create, self.req, body=body)

nova/tests/unit/api/openstack/compute/test_servers.py

@@ -8023,7 +8023,7 @@ def req(self, url, use_admin_context=False):
             version=self.microversion)
 
     def test_get_server_list_detail_with_down_cells(self):
-        # Fake out 1 partially constructued instance and one full instance.
+        # Fake out 1 partially constructed instance and one full instance.
         self.instances = [
                 self.instance,
                 objects.Instance(
@@ -8151,7 +8151,7 @@ def test_get_server_list_detail_with_down_cells(self):
         self.assertThat(output, matchers.DictMatches(expected))
 
     def test_get_server_list_with_down_cells(self):
-        # Fake out 1 partially constructued instance and one full instance.
+        # Fake out 1 partially constructed instance and one full instance.
         self.instances = [
                 self.instance,
                 objects.Instance(
@@ -8203,7 +8203,7 @@ def test_get_server_list_with_down_cells(self):
         self.assertThat(output, matchers.DictMatches(expected))
 
     def test_get_server_with_down_cells(self):
-        # Fake out 1 partially constructued instance.
+        # Fake out 1 partially constructed instance.
         self.instance = objects.Instance(
             context=self.ctxt,
             uuid=self.uuid,
@@ -8266,7 +8266,7 @@ def test_get_server_with_down_cells(self):
         self.assertThat(output, matchers.DictMatches(expected))
 
     def test_get_server_without_image_avz_user_id_set_from_down_cells(self):
-        # Fake out 1 partially constructued instance.
+        # Fake out 1 partially constructed instance.
         self.instance = objects.Instance(
             context=self.ctxt,
             uuid=self.uuid,

nova/tests/unit/cmd/test_status.py

@@ -18,7 +18,7 @@
 
 # NOTE(cdent): Additional tests of nova-status may be found in
 # nova/tests/functional/test_nova_status.py. Those tests use the external
-# PlacementFixture, which is only available in functioanl tests.
+# PlacementFixture, which is only available in functional tests.
 
 from io import StringIO
 

nova/tests/unit/compute/test_api.py

@@ -1354,7 +1354,7 @@ def test_delete_fast_if_host_not_set(self, mock_br_get, mock_save,
             hard_delete=False)
 
     def _fake_do_delete(context, instance, bdms,
-                        rservations=None, local=False):
+                        reservations=None, local=False):
         pass
 
     @mock.patch.object(compute_utils, 'notify_about_instance_action')
@@ -3417,7 +3417,7 @@ def fake_quiesce_instance(context, instance):
                 raise exception.InstanceQuiesceNotSupported(
                     instance_id=instance['uuid'], reason='unsupported')
             if quiesce_fails:
-                raise oslo_exceptions.MessagingTimeout('quiece timeout')
+                raise oslo_exceptions.MessagingTimeout('quiesce timeout')
             quiesced[0] = True
 
         def fake_unquiesce_instance(context, instance, mapping=None):
@@ -3579,7 +3579,7 @@ def test_snapshot_volume_backed_with_quiesce_unsupported(self):
         self._test_snapshot_volume_backed(quiesce_required=True,
                                           quiesce_unsupported=False)
 
-    def test_snaphost_volume_backed_with_quiesce_failure(self):
+    def test_snapshot_volume_backed_with_quiesce_failure(self):
         self.assertRaises(oslo_exceptions.MessagingTimeout,
                           self._test_snapshot_volume_backed,
                           quiesce_required=True,
@@ -4815,7 +4815,7 @@ def test_validate_vol_az_for_create_multiple_vols_diff_az(self, cross_az):
     def test_validate_vol_az_for_create_vol_az_matches_default_cpu_az(self):
         """Tests the scenario that the instance is not being created in a
         specific zone and the volume's zone matches
-        CONF.default_availabilty_zone so None is returned indicating the
+        CONF.default_availability_zone so None is returned indicating the
         RequestSpec.availability_zone does not need to be updated.
         """
         self.flags(cross_az_attach=False, group='cinder')
@@ -7155,7 +7155,7 @@ def test__validate_numa_rebuild_no_conflict(self):
         # be no conflict.
         self.compute_api._validate_numa_rebuild(instance, image, flavor)
 
-    def test__validate_numa_rebuild_add_numa_toplogy(self):
+    def test__validate_numa_rebuild_add_numa_topology(self):
         """Assert that a rebuild of an instance with a new image
         that requests a NUMA topology when the original instance did not
         have a NUMA topology is invalid.
@@ -7178,7 +7178,7 @@ def test__validate_numa_rebuild_add_numa_toplogy(self):
             exception.ImageNUMATopologyRebuildConflict,
             self.compute_api._validate_numa_rebuild, instance, image, flavor)
 
-    def test__validate_numa_rebuild_remove_numa_toplogy(self):
+    def test__validate_numa_rebuild_remove_numa_topology(self):
         """Assert that a rebuild of an instance with a new image
         that does not request a NUMA topology when the original image did
         is invalid if it would alter the instances topology as a result.
@@ -7209,7 +7209,7 @@ def test__validate_numa_rebuild_remove_numa_toplogy(self):
                 self.compute_api._validate_numa_rebuild, instance,
                 image, flavor)
 
-    def test__validate_numa_rebuild_alter_numa_toplogy(self):
+    def test__validate_numa_rebuild_alter_numa_topology(self):
         """Assert that a rebuild of an instance with a new image
         that requests a different NUMA topology than the original image
         is invalid.
@@ -8031,7 +8031,7 @@ def test_block_accelerators_with_device_profile(self):
     @mock.patch('nova.objects.service.get_minimum_version_all_cells',
                 return_value=54)
     def test_block_accelerators_until_service(self, mock_get_min):
-        """Support operating server with acclerators until compute service
+        """Support operating server with accelerators until compute service
         more than the version of 53.
         """
         extra_specs = {'accel:device_profile': 'mydp'}

nova/tests/unit/compute/test_compute.py

@@ -7379,7 +7379,7 @@ def test_poll_unconfirmed_resizes(self):
             fake_instance.fake_db_instance(uuid=uuids.migration_instance_5,
                                            vm_state=vm_states.ACTIVE,
                                            task_state=None),
-            # The expceted migration result will be None instead of error
+            # The expected migration result will be None instead of error
             # since _poll_unconfirmed_resizes will not change it
             # when the instance vm state is RESIZED and task state
             # is deleting, see bug 1301696 for more detail
@@ -10493,7 +10493,7 @@ def create_resource_req(context, requested_networks,
         pci_reqs = mock_claim_pci.mock_calls[0][1][1]
         self.assertEqual([pci_req], pci_reqs.requests)
 
-        # after the pci claim we also need to allocate that pci to the instace
+        # after the pci claim we also need to allocate that pci to the instance
         mock_allocate_pci.assert_called_once_with(self.context, instance)
         # and as this changes the instance we have to save it.
         mock_save.assert_called_once_with()