Merge "Fix for multiple misspelled words"

neutron/agent/linux/iptables_firewall.py

@@ -333,7 +333,7 @@ class IptablesFirewallDriver(firewall.FirewallDriver):
 
         if protocol in ['icmp', 'icmpv6']:
             # Note(xuhanp): port_range_min/port_range_max represent
-            # icmp type/code when protocal is icmp or icmpv6
+            # icmp type/code when protocol is icmp or icmpv6
             # icmp code can be 0 so we cannot use "if port_range_max" here
             if port_range_max is not None:
                 return ['--%s-type' % protocol,

neutron/db/db_base_plugin_v2.py

@@ -238,7 +238,7 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
         db.configure_db()
         if cfg.CONF.notify_nova_on_port_status_changes:
             from neutron.notifiers import nova
-            # NOTE(arosen) These event listners are here to hook into when
+            # NOTE(arosen) These event listeners are here to hook into when
             # port status changes and notify nova about their change.
             self.nova_notifier = nova.Notifier()
             event.listen(models_v2.Port, 'after_insert',

neutron/db/migration/migrate_to_ml2.py

@@ -34,7 +34,7 @@ Example usage:
   python -m neutron.db.migration.migrate_to_ml2 openvswitch \
       mysql://login:pass@127.0.0.1/neutron
 
-Note that migration of tunneling state will only be attemped if the
+Note that migration of tunneling state will only be attempted if the
 --tunnel-type parameter is provided.
 
 To manually test migration from ovs to ml2 with devstack:

neutron/notifiers/nova.py

@@ -75,7 +75,7 @@ class Notifier(object):
         If a thread is already alive and waiting, this call will simply queue
         the event and return leaving it up to the thread to send it.
 
-        :param event: the event that occured.
+        :param event: the event that occurred.
         """
         if not event:
             return
@@ -120,7 +120,7 @@ class Notifier(object):
                             returned_obj):
         """Called when a network change is made that nova cares about.
 
-        :param action: the event that occured.
+        :param action: the event that occurred.
         :param original_obj: the previous value of resource before action.
         :param returned_obj: the body returned to client as result of action.
         """

neutron/openstack/common/systemd.py

@@ -75,7 +75,7 @@ def onready(notify_socket, timeout):
     :type timeout:        float
     :returns:             0 service ready
                           1 service not ready
-                          2 timeout occured
+                          2 timeout occurred
     """
     sock = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
     sock.settimeout(timeout)

neutron/tests/unit/test_extension_ext_net.py

@@ -139,7 +139,7 @@ class ExtNetDBTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
                         pass
                     self.assertEqual(ctx_manager.exception.code, 403)
 
-    def test_create_port_external_network_admin_suceeds(self):
+    def test_create_port_external_network_admin_succeeds(self):
         with self.network(router__external=True) as ext_net:
             with self.subnet(network=ext_net) as ext_subnet:
                 with self.port(subnet=ext_subnet) as port:
@@ -154,7 +154,7 @@ class ExtNetDBTestCase(test_db_plugin.NeutronDbPluginV2TestCase):
                 pass
             self.assertEqual(ctx_manager.exception.code, 403)
 
-    def test_create_external_network_admin_suceeds(self):
+    def test_create_external_network_admin_succeeds(self):
         with self.network(router__external=True) as ext_net:
             self.assertEqual(ext_net['network'][external_net.EXTERNAL],
                              True)