vrf: T3344: move dynamic routing protocols under "vrf name <name> protocols"

Instead of having the dynamic routing protocols OSPF and BGP residing under
the "protocols vrf <name> [ospf|bgp]" nodes, rather move them directly under
the "vrf name <name> protocols [ospf|bgp]" node. Now all VRF related parts
are placed under the same root node.

This eases the verify steps tremendously, as we do not need to check wheter a
VRF eists or not, it will always exist as we operate under a child node.

4 files changed, 76 insertions, 37 deletions

diff --git a/smoketest/scripts/cli/test_protocols_bgp.py b/smoketest/scripts/cli/test_protocols_bgp.py
index 9aa1541cf..7d397b55e 100755
--- a/smoketest/scripts/cli/test_protocols_bgp.py
+++ b/smoketest/scripts/cli/test_protocols_bgp.py
@@ -128,17 +128,19 @@ peer_group_config = {
         },
 }
 
-def getFRRBGPconfig():
-    return cmd(f'vtysh -c "show run" | sed -n "/^router bgp {ASN}/,/^!/p"')
+def getFRRBGPconfig(vrf=None):
+    if vrf:
+        return cmd(f'vtysh -c "show run" | sed -n "/^router bgp {ASN} vrf {vrf}$/,/^!/p"')
+    return cmd(f'vtysh -c "show run" | sed -n "/^router bgp {ASN}$/,/^!/p"')
 
 def getFRRBgpAfiConfig(afi):
-    return cmd(f'vtysh -c "show run" | sed -n "/^router bgp {ASN}/,/^!/p" | sed -n "/^ address-family {afi} unicast/,/^ exit-address-family/p"')
+    return cmd(f'vtysh -c "show run" | sed -n "/^router bgp {ASN}$/,/^!/p" | sed -n "/^ address-family {afi} unicast/,/^ exit-address-family/p"')
 
 def getFRRBGPVNIconfig(vni):
-    return cmd(f'vtysh -c "show run" | sed -n "/^  vni {vni}/,/^!/p"')
+    return cmd(f'vtysh -c "show run" | sed -n "/^  vni {vni}$/,/^!/p"')
 
 def getFRRRPKIconfig():
-    return cmd(f'vtysh -c "show run" | sed -n "/^rpki/,/^!/p"')
+    return cmd(f'vtysh -c "show run" | sed -n "/^rpki$/,/^!/p"')
 
 class TestProtocolsBGP(unittest.TestCase):
     def setUp(self):
@@ -551,5 +553,27 @@ class TestProtocolsBGP(unittest.TestCase):
             self.assertIn(f'   advertise-default-gw', vniconfig)
             self.assertIn(f'   advertise-svi-ip', vniconfig)
 
+    def test_bgp_08_vrf_simple(self):
+        router_id = '127.0.0.3'
+        vrfs = ['red', 'green', 'blue']
+        # 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'
+        for vrf in vrfs:
+            vrf_base = ['vrf', 'name', vrf]
+            self.session.set(vrf_base + ['table', table])
+            self.session.set(vrf_base + ['protocols', 'bgp', ASN, 'parameters', 'router-id', router_id])
+            table = str(int(table) + 1000)
+
+        self.session.commit()
+
+        for vrf in vrfs:
+            # Verify FRR bgpd configuration
+            frrconfig = getFRRBGPconfig(vrf)
+
+            self.assertIn(f'router bgp {ASN} vrf {vrf}', frrconfig)
+            self.assertIn(f' bgp router-id {router_id}', frrconfig)
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_protocols_ospf.py b/smoketest/scripts/cli/test_protocols_ospf.py
index 683ca12b8..532d84cc8 100755
--- a/smoketest/scripts/cli/test_protocols_ospf.py
+++ b/smoketest/scripts/cli/test_protocols_ospf.py
@@ -29,8 +29,8 @@ route_map = 'foo-bar-baz10'
 
 def getFRRconfig(vrf=None):
     if vrf:
-        return cmd(f'vtysh -c "show run" | sed -n "/^router ospf vrf {vrf}/,/^!/p"')
-    return cmd('vtysh -c "show run" | sed -n "/^router ospf/,/^!/p"')
+        return cmd(f'vtysh -c "show run" | sed -n "/^router ospf vrf {vrf}$/,/^!/p"')
+    return cmd('vtysh -c "show run" | sed -n "/^router ospf$/,/^!/p"')
 
 def getFRRInterfaceConfig(interface):
     return cmd(f'vtysh -c "show run" | sed -n "/^interface {interface}$/,/^!/p"')
