vrf: T5150: l3vni must be removed prior to removing BGP VRF process

4 files changed, 91 insertions, 3 deletions

diff --git a/data/configd-include.json b/data/configd-include.json
index 2f1d39006..456211caa 100644
--- a/data/configd-include.json
+++ b/data/configd-include.json
@@ -85,5 +85,6 @@
 "vpn_l2tp.py",
 "vpn_pptp.py",
 "vpn_sstp.py",
-"vrf.py"
+"vrf.py",
+"vrf_vni.py"
 ]
diff --git a/data/templates/frr/zebra.vrf.route-map.frr.j2 b/data/templates/frr/zebra.vrf.route-map.frr.j2
index eb6abd8e7..3c5791c4c 100644
--- a/data/templates/frr/zebra.vrf.route-map.frr.j2
+++ b/data/templates/frr/zebra.vrf.route-map.frr.j2
@@ -18,7 +18,7 @@ vrf {{ vrf }}
 {%         if vrf_config.vni is vyos_defined %}
  vni {{ vrf_config.vni }}
 {%         endif %}
+exit-vrf
 {%     endfor %}
- exit-vrf
 !
 {% endif %}
diff --git a/interface-definitions/vrf.xml.in b/interface-definitions/vrf.xml.in
index a7efe146a..3783785ce 100644
--- a/interface-definitions/vrf.xml.in
+++ b/interface-definitions/vrf.xml.in
@@ -121,7 +121,20 @@
               <constraintErrorMessage>VRF routing table must be in range from 100 to 65535</constraintErrorMessage>
             </properties>
           </leafNode>
-          #include <include/vni.xml.i>
+          <leafNode name="vni" owner="${vyos_conf_scripts_dir}/vrf_vni.py $VAR(../@)">
+            <properties>
+              <help>Virtual Network Identifier</help>
+              <!-- must be after BGP to keep correct order when removing L3VNIs in FRR -->
+              <priority>822</priority>
+              <valueHelp>
+                <format>u32:0-16777214</format>
+                <description>VXLAN virtual network identifier</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 0-16777214"/>
+              </constraint>
+            </properties>
+          </leafNode>
         </children>
       </tagNode>
     </children>
diff --git a/src/conf_mode/vrf_vni.py b/src/conf_mode/vrf_vni.py
new file mode 100644
index 000000000..56069ecbd
--- /dev/null
+++ b/src/conf_mode/vrf_vni.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2023 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/>.
+
+from sys import argv
+from sys import exit
+
+from vyos.config import Config
+from vyos.template import render_to_string
+from vyos import ConfigError
+from vyos import frr
+from vyos import airbag
+airbag.enable()
+
+def get_config(config=None):
+    if config:
+        conf = config
+    else:
+        conf = Config()
+
+    vrf_name = None
+    if len(argv) > 1:
+        vrf_name = argv[1]
+
+    base = ['vrf', 'name', vrf_name]
+    vrf = { 'name' : conf.get_config_dict(base, key_mangling=('-', '_'),
+                                          get_first_key=False) }
+
+    return vrf
+
+def verify(vrf):
+    if len(argv) < 2:
+        raise ConfigError('VRF parameter not specified when valling vrf_vni.py')
+
+    return None
+
+def generate(vrf):
+    vrf['new_frr_config'] = render_to_string('frr/zebra.vrf.route-map.frr.j2', vrf)
+    return None
+
+def apply(vrf):
+    frr_daemon = 'zebra'
+
+    # add configuration to FRR
+    frr_cfg = frr.FRRConfig()
+    frr_cfg.load_configuration(frr_daemon)
+    frr_cfg.modify_section(f'^vrf .+', stop_pattern='^exit-vrf', remove_stop_mark=True)
+    if 'new_frr_config' in vrf:
+        frr_cfg.add_before(frr.default_add_before, vrf['new_frr_config'])
+    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)