vrf: T5174: ensure no duplicate VNIs can be defined

1 files changed, 10 insertions, 4 deletions

diff --git a/src/conf_mode/vrf.py b/src/conf_mode/vrf.py
index a7ef4cb5c..0b983293e 100755
--- a/src/conf_mode/vrf.py
+++ b/src/conf_mode/vrf.py
@@ -108,6 +108,12 @@ def get_config(config=None):
     # vyos.configverify.verify_common_route_maps() for more information.
     tmp = {'policy' : {'route-map' : conf.get_config_dict(['policy', 'route-map'],
                                                           get_first_key=True)}}
+
+    # L3VNI setup is done via vrf_vni.py as it must be de-configured (on node
+    # deletetion prior to the BGP process. Tell the Jinja2 template no VNI
+    # setup is needed
+    vrf.update({'no_vni' : ''})
+
     # Merge policy dict into "regular" config dict
     vrf = dict_merge(tmp, vrf)
     return vrf
@@ -124,8 +130,8 @@ def verify(vrf):
                                   f'static routes installed!')
 
     if 'name' in vrf:
-        reserved_names = ["add", "all", "broadcast", "default", "delete", "dev", "get", "inet", "mtu", "link", "type",
-                          "vrf"]
+        reserved_names = ["add", "all", "broadcast", "default", "delete", "dev",
+                          "get", "inet", "mtu", "link", "type", "vrf"]
         table_ids = []
         for name, vrf_config in vrf['name'].items():
             # Reserved VRF names
@@ -142,8 +148,8 @@ def verify(vrf):
                 if tmp and tmp != vrf_config['table']:
                     raise ConfigError(f'VRF "{name}" table id modification not possible!')
 
-            # VRf routing table ID must be unique on the system
-            if vrf_config['table'] in table_ids:
+            # VRF routing table ID must be unique on the system
+            if 'table' in vrf_config and vrf_config['table'] in table_ids:
                 raise ConfigError(f'VRF "{name}" table id is not unique!')
             table_ids.append(vrf_config['table'])