summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-10-06 15:19:09 +0200
committerChristian Breunig <christian@breunig.cc>2024-12-16 22:21:36 +0100
commit6544973ae66bbecaea8b6194a8bf6cd3eadf4fa8 (patch)
treec7761dc21c34f2d233c67550b97de72421f44768
parent81923562a8a164f7ff9761e976c20420a585907a (diff)
downloadvyos-1x-6544973ae66bbecaea8b6194a8bf6cd3eadf4fa8.tar.gz
vyos-1x-6544973ae66bbecaea8b6194a8bf6cd3eadf4fa8.zip
frr: T6747: ensure there are no daemon leftovers in vtysh CLI after smoketests
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_bgp.py3
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_ospf.py3
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_ospfv3.py3
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_rip.py3
-rwxr-xr-xsmoketest/scripts/cli/test_protocols_ripng.py3
5 files changed, 15 insertions, 0 deletions
diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index ad9ce3676..6eeac37a7 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -218,6 +218,9 @@ class TestProtocolsBGP(VyOSUnitTestSHIM.TestCase):
self.cli_delete(base_path)
self.cli_commit()
+ frrconfig = self.getFRRconfig('router bgp')
+ self.assertNotIn(f'router bgp', frrconfig)
+
# check process health and continuity
self.assertEqual(self.daemon_pid, process_named_running(PROCESS_NAME))
diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py
index c3ae54e12..5da352300 100755
--- a/smoketest/scripts/cli/test_protocols_ospf.py
+++ b/smoketest/scripts/cli/test_protocols_ospf.py
@@ -55,6 +55,9 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
self.cli_delete(base_path)
self.cli_commit()
+ frrconfig = self.getFRRconfig('router ospf')
+ self.assertNotIn(f'router ospf', frrconfig)
+
# check process health and continuity
self.assertEqual(self.daemon_pid, process_named_running(PROCESS_NAME))
diff --git a/smoketest/scripts/cli/test_protocols_ospfv3.py b/smoketest/scripts/cli/test_protocols_ospfv3.py
index 989e1552d..f0892d576 100755
--- a/smoketest/scripts/cli/test_protocols_ospfv3.py
+++ b/smoketest/scripts/cli/test_protocols_ospfv3.py
@@ -54,6 +54,9 @@ class TestProtocolsOSPFv3(VyOSUnitTestSHIM.TestCase):
self.cli_delete(base_path)
self.cli_commit()
+ frrconfig = self.getFRRconfig('router ospf6')
+ self.assertNotIn(f'router ospf6', frrconfig)
+
# check process health and continuity
self.assertEqual(self.daemon_pid, process_named_running(PROCESS_NAME))
diff --git a/smoketest/scripts/cli/test_protocols_rip.py b/smoketest/scripts/cli/test_protocols_rip.py
index bfc327fd4..48a1f877b 100755
--- a/smoketest/scripts/cli/test_protocols_rip.py
+++ b/smoketest/scripts/cli/test_protocols_rip.py
@@ -66,6 +66,9 @@ class TestProtocolsRIP(VyOSUnitTestSHIM.TestCase):
self.cli_delete(base_path)
self.cli_commit()
+ frrconfig = self.getFRRconfig('router rip')
+ self.assertNotIn(f'router rip', frrconfig)
+
# check process health and continuity
self.assertEqual(self.daemon_pid, process_named_running(PROCESS_NAME))
diff --git a/smoketest/scripts/cli/test_protocols_ripng.py b/smoketest/scripts/cli/test_protocols_ripng.py
index 0cfb065c6..c266bdfd2 100755
--- a/smoketest/scripts/cli/test_protocols_ripng.py
+++ b/smoketest/scripts/cli/test_protocols_ripng.py
@@ -66,6 +66,9 @@ class TestProtocolsRIPng(VyOSUnitTestSHIM.TestCase):
self.cli_delete(base_path)
self.cli_commit()
+ frrconfig = self.getFRRconfig('router ripng')
+ self.assertNotIn(f'router ripng', frrconfig)
+
# check process health and continuity
self.assertEqual(self.daemon_pid, process_named_running(PROCESS_NAME))