Merge "Fix simple typos"

neutron/api/rpc/agentnotifiers/utils.py

@@ -23,12 +23,12 @@ LOG = logging.getLogger(__name__)
 
 
 def _call_with_retry(max_attempts):
-    """A wrapper to retry function using rpc call in case of
+    """A wrapper to retry a function using rpc call in case of
        MessagingException.
 
     Retries the decorated function in case of MessagingException of some kind
     (a timeout, client send error etc).
-    If maximum attempts exceeded, the exception which occured during last
+    If maximum attempts are exceeded, the exception which occurred during last
     attempt is reraised.
     """
     def wrapper(f):

neutron/common/utils.py

@@ -527,11 +527,11 @@ def create_object_with_dependency(creator, dep_getter, dep_creator,
     dep_id_attr be used to determine if the dependency changed during object
     creation.
 
-    dep_getter should return None if the dependency does not exist
+    dep_getter should return None if the dependency does not exist.
 
     dep_creator can raise a DBDuplicateEntry to indicate that a concurrent
-    create of the dependency occured and the process will restart to get the
+    create of the dependency occurred and the process will restart to get the
-    concurrently created one
+    concurrently created one.
 
     This function will return both the created object and the dependency it
     used/created.

neutron/services/auto_allocate/db.py

@@ -102,7 +102,7 @@ class AutoAllocatedTopologyMixin(common_db_mixin.CommonDbMixin):
         tenant_id = self._validate(context, tenant_id)
         if CHECK_REQUIREMENTS in fields:
             # for dry-run requests, simply validates that subsequent
-            # requests can be fullfilled based on a set of requirements
+            # requests can be fulfilled based on a set of requirements
             # such as existence of default networks, pools, etc.
             return self._check_requirements(context, tenant_id)
         elif fields:

neutron/tests/functional/agent/linux/test_utils.py

@@ -56,7 +56,7 @@ class TestGetRootHelperChildPid(functional_base.BaseSudoTestCase):
     def test_get_root_helper_child_pid_returns_first_child(self):
         """Test that the first child, not lowest child pid is returned.
 
-        Test creates following proccess tree:
+        Test creates following process tree:
           sudo +
                |
                +--rootwrap +

neutron/tests/functional/services/l3_router/test_l3_dvr_router_plugin.py

@@ -875,7 +875,7 @@ class L3DvrTestCase(ml2_test_base.ML2TestFramework):
                                  constants.DEVICE_OWNER_LOADBALANCER)
                 # Now change the compute port admin_state_up from True to
                 # False, and see if the vrrp ports device_owner and binding
-                # inheritence reverts back to normal
+                # inheritance reverts back to normal
                 mod_int_port = self.core_plugin.update_port(
                     self.context, cur_int_port['id'],
                     {'port': {

neutron/tests/tempest/api/test_qos.py

@@ -124,7 +124,7 @@ class QosTestJSON(base.BaseAdminNetworkTest):
         # In theory, we could make the test conditional on which ml2 drivers
         # are enabled in gate (or more specifically, on which supported qos
         # rules are claimed by core plugin), but that option doesn't seem to be
-        # available thru tempest.lib framework
+        # available through tempest.lib framework
         expected_rule_types = []
         expected_rule_details = ['type']