@@ -237,6 +237,7 @@ class TestProtocolsOSPF(unittest.TestCase):
             else:
                 self.assertIn(f' redistribute {protocol} metric {metric} metric-type {metric_type} route-map {route_map}', frrconfig)
 
+
     def test_ospf_09_virtual_link(self):
         networks = ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16']
         area = '10'
@@ -279,6 +280,7 @@ class TestProtocolsOSPF(unittest.TestCase):
         for network in networks:
             self.assertIn(f' network {network} area {area}', frrconfig)
 
+
     def test_ospf_10_interface_configureation(self):
         interfaces = Section.interfaces('ethernet')
         password = 'vyos1234'
@@ -310,17 +312,21 @@ class TestProtocolsOSPF(unittest.TestCase):
             self.assertIn(f' ip ospf priority {priority}', config)
             self.assertIn(f' bandwidth {bandwidth}', config)
 
-    def test_ospf_01_11_vrfs(self):
+
+    def test_ospf_11_vrfs(self):
         vrfs = ['red', 'green', 'blue']
         # 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'
         for vrf in vrfs:
-            self.session.set(['vrf', 'name', vrf, 'table', table])
-            self.session.set(['protocols', 'vrf', vrf, 'ospf'])
+            vrf_base = ['vrf', 'name', vrf]
+            self.session.set(vrf_base + ['table', table])
+            self.session.set(vrf_base + ['protocols', 'ospf'])
             table = str(int(table) + 1000)
 
+        # Also set a default VRF OSPF config
+        self.session.set(base_path)
         self.session.commit()
 
         # Verify FRR ospfd configuration
@@ -335,9 +341,8 @@ class TestProtocolsOSPF(unittest.TestCase):
             self.assertIn(f' auto-cost reference-bandwidth 100', frrconfig)
             self.assertIn(f' timers throttle spf 200 1000 10000', frrconfig) # defaults
 
-            self.session.delete(['protocols', 'vrf', vrf])
             self.session.delete(['vrf', 'name', vrf])
 
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2, failfast=True)
+    unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_protocols_static.py b/smoketest/scripts/cli/test_protocols_static.py
index cf591f060..e68b86024 100755
--- a/smoketest/scripts/cli/test_protocols_static.py
+++ b/smoketest/scripts/cli/test_protocols_static.py
@@ -21,6 +21,7 @@ from vyos.configsession import ConfigSession
 from vyos.configsession import ConfigSessionError
 from vyos.template import is_ipv6
 from vyos.util import cmd
+from vyos.util import get_json_iface_options
 
 base_path = ['protocols', 'static']
 vrf_path =  ['protocols', 'vrf']
@@ -85,7 +86,6 @@ routes = {
     },
 }
 
-vrfs = ['red', 'green', 'blue']
 tables = ['80', '81', '82']
 
 class StaticRouteTest(unittest.TestCase):
@@ -99,9 +99,6 @@ class StaticRouteTest(unittest.TestCase):
                 route_type = 'route6'
             self.session.delete(base_path + [route_type, route])
 
-        for vrf in vrfs:
-            self.session.delete(vrf_path + [vrf])
-
         for table in tables:
             self.session.delete(base_path + ['table', table])
 
@@ -290,47 +287,65 @@ class StaticRouteTest(unittest.TestCase):
 
 
     def test_protocols_vrf_static(self):
-        for vrf in vrfs:
+        # Create VRF instances and apply the static routes from above to FRR.
+        # Re-read the configured routes and match them if they are programmed
+        # properly. This also includes VRF leaking
+        vrfs = {
+            'red'   : { 'table' : '1000' },
+            'green' : { 'table' : '2000' },
+            'blue'  : { 'table' : '3000' },
+        }
+
+        for vrf, vrf_config in vrfs.items():
+            vrf_base_path = ['vrf', 'name', vrf]
+            self.session.set(vrf_base_path + ['table', vrf_config['table']])
+
             for route, route_config in routes.items():
                 route_type = 'route'
                 if is_ipv6(route):
                     route_type = 'route6'
