smoketest: vrf: verify routes via FRR cli

1 files changed, 19 insertions, 20 deletions

diff --git a/smoketest/scripts/cli/test_vrf.py b/smoketest/scripts/cli/test_vrf.py
index 938fd4798..75be9e4f8 100755
--- a/smoketest/scripts/cli/test_vrf.py
+++ b/smoketest/scripts/cli/test_vrf.py
@@ -26,6 +26,7 @@ from netifaces import interfaces
 from vyos.configsession import ConfigSessionError
 from vyos.ifconfig import Interface
 from vyos.ifconfig import Section
+from vyos.template import is_ipv6
 from vyos.template import is_ipv4
 from vyos.util import cmd
 from vyos.util import read_file
@@ -62,6 +63,8 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
     def tearDown(self):
         # delete all VRFs
         self.cli_delete(base_path)
+        self.cli_delete(['interfaces', 'dummy'])
+        self.cli_delete(['protocols', 'vrf'])
         self.cli_commit()
         for vrf in vrfs:
             self.assertNotIn(vrf, interfaces())
@@ -248,14 +251,14 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
                 },
         }
 
+        # required interface for leaking to default table
+        self.cli_set(['interfaces', 'ethernet', 'eth0', 'address', '192.0.2.1/24'])
+
         table = '2000'
         for vrf in vrfs:
             base = base_path + ['name', vrf]
             self.cli_set(base + ['table', str(table)])
 
-            # required interface for leaking to default table
-            self.cli_set(['interfaces', 'ethernet', 'eth0', 'address', '192.0.2.1/24'])
-
             # we also need an interface in "UP" state to install routes
             self.cli_set(['interfaces', 'dummy', f'dum{table}', 'vrf', vrf])
             self.cli_set(['interfaces', 'dummy', f'dum{table}', 'address', '192.0.2.1/24'])
@@ -277,28 +280,24 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         # Verify routes
-        table = '2000'
         for vrf in vrfs:
-            for route, route_config in routes.items():
-                if is_ipv6(route):
-                    tmp = get_vrf_ipv6_routes(vrf)
-                else:
-                    tmp = get_vrf_ipv4_routes(vrf)
+            self.assertIn(vrf, interfaces())
+            frrconfig = self.getFRRconfig(f'vrf {vrf}')
+            for prefix, prefix_config in routes.items():
+                tmp = 'ip'
+                if is_ipv6(prefix):
+                    tmp += 'v6'
 
-                found = False
-                for result in tmp:
-                    if 'dst' in result and result['dst'] == route:
-                        if 'gateway' in result and result['gateway'] == route_config['next_hop']:
-                            found = True
+                tmp += f' route {prefix} {prefix_config["next_hop"]}'
+                if 'distance' in prefix_config:
+                    tmp += ' ' + prefix_config['distance']
+                if 'next_hop_vrf' in prefix_config:
+                    tmp += ' nexthop-vrf ' + prefix_config['next_hop_vrf']
 
-                self.assertTrue(found)
+                    self.assertIn(tmp, frrconfig)
 
-            # Cleanup
-            self.cli_delete(['protocols', 'vrf', vrf])
-            self.cli_delete(['interfaces', 'dummy', f'dum{table}'])
-            self.cli_delete(['interfaces', 'ethernet', 'eth0', 'address', '192.0.2.1/24'])
+        self.cli_delete(['interfaces', 'ethernet', 'eth0', 'address'])
 
-            table = str(int(table) + 1)
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)