Typos. A bunch of typos I've been collecting.

Change-Id: I53ab8d17914e6563110354e4052109ac02bf8f3b
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>

32 files changed, 145 insertions, 142 deletions

diff --git a/test/ipfix.py b/test/ipfix.py
index e1c41b708d7..dd43560d9a6 100644
--- a/test/ipfix.py
+++ b/test/ipfix.py
@@ -509,7 +509,7 @@ class IPFIXDecoder(object):
 
     def add_template(self, template):
         """
-        Add IPFIX tempalte
+        Add IPFIX template
 
         :param template: IPFIX template
         """
diff --git a/test/remote_test.py b/test/remote_test.py
index bc6d70764ec..0a6c3208ca8 100644
--- a/test/remote_test.py
+++ b/test/remote_test.py
@@ -353,7 +353,7 @@ class RemoteVppTestCase(VppTestCase):
 
         @classmethod
         def setUpClass(cls):
-            # fork new process before clinet connects to VPP
+            # fork new process before client connects to VPP
             cls.remote_test = RemoteClass(RemoteVppTestCase)
 
             # start remote process
diff --git a/test/template_bd.py b/test/template_bd.py
index b0d508fee7c..39f71438ab0 100644
--- a/test/template_bd.py
+++ b/test/template_bd.py
@@ -98,7 +98,7 @@ class BridgeDomain(object):
 
         self.pg_start()
 
-        # Pick first received frame and check if it's corectly encapsulated.
+        # Pick first received frame and check if it's correctly encapsulated.
         out = self.pg0.get_capture(1)
         pkt = out[0]
         self.check_encapsulation(pkt, self.single_tunnel_bd)
@@ -117,7 +117,7 @@ class BridgeDomain(object):
 
         self.pg_start()
 
-        # Get packet from each tunnel and assert it's corectly encapsulated.
+        # Get packet from each tunnel and assert it's correctly encapsulated.
         out = self.pg0.get_capture(self.n_ucast_tunnels)
         for pkt in out:
             self.check_encapsulation(pkt, self.ucast_flood_bd, True)
@@ -135,7 +135,7 @@ class BridgeDomain(object):
 
         self.pg_start()
 
