vrf: T2450: provide full protocol support in XML and Python with new CLI

15 files changed, 670 insertions, 363 deletions

diff --git a/Makefile b/Makefile
index c27380dc1..fbd5d57ce 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,6 @@ interface_definitions: $(config_xml_obj)
 	rm -f $(TMPL_DIR)/vpn/node.def
 	rm -f $(TMPL_DIR)/vpn/ipsec/node.def
 	rm -rf $(TMPL_DIR)/vpn/nipsec
-	rm -rf $(TMPL_DIR)/protocols/nvrf
 	rm -rf $(TMPL_DIR)/protocols/nripng
 	rm -rf $(TMPL_DIR)/protocols/nstatic
 
diff --git a/data/configd-include.json b/data/configd-include.json
index 751d8e012..c0263127a 100644
--- a/data/configd-include.json
+++ b/data/configd-include.json
@@ -40,6 +40,7 @@
 "protocols_pim.py",
 "protocols_rip.py",
 "protocols_static_multicast.py",
+"protocols_vrf.py",
 "salt-minion.py",
 "service_console-server.py",
 "service_ids_fastnetmon.py",
diff --git a/data/templates/frr/vrf.frr.tmpl b/data/templates/frr/vrf.frr.tmpl
new file mode 100644
index 000000000..1cb055962
--- /dev/null
+++ b/data/templates/frr/vrf.frr.tmpl
@@ -0,0 +1,42 @@
+!
+{% if vrf is defined and vrf is not none %}
+{%   for vrf_name, vrf_config in vrf.items() %}
+vrf {{ vrf_name }}
+{%     if vrf_config.static is defined and vrf_config.static is not none %}
+{#       IPv4 routes #}
+{%       if vrf_config.static.route is defined and vrf_config.static.route is not none %}
+{%         for route, route_config in vrf_config.static.route.items() %}
+{%           if route_config.blackhole is defined %}
+ ip route {{ route }} blackhole {{ route_config.blackhole.distance if route_config.blackhole.distance is defined }}
+{%           elif route_config.interface is defined and route_config.interface is not none %}
+{%             for interface, interface_config in route_config.interface.items() if interface_config.disable is not defined %}
+ ip route {{ route }} {{ interface }} {{ interface_config.distance if interface_config.distance is defined }} {{ 'nexthop-vrf ' + interface_config.vrf if interface_config.vrf is defined }}
+{%             endfor %}
+{%           elif route_config.next_hop is defined and route_config.next_hop is not none %}
+{%             for next_hop, next_hop_config in route_config.next_hop.items() if next_hop_config.disable is not defined %}
+ ip route {{ route }} {{ next_hop }} {{ next_hop_config.interface if next_hop_config.interface is defined }} {{ next_hop_config.distance if next_hop_config.distance is defined }} {{ 'nexthop-vrf ' + next_hop_config.vrf if next_hop_config.vrf is defined }}
+{%             endfor %}
+{%           endif %}
+{%         endfor %}
+{%       endif %}
+{#       IPv6 routes #}
+{%       if vrf_config.static.route6 is defined and vrf_config.static.route6 is not none %}
+{%         for route, route_config in vrf_config.static.route6.items() %}
+{%           if route_config.blackhole is defined %}
+ ipv6 route {{ route }} blackhole {{ route_config.blackhole.distance if route_config.blackhole.distance is defined }}
+{%           elif route_config.interface is defined and route_config.interface is not none %}
+{%             for interface, interface_config in route_config.interface.items() if interface_config.disable is not defined %}
+ ipv6 route {{ route }} {{ interface }} {{ interface_config.distance if interface_config.distance is defined }} {{ 'nexthop-vrf ' + interface_config.vrf if interface_config.vrf is defined }}
+{%             endfor %}
+{%           elif route_config.next_hop is defined and route_config.next_hop is not none %}
+{%             for next_hop, next_hop_config in route_config.next_hop.items() if next_hop_config.disable is not defined %}
+ ipv6 route {{ route }} {{ next_hop }} {{ next_hop_config.interface if next_hop_config.interface is defined }} {{ next_hop_config.distance if next_hop_config.distance is defined }} {{ 'nexthop-vrf ' + next_hop_config.vrf if next_hop_config.vrf is defined }}
+{%             endfor %}
+{%           endif %}
+
+{%         endfor %}
+{%       endif %}
+{%     endif %}
+{%   endfor %}
+{% endif %}
+!
diff --git a/interface-definitions/include/static-route-blackhole.xml.i b/interface-definitions/include/static-route-blackhole.xml.i
new file mode 100644
index 000000000..c880ee778
--- /dev/null
+++ b/interface-definitions/include/static-route-blackhole.xml.i
@@ -0,0 +1,10 @@
+<!-- included start from static-route-blackhole.xml.i -->

+<node name="blackhole">

+  <properties>

+    <help>Silently discard packets when matched</help>

+  </properties>

+  <children>

+    #include <include/static-route-distance.xml.i>

+  </children>

+</node>

+<!-- included end -->

diff --git a/interface-definitions/include/static-route-disable.xml.i b/interface-definitions/include/static-route-disable.xml.i
deleted file mode 100644
index 100ca3cbf..000000000
--- a/interface-definitions/include/static-route-disable.xml.i
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- included start from static-route-disable.xml.i.xml.i -->
-<leafNode name="disable">
-  <properties>
-    <help>Disable interface static route</help>
-    <valueless/>
-  </properties>
-</leafNode>
-<!-- included end -->
diff --git a/interface-definitions/include/static-route-next-hop-interface.xml.i b/interface-definitions/include/static-route-next-hop-interface.xml.i
new file mode 100644
index 000000000..01c253597
--- /dev/null
+++ b/interface-definitions/include/static-route-next-hop-interface.xml.i
@@ -0,0 +1,17 @@
+<!-- included start from static-route-next-hop-interface.xml.i -->
+<leafNode name="interface">
+  <properties>
+    <help>Gateway interface name</help>
+    <completionHelp>
+      <script>${vyos_completion_dir}/list_interfaces.py</script>
+    </completionHelp>
+    <valueHelp>
+      <format>txt</format>
+      <description>Gateway interface name</description>
+    </valueHelp>
+    <constraint>
+      <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>
+    </constraint>
+  </properties>
+</leafNode>
+<!-- included end -->
diff --git a/interface-definitions/include/static-route-next-hop-vrf.xml.i b/interface-definitions/include/static-route-next-hop-vrf.xml.i
index c90140856..ae2515a12 100644
--- a/interface-definitions/include/static-route-next-hop-vrf.xml.i
+++ b/interface-definitions/include/static-route-next-hop-vrf.xml.i
@@ -1,16 +1,18 @@
 <!-- included start from static-route-next-hop-vrf.xml.i -->
-<leafNode name="next-hop-vrf">
+<leafNode name="vrf">
   <properties>
     <help>VRF to leak route</help>
+    <completionHelp>
+      <list>default</list>
+      <path>vrf name</path>
+    </completionHelp>
     <valueHelp>
       <format>txt</format>
       <description>Name of VRF to leak to</description>
     </valueHelp>
-    <completionHelp>
-      <path>protocols vrf</path>
-    </completionHelp>
     <constraint>
-      <regex>^[a-zA-Z0-9\-_]{1,100}$</regex>
+      <regex>^(default)$</regex>
+      <validator name="vrf-name"/>
     </constraint>
   </properties>
 </leafNode>
diff --git a/interface-definitions/include/static-route.xml.i b/interface-definitions/include/static-route.xml.i
new file mode 100644
index 000000000..9ab3926da
--- /dev/null
+++ b/interface-definitions/include/static-route.xml.i
@@ -0,0 +1,63 @@
+<!-- included start from static-route.xml.i -->

+<tagNode name="route">

+  <properties>

+    <help>VRF static IPv4 route</help>

+    <valueHelp>

+      <format>ipv4net</format>

+      <description>VRF static IPv4 route</description>

+    </valueHelp>

+    <constraint>

+      <validator name="ipv4-prefix"/>

+    </constraint>

+  </properties>

+  <children>

+    <node name="blackhole">

+      <properties>

+        <help>Silently discard pkts when matched</help>

+      </properties>

+      <children>

+        #include <include/static-route-distance.xml.i>

+      </children>

+    </node>

+    <tagNode name="interface">

+      <properties>

+        <help>Next-hop IPv4 router interface</help>

+        <completionHelp>

+          <script>${vyos_completion_dir}/list_interfaces.py</script>

+        </completionHelp>

+        <valueHelp>

+          <format>txt</format>

+          <description>Gateway interface name</description>

+        </valueHelp>

+        <constraint>

+          <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>

+        </constraint>

+      </properties>

+      <children>

+        #include <include/generic-disable-node.xml.i>

+        #include <include/static-route-distance.xml.i>

+        #include <include/static-route-next-hop-vrf.xml.i>

+      </children>

+    </tagNode>

+    <tagNode name="next-hop">

+      <properties>

+        <help>Next-hop IPv4 router address</help>

+        <valueHelp>

+          <format>ipv4</format>

+          <description>Next-hop router address</description>

+        </valueHelp>

+        <constraint>

+          <validator name="ipv4-address"/>

+        </constraint>

+      </properties>

+      <children>

+        #include <include/generic-disable-node.xml.i>

+        #include <include/static-route-distance.xml.i>

+        #include <include/static-route-next-hop-interface.xml.i>

+        #include <include/static-route-next-hop-vrf.xml.i>

+      </children>

+    </tagNode>

+  </children>

+</tagNode>

+<!-- included end -->

+

diff --git a/interface-definitions/include/static-route6.xml.i b/interface-definitions/include/static-route6.xml.i
new file mode 100644
index 000000000..d484b285c
--- /dev/null
+++ b/interface-definitions/include/static-route6.xml.i
@@ -0,0 +1,63 @@
+<!-- included start from static-route6.xml.i -->

+<tagNode name="route6">

+  <properties>

+    <help>VRF static IPv6 route</help>

+    <valueHelp>

+      <format>ipv6net</format>

+      <description>VRF static IPv6 route</description>

+    </valueHelp>

+    <constraint>

+      <validator name="ipv6-prefix"/>

+    </constraint>

+  </properties>

+  <children>

+    <node name="blackhole">

+      <properties>

+        <help>Silently discard pkts when matched</help>

+      </properties>

+      <children>

+        #include <include/static-route-distance.xml.i>

+      </children>

+    </node>

+    <tagNode name="interface">

+      <properties>

+        <help>IPv6 gateway interface name</help>

+        <completionHelp>

+          <script>${vyos_completion_dir}/list_interfaces.py</script>

+        </completionHelp>

+        <valueHelp>

+          <format>txt</format>

+          <description>Gateway interface name</description>

+        </valueHelp>

+        <constraint>

+          <regex>^(br|bond|dum|en|eth|gnv|peth|tun|vti|vxlan|wg|wlan)[0-9]+|lo$</regex>

+        </constraint>

+      </properties>

+      <children>

+        #include <include/generic-disable-node.xml.i>

+        #include <include/static-route-distance.xml.i>

+        #include <include/static-route-next-hop-vrf.xml.i>

+      </children>

+    </tagNode>

+    <tagNode name="next-hop">

+      <properties>

+        <help>IPv6 gateway address</help>

+        <valueHelp>

+          <format>ipv6</format>

+          <description>Next-hop IPv6 router</description>

+        </valueHelp>

+        <constraint>

+          <validator name="ipv6-address"/>

+        </constraint>

+      </properties>

+      <children>

+        #include <include/generic-disable-node.xml.i>

+        #include <include/static-route-distance.xml.i>

+        #include <include/static-route-next-hop-interface.xml.i>

+        #include <include/static-route-next-hop-vrf.xml.i>

+      </children>

+    </tagNode>

+  </children>

+</tagNode>

+<!-- included end -->

+

diff --git a/interface-definitions/protocols-static.xml.in b/interface-definitions/protocols-static.xml.in
index 2a9f7014f..3ad6434db 100644
--- a/interface-definitions/protocols-static.xml.in
+++ b/interface-definitions/protocols-static.xml.in
@@ -28,11 +28,11 @@
                   </completionHelp>
                 </properties>
                 <children>
-                  #include <include/static-route-disable.xml.i>
+                  #include <include/generic-disable-node.xml.i>
                   #include <include/static-route-distance.xml.i>
                   #include <include/static-route-next-hop-vrf.xml.i>
                 </children>
-              </tagNode> 
+              </tagNode>
             </children>
           </tagNode>
           <tagNode name="interface-route6">
@@ -55,10 +55,10 @@
                   </completionHelp>
                 </properties>
                 <children>
-                  #include <include/static-route-disable.xml.i>
+                  #include <include/generic-disable-node.xml.i>
                   #include <include/static-route-distance.xml.i>
                 </children>
-              </tagNode> 
+              </tagNode>
             </children>
           </tagNode>
           #include <include/static-route-map.xml.i>
@@ -118,7 +118,7 @@
                   </constraint>
                 </properties>
                 <children>
-                  #include <include/static-route-disable.xml.i>
+                  #include <include/generic-disable-node.xml.i>
                   #include <include/static-route-distance.xml.i>
                   <leafNode name="next-hop-interface">
                     <properties>
@@ -169,7 +169,7 @@
                   </constraint>
                 </properties>
                 <children>
-                  #include <include/static-route-disable.xml.i>
+                  #include <include/generic-disable-node.xml.i>
                   #include <include/static-route-distance.xml.i>
                   <leafNode name="interface">
                     <properties>
@@ -220,10 +220,10 @@
                       </completionHelp>
                     </properties>
                     <children>
-                      #include <include/static-route-disable.xml.i>
+                      #include <include/generic-disable-node.xml.i>
                       #include <include/static-route-distance.xml.i>
                     </children>
-                  </tagNode> 
+                  </tagNode>
                 </children>
               </tagNode>
               <tagNode name="interface-route6">
@@ -246,10 +246,10 @@
                       </completionHelp>
                     </properties>
                     <children>
-                      #include <include/static-route-disable.xml.i>
+                      #include <include/generic-disable-node.xml.i>
                       #include <include/static-route-distance.xml.i>
                     </children>
-                  </tagNode> 
+                  </tagNode>
                 </children>
               </tagNode>
               <tagNode name="route">
@@ -296,7 +296,7 @@
                       </constraint>
                     </properties>
                     <children>
-                      #include <include/static-route-disable.xml.i>
+                      #include <include/generic-disable-node.xml.i>
                       #include <include/static-route-distance.xml.i>
                       <leafNode name="next-hop-interface">
                         <properties>
@@ -347,7 +347,7 @@
                       </constraint>
                     </properties>
                     <children>
-                      #include <include/static-route-disable.xml.i>
+                      #include <include/generic-disable-node.xml.i>
                       #include <include/static-route-distance.xml.i>
                     </children>
                   </tagNode>
diff --git a/interface-definitions/protocols-vrf.xml.in b/interface-definitions/protocols-vrf.xml.in
index d58f85b02..81942d124 100644
--- a/interface-definitions/protocols-vrf.xml.in
+++ b/interface-definitions/protocols-vrf.xml.in
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Protocol VRF configuration -->
 <interfaceDefinition>
   <node name="protocols">
     <children>
-       <tagNode name="nvrf" owner="${vyos_conf_scripts_dir}/vrf.py">
+       <tagNode name="vrf" owner="${vyos_conf_scripts_dir}/protocols_vrf.py">
         <properties>
           <help>Name of VRF to add route for</help>
+          <completionHelp>
+            <path>vrf name</path>
+          </completionHelp>
           <valueHelp>
             <format>txt</format>
-            <description>Name of VRF to add route for</description>
+            <description>VRF instance name</description>
           </valueHelp>
-          <completionHelp>
-            <path>protocols vrf</path>
-          </completionHelp>
+          <constraint>
+            <validator name="vrf-name"/>
+          </constraint>
+          <constraintErrorMessage>VRF instance name must be 15 characters or less and can not\nbe named as regular network interfaces.\n</constraintErrorMessage>
         </properties>
         <children>
           <node name="static">
@@ -20,336 +23,8 @@
               <help>Static route parameters</help>
             </properties>
             <children>
-              <tagNode name="interface-route">
-                <properties>
-                  <help>Interface based static route</help>
-                  <valueHelp>
-                    <format>ipv4net</format>
-                    <description>Interface based static route</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-prefix"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <tagNode name="next-hop-interface">
-                    <properties>
-                      <help>Next-hop interface [REQUIRED]</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces.py</script>
-                      </completionHelp>
-                    </properties>
-                    <children>
-                      <leafNode name="disable">
-                        <properties>
-                          <help>Disable IPv4 interface static route</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="distance">
-                        <properties>
-                          <help>Distance for this route</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Distance for this route</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="next-hop-vrf">
-                        <properties>
-                          <help>VRF to leak route</help>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>Name of VRF to leak to</description>
-                          </valueHelp>
-                          <valueHelp>
-                            <format>default</format>
-                            <description>Name of VRF to leak to</description>
-                          </valueHelp>
-                          <completionHelp>
-                            <list>default</list>
-                            <path>protocols vrf</path>
-                          </completionHelp>
-                          <constraint>
-                            <regex>^[a-zA-Z0-9\-_]{1,100}$</regex>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </tagNode> 
-                </children>
-              </tagNode>
-              <tagNode name="interface-route6">
-                <properties>
-                  <help>Interface based IPv6 static route</help>
-                  <valueHelp>
-                    <format>ipv6net</format>
-                    <description>Interface based IPv6 static route</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv6-prefix"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <tagNode name="next-hop-interface">
-                    <properties>
-                      <help>Next-hop interface [REQUIRED]</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces.py</script>
-                      </completionHelp>
-                    </properties>
-                    <children>
-                      <leafNode name="disable">
-                        <properties>
-                          <help>Disable IPv6 interface static route</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="distance">
-                        <properties>
-                          <help>Distance for this route</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Distance for this route</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="next-hop-vrf">
-                        <properties>
-                          <help>VRF to leak route</help>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>Name of VRF to leak to</description>
-                          </valueHelp>
-                          <valueHelp>
-                            <format>default</format>
-                            <description>Name of VRF to leak to</description>
-                          </valueHelp>
-                          <completionHelp>
-                            <list>default</list>
-                            <path>protocols vrf</path>
-                          </completionHelp>
-                          <constraint>
-                            <regex>^[a-zA-Z0-9\-_]{1,100}$</regex>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </tagNode> 
-                </children>
-              </tagNode>
-              <tagNode name="route">
-                <properties>
-                  <help>VRF static IPv4 route</help>
-                  <valueHelp>
-                    <format>ipv4net</format>
-                    <description>VRF static IPv4 route</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-prefix"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <node name="blackhole">
-                    <properties>
-                      <help>Silently discard pkts when matched</help>
-                    </properties>
-                    <children>
-                      <leafNode name="distance">
-                        <properties>
-                          <help>Distance value for this route</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Distance for this route</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                  <leafNode name="dhcp-interface">
-                    <properties>
-                      <help>DHCP interface that supplies the next-hop IP address for this static route</help>
-                      <completionHelp>
-                        <script>${vyos_completion_dir}/list_interfaces.py</script>
-                      </completionHelp>
-                      <valueHelp>
-                        <format>txt</format>
-                        <description>DHCP interface</description>
-                      </valueHelp>
-                    </properties>
-                  </leafNode>
-                  <tagNode name="next-hop">
-                    <properties>
-                      <help>Next-hop router</help>
-                      <valueHelp>
-                        <format>ipv4</format>
-                        <description>Next-hop router</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                    <children>
-                      <leafNode name="disable">
-                        <properties>
-                          <help>Disable IPv4 interface static route</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="distance">
-                        <properties>
-                          <help>Distance for this route</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Distance for this route</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="next-hop-interface">
-                        <properties>
-                          <help>IPv4 gateway interface name</help>
-                          <completionHelp>
-                            <script>${vyos_completion_dir}/list_interfaces.py</script>
-                          </completionHelp>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>IPv4 gateway interface name</description>
-                          </valueHelp>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="next-hop-vrf">
-                        <properties>
-                          <help>VRF to leak route</help>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>Name of VRF to leak to</description>
-                          </valueHelp>
-                          <valueHelp>
-                            <format>default</format>
-                            <description>Name of VRF to leak to</description>
-                          </valueHelp>
-                          <completionHelp>
-                            <list>default</list>
-                            <path>protocols vrf</path>
-                          </completionHelp>
-                          <constraint>
-                            <regex>^[a-zA-Z0-9\-_]{1,100}$</regex>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                </children>
-              </tagNode>
-              <tagNode name="route6">
-                <properties>
-                  <help>VRF static IPv6 route</help>
-                  <valueHelp>
-                    <format>ipv6net</format>
-                    <description>VRF static IPv6 route</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv6-prefix"/>
-                  </constraint>
-                </properties>
-                <children>
-                  <node name="blackhole">
-                    <properties>
-                      <help>Silently discard pkts when matched</help>
-                    </properties>
-                    <children>
-                      <leafNode name="distance">
-                        <properties>
-                          <help>Distance value for this route</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Distance for this route</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </node>
-                  <tagNode name="next-hop">
-                    <properties>
-                      <help>Next-hop IPv6 router [REQUIRED]</help>
-                      <valueHelp>
-                        <format>ipv6</format>
-                        <description>Next-hop IPv6 router [REQUIRED]</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv6-address"/>
-                      </constraint>
-                    </properties>
-                    <children>
-                      <leafNode name="disable">
-                        <properties>
-                          <help>Disable IPv6 interface static route</help>
-                          <valueless/>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="distance">
-                        <properties>
-                          <help>Distance for this route</help>
-                          <valueHelp>
-                            <format>u32:1-255</format>
-                            <description>Distance for this route</description>
-                          </valueHelp>
-                          <constraint>
-                            <validator name="numeric" argument="--range 1-255"/>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="interface">
-                        <properties>
-                          <help>IPv6 gateway interface name</help>
-                          <completionHelp>
-                            <script>${vyos_completion_dir}/list_interfaces.py</script>
-                          </completionHelp>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>IPv6 gateway interface name</description>
-                          </valueHelp>
-                        </properties>
-                      </leafNode>
-                      <leafNode name="next-hop-vrf">
-                        <properties>
-                          <help>VRF to leak route</help>
-                          <valueHelp>
-                            <format>txt</format>
-                            <description>Name of VRF to leak to</description>
-                          </valueHelp>
-                          <valueHelp>
-                            <format>default</format>
-                            <description>Name of VRF to leak to</description>
-                          </valueHelp>
-                          <completionHelp>
-                            <list>default</list>
-                            <path>protocols vrf</path>
-                          </completionHelp>
-                          <constraint>
-                            <regex>^[a-zA-Z0-9\-_]{1,100}$</regex>
-                          </constraint>
-                        </properties>
-                      </leafNode>
-                    </children>
-                  </tagNode>
-                </children>
-              </tagNode>
+              #include <include/static-route.xml.i>
+              #include <include/static-route6.xml.i>
             </children>
           </node>
         </children>
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index 81c89d94b..eca9e75a7 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -21,7 +21,7 @@
           </constraint>
           <constraintErrorMessage>VRF instance name must be 15 characters or less and can not\nbe named as regular network interfaces.\n</constraintErrorMessage>
           <valueHelp>
-            <format>name</format>
+            <format>txt</format>
             <description>Instance name</description>
           </valueHelp>
         </properties>
diff --git a/smoketest/configs/vrf-basic b/smoketest/configs/vrf-basic
new file mode 100644
index 000000000..ded33f683
--- /dev/null
+++ b/smoketest/configs/vrf-basic
@@ -0,0 +1,231 @@
+interfaces {
+    ethernet eth0 {
+        address 192.0.2.1/24
+    }
+    ethernet eth1 {
+        duplex auto
+        speed auto
+        vrf green
+    }
+    ethernet eth2 {
+        vrf red
+    }
+}
+protocols {
+    static {
+        route 0.0.0.0/0 {
+            next-hop 192.0.2.254 {
+                distance 10
+            }
+        }
+        table 10 {
+            interface-route 1.0.0.0/8 {
+                next-hop-interface eth0 {
+                    distance 20
+                }
+            }
+            interface-route 2.0.0.0/8 {
+                next-hop-interface eth0 {
+                    distance 20
+                }
+            }
+            interface-route 3.0.0.0/8 {
+                next-hop-interface eth0 {
+                    distance 20
+                }
+            }
+        }
+        table 20 {
+            interface-route 4.0.0.0/8 {
+                next-hop-interface eth0 {
+                    distance 20
+                }
+            }
+            interface-route 5.0.0.0/8 {
+                next-hop-interface eth0 {
+                    distance 50
+                }
+            }
+            interface-route 6.0.0.0/8 {
+                next-hop-interface eth0 {
+                    distance 60
+                }
+            }
+            interface-route6 2001:db8:100::/40 {
+                next-hop-interface eth1 {
+                    distance 20
+                }
+            }
+            interface-route6 2001:db8::/40 {
+                next-hop-interface eth1 {
+                    distance 10
+                }
+            }
+            route 11.0.0.0/8 {
+                next-hop 1.1.1.1 {
+                    next-hop-interface eth0
+                }
+            }
+            route 12.0.0.0/8 {
+                next-hop 1.1.1.1 {
+                    next-hop-interface eth0
+                }
+            }
+            route 13.0.0.0/8 {
+                next-hop 1.1.1.1 {
+                    next-hop-interface eth0
+                }
+            }
+        }
+        table 30 {
+            interface-route6 2001:db8:200::/40 {
+                next-hop-interface eth1 {
+                    distance 20
+                }
+            }
+            route 14.0.0.0/8 {
+                next-hop 2.2.1.1 {
+                    next-hop-interface eth1
+                }
+            }
+            route 15.0.0.0/8 {
+                next-hop 2.2.1.1 {
+                    next-hop-interface eth1
+                }
+            }
+        }
+    }
+    vrf green {
+        static {
+            interface-route 100.0.0.0/8 {
+                next-hop-interface eth0 {
+                    distance 200
+                    next-hop-vrf default
+                }
+            }
+            interface-route 101.0.0.0/8 {
+                next-hop-interface eth0 {
+                    next-hop-vrf default
+                }
+                next-hop-interface eth1 {
+                }
+            }
+            interface-route6 2001:db8:300::/40 {
+                next-hop-interface eth1 {
+                    distance 20
+                    next-hop-vrf default
+                }
+            }
+            route 20.0.0.0/8 {
+                next-hop 1.1.1.1 {
+                    next-hop-interface eth1
+                    next-hop-vrf default
+                }
+            }
+            route 21.0.0.0/8 {
+                next-hop 2.2.1.1 {
+                    next-hop-interface eth1
+                    next-hop-vrf default
+                }
+            }
+            route6 2001:db8:100::/40 {
+                next-hop fe80::1 {
+                    interface eth0
+                    next-hop-vrf default
+                }
+            }
+        }
+    }
+    vrf red {
+        static {
+            interface-route 103.0.0.0/8 {
+                next-hop-interface eth0 {
+                    distance 201
+                    next-hop-vrf default
+                }
+            }
+            interface-route 104.0.0.0/8 {
+                next-hop-interface eth0 {
+                    next-hop-vrf default
+                }
+                next-hop-interface eth1 {
+                    next-hop-vrf default
+                }
+            }
+            interface-route6 2001:db8:400::/40 {
+                next-hop-interface eth1 {
+                    distance 24
+                    next-hop-vrf default
+                }
+            }
+            route 30.0.0.0/8 {
+                next-hop 1.1.1.1 {
+                    next-hop-interface eth1
+                }
+            }
+            route 40.0.0.0/8 {
+                next-hop 2.2.1.1 {
+                    next-hop-interface eth1
+                    next-hop-vrf default
+                }
+            }
+            route6 2001:db8:100::/40 {
+                next-hop fe80::1 {
+                    interface eth0
+                    next-hop-vrf default
+                }
+            }
+        }
+    }
+}
+system {
+    config-management {
+        commit-revisions 100
+    }
+    console {
+        device ttyS0 {
+            speed 115200
+        }
+    }
+    host-name vyos
+    login {
+        user vyos {
+            authentication {
+                encrypted-password $6$O5gJRlDYQpj$MtrCV9lxMnZPMbcxlU7.FI793MImNHznxGoMFgm3Q6QP3vfKJyOSRCt3Ka/GzFQyW1yZS4NS616NLHaIPPFHc0
+                plaintext-password ""
+            }
+        }
+    }
+    nt
+    ntp {
+        server 0.pool.ntp.org {
+        }
+        server 1.pool.ntp.org {
+        }
+        server 2.pool.ntp.org {
+        }
+    }
+    syslog {
+        global {
+            facility all {
+                level info
+            }
+            facility protocols {
+                level debug
+            }
+        }
+    }
+    time-zone Europe/Berlin
+}
+vrf {
+    name green {
+        table 1000
+    }
+    name red {
+        table 2000
+    }
+}
+
+// Warning: Do not remove the following line.
+// vyos-config-version: "broadcast-relay@1:cluster@1:config-management@1:conntrack@1:conntrack-sync@1:dhcp-relay@2:dhcp-server@5:dhcpv6-server@1:dns-forwarding@3:firewall@5:https@2:interfaces@18:ipoe-server@1:ipsec@5:l2tp@3:lldp@1:mdns@1:nat@5:ntp@1:pppoe-server@5:pptp@2:qos@1:quagga@6:salt@1:snmp@2:ssh@2:sstp@3:system@20:vrrp@2:vyos-accel-ppp@2:wanloadbalance@3:webproxy@2:zone-policy@1"
+// Release version: 1.3-beta-202101231023
diff --git a/src/conf_mode/protocols_vrf.py b/src/conf_mode/protocols_vrf.py
new file mode 100755
index 000000000..7c32c7013
--- /dev/null
+++ b/src/conf_mode/protocols_vrf.py
@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+from sys import exit
+
+from vyos.config import Config
+from vyos.template import render
+from vyos.template import render_to_string
+from vyos.util import call
+from vyos import ConfigError
+from vyos import frr
+from vyos import airbag
+airbag.enable()
+
+config_file = r'/tmp/vrf.frr'
+frr_daemon = 'staticd'
+
+DEBUG = os.path.exists('/tmp/vrf.debug')
+if DEBUG:
+    import logging
+    lg = logging.getLogger("vyos.frr")
+    lg.setLevel(logging.DEBUG)
+    ch = logging.StreamHandler()
+    lg.addHandler(ch)
+
+def get_config(config=None):
+    if config:
+        conf = config
+    else:
+        conf = Config()
+    base = ['protocols', 'vrf']
+    vrf = conf.get_config_dict(base, key_mangling=('-', '_'))
+    return vrf
+
+def verify(vrf):
+
+    return None
+
+def generate(vrf):
+    # render(config) not needed, its only for debug
+    render(config_file, 'frr/vrf.frr.tmpl', vrf)
+    vrf['new_frr_config'] = render_to_string('frr/vrf.frr.tmpl', vrf)
+
+    return None
+
+def apply(vrf):
+    # Save original configuration prior to starting any commit actions
+    frr_cfg = frr.FRRConfig()
+    frr_cfg.load_configuration(frr_daemon)
+    frr_cfg.modify_section(r'vrf \S+', '')
+    frr_cfg.add_before(r'(ip prefix-list .*|route-map .*|line vty)', vrf['new_frr_config'])
+
+    # Debugging
+    if DEBUG:
+        from pprint import pprint
+        print('')
+        print('--------- DEBUGGING ----------')
+        pprint(dir(frr_cfg))
+        print('Existing config:\n')
+        for line in frr_cfg.original_config:
+            print(line)
+        print(f'Replacement config:\n')
+        print(f'{vrf["new_frr_config"]}')
+        print(f'Modified config:\n')
+        print(f'{frr_cfg}')
+
+    frr_cfg.commit_configuration(frr_daemon)
+
+    # If FRR config is blank, rerun the blank commit x times due to frr-reload
+    # behavior/bug not properly clearing out on one commit.
+    if vrf['new_frr_config'] == '':
+        for a in range(5):
+            frr_cfg.commit_configuration(frr_daemon)
+
+    return None
+
+if __name__ == '__main__':
+    try:
+        c = get_config()
+        verify(c)
+        generate(c)
+        apply(c)
+    except ConfigError as e:
+        print(e)
+        exit(1)
diff --git a/src/migration-scripts/vrf/0-to-1 b/src/migration-scripts/vrf/0-to-1
new file mode 100755
index 000000000..29b2fab74
--- /dev/null
+++ b/src/migration-scripts/vrf/0-to-1
@@ -0,0 +1,112 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2021 VyOS maintainers and contributors
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or later as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# - T2450: drop interface-route and interface-route6 from "protocols vrf"
+
+from sys import argv
+from sys import exit
+from vyos.configtree import ConfigTree
+
+if (len(argv) < 2):
+    print("Must specify file name!")
+    exit(1)
+
+file_name = argv[1]
+
+with open(file_name, 'r') as f:
+    config_file = f.read()
+
+base = ['protocols', 'vrf']
+config = ConfigTree(config_file)
+
+if not config.exists(base):
+    # Nothing to do
+    exit(0)
+
+for vrf in config.list_nodes(base):
+    static_base = base + [vrf, 'static']
+    if not config.exists(static_base):
+        continue
+
+    #
+    # Migrate interface-route into route
+    #
+    interface_route_path = static_base + ['interface-route']
+    if config.exists(interface_route_path):
+        for route in config.list_nodes(interface_route_path):
+            interface = config.list_nodes(interface_route_path + [route, 'next-hop-interface'])
+
+            tmp = interface_route_path + [route, 'next-hop-interface']
+            for interface in config.list_nodes(tmp):
+                new_base = static_base + ['route', route, 'interface']
+                config.set(new_base)
+                config.set_tag(new_base)
+                config.copy(tmp + [interface], new_base + [interface])
+
+        config.delete(interface_route_path)
+
+    #
+    # Migrate interface-route6 into route6
+    #
+    interface_route_path = static_base + ['interface-route6']
+    if config.exists(interface_route_path):
+        for route in config.list_nodes(interface_route_path):
+            interface = config.list_nodes(interface_route_path + [route, 'next-hop-interface'])
+
+            tmp = interface_route_path + [route, 'next-hop-interface']
+            for interface in config.list_nodes(tmp):
+                new_base = static_base + ['route6', route, 'interface']
+                config.set(new_base)
+                config.set_tag(new_base)
+                config.copy(tmp + [interface], new_base + [interface])
+
+        config.delete(interface_route_path)
+
+    #
+    # Cleanup nodes inside route
+    #
+    route_path = static_base + ['route']
+    if config.exists(route_path):
+        for route in config.list_nodes(route_path):
+            next_hop = route_path + [route, 'next-hop']
+            if config.exists(next_hop):
+                for gateway in config.list_nodes(next_hop):
+                    interface_path = next_hop + [gateway, 'next-hop-interface']
+                    if config.exists(interface_path):
+                        config.rename(interface_path, 'interface')
+                    vrf_path = next_hop + [gateway, 'next-hop-vrf']
+                    if config.exists(vrf_path):
+                        config.rename(vrf_path, 'vrf')
+
+    #
+    # Cleanup nodes inside route6
+    #
+    route_path = static_base + ['route6']
+    if config.exists(route_path):
+        for route in config.list_nodes(route_path):
+            next_hop = route_path + [route, 'next-hop']
+            if config.exists(next_hop):
+                for gateway in config.list_nodes(next_hop):
+                    vrf_path = next_hop + [gateway, 'next-hop-vrf']
+                    if config.exists(vrf_path):
+                        config.rename(vrf_path, 'vrf')
+
+try:
+    with open(file_name, 'w') as f:
+        f.write(config.to_string())
+except OSError as e:
+    print("Failed to save the modified config: {}".format(e))
+    exit(1)