isis: T3417: add VRF support

VRF support can be tested using:

set vrf name red table 1000
set vrf name red protocols isis domain FOOO
set vrf name red protocols isis net 49.0001.1921.6800.1002.00
set vrf name red protocols isis interface eth1

1 files changed, 38 insertions, 2 deletions

diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py
index 765e0ef4e..79d497186 100755
--- a/smoketest/scripts/cli/test_protocols_isis.py
+++ b/smoketest/scripts/cli/test_protocols_isis.py
@@ -36,7 +36,7 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         # Check for running process
         self.assertTrue(process_named_running(PROCESS_NAME))
 
-    def test_isis_redistribute(self):
+    def test_isis_01_redistribute(self):
         prefix_list = 'EXPORT-ISIS'
         route_map = 'EXPORT-ISIS'
         rule = '10'
@@ -57,7 +57,8 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         # Verify all changes
-        tmp = self.getFRRconfig(f'router isis {domain}', end='')
+        # XXX: FRR represents router isis with a trailing whitespace :/
+        tmp = self.getFRRconfig(f'router isis {domain} ')
         self.assertIn(f' net {net}', tmp)
         self.assertIn(f' redistribute ipv4 connected level-2 route-map {route_map}', tmp)
 
@@ -67,5 +68,40 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
 
         self.cli_delete(['policy'])
 
+
+    def test_isis_02_vrfs(self):
+        vrfs = ['red', 'green', 'blue']
+        # It is safe to assume that when the basic VRF test works, all other
+        # IS-IS related features work, as we entirely inherit the CLI templates
+        # and Jinja2 FRR template.
+        table = '1000'
+        vrf = 'red'
+        vrf_base = ['vrf', 'name', vrf]
+        vrf_iface = 'eth1'
+        self.cli_set(vrf_base + ['table', table])
+        self.cli_set(vrf_base + ['protocols', 'isis', 'domain', domain])
+        self.cli_set(vrf_base + ['protocols', 'isis', 'net', net])
+        self.cli_set(vrf_base + ['protocols', 'isis', 'interface', vrf_iface])
+        self.cli_set(['interfaces', 'ethernet', vrf_iface, 'vrf', vrf])
+
+        # Also set a default VRF IS-IS config
+        self.cli_set(base_path + ['domain', domain])
+        self.cli_set(base_path + ['net', net])
+        self.cli_set(base_path + ['interface', 'eth0'])
+        self.cli_commit()
+
+        # Verify FRR isisd configuration
+        # XXX: FRR represents router isis with a trailing whitespace :/
+        tmp = self.getFRRconfig(f'router isis {domain} ')
+        self.assertIn(f'router isis {domain}', tmp)
+        self.assertIn(f' net {net}', tmp)
+
+        tmp = self.getFRRconfig(f'router isis {domain} vrf {vrf}')
+        self.assertIn(f'router isis {domain} vrf {vrf}', tmp)
+        self.assertIn(f' net {net}', tmp)
+
+        self.cli_delete(['vrf', 'name', vrf])
+        self.cli_delete(['interfaces', 'ethernet', vrf_iface, 'vrf'])
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)