smoketest: ospf: rearrange testcases - place vrf last

1 files changed, 33 insertions, 34 deletions

diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py
index 3942219e7..04853c5fe 100755
--- a/smoketest/scripts/cli/test_protocols_ospf.py
+++ b/smoketest/scripts/cli/test_protocols_ospf.py
@@ -279,39 +279,7 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
             self.assertIn(f' no ip ospf passive', config)
             self.assertIn(f' bandwidth {bandwidth}', config)
 
-
-    def test_ospf_10_vrfs(self):
-        # It is safe to assume that when the basic VRF test works, all
-        # other OSPF related features work, as we entirely inherit the CLI
-        # templates and Jinja2 FRR template.
-        table = '1000'
-        vrf = 'blue'
-        vrf_base = ['vrf', 'name', vrf]
-        vrf_iface = 'eth1'
-        self.cli_set(vrf_base + ['table', table])
-        self.cli_set(vrf_base + ['protocols', 'ospf', 'interface', vrf_iface])
-        self.cli_set(['interfaces', 'ethernet', vrf_iface, 'vrf', vrf])
-
-        # Also set a default VRF OSPF config
-        self.cli_set(base_path)
-        self.cli_commit()
-
-        # Verify FRR ospfd configuration
-        frrconfig = self.getFRRconfig('router ospf')
-        self.assertIn(f'router ospf', frrconfig)
-        self.assertIn(f' auto-cost reference-bandwidth 100', frrconfig)
-        self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults
-
-        frrconfig = self.getFRRconfig(f'router ospf vrf {vrf}')
-        self.assertIn(f'router ospf vrf {vrf}', frrconfig)
-        self.assertIn(f' auto-cost reference-bandwidth 100', frrconfig)
-        self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults
-
-        self.cli_delete(['vrf', 'name', vrf])
-        self.cli_delete(['interfaces', 'ethernet', vrf_iface, 'vrf'])
-
-
-    def test_ospf_11_zebra_route_map(self):
+    def test_ospf_10_zebra_route_map(self):
         # Implemented because of T3328
         self.cli_set(base_path + ['route-map', route_map])
         # commit changes
@@ -331,7 +299,7 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
         frrconfig = self.getFRRconfig(zebra_route_map)
         self.assertNotIn(zebra_route_map, frrconfig)
 
-    def test_ospf_12_interface_area(self):
+    def test_ospf_11_interface_area(self):
         area = '0'
         interfaces = Section.interfaces('ethernet')
 
@@ -355,6 +323,37 @@ class TestProtocolsOSPF(VyOSUnitTestSHIM.TestCase):
             self.assertIn(f'interface {interface}', config)
             self.assertIn(f' ip ospf area {area}', config)
 
+    def test_ospf_12_vrfs(self):
+        # It is safe to assume that when the basic VRF test works, all
+        # other OSPF related features work, as we entirely inherit the CLI
+        # templates and Jinja2 FRR template.
+        table = '1000'
+        vrf = 'blue'
+        vrf_base = ['vrf', 'name', vrf]
+        vrf_iface = 'eth1'
+        self.cli_set(vrf_base + ['table', table])
+        self.cli_set(vrf_base + ['protocols', 'ospf', 'interface', vrf_iface])
+        self.cli_set(['interfaces', 'ethernet', vrf_iface, 'vrf', vrf])
+
+        # Also set a default VRF OSPF config
+        self.cli_set(base_path)
+        self.cli_commit()
+
+        # Verify FRR ospfd configuration
+        frrconfig = self.getFRRconfig('router ospf')
+        self.assertIn(f'router ospf', frrconfig)
+        self.assertIn(f' auto-cost reference-bandwidth 100', frrconfig)
+        self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults
+
+        frrconfig = self.getFRRconfig(f'router ospf vrf {vrf}')
+        self.assertIn(f'router ospf vrf {vrf}', frrconfig)
+        self.assertIn(f' auto-cost reference-bandwidth 100', frrconfig)
+        self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults
+
+        # cleanup
+        self.cli_delete(['vrf', 'name', vrf])
+        self.cli_delete(['interfaces', 'ethernet', vrf_iface, 'vrf'])
+
 if __name__ == '__main__':
     logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
     unittest.main(verbosity=2)