-                base = vrf_path + [vrf, 'static', route_type, route]
+                route_base_path = vrf_base_path + ['protocols', 'static', route_type, route]
 
                 if 'next_hop' in route_config:
                     for next_hop, next_hop_config in route_config['next_hop'].items():
-                        self.session.set(base + ['next-hop', next_hop])
+                        self.session.set(route_base_path + ['next-hop', next_hop])
                         if 'disable' in next_hop_config:
-                            self.session.set(base + ['next-hop', next_hop, 'disable'])
+                            self.session.set(route_base_path + ['next-hop', next_hop, 'disable'])
                         if 'distance' in next_hop_config:
-                            self.session.set(base + ['next-hop', next_hop, 'distance', next_hop_config['distance']])
+                            self.session.set(route_base_path + ['next-hop', next_hop, 'distance', next_hop_config['distance']])
                         if 'interface' in next_hop_config:
-                            self.session.set(base + ['next-hop', next_hop, 'interface', next_hop_config['interface']])
+                            self.session.set(route_base_path + ['next-hop', next_hop, 'interface', next_hop_config['interface']])
                         if 'vrf' in next_hop_config:
-                            self.session.set(base + ['next-hop', next_hop, 'vrf', next_hop_config['vrf']])
+                            self.session.set(route_base_path + ['next-hop', next_hop, 'vrf', next_hop_config['vrf']])
 
 
                 if 'interface' in route_config:
                     for interface, interface_config in route_config['interface'].items():
-                        self.session.set(base + ['interface', interface])
+                        self.session.set(route_base_path + ['interface', interface])
                         if 'disable' in interface_config:
-                            self.session.set(base + ['interface', interface, 'disable'])
+                            self.session.set(route_base_path + ['interface', interface, 'disable'])
                         if 'distance' in interface_config:
-                            self.session.set(base + ['interface', interface, 'distance', interface_config['distance']])
+                            self.session.set(route_base_path + ['interface', interface, 'distance', interface_config['distance']])
                         if 'vrf' in interface_config:
-                            self.session.set(base + ['interface', interface, 'vrf', interface_config['vrf']])
+                            self.session.set(route_base_path + ['interface', interface, 'vrf', interface_config['vrf']])
 
                 if 'blackhole' in route_config:
-                    self.session.set(base + ['blackhole'])
+                    self.session.set(route_base_path + ['blackhole'])
                     if 'distance' in route_config['blackhole']:
-                        self.session.set(base + ['blackhole', 'distance', route_config['blackhole']['distance']])
+                        self.session.set(route_base_path + ['blackhole', 'distance', route_config['blackhole']['distance']])
                     if 'tag' in route_config['blackhole']:
-                        self.session.set(base + ['blackhole', 'tag', route_config['blackhole']['tag']])
+                        self.session.set(route_base_path + ['blackhole', 'tag', route_config['blackhole']['tag']])
 
         # commit changes
         self.session.commit()
 
-        for vrf in vrfs:
+        for vrf, vrf_config in vrfs.items():
+            tmp = get_json_iface_options(vrf)
+
+            # Compare VRF table ID
+            self.assertEqual(tmp['linkinfo']['info_data']['table'], int(vrf_config['table']))
+            self.assertEqual(tmp['linkinfo']['info_kind'],          'vrf')
+
             # Verify FRR bgpd configuration
             frrconfig = getFRRCconfig(vrf)
             self.assertIn(f'vrf {vrf}', frrconfig)
@@ -380,6 +395,7 @@ class StaticRouteTest(unittest.TestCase):
 
                     self.assertIn(tmp, frrconfig)
 
+        self.session.delete(['vrf'])
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/smoketest/scripts/cli/test_vrf.py b/smoketest/scripts/cli/test_vrf.py
index 8e977d407..aac115663 100755
--- a/smoketest/scripts/cli/test_vrf.py
+++ b/smoketest/scripts/cli/test_vrf.py
@@ -33,12 +33,6 @@ from vyos.validate import is_intf_addr_assigned
 base_path = ['vrf']
 vrfs = ['red', 'green', 'blue', 'foo-bar', 'baz_foo']
 
-def get_vrf_ipv4_routes(vrf):
-    return json.loads(cmd(f'ip -4 -j route show vrf {vrf}'))
-
-def get_vrf_ipv6_routes(vrf):
-    return json.loads(cmd(f'ip -6 -j route show vrf {vrf}'))
-
 class VRFTest(unittest.TestCase):
     _interfaces = []