Merge pull request #5298 from vyos/ci/T8490-typos-vyos-1x

ci: T8490: fix typos in comments, strings, and local identifiers

14 files changed, 24 insertions, 24 deletions

diff --git a/src/conf_mode/system_host-name.py b/src/conf_mode/system_host-name.py
index 5a9265eba..2267508af 100755
--- a/src/conf_mode/system_host-name.py
+++ b/src/conf_mode/system_host-name.py
@@ -39,7 +39,7 @@ default_config_data = {
     'domain_search': [],
     'nameserver': [],
     'nameservers_dhcp_interfaces': {},
-    'snmpd_restart_reqired': False,
+    'snmpd_restart_required': False,
     'static_host_mapping': {}
 }
 
@@ -57,7 +57,7 @@ def get_config(config=None):
 
     base = ['system']
     if leaf_node_changed(conf, base + ['host-name']) or leaf_node_changed(conf, base + ['domain-name']):
-        hosts['snmpd_restart_reqired'] = True
+        hosts['snmpd_restart_required'] = True
 
     # This may happen if the config is not loaded yet,
     # e.g. if run by cloud-init
@@ -179,7 +179,7 @@ def apply(config):
         call(f'systemctl restart {tmp}')
 
     # If SNMP is running, restart it too
-    if process_named_running('snmpd') and config['snmpd_restart_reqired']:
+    if process_named_running('snmpd') and config['snmpd_restart_required']:
         tmp = systemd_services['snmpd']
         call(f'systemctl restart {tmp}')
 
diff --git a/src/helpers/run-config-migration.py b/src/helpers/run-config-migration.py
index 6a3533644..6329d2979 100755
--- a/src/helpers/run-config-migration.py
+++ b/src/helpers/run-config-migration.py
@@ -47,13 +47,13 @@ if not os.access(config_file, os.R_OK):
 
 if out_file is None:
     if not os.access(config_file, os.W_OK):
-        print(f"Config file '{config_file}' not writeable")
+        print(f"Config file '{config_file}' not writable")
         sys.exit(1)
 else:
     try:
         open(out_file, 'w').close()
     except OSError:
-        print(f"Output file '{out_file}' not writeable")
+        print(f"Output file '{out_file}' not writable")
         sys.exit(1)
 
 config_migrate = ConfigMigrate(config_file, force=force, output_file=out_file)
diff --git a/src/migration-scripts/l2tp/2-to-3 b/src/migration-scripts/l2tp/2-to-3
index 748d9544e..053c2d427 100644
--- a/src/migration-scripts/l2tp/2-to-3
+++ b/src/migration-scripts/l2tp/2-to-3
@@ -69,7 +69,7 @@ def migrate(config: ConfigTree) -> None:
         prefix_old = config.return_values(ipv6_base + ['prefix'])
         # delete old prefix CLI nodes
         config.delete(ipv6_base + ['prefix'])
-        # create ned prefix tag node
+        # create new prefix tag node
         config.set(ipv6_base + ['prefix'])
         config.set_tag(ipv6_base + ['prefix'])
 
@@ -82,7 +82,7 @@ def migrate(config: ConfigTree) -> None:
         prefix_old = config.return_values(ipv6_base + ['delegate-prefix'])
         # delete old delegate prefix CLI nodes
         config.delete(ipv6_base + ['delegate-prefix'])
-        # create ned delegation tag node
+        # create new delegation tag node
         config.set(ipv6_base + ['delegate'])
         config.set_tag(ipv6_base + ['delegate'])
 
diff --git a/src/migration-scripts/pppoe-server/3-to-4 b/src/migration-scripts/pppoe-server/3-to-4
index b0eb6f2b9..4954d3d22 100644
--- a/src/migration-scripts/pppoe-server/3-to-4
+++ b/src/migration-scripts/pppoe-server/3-to-4
@@ -98,7 +98,7 @@ def migrate(config: ConfigTree) -> None:
         prefix_old = config.return_values(ipv6_base + ['prefix'])
         # delete old prefix CLI nodes
         config.delete(ipv6_base + ['prefix'])
