Merge pull request #3838 from c-po/ospf-frr-fix

smoketest: T6600: ospf: enable MPLS LDP on dummy interfaces
vyos · Jul 22, 2024 · 9fdb74d · 9fdb74d
2 parents da3d941 + 71926f6
commit 9fdb74d
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py
@@ -16,7 +16,6 @@
 
 import unittest
 
-from time import sleep
 from base_vyostest_shim import VyOSUnitTestSHIM
 
 from vyos.configsession import ConfigSessionError
@@ -27,6 +26,7 @@
 base_path = ['protocols', 'ospf']
 
 route_map = 'foo-bar-baz10'
+dummy_if = 'dum3562'
 
 class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
     @classmethod
@@ -38,6 +38,7 @@ def setUpClass(cls):
 
         cls.cli_set(cls, ['policy', 'route-map', route_map, 'rule', '10', 'action', 'permit'])
         cls.cli_set(cls, ['policy', 'route-map', route_map, 'rule', '20', 'action', 'permit'])
+        cls.cli_set(cls, ['interfaces', 'dummy', dummy_if])
 
         # ensure we can also run this test on a live system - so lets clean
         # out the current configuration :)
@@ -46,6 +47,7 @@ def setUpClass(cls):
     @classmethod
     def tearDownClass(cls):
         cls.cli_delete(cls, ['policy', 'route-map', route_map])
+        cls.cli_delete(cls, ['interfaces', 'dummy', dummy_if])
         super(TestProtocolsOSPF, cls).tearDownClass()
 
     def tearDown(self):
@@ -441,14 +443,13 @@ def test_ospf_14_segment_routing_configuration(self):
         global_block_high = "399"
         local_block_low = "400"
         local_block_high = "499"
-        interface = 'lo'
         maximum_stack_size = '5'
         prefix_one = '192.168.0.1/32'
         prefix_two = '192.168.0.2/32'
         prefix_one_value = '1'
         prefix_two_value = '2'
 
-        self.cli_set(base_path + ['interface', interface])
+        self.cli_set(base_path + ['interface', dummy_if])
         self.cli_set(base_path + ['segment-routing', 'maximum-label-depth', maximum_stack_size])
         self.cli_set(base_path + ['segment-routing', 'global-block', 'low-label-value', global_block_low])
         self.cli_set(base_path + ['segment-routing', 'global-block', 'high-label-value', global_block_high])
@@ -472,17 +473,14 @@ def test_ospf_14_segment_routing_configuration(self):
 
     def test_ospf_15_ldp_sync(self):
         holddown = "500"
-        interface = 'lo'
         interfaces = Section.interfaces('ethernet')
 
-        self.cli_set(base_path + ['interface', interface])
+        self.cli_set(base_path + ['interface', dummy_if])
         self.cli_set(base_path + ['ldp-sync', 'holddown', holddown])
 
         # Commit main OSPF changes
         self.cli_commit()
 
-        sleep(10)
-
         # Verify main OSPF changes
         frrconfig = self.getFRRconfig('router ospf', daemon=PROCESS_NAME)
         self.assertIn(f'router ospf', frrconfig)
@@ -514,7 +512,7 @@ def test_ospf_15_ldp_sync(self):
             config = self.getFRRconfig(f'interface {interface}', daemon=PROCESS_NAME)
             self.assertIn(f'interface {interface}', config)
             self.assertIn(f' ip ospf dead-interval 40', config)
-            self.assertIn(f' no ip ospf mpls ldp-sync', config)
+            self.assertNotIn(f' ip ospf mpls ldp-sync', config)
 
     def test_ospf_16_graceful_restart(self):
         period = '300'