-        # Pick first received frame and check if it's corectly encapsulated.
+        # Pick first received frame and check if it's correctly encapsulated.
         out = self.pg0.get_capture(1)
         pkt = out[0]
         self.check_encapsulation(pkt, self.mcast_flood_bd,
diff --git a/test/template_ipsec.py b/test/template_ipsec.py
index 273865d407c..df4c2bc6a60 100644
--- a/test/template_ipsec.py
+++ b/test/template_ipsec.py
@@ -345,8 +345,8 @@ class IpsecTra4Tests(object):
         # move VPP's SA to just before the seq-number wrap
         self.vapi.cli("test ipsec sa %d seq 0xffffffff" % p.scapy_tra_sa_id)
 
-        # then fire in a packet that VPP should drop becuase it causes the
-        # seq number to wrap, unless we're using exteneded.
+        # then fire in a packet that VPP should drop because it causes the
+        # seq number to wrap  unless we're using extended.
         pkt = (Ether(src=self.tra_if.remote_mac,
                      dst=self.tra_if.local_mac) /
                p.scapy_tra_sa.encrypt(IP(src=self.tra_if.remote_ip4,
diff --git a/test/test_abf.py b/test/test_abf.py
index 69d561bc19c..ecd8c536230 100644
--- a/test/test_abf.py
+++ b/test/test_abf.py
@@ -171,7 +171,7 @@ class TestAbf(VppTestCase):
         # the application of ACLs to a forwarding path to achieve
         # ABF
         # So we construct just a few ACLs to ensure the ABF policies
-        # are correclty constructed and used. And a few path types
+        # are correctly constructed and used. And a few path types
         # to test the API path decoding.
         #
 
diff --git a/test/test_dhcp6.py b/test/test_dhcp6.py
index ae0f01f6154..dcf02fae4af 100644
--- a/test/test_dhcp6.py
+++ b/test/test_dhcp6.py
@@ -42,7 +42,7 @@ class TestDHCPv6DataPlane(VppTestCase):
         super(TestDHCPv6DataPlane, self).tearDown()
 
     def test_dhcp_ia_na_send_solicit_receive_advertise(self):
-        """ Verify DHCPv6 IA NA Solicit packet and Advertise envent """
+        """ Verify DHCPv6 IA NA Solicit packet and Advertise event """
 
         self.vapi.dhcp6_clients_enable_disable()
 
@@ -119,7 +119,7 @@ class TestDHCPv6DataPlane(VppTestCase):
             self.vapi.want_dhcp6_reply_events(enable_disable=0)
 
     def test_dhcp_pd_send_solicit_receive_advertise(self):
-        """ Verify DHCPv6 PD Solicit packet and Advertise envent """
+        """ Verify DHCPv6 PD Solicit packet and Advertise event """
 
         self.vapi.dhcp6_clients_enable_disable()
 
@@ -410,7 +410,7 @@ class TestDHCPv6IANAControlPlane(VppTestCase):
         self.send_advertise(ianaopts=noavail)
         self.wait_for_solicit(is_resend=True)
 
-    def test_preferred_greater_than_valit_lifetime(self):
+    def test_preferred_greater_than_valid_lifetime(self):
         """ Preferred lifetime is greater than valid lifetime """
 
         self.wait_for_solicit()
@@ -705,7 +705,7 @@ class TestDHCPv6PDControlPlane(VppTestCase):
         self.send_advertise(iapdopt=noavail)
         self.wait_for_solicit(is_resend=True)
 
-    def test_preferred_greater_than_valit_lifetime(self):
+    def test_preferred_greater_than_valid_lifetime(self):
         """ Preferred lifetime is greater than valid lifetime """
 
         try:
diff --git a/test/test_dvr.py b/test/test_dvr.py
index 07ea7878a74..cf411bb0cb1 100644
--- a/test/test_dvr.py
+++ b/test/test_dvr.py
@@ -308,7 +308,7 @@ class TestDVR(VppTestCase):
             push_dot1q=93)
 
         #
-        # Disable UU flooding, learning and ARP terminaation. makes this test
+        # Disable UU flooding, learning and ARP termination. makes this test
         # easier as unicast packets are dropped if not extracted.
         #
         self.vapi.bridge_flags(bd_id=1, is_set=0,
diff --git a/test/test_flowprobe.py b/test/test_flowprobe.py
index 5ffb7ce8efc..544d3beb328 100644
--- a/test/test_flowprobe.py
+++ b/test/test_flowprobe.py
@@ -234,7 +234,7 @@ class MethodHolder(VppTestCase):
                 ip_layer = capture[0][IPv6]
             if data_set is not None:
                 for record in data:
-                    # skip flow if in/out gress interface is 0
+                    # skip flow if ingress/egress interface is 0
                     if int(binascii.hexlify(record[10]), 16) == 0:
                         continue
                     if int(binascii.hexlify(record[14]), 16) == 0:
@@ -881,7 +881,7 @@ class DisableIPFIX(MethodHolder):
         self.wait_for_cflow_packet(self.collector, templates[1])
         self.collector.get_capture(4)
 
-        # disble IPFIX
+        # disable IPFIX
         ipfix.disable_exporter()
         self.pg_enable_capture([self.collector])
 
@@ -998,7 +998,7 @@ class DisableFP(MethodHolder):
         self.wait_for_cflow_packet(self.collector, templates[1])
         self.collector.get_capture(4)
 
-        # disble IPFIX
+        # disable IPFIX
         ipfix.disable_flowprobe_feature()
         self.pg_enable_capture([self.collector])
 
@@ -1049,7 +1049,7 @@ class ReenableFP(MethodHolder):
         self.wait_for_cflow_packet(self.collector, templates[1], 5)
         self.collector.get_capture(4)
 
-        # disble FPP feature
+        # disable FPP feature
         ipfix.disable_flowprobe_feature()
         self.pg_enable_capture([self.collector])
 
diff --git a/test/test_gbp.py b/test/test_gbp.py
index 1eedf54f433..74eb424eb4f 100644
--- a/test/test_gbp.py
+++ b/test/test_gbp.py
@@ -1109,7 +1109,7 @@ class TestGBP(VppTestCase):
         self.send_and_expect_bridged(self.pg0, pkt_intra_epg * 65, self.pg1)
 
         #
-        # in the abscense of policy, endpoints in the different EPG
+        # in the absence of policy, endpoints in the different EPG
         # cannot communicate
         #
         pkt_inter_epg_220_to_221 = (Ether(src=self.pg0.remote_mac,
@@ -1284,7 +1284,7 @@ class TestGBP(VppTestCase):
                                        eps[0].fip6))
 
         #
-        # From an EP to an outside addess: IN2OUT
+        # From an EP to an outside address: IN2OUT
         #
         pkt_inter_epg_220_to_global = (Ether(src=self.pg0.remote_mac,
                                              dst=str(self.router_mac)) /
@@ -1526,7 +1526,7 @@ class TestGBP(VppTestCase):
 
         #
         # The VXLAN GBP tunnel is a bridge-port and has L2 endpoint
-        # leanring enabled
+        # learning enabled
         #
         vx_tun_l2_1 = VppGbpVxlanTunnel(
             self, 99, bd1.bd_id,
@@ -1546,7 +1546,7 @@ class TestGBP(VppTestCase):
 
         self.assertTrue(find_route(self, ep.ip4.address, 32, table_id=1))
 
-        # a packet with an sclass from an unknwon EPG
+        # a packet with an sclass from an unknown EPG
         p = (Ether(src=self.pg2.remote_mac,
                    dst=self.pg2.local_mac) /
              IP(src=self.pg2.remote_hosts[0].ip4,
@@ -1570,14 +1570,14 @@ class TestGBP(VppTestCase):
                                                self.pg2.remote_hosts[0].ip4,
                                                99))
 
-        # epg is not learnt, becasue the EPG is unknwon
+        # epg is not learnt, because the EPG is unknwon
         self.assertEqual(len(self.vapi.gbp_endpoint_dump()), 1)
 
         #
         # Learn new EPs from IP packets
         #
         for ii, l in enumerate(learnt):
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             # arriving on an unknown TEP
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
@@ -1627,7 +1627,7 @@ class TestGBP(VppTestCase):
         # Learn new EPs from GARP packets received on the BD's mcast tunnel
         #
         for ii, l in enumerate(learnt):
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             # arriving on an unknown TEP
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
@@ -1672,7 +1672,7 @@ class TestGBP(VppTestCase):
         # Learn new EPs from L2 packets
         #
         for ii, l in enumerate(learnt):
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             # arriving on an unknown TEP
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
@@ -1716,7 +1716,7 @@ class TestGBP(VppTestCase):
         # repeat. the do not learn bit is set so the EPs are not learnt
         #
         for l in learnt:
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
                  IP(src=self.pg2.remote_hosts[1].ip4,
@@ -1739,7 +1739,7 @@ class TestGBP(VppTestCase):
         # repeat
         #
         for l in learnt:
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
                  IP(src=self.pg2.remote_hosts[1].ip4,
@@ -1791,7 +1791,7 @@ class TestGBP(VppTestCase):
         # so the packet is cleared for delivery
         #
         for l in learnt:
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
                  IP(src=self.pg2.remote_hosts[1].ip4,
@@ -1824,7 +1824,7 @@ class TestGBP(VppTestCase):
         # refresh the entries after the check for no replies above
         #
         for l in learnt:
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
                  IP(src=self.pg2.remote_hosts[1].ip4,
@@ -1903,7 +1903,7 @@ class TestGBP(VppTestCase):
         # Check v6 Endpoints
         #
         for l in learnt:
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
                  IP(src=self.pg2.remote_hosts[1].ip4,
@@ -2015,7 +2015,7 @@ class TestGBP(VppTestCase):
 
         #
         # The VXLAN GBP tunnel is a bridge-port and has L2 endpoint
-        # leanring enabled
+        # learning enabled
         #
         vx_tun_l2_1 = VppGbpVxlanTunnel(
             self, 99, bd1.bd_id,
@@ -2039,7 +2039,7 @@ class TestGBP(VppTestCase):
         # Send to the static EP
         #
         for ii, l in enumerate(learnt):
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             # arriving on an unknown TEP
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
@@ -2191,7 +2191,7 @@ class TestGBP(VppTestCase):
 
         #
         # The VXLAN GBP tunnel is a bridge-port and has L2 endpoint
-        # leanring enabled
+        # learning enabled
         #
         vx_tun_l3 = VppGbpVxlanTunnel(
             self, 101, rd1.rd_id,
@@ -2213,7 +2213,7 @@ class TestGBP(VppTestCase):
         # learn some remote IPv4 EPs
         #
         for ii, l in enumerate(learnt):
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             # arriving on an unknown TEP
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
@@ -2280,7 +2280,7 @@ class TestGBP(VppTestCase):
         # learn some remote IPv6 EPs
         #
         for ii, l in enumerate(learnt):
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             # arriving on an unknown TEP
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
@@ -2390,7 +2390,7 @@ class TestGBP(VppTestCase):
         # learn some remote IPv4 EPs
         #
         for ii, l in enumerate(learnt):
-            # a packet with an sclass from a knwon EPG
+            # a packet with an sclass from a known EPG
             # arriving on an unknown TEP
             p = (Ether(src=self.pg2.remote_mac,
                        dst=self.pg2.local_mac) /
@@ -2445,7 +2445,7 @@ class TestGBP(VppTestCase):
         rep_2.add_vpp_config()
 
         #
-        # Add a route to the leanred EP's v4 subnet
+        # Add a route to the learned EP's v4 subnet
         #  packets should be send on the v4/v6 uu=fwd interface resp.
         #
         se_10_1_24 = VppGbpSubnet(
@@ -2507,7 +2507,7 @@ class TestGBP(VppTestCase):
         rxs = self.send_and_expect(self.pg0, [p], self.pg4)
 
         #
-        # to appease the testcase we cannot have the registered EP stll
+        # to appease the testcase we cannot have the registered EP still
         # present (because it's DP learnt) when the TC ends so wait until
         # it is removed
         #
@@ -3241,7 +3241,7 @@ class TestGBP(VppTestCase):
         rep.add_vpp_config()
 
         #
-        # ARP packet from External EPs are accpeted and replied to
+        # ARP packet from External EPs are accepted and replied to
         #
         p_arp = (Ether(src=eep1.mac, dst="ff:ff:ff:ff:ff:ff") /
                  Dot1Q(vlan=100) /
diff --git a/test/test_gtpu.py b/test/test_gtpu.py
index 4b776285766..26c292af868 100644
--- a/test/test_gtpu.py
+++ b/test/test_gtpu.py
@@ -86,7 +86,7 @@ class TestGtpu(BridgeDomain, VppTestCase):
 
         self.pg_start()
 
-        # Pick first received frame and check if it's corectly encapsulated.
+        # Pick first received frame and check if it's correctly encapsulated.
         out = self.pg0.get_capture(1)
         pkt = out[0]
         self.check_encapsulation(pkt, self.single_tunnel_bd)
@@ -105,7 +105,7 @@ class TestGtpu(BridgeDomain, VppTestCase):
 
         self.pg_start()
 
-        # Get packet from each tunnel and assert it's corectly encapsulated.
+        # Get packet from each tunnel and assert it's correctly encapsulated.
         out = self.pg0.get_capture(self.n_ucast_tunnels)
         for pkt in out:
             self.check_encapsulation(pkt, self.ucast_flood_bd, True)
@@ -123,7 +123,7 @@ class TestGtpu(BridgeDomain, VppTestCase):
 
         self.pg_start()
 
-        # Pick first received frame and check if it's corectly encapsulated.
+        # Pick first received frame and check if it's correctly encapsulated.
         out = self.pg0.get_capture(1)
         pkt = out[0]
         self.check_encapsulation(pkt, self.mcast_flood_bd,
diff --git a/test/test_igmp.py b/test/test_igmp.py
index 253007811be..e94d29bb7c5 100644
--- a/test/test_igmp.py
+++ b/test/test_igmp.py
@@ -265,7 +265,7 @@ class TestIgmp(VppTestCase):
                            [IgmpRecord(h1.sg, "Mode Is Include")])
 
         #
-        # Two source and group specific queires in qucik sucession, the
+        # Two source and group specific queries in quick succession, the
         # first does not have VPPs source the second does. then vice-versa
         #
         self.send(self.pg0, [p_gs2, p_gs1])
@@ -554,7 +554,7 @@ class TestIgmp(VppTestCase):
 
         #
         # resend the join. wait for two queries and then send a current-state
-        # record to include all sources. this should reset the exiry time
+        # record to include all sources. this should reset the expiry time
         # on the sources and thus they will still be present in 2 seconds time.
         # If the source timer was not refreshed, then the state would have
         # expired in 3 seconds.
@@ -601,7 +601,7 @@ class TestIgmp(VppTestCase):
         self.assertFalse(self.vapi.igmp_dump())
 
         #
-        # resend the join, then a leave. Router sends a gruop+source
+        # resend the join, then a leave. Router sends a group+source
         # specific query containing both sources
         #
         self.send(self.pg0, p_j)
@@ -658,7 +658,7 @@ class TestIgmp(VppTestCase):
                                             "239.1.1.3", "0.0.0.0", 1))
 
         #
-        # A 'allow sourcees' for {} should be ignored as it should
+        # A 'allow sources' for {} should be ignored as it should
         # never be sent.
         #
         p_j = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
diff --git a/test/test_ip4.py b/test/test_ip4.py
index c8c0a71d171..8a9841cb4f3 100644
--- a/test/test_ip4.py
+++ b/test/test_ip4.py
@@ -768,7 +768,7 @@ class TestIPSubNets(VppTestCase):
         # create a 2 pg interfaces
         self.create_pg_interfaces(range(2))
 
-        # pg0 we will use to experiemnt
+        # pg0 we will use to experiment
         self.pg0.admin_up()
 
         # pg1 is setup normally
@@ -967,7 +967,7 @@ class TestIPLoadBalance(VppTestCase):
         #    src,dst
         # We are not going to ensure equal amounts of packets across each link,
         # since the hash algorithm is statistical and therefore this can never
-        # be guaranteed. But wuth 64 different packets we do expect some
+        # be guaranteed. But with 64 different packets we do expect some
         # balancing. So instead just ensure there is traffic on each link.
         #
         self.send_and_expect_load_balancing(self.pg0, port_ip_pkts,
@@ -1241,7 +1241,7 @@ class TestIPPunt(VppTestCase):
         self.pg_start()
 
         #
-        # the number of packet recieved should be greater than 0,
+        # the number of packet received should be greater than 0,
         # but not equal to the number sent, since some were policed
         #
         rx = self.pg1._get_capture(1)
@@ -1249,7 +1249,7 @@ class TestIPPunt(VppTestCase):
         self.assertLess(len(rx), len(pkts))
 
         #
-        # remove the poilcer. back to full rx
+        # remove the policer. back to full rx
         #
         self.vapi.ip_punt_police(policer.policer_index, is_add=0)
         self.vapi.policer_add_del(b"ip4-punt", 400, 0, 10, 0,
diff --git a/test/test_ip6.py b/test/test_ip6.py
index 6cfb04be142..77ae63bfa39 100644
--- a/test/test_ip6.py
+++ b/test/test_ip6.py
@@ -563,7 +563,7 @@ class TestIPv6(TestIPv6ND):
 
         #
         # remove the duplicate on pg1
-        # packet stream shoud generate NSs out of pg1
+        # packet stream should generate NSs out of pg1
         #
         ns_pg1.remove_vpp_config()
 
@@ -626,7 +626,7 @@ class TestIPv6(TestIPv6ND):
             # decipher how to decode. this 1st layer of option always returns
             # nested classes, so a direct obj1=obj2 comparison always fails.
             # however, the getlayer(.., 2) does give one instnace.
-            # so we cheat here and construct a new opt instnace for comparison
+            # so we cheat here and construct a new opt instance for comparison
             rd = ICMPv6NDOptPrefixInfo(
                 prefixlen=raos.prefixlen,
                 prefix=raos.prefix,
@@ -685,7 +685,8 @@ class TestIPv6(TestIPv6ND):
         self.send_and_assert_no_replies(self.pg0, pkts, "RA rate limited")
 
         #
-        # When we reconfiure the IPv6 RA config, we reset the RA rate limiting,
+        # When we reconfigure the IPv6 RA config,
+        # we reset the RA rate limiting,
         # so we need to do this before each test below so as not to drop
         # packets for rate limiting reasons. Test this works here.
         #
@@ -856,7 +857,7 @@ class TestIPv6(TestIPv6ND):
                                 opt=opt)
 
         #
-        # Use the reset to defults option to revert to defaults
+        # Use the reset to defaults option to revert to defaults
         #  L and A flag are clear in the advert
         #
         self.pg0.ip6_ra_prefix(self.pg0.local_ip6,
@@ -905,7 +906,7 @@ class TestIPv6(TestIPv6ND):
                                 opt=opt)
 
         #
-        # Remove the first refix-info - expect the second is still in the
+        # Remove the first prefix-info - expect the second is still in the
         # advert
         #
         self.pg0.ip6_ra_prefix(self.pg0.local_ip6,
@@ -925,7 +926,7 @@ class TestIPv6(TestIPv6ND):
                                 opt=opt)
 
         #
-        # Remove the second prefix-info - expect no prefix-info i nthe adverts
+        # Remove the second prefix-info - expect no prefix-info in the adverts
         #
         self.pg0.ip6_ra_prefix(self.pg1.local_ip6,
                                self.pg1.local_ip6_prefix_len,
@@ -1166,10 +1167,10 @@ class TestIPv6RDControlPlane(TestIPv6ND):
             if entry.address_length == 0:
                 for path in entry.path:
                     if path.sw_if_index != 0xFFFFFFFF:
-                        defaut_route = {}
-                        defaut_route['sw_if_index'] = path.sw_if_index
-                        defaut_route['next_hop'] = path.next_hop
-                        list.append(defaut_route)
+                        default_route = {}
+                        default_route['sw_if_index'] = path.sw_if_index
+                        default_route['next_hop'] = path.next_hop
+                        list.append(default_route)
         return list
 
     @staticmethod
@@ -1566,7 +1567,7 @@ class TestIPDisabled(VppTestCase):
         # create 2 pg interfaces
         self.create_pg_interfaces(range(2))
 
-        # PG0 is IP enalbed
+        # PG0 is IP enabled
         self.pg0.admin_up()
         self.pg0.config_ip6()
         self.pg0.resolve_ndp()
@@ -1743,7 +1744,7 @@ class TestIP6LoadBalance(VppTestCase):
                                   src_ip_hdr))
 
         #
-        # A route for the IP pacekts
+        # A route for the IP packets
         #
         route_3000_1 = VppIpRoute(self, "3000::1", 128,
                                   [VppRoutePath(self.pg1.remote_ip6,
@@ -1781,7 +1782,7 @@ class TestIP6LoadBalance(VppTestCase):
         #    src,dst
         # We are not going to ensure equal amounts of packets across each link,
         # since the hash algorithm is statistical and therefore this can never
-        # be guaranteed. But wuth 64 different packets we do expect some
+        # be guaranteed. But with 64 different packets we do expect some
         # balancing. So instead just ensure there is traffic on each link.
         #
         self.send_and_expect_load_balancing(self.pg0, port_ip_pkts,
@@ -1797,7 +1798,7 @@ class TestIP6LoadBalance(VppTestCase):
 
         #
         # The packets with Entropy label in should not load-balance,
-        # since the Entorpy value is fixed.
+        # since the Entropy value is fixed.
         #
         self.send_and_expect_one_itf(self.pg0, port_ent_pkts, self.pg1)
 
@@ -1965,7 +1966,7 @@ class TestIP6Punt(VppTestCase):
         self.pg_start()
 
         #
-        # the number of packet recieved should be greater than 0,
+        # the number of packet received should be greater than 0,
         # but not equal to the number sent, since some were policed
         #
         rx = self.pg1._get_capture(1)
diff --git a/test/test_ip_mcast.py b/test/test_ip_mcast.py
index 41c6f3bdcaa..81da693c516 100644
--- a/test/test_ip_mcast.py
+++ b/test/test_ip_mcast.py
@@ -104,7 +104,7 @@ class TestIPMcast(VppTestCase):
 
     def verify_filter(self, capture, sent):
         if not len(capture) == len(sent):
-            # filter out any IPv6 RAs from the captur
+            # filter out any IPv6 RAs from the capture
             for p in capture:
                 if (p.haslayer(IPv6)):
                     capture.remove(p)
@@ -184,7 +184,7 @@ class TestIPMcast(VppTestCase):
         #
         # A (*,G).
         # one accepting interface, pg0, 7 forwarding interfaces
-        #  many forwarding interfaces test the case where the replicare DPO
+        #  many forwarding interfaces test the case where the replicate DPO
         #  needs to use extra cache lines for the buckets.
         #
         route_232_1_1_1 = VppIpMRoute(
diff --git a/test/test_ipip.py b/test/test_ipip.py
index 0369cb7569e..c01972a2413 100644
--- a/test/test_ipip.py
+++ b/test/test_ipip.py
@@ -460,7 +460,7 @@ class TestIPIP6(VppTestCase):
         rx = self.pg1.get_capture(2)
 
         # Scapy defragment doesn't deal well with multiple layers
-        # of samy type / Ethernet header first
+        # of same type / Ethernet header first
         f = [p[1] for p in rx]
         reass_pkt = defragment6(f)
         self.validate(reass_pkt, p6_reply)
diff --git a/test/test_ipsec_esp.py b/test/test_ipsec_esp.py
index 468636018b5..d254ee76762 100644
--- a/test/test_ipsec_esp.py
+++ b/test/test_ipsec_esp.py
@@ -153,11 +153,11 @@ class TemplateIpsecEsp(TemplateIpsec):
 
     Below 4 cases are covered as part of this test
     1) ipsec esp v4 transport basic test  - IPv4 Transport mode
-        scenario using HMAC-SHA1-96 intergrity algo
+        scenario using HMAC-SHA1-96 integrity algo
     2) ipsec esp v4 transport burst test
         Above test for 257 pkts
     3) ipsec esp 4o4 tunnel basic test    - IPv4 Tunnel mode
-        scenario using HMAC-SHA1-96 intergrity algo
+        scenario using HMAC-SHA1-96 integrity algo
     4) ipsec esp 4o4 tunnel burst test
         Above test for 257 pkts
 
diff --git a/test/test_ipsec_tun_if_esp.py b/test/test_ipsec_tun_if_esp.py
index ac96cfb9cc4..7b68f1fcfe6 100644
--- a/test/test_ipsec_tun_if_esp.py
+++ b/test/test_ipsec_tun_if_esp.py
@@ -149,7 +149,7 @@ class TestIpsec4MultiTunIfEsp(TemplateIpsec, IpsecTun4):
 
 
 class TestIpsec6MultiTunIfEsp(TemplateIpsec, IpsecTun6):
-    """ IPsec IPv6 Muitli Tunnel interface """
+    """ IPsec IPv6 Multi Tunnel interface """
 
     encryption_type = ESP
     tun6_encrypt_node_name = "esp6-encrypt"
diff --git a/test/test_l2_flood.py b/test/test_l2_flood.py
index e81daf99235..35d325e1329 100644
--- a/test/test_l2_flood.py
+++ b/test/test_l2_flood.py
@@ -201,7 +201,7 @@ class TestL2Flood(VppTestCase):
                                                  bd_id=1, shg=0)
 
         #
-        # an unknown unicast and braodcast packets
+        # an unknown unicast and broadcast packets
         #
         p_uu = (Ether(dst="00:00:00:c1:5c:00",
                       src="00:00:de:ad:be:ef") /
diff --git a/test/test_l2bd.py b/test/test_l2bd.py
index 61cf4efdb2e..a921bdfe0da 100644
--- a/test/test_l2bd.py
+++ b/test/test_l2bd.py
@@ -252,7 +252,7 @@ class TestL2bd(VppTestCase):
         Test scenario:
             1.config
                 MAC learning enabled
-                learn 100 MAC enries
+                learn 100 MAC entries
                 3 interfaces: untagged, dot1q, dot1ad (dot1q used instead of
                 dot1ad in the first version)
 
@@ -269,7 +269,7 @@ class TestL2bd(VppTestCase):
          Test scenario:
             1.config
                 MAC learning enabled
-                learn 100 MAC enries
+                learn 100 MAC entries
                 3 interfaces: untagged, dot1q, dot1ad (dot1q used instead of
                 dot1ad in the first version)
 
diff --git a/test/test_map.py b/test/test_map.py
index 1655ceda361..a8e8ab378a6 100644
--- a/test/test_map.py
+++ b/test/test_map.py
@@ -151,7 +151,7 @@ class TestMAP(VppTestCase):
         self.vapi.ppcli("map params pre-resolve ip6-nh 4001::1")
 
         self.send_and_assert_no_replies(self.pg0, v4,
-                                        "resovled via default route")
+                                        "resolved via default route")
 
         #
         # Add a route to 4001::1. Expect the encapped traffic to be
diff --git a/test/test_mpls.py b/test/test_mpls.py
index 09e47521ee0..8d5d5abb48d 100644
--- a/test/test_mpls.py
+++ b/test/test_mpls.py
@@ -452,7 +452,7 @@ class TestMPLS(VppTestCase):
         self.verify_capture_ip4(self.pg0, rx, tx)
 
         #
-        # disposed packets have an invalid IPv4 checkusm
+        # disposed packets have an invalid IPv4 checksum
         #
         tx = self.create_stream_labelled_ip4(self.pg0, [VppMplsLabel(33)],
                                              dst_ip=self.pg0.remote_ip4,
@@ -1281,7 +1281,7 @@ class TestMPLS(VppTestCase):
         self.send_and_assert_no_replies(self.pg0, tx, "RPF-ID drop none")
 
         #
-        # set the RPF-ID of the enrtry to match the input packet's
+        # set the RPF-ID of the entry to match the input packet's
         #
         route_232_1_1_1.update_rpf_id(55)
 
@@ -1291,7 +1291,7 @@ class TestMPLS(VppTestCase):
         self.verify_capture_ip4(self.pg1, rx, tx)
 
         #
-        # disposed packets have an invalid IPv4 checkusm
+        # disposed packets have an invalid IPv4 checksum
         #
         tx = self.create_stream_labelled_ip4(self.pg0, [VppMplsLabel(34)],
                                              dst_ip="232.1.1.1", n=65,
@@ -1351,7 +1351,7 @@ class TestMPLS(VppTestCase):
         self.send_and_assert_no_replies(self.pg0, tx, "RPF Miss")
 
         #
-        # set the RPF-ID of the enrtry to match the input packet's
+        # set the RPF-ID of the entry to match the input packet's
         #
         route_ff.update_rpf_id(55)
 
@@ -1371,7 +1371,7 @@ class TestMPLS(VppTestCase):
         self.verify_capture_ip6_icmp(self.pg0, rx, tx)
 
         #
-        # set the RPF-ID of the enrtry to not match the input packet's
+        # set the RPF-ID of the entry to not match the input packet's
         #
         route_ff.update_rpf_id(56)
         tx = self.create_stream_labelled_ip6(self.pg0,
@@ -1392,7 +1392,7 @@ class TestMPLSDisabled(VppTestCase):
         self.tbl = VppMplsTable(self, 0)
         self.tbl.add_vpp_config()
 
-        # PG0 is MPLS enalbed
+        # PG0 is MPLS enabled
         self.pg0.admin_up()
         self.pg0.config_ip4()
         self.pg0.resolve_arp()
@@ -1573,7 +1573,7 @@ class TestMPLSPIC(VppTestCase):
         rx0 = self.pg0._get_capture(1)
         rx1 = self.pg1._get_capture(1)
 
-        # not testig the LB hashing algorithm so we're not concerned
+        # not testing the LB hashing algorithm so we're not concerned
         # with the split ratio, just as long as neither is 0
         self.assertNotEqual(0, len(rx0))
         self.assertNotEqual(0, len(rx1))
@@ -1581,7 +1581,7 @@ class TestMPLSPIC(VppTestCase):
         #
         # use a test CLI command to stop the FIB walk process, this
         # will prevent the FIB converging the VPN routes and thus allow
-        # us to probe the interim (psot-fail, pre-converge) state
+        # us to probe the interim (post-fail, pre-converge) state
         #
         self.vapi.ppcli("test fib-walk-process disable")
 
@@ -1681,7 +1681,7 @@ class TestMPLSPIC(VppTestCase):
         #
         # use a test CLI command to stop the FIB walk process, this
         # will prevent the FIB converging the VPN routes and thus allow
-        # us to probe the interim (psot-fail, pre-converge) state
+        # us to probe the interim (post-fail, pre-converge) state
         #
         self.vapi.ppcli("test fib-walk-process disable")
 
@@ -1781,7 +1781,7 @@ class TestMPLSPIC(VppTestCase):
         #
         # use a test CLI command to stop the FIB walk process, this
         # will prevent the FIB converging the VPN routes and thus allow
-        # us to probe the interim (psot-fail, pre-converge) state
+        # us to probe the interim (post-fail, pre-converge) state
         #
         self.vapi.ppcli("test fib-walk-process disable")
 
@@ -1937,7 +1937,7 @@ class TestMPLSL2(VppTestCase):
         self.assertEqual(rx0[0][Ether].src, payload[Ether].src)
 
         #
-        # Inject a packet from the custoer/L2 side
+        # Inject a packet from the customer/L2 side
         #
         tx1 = pcore[MPLS].payload * 65
         rx1 = self.send_and_expect(self.pg1, tx1, self.pg0)
diff --git a/test/test_nat.py b/test/test_nat.py
index b2c442f81e6..b8d3a5457f6 100644
--- a/test/test_nat.py
+++ b/test/test_nat.py
@@ -178,8 +178,8 @@ class MethodHolder(VppTestCase):
                 protocol=id_m.protocol,
                 is_add=0)
 
-        adresses = self.vapi.nat44_address_dump()
-        for addr in adresses:
+        addresses = self.vapi.nat44_address_dump()
+        for addr in addresses:
             self.vapi.nat44_add_del_address_range(addr.ip_address,
                                                   addr.ip_address,
                                                   twice_nat=addr.twice_nat,
@@ -241,7 +241,7 @@ class MethodHolder(VppTestCase):
 
         :param ip: IP address
         :param is_add: 1 if add, 0 if delete (Default add)
-        :param twice_nat: twice NAT address for extenal hosts
+        :param twice_nat: twice NAT address for external hosts
         """
         nat_addr = socket.inet_pton(socket.AF_INET, ip)
         self.vapi.nat44_add_del_address_range(nat_addr, nat_addr, is_add,
@@ -481,7 +481,7 @@ class MethodHolder(VppTestCase):
 
         :param capture: Captured packets
         :param nat_ip: Translated IP address (Default use global NAT address)
-        :param same_port: Sorce port number is not translated (Default False)
+        :param same_port: Source port number is not translated (Default False)
         :param dst_ip: Destination IP address (Default do not verify)
         :param is_ip6: If L3 protocol is IPv6 (Default False)
         """
@@ -534,7 +534,7 @@ class MethodHolder(VppTestCase):
 
         :param capture: Captured packets
         :param nat_ip: Translated IP address
-        :param same_port: Sorce port number is not translated (Default False)
+        :param same_port: Source port number is not translated (Default False)
         :param dst_ip: Destination IP address (Default do not verify)
         """
         return self.verify_capture_out(capture, nat_ip, same_port, dst_ip,
@@ -686,7 +686,7 @@ class MethodHolder(VppTestCase):
         :param data: Payload data
         :param proto: protocol (TCP, UDP, ICMP)
         :param echo_reply: use echo_reply if protocol is ICMP
-        :returns: Fragmets
+        :returns: Fragments
         """
         if proto == IP_PROTOS.tcp:
             p = (IP(src=src_if.remote_ip4, dst=dst) /
@@ -748,7 +748,7 @@ class MethodHolder(VppTestCase):
         :param pref: NAT64 prefix
         :param plen: NAT64 prefix length
         :param fragsize: size of fragments
-        :returns: Fragmets
+        :returns: Fragments
         """
         if pref is None:
             dst_ip6 = ''.join(['64:ff9b::', dst])
@@ -2584,19 +2584,19 @@ class TestNAT44(MethodHolder):
         self.vapi.nat44_add_del_interface_addr(self.pg7.sw_if_index)
 
         # no address in NAT pool
-        adresses = self.vapi.nat44_address_dump()
-        self.assertEqual(0, len(adresses))
+        addresses = self.vapi.nat44_address_dump()
+        self.assertEqual(0, len(addresses))
 
         # configure interface address and check NAT address pool
         self.pg7.config_ip4()
-        adresses = self.vapi.nat44_address_dump()
-        self.assertEqual(1, len(adresses))
-        self.assertEqual(adresses[0].ip_address[0:4], self.pg7.local_ip4n)
+        addresses = self.vapi.nat44_address_dump()
+        self.assertEqual(1, len(addresses))
+        self.assertEqual(addresses[0].ip_address[0:4], self.pg7.local_ip4n)
 
         # remove interface address and check NAT address pool
         self.pg7.unconfig_ip4()
-        adresses = self.vapi.nat44_address_dump()
-        self.assertEqual(0, len(adresses))
+        addresses = self.vapi.nat44_address_dump()
+        self.assertEqual(0, len(addresses))
 
     def test_interface_addr_static_mapping(self):
         """ Static mapping with addresses from interface """
@@ -2697,10 +2697,10 @@ class TestNAT44(MethodHolder):
                          identity_mappings[0].sw_if_index)
 
     def test_ipfix_nat44_sess(self):
-        """ IPFIX logging NAT44 session created/delted """
+        """ IPFIX logging NAT44 session created/deleted """
         self.ipfix_domain_id = 10
         self.ipfix_src_port = 20202
-        colector_port = 30303
+        collector_port = 30303
         bind_layers(UDP, IPFIX, dport=30303)
         self.nat44_add_address(self.nat_addr)
         self.vapi.nat44_interface_add_del_feature(self.pg0.sw_if_index)
@@ -2710,7 +2710,7 @@ class TestNAT44(MethodHolder):
                                      src_address=self.pg3.local_ip4n,
                                      path_mtu=512,
                                      template_interval=10,
-                                     collector_port=colector_port)
+                                     collector_port=collector_port)
         self.vapi.nat_ipfix_enable_disable(domain_id=self.ipfix_domain_id,
                                            src_port=self.ipfix_src_port)
 
@@ -2730,7 +2730,7 @@ class TestNAT44(MethodHolder):
             self.assertEqual(p[IP].src, self.pg3.local_ip4)
             self.assertEqual(p[IP].dst, self.pg3.remote_ip4)
             self.assertEqual(p[UDP].sport, self.ipfix_src_port)
-            self.assertEqual(p[UDP].dport, colector_port)
+            self.assertEqual(p[UDP].dport, collector_port)
             self.assertEqual(p[IPFIX].observationDomainID,
                              self.ipfix_domain_id)
             if p.haslayer(Template):
@@ -5127,7 +5127,7 @@ class TestNAT44EndpointDependent(MethodHolder):
         self.vapi.nat44_interface_add_del_output_feature(self.pg1.sw_if_index,
                                                          is_inside=0)
 
-        # session initiaded from service host - translate
+        # session initiated from service host - translate
         pkts = self.create_stream_in(self.pg0, self.pg1)
         self.pg0.add_stream(pkts)
         self.pg_enable_capture(self.pg_interfaces)
@@ -5142,7 +5142,7 @@ class TestNAT44EndpointDependent(MethodHolder):
         capture = self.pg0.get_capture(len(pkts))
         self.verify_capture_in(capture, self.pg0)
 
-        # session initiaded from remote host - do not translate
+        # session initiated from remote host - do not translate
         self.tcp_port_in = 60303
         self.udp_port_in = 60304
         self.icmp_id_in = 60305
@@ -6647,7 +6647,7 @@ class TestDeterministicNAT(MethodHolder):
 
         :param capture: Captured packets
         :param nat_ip: Translated IP address (Default use global NAT address)
-        :param same_port: Sorce port number is not translated (Default False)
+        :param same_port: Source port number is not translated (Default False)
         """
         if nat_ip is None:
             nat_ip = self.nat_addr
@@ -8168,8 +8168,8 @@ class TestNAT64(MethodHolder):
         self.vapi.nat64_add_del_interface_addr(self.pg4.sw_if_index)
 
         # no address in NAT64 pool
-        adresses = self.vapi.nat44_address_dump()
-        self.assertEqual(0, len(adresses))
+        addresses = self.vapi.nat44_address_dump()
+        self.assertEqual(0, len(addresses))
 
         # configure interface address and check NAT64 address pool
         self.pg4.config_ip4()
@@ -8180,7 +8180,7 @@ class TestNAT64(MethodHolder):
         # remove interface address and check NAT64 address pool
         self.pg4.unconfig_ip4()
         addresses = self.vapi.nat64_pool_addr_dump()
-        self.assertEqual(0, len(adresses))
+        self.assertEqual(0, len(addresses))
 
     @unittest.skipUnless(running_extended_tests, "part of extended tests")
     def test_ipfix_max_bibs_sessions(self):
diff --git a/test/test_neighbor.py b/test/test_neighbor.py
index aec48712921..c3005ccaf57 100644
--- a/test/test_neighbor.py
+++ b/test/test_neighbor.py
@@ -500,7 +500,7 @@ class ARPTestCase(VppTestCase):
                              self.pg1._remote_hosts[9].ip4)
 
         #
-        # Add a hierachy of routes for a host in the sub-net.
+        # Add a hierarchy of routes for a host in the sub-net.
         # Should still get an ARP resp since the cover is attached
         #
         p = (Ether(dst="ff:ff:ff:ff:ff:ff", src=self.pg1.remote_mac) /
@@ -599,8 +599,8 @@ class ARPTestCase(VppTestCase):
         #
         #  2 - don't respond to ARP request from an address not within the
         #      interface's sub-net
-        #   2b - to a prxied address
-        #   2c - not within a differents interface's sub-net
+        #   2b - to a proxied address
+        #   2c - not within a different interface's sub-net
         p = (Ether(dst="ff:ff:ff:ff:ff:ff", src=self.pg0.remote_mac) /
              ARP(op="who-has",
                  hwsrc=self.pg0.remote_mac,
@@ -743,7 +743,7 @@ class ARPTestCase(VppTestCase):
         self.pg1.generate_remote_hosts(2)
 
         #
-        # Proxy ARP rewquest packets for each interface
+        # Proxy ARP request packets for each interface
         #
         arp_req_pg0 = (Ether(src=self.pg0.remote_mac,
                              dst="ff:ff:ff:ff:ff:ff") /
@@ -911,7 +911,7 @@ class ARPTestCase(VppTestCase):
         self.pg2.generate_remote_hosts(2)
 
         #
-        # Add a reoute with out going label via an ARP unresolved next-hop
+        # Add a route with out going label via an ARP unresolved next-hop
         #
         ip_10_0_0_1 = VppIpRoute(self, "10.0.0.1", 32,
                                  [VppRoutePath(self.pg2.remote_hosts[1].ip4,
@@ -1054,7 +1054,7 @@ class ARPTestCase(VppTestCase):
 
         #
         # remove the duplicate on pg1
-        # packet stream shoud generate ARPs out of pg1
+        # packet stream should generate ARPs out of pg1
         #
         arp_pg1.remove_vpp_config()
 
@@ -1207,7 +1207,7 @@ class ARPTestCase(VppTestCase):
                        self.pg1.remote_hosts[1].ip4)
 
         #
-        # set the mac address on the inteface that does not have a
+        # set the mac address on the interface that does not have a
         # configured subnet and thus no glean
         #
         self.vapi.sw_interface_set_mac_address(self.pg2.sw_if_index,
@@ -1276,7 +1276,7 @@ class ARPTestCase(VppTestCase):
                                  mac=self.pg1.remote_hosts[3].mac))
 
         #
-        # GARPs (requets nor replies) for host we don't know yet
+        # GARPs (request nor replies) for host we don't know yet
         # don't result in new neighbour entries
         #
         p1 = (Ether(dst="ff:ff:ff:ff:ff:ff",
@@ -1380,7 +1380,7 @@ class ARPTestCase(VppTestCase):
         # Test that VPP responds with ARP requests to addresses that
         # are connected and local routes.
         # Use one of the 'remote' addresses in the subnet as a local address
-        # The intention of this route is that it then acts like a secondardy
+        # The intention of this route is that it then acts like a secondary
         # address added to an interface
         #
         self.pg0.generate_remote_hosts(2)
diff --git a/test/test_pipe.py b/test/test_pipe.py
index 73d716f1d91..d2f21efd4d0 100644
--- a/test/test_pipe.py
+++ b/test/test_pipe.py
@@ -100,7 +100,7 @@ class TestPipe(VppTestCase):
                                                self.pg1.sw_if_index,
                                                enable=1)
 
-        # test bi-drectional L2 flow pg0<->pg1
+        # test bi-directional L2 flow pg0<->pg1
         p = (Ether(src=self.pg0.remote_mac,
                    dst=self.pg1.remote_mac) /
              IP(src="1.1.1.1",
diff --git a/test/test_punt.py b/test/test_punt.py
index 2a245385d85..74dc923365c 100644
--- a/test/test_punt.py
+++ b/test/test_punt.py
@@ -303,7 +303,7 @@ class TestIP4PuntSocket(TestPuntSocket):
             self.portsCheck[p] = 0
 
         #
-        # create stream with random pakets count per given ports
+        # create stream with random packets count per given ports
         #
         pkts = list()
         for _ in range(0, self.nr_packets):
@@ -362,7 +362,7 @@ class TestIP4PuntSocket(TestPuntSocket):
             self.portsCheck[p] = 0
 
         #
-        # create stream with random pakets count per given ports
+        # create stream with random packets count per given ports
         #
         pkts = list()
         for _ in range(0, self.nr_packets):
@@ -558,7 +558,7 @@ class TestIP6PuntSocket(TestPuntSocket):
             self.portsCheck[p] = 0
 
         #
-        # create stream with random pakets count per given ports
+        # create stream with random packets count per given ports
         #
         pkts = list()
         for _ in range(0, self.nr_packets):
@@ -617,7 +617,7 @@ class TestIP6PuntSocket(TestPuntSocket):
             self.portsCheck[p] = 0
 
         #
-        # create stream with random pakets count per given ports
+        # create stream with random packets count per given ports
         #
         pkts = list()
         for _ in range(0, self.nr_packets):
diff --git a/test/test_qos.py b/test/test_qos.py
index 38f4aafcb11..c6de8498b33 100644
--- a/test/test_qos.py
+++ b/test/test_qos.py
@@ -141,7 +141,7 @@ class TestQOS(VppTestCase):
             self.assertEqual(p[IPv6].tc, 1)
 
         #
-        # Enable QoS recrding on IP input for pg0
+        # Enable QoS recording on IP input for pg0
         #
         self.vapi.qos_record_enable_disable(self.pg0.sw_if_index,
                                             QOS_SOURCE.IP,
@@ -263,7 +263,7 @@ class TestQOS(VppTestCase):
             self.assertEqual(p[IP].tos, 254)
 
         #
-        # clean-up the masp
+        # clean-up the map
         #
         self.vapi.qos_egress_map_delete(1)
         self.vapi.qos_egress_map_delete(4)
diff --git a/test/test_srv6.py b/test/test_srv6.py
index cc53c6b1e79..ed453b2ce96 100644
--- a/test/test_srv6.py
+++ b/test/test_srv6.py
@@ -1235,7 +1235,7 @@ class TestSRv6(VppTestCase):
         self.assertIsNotNone(r, 'No response msg for add_del_table')
         table_index = r.new_table_index
 
-        # add the source routign node as a ip6 inacl netxt node
+        # add the source routing node as a ip6 inacl netxt node
         r = self.vapi.add_node_next('ip6-inacl',
                                     'sr-pl-rewrite-insert')
         inacl_next_node_index = r.node_index
diff --git a/test/test_svs.py b/test/test_svs.py
index cfbe75ed974..563ed1ad0cb 100644
--- a/test/test_svs.py
+++ b/test/test_svs.py
@@ -1,5 +1,7 @@
 #!/usr/bin/env python
 
+import unittest
+
 from framework import VppTestCase, VppTestRunner
 from vpp_ip_route import VppIpTable
 
@@ -53,7 +55,7 @@ class TestSVS(VppTestCase):
         """ Source VRF Select IP4 """
 
         #
-        # packets destinet out of the 3 non-default table interfaces
+        # packets destined out of the 3 non-default table interfaces
         #
         pkts_0 = [(Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
                    IP(src="1.1.1.1", dst=self.pg1.remote_ip4) /
@@ -89,7 +91,7 @@ class TestSVS(VppTestCase):
 
         #
         # Add table 1001 & 1002 into which we'll add the routes
-        # determing the source VRF selection
+        # determining the source VRF selection
         #
         table_ids = [101, 102]
 
@@ -180,7 +182,7 @@ class TestSVS(VppTestCase):
         """ Source VRF Select IP6 """
 
         #
-        # packets destinet out of the 3 non-default table interfaces
+        # packets destined out of the 3 non-default table interfaces
         #
         pkts_0 = [(Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) /
                    IPv6(src="2001:1::1", dst=self.pg1.remote_ip6) /
@@ -216,7 +218,7 @@ class TestSVS(VppTestCase):
 
         #
         # Add table 1001 & 1002 into which we'll add the routes
-        # determing the source VRF selection
+        # determining the source VRF selection
         #
         table_ids = [101, 102]
 
diff --git a/test/test_udp.py b/test/test_udp.py
index d0ad23fb230..3010a1dd7e1 100644
--- a/test/test_udp.py
+++ b/test/test_udp.py
@@ -85,7 +85,7 @@ class TestUdpEncap(VppTestCase):
 
         #
         # construct a UDP encap object through each of the peers
-        # v4 through the first two peears, v6 through the second.
+        # v4 through the first two peers, v6 through the second.
         #
         udp_encap_0 = VppUdpEncap(self,
                                   self.pg0.local_ip4,
diff --git a/test/test_vxlan_gbp.py b/test/test_vxlan_gbp.py
index 11e119822ee..1e6edcfeda5 100644
--- a/test/test_vxlan_gbp.py
+++ b/test/test_vxlan_gbp.py
@@ -199,7 +199,7 @@ class TestVxlanGbp(VppTestCase):
 
         self.pg_start()
 
-        # Pick first received frame and check if it's corectly encapsulated.
+        # Pick first received frame and check if it's correctly encapsulated.
         out = self.pg0.get_capture(1)
         pkt = out[0]
         self.check_encapsulation(pkt, self.single_tunnel_bd)
@@ -218,7 +218,7 @@ class TestVxlanGbp(VppTestCase):
 
         self.pg_start()
 
-        # Get packet from each tunnel and assert it's corectly encapsulated.
+        # Get packet from each tunnel and assert it's correctly encapsulated.
         out = self.pg0.get_capture(self.n_ucast_tunnels)
         for pkt in out:
             self.check_encapsulation(pkt, self.ucast_flood_bd, True)
diff --git a/test/vpp_ipsec.py b/test/vpp_ipsec.py
index cf74b4c978d..5866a0bb72d 100644
--- a/test/vpp_ipsec.py
+++ b/test/vpp_ipsec.py
@@ -41,7 +41,7 @@ class VppIpsecSpd(VppObject):
 class VppIpsecSpdItfBinding(VppObject):
     """
     VPP SPD DB to interface binding
-    (i.e. this SPD is used on this interfce)
+    (i.e. this SPD is used on this interface)
     """
 
     def __init__(self, test, spd, itf):
diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 1240647582f..ed2eee1dc84 100644
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -632,7 +632,7 @@ class VppPapiProvider(object):
         :param outer_fib_id:  (Default value = 0)
         :param tunnel_type:  (Default value = 0)
         :param instance:  (Default value = 0xFFFFFFFF)
-        :param session_id: (Defalt value = 0)
+        :param session_id: (Default value = 0)
         :param is_add:  (Default value = 1)
         :param is_ipv6:  (Default value = 0)
         """
@@ -890,7 +890,7 @@ class VppPapiProvider(object):
         :param first_ip_address: First IP address
         :param last_ip_address: Last IP address
         :param vrf_id: VRF id for the address range
-        :param twice_nat: twice NAT address for extenal hosts
+        :param twice_nat: twice NAT address for extenral hosts
         :param is_add: 1 if add, 0 if delete (Default value = 1)
         """
         return self.api(
@@ -909,7 +909,7 @@ class VppPapiProvider(object):
         """Add/del NAT44 address from interface
 
         :param sw_if_index: Software index of the interface
-        :param twice_nat: twice NAT address for extenal hosts
+        :param twice_nat: twice NAT address for external hosts
         :param is_add: 1 if add, 0 if delete (Default value = 1)
         """
         return self.api(
@@ -964,7 +964,7 @@ class VppPapiProvider(object):
             is_add=1):
         """Add/delete NAT44 load-balancing static mapping rule backend
 
-        :param external_addr: external IPv4 address of the servic
+        :param external_addr: external IPv4 address of the service
         :param external_port: external L4 port number of the service
         :param local_addr: IPv4 address of the internal node
         :param local_port: L4 port number of the internal node
@@ -1000,7 +1000,7 @@ class VppPapiProvider(object):
         :param por: port number
         :param protocol: IP protocol number
         :param vrf_id: VRF ID
-        :param is_in: 1 if inside network addres and port pari, 0 if outside
+        :param is_in: 1 if inside network address and port pair, 0 if outside
         :param ext_host_address: external host IPv4 address
         :param ext_host_port: external host port
         """
@@ -1193,7 +1193,7 @@ class VppPapiProvider(object):
         """Dump NAT64 session table
 
         :param protocol: IP protocol (Default value = 255, all STs)
-        :returns: Dictionary of NAT64 sesstion table entries
+        :returns: Dictionary of NAT64 session table entries
         """
         return self.api(self.papi.nat64_st_dump, {'proto': protocol})
 
@@ -1302,7 +1302,7 @@ class VppPapiProvider(object):
         """Set HA failover (remote settings)
 
         :param addr: failover IP4 address
-        :param port: failvoer UDP port number
+        :param port: failover UDP port number
         :param refresh: number of seconds after which to send session refresh
         """
         return self.api(self.papi.nat_ha_set_failover,