-        # create ned prefix tag node
+        # create new prefix tag node
         config.set(ipv6_base + ['prefix'])
         config.set_tag(ipv6_base + ['prefix'])
 
@@ -111,7 +111,7 @@ def migrate(config: ConfigTree) -> None:
         prefix_old = config.return_values(ipv6_base + ['delegate-prefix'])
         # delete old delegate prefix CLI nodes
         config.delete(ipv6_base + ['delegate-prefix'])
-        # create ned delegation tag node
+        # create new delegation tag node
         config.set(ipv6_base + ['delegate'])
         config.set_tag(ipv6_base + ['delegate'])
 
diff --git a/src/migration-scripts/system/13-to-14 b/src/migration-scripts/system/13-to-14
index 0c2480bdb..3632b4b6a 100644
--- a/src/migration-scripts/system/13-to-14
+++ b/src/migration-scripts/system/13-to-14
@@ -38,10 +38,10 @@ def migrate(config: ConfigTree) -> None:
 
     # retrieve all valid timezones
     try:
-        tz_datas = cmd('timedatectl list-timezones')
+        tz_data_raw = cmd('timedatectl list-timezones')
     except OSError:
-        tz_datas = ''
-    tz_data = tz_datas.split('\n')
+        tz_data_raw = ''
+    tz_data = tz_data_raw.split('\n')
 
     if re.match(r'[Ll][Oo][Ss].+', tz):
         tz = 'America/Los_Angeles'
diff --git a/src/ocaml/vyos_op_run.ml b/src/ocaml/vyos_op_run.ml
index aa88d42fd..69028792e 100644
--- a/src/ocaml/vyos_op_run.ml
+++ b/src/ocaml/vyos_op_run.ml
@@ -286,7 +286,7 @@ let is_admin_only_command cmd =
   match res with
   | None -> false
   | Some _ ->
-    let () = Logs.debug @@ fun m -> m "Commandis reserved for admins" in
+    let () = Logs.debug @@ fun m -> m "Command is reserved for admins" in
     true
 
 let check_command_permissions perms cmd =
diff --git a/src/op_mode/generate_tech-support_archive.py b/src/op_mode/generate_tech-support_archive.py
index d005d78ee..d64993b61 100755
--- a/src/op_mode/generate_tech-support_archive.py
+++ b/src/op_mode/generate_tech-support_archive.py
@@ -99,7 +99,7 @@ def __generate_archived_files(location_path: str) -> None:
 
         return tarinfo
 
