T8410: Fix typos and mistakes for comments and messages

Fix typos and mistakes
No functional changes

17 files changed, 31 insertions, 31 deletions

diff --git a/smoketest/scripts/cli/base_accel_ppp_test.py b/smoketest/scripts/cli/base_accel_ppp_test.py
index 2a1698ab7..b4e52004e 100644
--- a/smoketest/scripts/cli/base_accel_ppp_test.py
+++ b/smoketest/scripts/cli/base_accel_ppp_test.py
@@ -70,7 +70,7 @@ class BasicAccelPPPTest:
         def basic_protocol_specific_config(self):
             """
             An astract method.
-            Initialize protocol scpecific configureations.
+            Initialize protocol specific configurations.
             """
             self.assertFalse(True, msg="Function must be defined")
 
@@ -126,7 +126,7 @@ class BasicAccelPPPTest:
             """
             Return part of configuration from line
             where the first injection of start keyword to the line
-            where the first injection of end keyowrd
+            where the first injection of end keyword
             :param start: start keyword
             :type start: str
             :param end: end keyword
diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py
index b2f700fce..50606efe3 100644
--- a/smoketest/scripts/cli/base_interfaces_test.py
+++ b/smoketest/scripts/cli/base_interfaces_test.py
@@ -581,7 +581,7 @@ class BasicInterfaceTest:
                         self.assertTrue(is_intf_addr_assigned(intf, addr['addr']))
 
         def test_ipv6_link_local_address(self):
-            # Common function for IPv6 link-local address assignemnts
+            # Common function for IPv6 link-local address assignments
             if not self._test_ipv6:
                 self.skipTest(MSG_TESTCASE_UNSUPPORTED)
 
diff --git a/smoketest/scripts/cli/base_vyostest_shim.py b/smoketest/scripts/cli/base_vyostest_shim.py
index 08639f31b..ab0a95caf 100644
--- a/smoketest/scripts/cli/base_vyostest_shim.py
+++ b/smoketest/scripts/cli/base_vyostest_shim.py
@@ -43,7 +43,7 @@ save_config = '/tmp/vyos-smoketest-save'
 class VyOSUnitTestSHIM:
     class TestCase(unittest.TestCase):
         # If enabled, print out each and every set/del command on stdout.
-        # This is usefull to grap all the commands required to trigger the
+        # This is useful to grab all the commands required to trigger the
         # certain failure condition.
         debug = False
         mgmt_daemon_pid = 0
diff --git a/smoketest/scripts/cli/test_container.py b/smoketest/scripts/cli/test_container.py
index ae85273e8..237e6238d 100755
--- a/smoketest/scripts/cli/test_container.py
+++ b/smoketest/scripts/cli/test_container.py
@@ -297,7 +297,7 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         n = cmd_to_json(f'sudo podman network inspect {net_name}')
         self.assertEqual(n['subnets'][0]['subnet'], prefix)
 
-        # skipt first container, it was never created
+        # skip first container, it was never created
         for ii in range(2, 6):
             name = f'{base_name}-{ii}'
             c = cmd_to_json(f'sudo podman container inspect {name}')
@@ -343,7 +343,7 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         n = cmd_to_json(f'sudo podman network inspect {net_name}')
         self.assertEqual(n['subnets'][0]['subnet'], prefix)
 
-        # skipt first container, it was never created
+        # skip first container, it was never created
         for ii in range(2, 6):
             name = f'{base_name}-{ii}'
             c = cmd_to_json(f'sudo podman container inspect {name}')
@@ -403,7 +403,7 @@ class TestContainer(VyOSUnitTestSHIM.TestCase):
         self.assertEqual(n['subnets'][0]['subnet'], prefix4)
         self.assertEqual(n['subnets'][1]['subnet'], prefix6)
 
-        # skipt first container, it was never created
+        # skip first container, it was never created
         for ii in range(2, 6):
             name = f'{base_name}-{ii}'
             c = cmd_to_json(f'sudo podman container inspect {name}')
diff --git a/smoketest/scripts/cli/test_interfaces_openvpn.py b/smoketest/scripts/cli/test_interfaces_openvpn.py
index 42e4eed60..2cf3a26c0 100755
--- a/smoketest/scripts/cli/test_interfaces_openvpn.py
+++ b/smoketest/scripts/cli/test_interfaces_openvpn.py
@@ -290,7 +290,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f'remote {remote_host}', config)
         self.assertIn(f'persist-tun', config)
 
-        # IPv4 only: client usees udp4 protocol
+        # IPv4 only: client uses udp4 protocol
         self.cli_set(path + ['ip-version', 'ipv4'])
         self.cli_commit()
 
@@ -319,7 +319,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase):
         interface = 'vtun5000'
         path = base_path + [interface]
 
-        # check validate() - must speciy operating mode
+        # check validate() - must specify operating mode
         self.cli_set(path)
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
@@ -559,7 +559,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f'lport {port}', config)
         self.assertIn(f'push "redirect-gateway def1"', config)
 
-        # IPv4 only: server usees udp4 protocol
+        # IPv4 only: server uses udp4 protocol
         self.cli_set(path + ['ip-version', 'ipv4'])
         self.cli_commit()
 
@@ -799,7 +799,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f'lport {port}', config)
         self.assertIn(f'rport {port}', config)
 
-        # IPv4 only: server usees udp4 protocol
+        # IPv4 only: server uses udp4 protocol
         self.cli_set(path + ['ip-version', 'ipv4'])
         self.cli_commit()
 
diff --git a/smoketest/scripts/cli/test_interfaces_tunnel.py b/smoketest/scripts/cli/test_interfaces_tunnel.py
index e656a89f2..8d6d4c562 100755
--- a/smoketest/scripts/cli/test_interfaces_tunnel.py
+++ b/smoketest/scripts/cli/test_interfaces_tunnel.py
@@ -346,7 +346,7 @@ class TunnelInterfaceTest(BasicInterfaceTest.TestCase):
             if 'remote' in tunnel_config:
                 self.cli_set(self._base_path + [tunnel, 'remote', tunnel_config['remote']])
 
-        # GRE key must be supplied when two or more tunnels are formed to the same desitnation
+        # GRE key must be supplied when two or more tunnels are formed to the same destination
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
         for tunnel, tunnel_config in tunnels.items():
diff --git a/smoketest/scripts/cli/test_qos.py b/smoketest/scripts/cli/test_qos.py
index 3529fecf9..8526e16b1 100755
--- a/smoketest/scripts/cli/test_qos.py
+++ b/smoketest/scripts/cli/test_qos.py
@@ -244,7 +244,7 @@ class TestQoS(VyOSUnitTestSHIM.TestCase):
             self.assertEqual(flows, tmp['options']['flows'])
             self.assertEqual(queue_limit, tmp['options']['limit'])
 
-            # due to internal rounding we need to substract 1 from interval and target after converting to milliseconds
+            # due to internal rounding we need to subtract 1 from interval and target after converting to milliseconds
             # configuration of:
             # tc qdisc add dev eth0 root fq_codel quantum 1500 flows 512 interval 100ms limit 2048 target 5ms noecn
             # results in: tc -j qdisc show dev eth0
diff --git a/smoketest/scripts/cli/test_service_dhcp-server.py b/smoketest/scripts/cli/test_service_dhcp-server.py
index 285b56dfe..3fe613672 100755
--- a/smoketest/scripts/cli/test_service_dhcp-server.py
+++ b/smoketest/scripts/cli/test_service_dhcp-server.py
@@ -909,7 +909,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):
         range_0_start = inc_ip(subnet, 10)
         range_0_stop = inc_ip(subnet, 100)
 
-        # the DHCP exclude addresse is blanked out of the range which is done
+        # the DHCP exclude address is blanked out of the range which is done
         # by slicing one range into two ranges
         exclude_addr = inc_ip(range_0_start, 20)
         range_0_stop_excl = dec_ip(exclude_addr, 1)
diff --git a/smoketest/scripts/cli/test_service_dns_dynamic.py b/smoketest/scripts/cli/test_service_dns_dynamic.py
index a4c06af88..c68b831af 100755
--- a/smoketest/scripts/cli/test_service_dns_dynamic.py
+++ b/smoketest/scripts/cli/test_service_dns_dynamic.py
@@ -75,7 +75,7 @@ class TestServiceDDNS(VyOSUnitTestSHIM.TestCase):
             for opt, value in details.items():
                 self.cli_set(name_path + [svc, opt, value])
 
-            # 'zone' option is supported by 'cloudfare' and 'zoneedit1', but not 'freedns'
+            # 'zone' option is supported by 'cloudflare' and 'zoneedit1', but not 'freedns'
             self.cli_set(name_path + [svc, 'zone', zone])
             if details['protocol'] in ['cloudflare', 'zoneedit1']:
                 pass
@@ -85,7 +85,7 @@ class TestServiceDDNS(VyOSUnitTestSHIM.TestCase):
                     self.cli_commit()
                 self.cli_delete(name_path + [svc, 'zone'])
 
-            # 'ttl' option is supported by 'cloudfare', but not 'freedns' and 'zoneedit'
+            # 'ttl' option is supported by 'cloudflare', but not 'freedns' and 'zoneedit'
             self.cli_set(name_path + [svc, 'ttl', ttl])
             if details['protocol'] == 'cloudflare':
                 pass
@@ -174,7 +174,7 @@ class TestServiceDDNS(VyOSUnitTestSHIM.TestCase):
             for opt, value in details.items():
                 self.cli_set(name_path + [name, opt, value])
 
-            # Dual stack is supported by 'cloudfare' and 'freedns' but not 'googledomains'
+            # Dual stack is supported by 'cloudflare' and 'freedns' but not 'googledomains'
             # exception is raised for unsupported ones
             self.cli_set(name_path + [name, 'ip-version', ip_version])
             if details['protocol'] not in ['cloudflare', 'freedns']:
diff --git a/smoketest/scripts/cli/test_service_lldp.py b/smoketest/scripts/cli/test_service_lldp.py
index 9a022a0ac..f01bc23d2 100755
--- a/smoketest/scripts/cli/test_service_lldp.py
+++ b/smoketest/scripts/cli/test_service_lldp.py
@@ -126,7 +126,7 @@ class TestServiceLLDP(VyOSUnitTestSHIM.TestCase):
     def test_06_lldp_snmp(self):
         self.cli_set(base_path + ['snmp'])
 
-        # verify - can not start lldp snmp without snmp beeing configured
+        # verify - can not start lldp snmp without snmp being configured
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
         self.cli_set(['service', 'snmp'])
diff --git a/smoketest/scripts/cli/test_service_mdns_repeater.py b/smoketest/scripts/cli/test_service_mdns_repeater.py
index c093f051d..ee46ed694 100755
--- a/smoketest/scripts/cli/test_service_mdns_repeater.py
+++ b/smoketest/scripts/cli/test_service_mdns_repeater.py
@@ -102,7 +102,7 @@ class TestServiceMDNSrepeater(VyOSUnitTestSHIM.TestCase):
         self.cli_set(base_path + ['interface', 'dum10'])
         self.cli_set(base_path + ['interface', 'dum40'])
 
-        # exception is raised if partcipating interfaces do not have IPv4 address
+        # exception is raised if participating interfaces do not have IPv4 address
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
         self.cli_delete(base_path + ['interface', 'dum40'])
@@ -119,12 +119,12 @@ class TestServiceMDNSrepeater(VyOSUnitTestSHIM.TestCase):
         self.assertEqual(conf['reflector']['enable-reflector'], 'yes')
 
     def test_service_ipv6(self):
-        # partcipating interfaces should have IPv6 addresses
+        # participating interfaces should have IPv6 addresses
         self.cli_set(base_path + ['ip-version', 'ipv6'])
         self.cli_set(base_path + ['interface', 'dum10'])
         self.cli_set(base_path + ['interface', 'dum30'])
 
-        # exception is raised if partcipating interfaces do not have IPv4 address
+        # exception is raised if participating interfaces do not have IPv4 address
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
         self.cli_delete(base_path + ['interface', 'dum10'])
diff --git a/smoketest/scripts/cli/test_service_snmp.py b/smoketest/scripts/cli/test_service_snmp.py
index a23692982..729dc2328 100755
--- a/smoketest/scripts/cli/test_service_snmp.py
+++ b/smoketest/scripts/cli/test_service_snmp.py
@@ -101,7 +101,7 @@ class TestSNMPService(VyOSUnitTestSHIM.TestCase):
 
         # verify listen address, it will be returned as
         # ['unix:/run/snmpd.socket,udp:127.0.0.1:161,udp6:[::1]:161']
-        # thus we need to transfor this into a proper list
+        # thus we need to transform this into a proper list
         config = get_config_value('agentaddress')
         expected = 'unix:/run/snmpd.socket'
         self.assertIn(expected, config)
@@ -202,7 +202,7 @@ class TestSNMPService(VyOSUnitTestSHIM.TestCase):
         self.cli_set(base_path + ['v3', 'user', 'vyos', 'group', snmpv3_group])
 
         self.cli_set(base_path + ['v3', 'group', snmpv3_group, 'mode', 'ro'])
-        # check validate() - a view must be created before this can be comitted
+        # check validate() - a view must be created before this can be committed
         with self.assertRaises(ConfigSessionError):
             self.cli_commit()
 
diff --git a/smoketest/scripts/cli/test_service_ssh.py b/smoketest/scripts/cli/test_service_ssh.py
index 72f828093..98dd90d8a 100755
--- a/smoketest/scripts/cli/test_service_ssh.py
+++ b/smoketest/scripts/cli/test_service_ssh.py
@@ -173,7 +173,7 @@ class TestServiceSSH(VyOSUnitTestSHIM.TestCase):
         # commit changes
         self.cli_commit()
 
-        # Check configured port agains CLI default value
+        # Check configured port against CLI default value
         port = get_config_value('Port')
         cli_default = default_value(base_path + ['port'])
         self.assertEqual(port, cli_default)
diff --git a/smoketest/scripts/cli/test_service_tftp-server.py b/smoketest/scripts/cli/test_service_tftp-server.py
index 71c147087..d001b3671 100755
--- a/smoketest/scripts/cli/test_service_tftp-server.py
+++ b/smoketest/scripts/cli/test_service_tftp-server.py
@@ -106,7 +106,7 @@ class TestServiceTFTPD(VyOSUnitTestSHIM.TestCase):
             self.assertIn(directory, config)
 
         # Check for running processes - one process is spawned per listen
-        # IP address, wheter it's IPv4 or IPv6
+        # IP address, whether it's IPv4 or IPv6
         count = 0
         for p in process_iter():
             if PROCESS_NAME in p.name():
diff --git a/smoketest/scripts/cli/test_system_login.py b/smoketest/scripts/cli/test_system_login.py
index 592e21ece..7088097c4 100755
--- a/smoketest/scripts/cli/test_system_login.py
+++ b/smoketest/scripts/cli/test_system_login.py
@@ -585,7 +585,7 @@ class TestSystemLogin(VyOSUnitTestSHIM.TestCase):
         self.assertFalse(err)
         self.assertEqual(out, self.ssh_test_command_result)
 
-        # Cancel pending reboot - we do wan't to preceed with the remaining tests
+        # Cancel pending reboot - we do want to proceed with the remaining tests
         self.op_mode(['reboot', 'cancel'])
 
 if __name__ == '__main__':
diff --git a/smoketest/scripts/cli/test_vpn_ipsec.py b/smoketest/scripts/cli/test_vpn_ipsec.py
index a15532a96..3e60e51b2 100755
--- a/smoketest/scripts/cli/test_vpn_ipsec.py
+++ b/smoketest/scripts/cli/test_vpn_ipsec.py
@@ -1473,7 +1473,7 @@ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase):
         self.tearDownPKI()
 
     def test_remote_access_no_rekey(self):
-        # In some RA secnarios, disabling server-initiated rekey of IKE and CHILD SA is desired
+        # In some RA scenarios, disabling server-initiated rekey of IKE and CHILD SA is desired
         self.setupPKI()
 
         ike_group = 'IKE-RW'
@@ -1882,7 +1882,7 @@ class TestVPNIPsec(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         for config_option, cli_option in retransmission_options.items():
-            # Check configured value agains CLI default value
+            # Check configured value against CLI default value
             config_values_list = get_config_value(charon_file,config_option + ' =')
 
             if config_values_list:
diff --git a/smoketest/scripts/cli/test_vrf.py b/smoketest/scripts/cli/test_vrf.py
index 2b364dea3..63fe46d21 100755
--- a/smoketest/scripts/cli/test_vrf.py
+++ b/smoketest/scripts/cli/test_vrf.py
@@ -64,7 +64,7 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
         # always forward to base class
         super().setUp()
 
-        # VRF strict_most ist always enabled
+        # VRF strict_most is always enabled
         tmp = read_file('/proc/sys/net/vrf/strict_mode')
         self.assertEqual(tmp, '1')
 
@@ -740,7 +740,7 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
         dns_2 = inc_ip(subnet, 3)
         domain_name = 'vyos.net'
 
-        # declare fiels
+        # declare files
         process_name = 'kea-dhcp4'
         kea4_conf = f'/var/run/kea/kea-{vrf}-dhcp4.conf'
 
@@ -938,7 +938,7 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
         interface = 'dum8888'
         interface_addr = inc_ip(subnet, 1) + '/64'
 
-        # declare fiels
+        # declare files
         process_name = 'kea-dhcp6'
         kea6_conf = f'/var/run/kea/kea-{vrf}-dhcp6.conf'