1 files changed, 40 insertions, 4 deletions
diff --git a/src/conf_mode/protocols_static.py b/src/conf_mode/protocols_static.py
index 5d101b33e..3314baf47 100755
--- a/src/conf_mode/protocols_static.py
+++ b/src/conf_mode/protocols_static.py
@@ -17,11 +17,13 @@
 import os
 
 from sys import exit
+from sys import argv
 
 from vyos.config import Config
+from vyos.configverify import verify_route_maps
+from vyos.configverify import verify_vrf
 from vyos.template import render_to_string
 from vyos.util import call
-from vyos.configverify import verify_route_maps
 from vyos import ConfigError
 from vyos import frr
 from vyos import airbag
@@ -34,12 +36,40 @@ def get_config(config=None):
         conf = config
     else:
         conf = Config()
-    base = ['protocols', 'static']
+
+    vrf = None
+    if len(argv) > 1:
+        vrf = argv[1]
+
+    base_path = ['protocols', 'static']
+    # eqivalent of the C foo ? 'a' : 'b' statement
+    base = vrf and ['vrf', 'name', vrf, 'protocols', 'static'] or base_path
     static = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
+
+    # Assign the name of our VRF context
+    if vrf: static['vrf'] = vrf
+
     return static
 
 def verify(static):
     verify_route_maps(static)
+
+    for route in ['route', 'route6']:
+        # if there is no route(6) key in the dictionary we can immediately
+        # bail out early
+        if route not in static:
+            continue
+
+        # When leaking routes to other VRFs we must ensure that the destination
+        # VRF exists
+        for prefix, prefix_options in static[route].items():
+            # both the interface and next-hop CLI node can have a VRF subnode,
+            # thus we check this using a for loop
+            for type in ['interface', 'next_hop']:
+                if type in prefix_options:
+                    for interface, interface_config in prefix_options[type].items():
+                        verify_vrf(interface_config)
+
     return None
 
 def generate(static):
@@ -50,8 +80,14 @@ def apply(static):
     # Save original configuration prior to starting any commit actions
     frr_cfg = frr.FRRConfig()
     frr_cfg.load_configuration(frr_daemon)
-    frr_cfg.modify_section(r'^ip route .*', '')
-    frr_cfg.modify_section(r'^ipv6 route .*', '')
+
+    if 'vrf' in static:
+        vrf = static['vrf']
+        frr_cfg.modify_section(f'^vrf {vrf}$', '')
+    else:
+        frr_cfg.modify_section(r'^ip route .*', '')
+        frr_cfg.modify_section(r'^ipv6 route .*', '')
+
     frr_cfg.add_before(r'(interface .*|line vty)', static['new_frr_config'])
     frr_cfg.commit_configuration(frr_daemon)