-    # Dictionary arhive_name:directory_to_arhive
+    # Dictionary archive_name:directory_to_archive
     archive_dict = {
         'etc': '/etc',
         'home': '/home',
diff --git a/src/op_mode/interfaces.py b/src/op_mode/interfaces.py
index ecc4e73d2..5c6f04476 100755
--- a/src/op_mode/interfaces.py
+++ b/src/op_mode/interfaces.py
@@ -96,7 +96,7 @@ def _split_text(text, used=0):
     take a string and attempt to split it to fit with the width of the screen
 
     text: the string to split
-    used: number of characted already used in the screen
+    used: number of character already used in the screen
     """
     no_tty = call('tty -s')
 
diff --git a/src/op_mode/ipsec.py b/src/op_mode/ipsec.py
index 3061089ee..b878789a7 100755
--- a/src/op_mode/ipsec.py
+++ b/src/op_mode/ipsec.py
@@ -412,7 +412,7 @@ def _get_raw_connections_summary(list_conn, list_sas):
     return tun_dict
 
 
-def _get_formatted_output_conections(data):
+def _get_formatted_output_connections(data):
     from tabulate import tabulate
 
     connections = []
@@ -813,7 +813,7 @@ def show_connections(raw: bool):
         return _get_raw_data_connections(list_conns, list_sas)
 
     connections = _get_raw_data_connections(list_conns, list_sas)
-    return _get_formatted_output_conections(connections)
+    return _get_formatted_output_connections(connections)
 
 
 def show_connections_summary(raw: bool):
diff --git a/src/op_mode/ping.py b/src/op_mode/ping.py
index f52dfa7de..eda4f4af8 100755
--- a/src/op_mode/ping.py
+++ b/src/op_mode/ping.py
@@ -179,7 +179,7 @@ def completion_failure(option: str) -> None:
     sys.exit(1)
 
 
-def expension_failure(option, completions):
+def expansion_failure(option, completions):
     reason = 'Ambiguous' if completions else 'Invalid'
     sys.stderr.write(
         '\n\n  {} command: {} [{}]\n\n'.format(reason, ' '.join(sys.argv),
@@ -201,7 +201,7 @@ def convert(command, args):
         shortname = args.first()
         longnames = complete(shortname)
         if len(longnames) != 1:
-            expension_failure(shortname, longnames)
+            expansion_failure(shortname, longnames)
         longname = longnames[0]
         if options[longname]['type'] == 'noarg':
             command = options[longname]['ping'].format(
diff --git a/src/op_mode/traceroute.py b/src/op_mode/traceroute.py
index ef67b7416..720dd56ea 100755
--- a/src/op_mode/traceroute.py
+++ b/src/op_mode/traceroute.py
@@ -135,7 +135,7 @@ def completion_failure(option: str) -> None:
     sys.exit(1)
 
 
-def expension_failure(option, completions):
+def expansion_failure(option, completions):
     reason = 'Ambiguous' if completions else 'Invalid'
     sys.stderr.write(
         '\n\n  {} command: {} [{}]\n\n'.format(reason, ' '.join(sys.argv),
@@ -157,7 +157,7 @@ def convert(command, args):
         shortname = args.first()
         longnames = complete(shortname)
         if len(longnames) != 1:
-            expension_failure(shortname, longnames)
+            expansion_failure(shortname, longnames)
         longname = longnames[0]
         if options[longname]['type'] == 'noarg':
             command = options[longname]['traceroute'].format(
diff --git a/src/opt/vyatta/sbin/if-mib-alias b/src/opt/vyatta/sbin/if-mib-alias
index bc86f999f..59b1a4d30 100755
--- a/src/opt/vyatta/sbin/if-mib-alias
+++ b/src/opt/vyatta/sbin/if-mib-alias
@@ -107,7 +107,7 @@ sub set_oid {
     my $ifname = ifindextoname($ifindex);
     if ($ifname) {
 	system("ip li set $ifname alias '$value' >/dev/null 2>&1");
-	print "not-writeable\n"	if ($? != 0);
+	print "not-writable\n"	if ($? != 0);
     }
 }
 
diff --git a/src/services/api/graphql/graphql/mutations.py b/src/services/api/graphql/graphql/mutations.py
index c979d06e8..dc5eedfd5 100644
--- a/src/services/api/graphql/graphql/mutations.py
+++ b/src/services/api/graphql/graphql/mutations.py
@@ -80,7 +80,7 @@ def make_mutation_resolver(mutation_name, class_name, session_func):
                         return {'success': False, 'errors': [error]}
                     return {'success': False, 'errors': ['not authenticated']}
             else:
-                # AtrributeError will have already been raised if no
+                # AttributeError will have already been raised if no
                 # auth_type; validation and defaultValue ensure it is
                 # one of the previous cases, so this is never reached.
                 pass
diff --git a/src/services/api/graphql/graphql/queries.py b/src/services/api/graphql/graphql/queries.py
index 3a8d12344..f5a5e8cb2 100644
--- a/src/services/api/graphql/graphql/queries.py
+++ b/src/services/api/graphql/graphql/queries.py
@@ -80,7 +80,7 @@ def make_query_resolver(query_name, class_name, session_func):
                         return {'success': False, 'errors': [error]}
                     return {'success': False, 'errors': ['not authenticated']}
             else:
-                # AtrributeError will have already been raised if no
+                # AttributeError will have already been raised if no
                 # auth_type; validation and defaultValue ensure it is
                 # one of the previous cases, so this is never reached.
                 pass