diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-06-16 20:24:44 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2026-06-16 20:24:44 +0200 |
| commit | fa853ed8f25b5b9bf396d6e819b2c6259e7f5f42 (patch) | |
| tree | 9ee5a9c573512f393384d5adc9211457915a3bac /smoketest/scripts/cli | |
| parent | 4fb32bc179127691f40c8e93c55877aa76f10416 (diff) | |
| download | vyos-1x-fa853ed8f25b5b9bf396d6e819b2c6259e7f5f42.tar.gz vyos-1x-fa853ed8f25b5b9bf396d6e819b2c6259e7f5f42.zip | |
T8923: normalize "can not" to "cannot"
Replace two-word "can not" / "Can not" with "cannot" across comments,
ConfigError messages, CLI help text, and op-mode output.
Standard SNMP MIB files under mibs/ are left unchanged.
Diffstat (limited to 'smoketest/scripts/cli')
20 files changed, 33 insertions, 33 deletions
diff --git a/smoketest/scripts/cli/base_interfaces_test.py b/smoketest/scripts/cli/base_interfaces_test.py index 50606efe3..3917cca71 100644 --- a/smoketest/scripts/cli/base_interfaces_test.py +++ b/smoketest/scripts/cli/base_interfaces_test.py @@ -448,7 +448,7 @@ class BasicInterfaceTest: self.cli_set(self._base_path + [interface] + option.split()) self.cli_set(self._base_path + [interface, 'vrf', 'invalid']) - # check validate() - can not use a non-existing VRF + # check validate() - cannot use a non-existing VRF with self.assertRaises(ConfigSessionError): self.cli_commit() @@ -645,7 +645,7 @@ class BasicInterfaceTest: self.cli_set(base + option.split()) self.cli_set(base + ['mtu', self._mtu]) - # check validate() - can not set low MTU if 'no-default-link-local' + # check validate() - cannot set low MTU if 'no-default-link-local' # is not set on CLI with self.assertRaises(ConfigSessionError): self.cli_commit() diff --git a/smoketest/scripts/cli/base_vyostest_shim.py b/smoketest/scripts/cli/base_vyostest_shim.py index 590670a06..4fbb6e050 100644 --- a/smoketest/scripts/cli/base_vyostest_shim.py +++ b/smoketest/scripts/cli/base_vyostest_shim.py @@ -37,7 +37,7 @@ save_config = '/tmp/vyos-smoketest-save' # the Python UnitTest framework. Before every test is loaded, we dump the current # system configuration and reload it after the test - despite the test results. # -# Using this approach we can not render a live system useless while running any +# Using this approach we cannot render a live system useless while running any # kind of smoketest. In addition it adds debug capabilities like printing the # command used to execute the test. diff --git a/smoketest/scripts/cli/test_container.py b/smoketest/scripts/cli/test_container.py index 237e6238d..27972ce37 100755 --- a/smoketest/scripts/cli/test_container.py +++ b/smoketest/scripts/cli/test_container.py @@ -286,7 +286,7 @@ class TestContainer(VyOSUnitTestSHIM.TestCase): ] ) - # verify() - first IP address of a prefix can not be used by a container + # verify() - first IP address of a prefix cannot be used by a container with self.assertRaises(ConfigSessionError): self.cli_commit() @@ -332,7 +332,7 @@ class TestContainer(VyOSUnitTestSHIM.TestCase): ] ) - # verify() - first IP address of a prefix can not be used by a container + # verify() - first IP address of a prefix cannot be used by a container with self.assertRaises(ConfigSessionError): self.cli_commit() @@ -391,7 +391,7 @@ class TestContainer(VyOSUnitTestSHIM.TestCase): ] ) - # verify() - first IP address of a prefix can not be used by a container + # verify() - first IP address of a prefix cannot be used by a container with self.assertRaises(ConfigSessionError): self.cli_commit() diff --git a/smoketest/scripts/cli/test_interfaces_bonding.py b/smoketest/scripts/cli/test_interfaces_bonding.py index a4afae5da..9d7199e7b 100755 --- a/smoketest/scripts/cli/test_interfaces_bonding.py +++ b/smoketest/scripts/cli/test_interfaces_bonding.py @@ -219,7 +219,7 @@ class BondingInterfaceTest(BasicInterfaceTest.TestCase): for member in self._members: self.cli_set(self._base_path + [interface, 'member', 'interface', member]) - # check validate() - can not use the same member interfaces multiple times + # check validate() - cannot use the same member interfaces multiple times with self.assertRaises(ConfigSessionError): self.cli_commit() # only keep the first bond interface configuration @@ -242,7 +242,7 @@ class BondingInterfaceTest(BasicInterfaceTest.TestCase): self.cli_set(self._base_path + [bond, 'member', 'interface', member]) self.cli_set(['interfaces', 'pppoe', pppoe, 'source-interface', member]) - # check validate() - can not add interface to bond, it is the source-interface of ... + # check validate() - cannot add interface to bond, it is the source-interface of ... with self.assertRaises(ConfigSessionError): self.cli_commit() @@ -262,7 +262,7 @@ class BondingInterfaceTest(BasicInterfaceTest.TestCase): self.cli_set(self._base_path + [bond, 'member', 'interface', member]) self.cli_set(['interfaces', 'bridge', bridge, 'member', 'interface', member]) - # check validate() - can not add interface to bond, it is a member of bridge ... + # check validate() - cannot add interface to bond, it is a member of bridge ... with self.assertRaises(ConfigSessionError): self.cli_commit() diff --git a/smoketest/scripts/cli/test_interfaces_bridge.py b/smoketest/scripts/cli/test_interfaces_bridge.py index a41ad1482..927ac0370 100755 --- a/smoketest/scripts/cli/test_interfaces_bridge.py +++ b/smoketest/scripts/cli/test_interfaces_bridge.py @@ -165,7 +165,7 @@ class BridgeInterfaceTest(BasicInterfaceTest.TestCase): for member in self._members: self.cli_set(self._base_path + [interface, 'member', 'interface', member]) - # check validate() - can not use the same member interfaces multiple times + # check validate() - cannot use the same member interfaces multiple times with self.assertRaises(ConfigSessionError): self.cli_commit() # only keep the first bond interface configuration diff --git a/smoketest/scripts/cli/test_interfaces_openvpn.py b/smoketest/scripts/cli/test_interfaces_openvpn.py index 2cf3a26c0..b13ced003 100755 --- a/smoketest/scripts/cli/test_interfaces_openvpn.py +++ b/smoketest/scripts/cli/test_interfaces_openvpn.py @@ -176,7 +176,7 @@ class TestInterfacesOpenVPN(VyOSUnitTestSHIM.TestCase): self.cli_set(path + ['tls', 'ca-certificate', 'ovpn_test']) self.cli_set(path + ['tls', 'certificate', 'ovpn_test']) - # check validate() - can not have auth username without a password + # check validate() - cannot have auth username without a password self.cli_set(path + ['authentication', 'username', 'vyos']) with self.assertRaises(ConfigSessionError): self.cli_commit() diff --git a/smoketest/scripts/cli/test_interfaces_tunnel.py b/smoketest/scripts/cli/test_interfaces_tunnel.py index 8d6d4c562..8eb32b7ca 100755 --- a/smoketest/scripts/cli/test_interfaces_tunnel.py +++ b/smoketest/scripts/cli/test_interfaces_tunnel.py @@ -74,7 +74,7 @@ class TunnelInterfaceTest(BasicInterfaceTest.TestCase): self.cli_set(self._base_path + [interface, 'remote', remote_ip4]) self.cli_set(self._base_path + [interface, 'source-interface', source_if]) - # Source interface can not be used with sit and gretap + # Source interface cannot be used with sit and gretap if encapsulation in ['sit', 'gretap']: with self.assertRaises(ConfigSessionError): self.cli_commit() @@ -122,7 +122,7 @@ class TunnelInterfaceTest(BasicInterfaceTest.TestCase): # Configure Tunnel Source interface self.cli_set(self._base_path + [interface, 'source-interface', source_if]) - # Source interface can not be used with ip6gretap + # Source interface cannot be used with ip6gretap if encapsulation in ['ip6gretap']: with self.assertRaises(ConfigSessionError): self.cli_commit() @@ -404,7 +404,7 @@ class TunnelInterfaceTest(BasicInterfaceTest.TestCase): for dynamic_interface in ['l2tp0', 'ppp4220', 'sstpc0', 'ipoe654']: self.cli_set(self._base_path + [interface, 'source-interface', dynamic_interface]) - # verify() - we can not source from dynamic interfaces + # verify() - we cannot source from dynamic interfaces with self.assertRaises(ConfigSessionError): self.cli_commit() self.cli_set(self._base_path + [interface, 'source-interface', 'eth0']) diff --git a/smoketest/scripts/cli/test_interfaces_vxlan.py b/smoketest/scripts/cli/test_interfaces_vxlan.py index b63fa79ca..e05346d1b 100755 --- a/smoketest/scripts/cli/test_interfaces_vxlan.py +++ b/smoketest/scripts/cli/test_interfaces_vxlan.py @@ -146,7 +146,7 @@ class VXLANInterfaceTest(BasicInterfaceTest.TestCase): self.cli_set(self._base_path + [interface, 'parameters', 'external']) self.cli_set(self._base_path + [interface, 'source-address', source_address]) - # Both 'VNI' and 'external' can not be specified at the same time. + # Both 'VNI' and 'external' cannot be specified at the same time. self.cli_set(self._base_path + [interface, 'vni', '111']) with self.assertRaises(ConfigSessionError): self.cli_commit() diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py index c0d505616..a4b8fca9b 100755 --- a/smoketest/scripts/cli/test_protocols_isis.py +++ b/smoketest/scripts/cli/test_protocols_isis.py @@ -178,12 +178,12 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase): self.cli_set(base_path + ['domain-password', 'plaintext-password', password]) self.cli_set(base_path + ['domain-password', 'md5', password]) - # verify() - can not use both md5 and plaintext-password for area-password + # verify() - cannot use both md5 and plaintext-password for area-password with self.assertRaises(ConfigSessionError): self.cli_commit() self.cli_delete(base_path + ['area-password', 'md5', password]) - # verify() - can not use both md5 and plaintext-password for domain-password + # verify() - cannot use both md5 and plaintext-password for domain-password with self.assertRaises(ConfigSessionError): self.cli_commit() self.cli_delete(base_path + ['domain-password', 'md5', password]) diff --git a/smoketest/scripts/cli/test_protocols_openfabric.py b/smoketest/scripts/cli/test_protocols_openfabric.py index c1e6f6598..b2a335a01 100644 --- a/smoketest/scripts/cli/test_protocols_openfabric.py +++ b/smoketest/scripts/cli/test_protocols_openfabric.py @@ -124,7 +124,7 @@ class TestProtocolsOpenFabric(VyOSUnitTestSHIM.TestCase): self.cli_set(path + ['interface', dummy_if, 'password', 'plaintext-password', f'{password}-{dummy_if}']) self.cli_set(path + ['interface', dummy_if, 'password', 'md5', f'{password}-{dummy_if}']) - # verify() - can not use both md5 and plaintext-password for password for the interface + # verify() - cannot use both md5 and plaintext-password for password for the interface with self.assertRaises(ConfigSessionError): self.cli_commit() self.cli_delete(path + ['interface', dummy_if, 'password', 'md5']) @@ -132,7 +132,7 @@ class TestProtocolsOpenFabric(VyOSUnitTestSHIM.TestCase): self.cli_set(path + ['domain-password', 'plaintext-password', password]) self.cli_set(path + ['domain-password', 'md5', password]) - # verify() - can not use both md5 and plaintext-password for domain-password + # verify() - cannot use both md5 and plaintext-password for domain-password with self.assertRaises(ConfigSessionError): self.cli_commit() self.cli_delete(path + ['domain-password', 'md5']) diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py index 299f518a8..ef70e19c4 100755 --- a/smoketest/scripts/cli/test_protocols_ospf.py +++ b/smoketest/scripts/cli/test_protocols_ospf.py @@ -356,7 +356,7 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase): self.assertIn(f' passive-interface default', frrconfig) for interface in interfaces: - # Can not use daemon for getFRRconfig() as bandwidth parameter belongs to zebra process + # Cannot use daemon for getFRRconfig() as bandwidth parameter belongs to zebra process config = self.getFRRconfig(f'interface {interface}', stop_section='^exit') self.assertIn(f'interface {interface}', config) self.assertIn(f' ip ospf authentication-key {password}', config) @@ -388,7 +388,7 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase): for interface in interfaces: self.cli_set(base_path + ['interface', interface, 'area', area]) - # we can not have bot area network and interface area set + # we cannot have bot area network and interface area set with self.assertRaises(ConfigSessionError): self.cli_commit() self.cli_delete(base_path + ['area', area, 'network']) @@ -586,7 +586,7 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase): self.cli_set(base_path + ['area', area0, 'network', network]) - # we can not have the same network defined on two areas + # we cannot have the same network defined on two areas self.cli_set(base_path + ['area', area1, 'network', network]) with self.assertRaises(ConfigSessionError): self.cli_commit() diff --git a/smoketest/scripts/cli/test_protocols_pim.py b/smoketest/scripts/cli/test_protocols_pim.py index cb04c5bb2..e531d0173 100755 --- a/smoketest/scripts/cli/test_protocols_pim.py +++ b/smoketest/scripts/cli/test_protocols_pim.py @@ -139,7 +139,7 @@ class TestProtocolsPIM(VyOSUnitTestSHIM.TestCase): self.cli_set(base_path) self.cli_set(igmp_proxy) - # check validate() - can not set both IGMP proxy and PIM + # check validate() - cannot set both IGMP proxy and PIM with self.assertRaises(ConfigSessionError): self.cli_commit() diff --git a/smoketest/scripts/cli/test_protocols_static.py b/smoketest/scripts/cli/test_protocols_static.py index 892a46d7b..596c61c3c 100755 --- a/smoketest/scripts/cli/test_protocols_static.py +++ b/smoketest/scripts/cli/test_protocols_static.py @@ -256,7 +256,7 @@ class TestProtocolsStatic(VyOSUnitTestSHIM.TestCase): self.cli_set(base + ['reject', 'tag', route_config['reject']['tag']]) if {'blackhole', 'reject'} <= set(route_config): - # Can not use blackhole and reject at the same time + # Cannot use blackhole and reject at the same time with self.assertRaises(ConfigSessionError): self.cli_commit() self.cli_delete(base + ['blackhole']) @@ -315,7 +315,7 @@ class TestProtocolsStatic(VyOSUnitTestSHIM.TestCase): self.assertIn(tmp, frrconfig) if {'blackhole', 'reject'} <= set(route_config): - # Can not use blackhole and reject at the same time + # Cannot use blackhole and reject at the same time # Config error validated above - skip this route continue diff --git a/smoketest/scripts/cli/test_qos.py b/smoketest/scripts/cli/test_qos.py index 8526e16b1..d7014dc44 100755 --- a/smoketest/scripts/cli/test_qos.py +++ b/smoketest/scripts/cli/test_qos.py @@ -851,7 +851,7 @@ class TestQoS(VyOSUnitTestSHIM.TestCase): interface = self._interfaces[0] self.cli_set(['qos', 'interface', interface]) - # Can not use both IPv6 and IPv4 in one match + # Cannot use both IPv6 and IPv4 in one match self.cli_set(['qos', 'traffic-match-group', '1', 'match', 'one', 'ip', 'dscp', 'EF']) self.cli_set(['qos', 'traffic-match-group', '1', 'match', 'one', 'ipv6', 'dscp', 'EF']) with self.assertRaises(ConfigSessionError) as e: diff --git a/smoketest/scripts/cli/test_service_lldp.py b/smoketest/scripts/cli/test_service_lldp.py index f01bc23d2..8d3d666d4 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 being configured + # verify - cannot 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_ssh.py b/smoketest/scripts/cli/test_service_ssh.py index 98dd90d8a..2e295bf24 100755 --- a/smoketest/scripts/cli/test_service_ssh.py +++ b/smoketest/scripts/cli/test_service_ssh.py @@ -159,7 +159,7 @@ class TestServiceSSH(VyOSUnitTestSHIM.TestCase): self.assertTrue(os.path.isfile(key_ed25519)) # Established SSH connections remains running after service is stopped. - # We can not use process_named_running here - we rather need to check + # We cannot use process_named_running here - we rather need to check # that the systemd service is no longer running self.assertFalse(is_systemd_service_running(PROCESS_NAME)) # always forward to base class diff --git a/smoketest/scripts/cli/test_service_webproxy.py b/smoketest/scripts/cli/test_service_webproxy.py index 7f3731800..afe0e6243 100755 --- a/smoketest/scripts/cli/test_service_webproxy.py +++ b/smoketest/scripts/cli/test_service_webproxy.py @@ -157,7 +157,7 @@ class TestServiceWebProxy(VyOSUnitTestSHIM.TestCase): self.cli_commit() self.cli_set(base_path + ['authentication', 'ldap', 'server', ldap_server]) - # check validate() - LDAP password can not be set when bind-dn is not define + # check validate() - LDAP password cannot be set when bind-dn is not define self.cli_set(base_path + ['authentication', 'ldap', 'password', ldap_password]) with self.assertRaises(ConfigSessionError): self.cli_commit() diff --git a/smoketest/scripts/cli/test_system_ipv6.py b/smoketest/scripts/cli/test_system_ipv6.py index eacf833ae..d7282c4c8 100755 --- a/smoketest/scripts/cli/test_system_ipv6.py +++ b/smoketest/scripts/cli/test_system_ipv6.py @@ -60,7 +60,7 @@ class TestSystemIPv6(VyOSUnitTestSHIM.TestCase): self.assertEqual(sysctl_read(['net', 'ipv6', 'conf', 'all', 'accept_dad']), '1') # Do not assign any IPv6 address on interfaces, this requires a reboot - # which can not be tested, but we can read the config file :) + # which cannot be tested, but we can read the config file :) self.cli_set(base_path + ['strict-dad']) self.cli_commit() @@ -72,7 +72,7 @@ class TestSystemIPv6(VyOSUnitTestSHIM.TestCase): self.assertEqual(sysctl_read(['net', 'ipv6', 'fib_multipath_hash_policy']), '0') # Do not assign any IPv6 address on interfaces, this requires a reboot - # which can not be tested, but we can read the config file :) + # which cannot be tested, but we can read the config file :) self.cli_set(base_path + ['multipath', 'layer4-hashing']) self.cli_commit() diff --git a/smoketest/scripts/cli/test_system_login.py b/smoketest/scripts/cli/test_system_login.py index 7088097c4..e2367e093 100755 --- a/smoketest/scripts/cli/test_system_login.py +++ b/smoketest/scripts/cli/test_system_login.py @@ -188,7 +188,7 @@ class TestSystemLogin(VyOSUnitTestSHIM.TestCase): system_user = 'backup' self.cli_set(base_path + ['user', system_user, 'authentication', 'plaintext-password', system_user]) - # check validate() - can not add username which exists on the Debian + # check validate() - cannot add username which exists on the Debian # base system (UID < 1000) with self.assertRaises(ConfigSessionError): self.cli_commit() diff --git a/smoketest/scripts/cli/test_vrf.py b/smoketest/scripts/cli/test_vrf.py index 902308b9b..49496707f 100755 --- a/smoketest/scripts/cli/test_vrf.py +++ b/smoketest/scripts/cli/test_vrf.py @@ -225,7 +225,7 @@ class VRFTest(VyOSUnitTestSHIM.TestCase): table = str(int(table) + 1) self.cli_set(base + ['table', table]) - # check validate() - table ID can not be altered! + # check validate() - table ID cannot be altered! with self.assertRaises(ConfigSessionError): self.cli_commit() |
