1 files changed, 44 insertions, 2 deletions
diff --git a/smoketest/scripts/cli/test_vrf.py b/smoketest/scripts/cli/test_vrf.py
index f36d16344..5ffa9c086 100755
--- a/smoketest/scripts/cli/test_vrf.py
+++ b/smoketest/scripts/cli/test_vrf.py
@@ -22,7 +22,6 @@ import unittest
 from netifaces import interfaces
 from base_vyostest_shim import VyOSUnitTestSHIM
 
-from vyos.configsession import ConfigSession
 from vyos.configsession import ConfigSessionError
 from vyos.ifconfig import Interface
 from vyos.ifconfig import Section
@@ -58,7 +57,7 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
         for vrf in vrfs:
             self.assertNotIn(vrf, interfaces())
 
-    def test_vrf_table_id(self):
+    def test_vrf_vni_and_table_id(self):
         table = '1000'
         for vrf in vrfs:
             base = base_path + ['name', vrf]
@@ -70,6 +69,7 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
                 self.cli_commit()
 
             self.cli_set(base + ['table', table])
+            self.cli_set(base + ['vni', table])
             if vrf == 'green':
                 self.cli_set(base + ['disable'])
 
@@ -101,6 +101,11 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
             #  ...
             regex = f'{table}\s+{vrf}\s+#\s+{description}'
             self.assertTrue(re.findall(regex, iproute2_config))
+
+            frrconfig = self.getFRRconfig(f'vrf {vrf}')
+            self.assertIn(f' vni {table}', frrconfig)
+
+            # Increment table ID for the next run
             table = str(int(table) + 1)
 
     def test_vrf_loopback_ips(self):
@@ -178,5 +183,42 @@ class VRFTest(VyOSUnitTestSHIM.TestCase):
             section = Section.section(interface)
             self.cli_delete(['interfaces', section, interface, 'vrf'])
 
+    def test_vrf_static_route(self):
+        table = '100'
+        for vrf in vrfs:
+            next_hop = f'192.0.{table}.1'
+            prefix = f'10.0.{table}.0/24'
+            base = base_path + ['name', vrf]
+
+            self.cli_set(base + ['vni', table])
+
+            # check validate() - a table ID is mandatory
+            with self.assertRaises(ConfigSessionError):
+                self.cli_commit()
+
+            self.cli_set(base + ['table', table])
+            self.cli_set(base + ['protocols', 'static', 'route', prefix, 'next-hop', next_hop])
+
+            table = str(int(table) + 1)
+
+        # commit changes
+        self.cli_commit()
+
+        # Verify VRF configuration
+        table = '100'
+        for vrf in vrfs:
+            next_hop = f'192.0.{table}.1'
+            prefix = f'10.0.{table}.0/24'
+
+            self.assertTrue(vrf in interfaces())
+            vrf_if = Interface(vrf)
+
+            frrconfig = self.getFRRconfig(f'vrf {vrf}')
+            self.assertIn(f' vni {table}', frrconfig)
+            self.assertIn(f' ip route {prefix} {next_hop}', frrconfig)
+
+            # Increment table ID for the next run
+            table = str(int(table) + 1)
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)