diff options
| author | Christian Breunig <christian@breunig.cc> | 2025-10-14 17:37:42 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2025-10-16 16:33:44 +0200 |
| commit | 9775bb49e4d42c7bf09f4d78b404b5b39b47b11f (patch) | |
| tree | 55caae9784be36945f86f6ab3d8a3bed6fea7847 /smoketest/scripts/cli/test_system_ip.py | |
| parent | 6961f7373fdec559f64a82dcb8c0b87d06f53e78 (diff) | |
| download | vyos-1x-9775bb49e4d42c7bf09f4d78b404b5b39b47b11f.tar.gz vyos-1x-9775bb49e4d42c7bf09f4d78b404b5b39b47b11f.zip | |
frr: T7664: drop BASH/SED implementation in smoketest getFRRconfig()
Rathern then re-inventing the wheel by outself we import the frr-reload.py
script and their read-in function of the current vtysh configuration.
Diffstat (limited to 'smoketest/scripts/cli/test_system_ip.py')
| -rwxr-xr-x | smoketest/scripts/cli/test_system_ip.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/smoketest/scripts/cli/test_system_ip.py b/smoketest/scripts/cli/test_system_ip.py index 57037fd8b..fdea3ab16 100755 --- a/smoketest/scripts/cli/test_system_ip.py +++ b/smoketest/scripts/cli/test_system_ip.py @@ -42,14 +42,16 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase): self.cli_set(base_path + ['disable-forwarding']) self.cli_commit() + self.assertEqual(sysctl_read('net.ipv4.conf.all.forwarding'), '0') - frrconfig = self.getFRRconfig('', end='') + frrconfig = self.getFRRconfig() self.assertIn('no ip forwarding', frrconfig) self.cli_delete(base_path + ['disable-forwarding']) self.cli_commit() + self.assertEqual(sysctl_read('net.ipv4.conf.all.forwarding'), '1') - frrconfig = self.getFRRconfig('', end='') + frrconfig = self.getFRRconfig() self.assertNotIn('no ip forwarding', frrconfig) def test_system_ip_multipath(self): @@ -89,7 +91,7 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Verify route-map properly applied to FRR - frrconfig = self.getFRRconfig('ip protocol', end='') + frrconfig = self.getFRRconfig('ip protocol', stop_section='^end') for protocol in protocols: self.assertIn(f'ip protocol {protocol} route-map route-map-{protocol}', frrconfig) @@ -100,7 +102,7 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Verify route-map properly applied to FRR - frrconfig = self.getFRRconfig('ip protocol', end='') + frrconfig = self.getFRRconfig('ip protocol', stop_section='^end') self.assertNotIn(f'ip protocol', frrconfig) def test_system_ip_protocol_non_existing_route_map(self): @@ -119,13 +121,13 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase): self.cli_set(base_path + ['nht', 'no-resolve-via-default']) self.cli_commit() # Verify CLI config applied to FRR - frrconfig = self.getFRRconfig('', end='') + frrconfig = self.getFRRconfig() self.assertIn(f'no ip nht resolve-via-default', frrconfig) self.cli_delete(base_path + ['nht', 'no-resolve-via-default']) self.cli_commit() # Verify CLI config removed to FRR - frrconfig = self.getFRRconfig('', end='') + frrconfig = self.getFRRconfig() self.assertNotIn(f'no ip nht resolve-via-default', frrconfig) def test_system_ip_import_table(self): @@ -138,7 +140,7 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase): self.cli_commit() # Verify CLI config applied to FRR - frrconfig = self.getFRRconfig('', end='') + frrconfig = self.getFRRconfig() self.assertIn(f'ip import-table {table_num} distance {distance} route-map {route_map_in}', frrconfig) self.cli_delete(['policy', 'route-map', route_map_in]) @@ -146,7 +148,7 @@ class TestSystemIP(VyOSUnitTestSHIM.TestCase): self.cli_delete(base_path + ['import-table']) self.cli_commit() # Verify CLI config removed to FRR - frrconfig = self.getFRRconfig('', end='') + frrconfig = self.getFRRconfig() self.assertNotIn(f'ip import-table {table_num} distance {distance}', frrconfig) if __name__ == '__main__': |