Enforce uniqueness on vxlanid

sonic-net · Feb 25, 2025 · a650a9b · a650a9b
1 parent 8367814
commit a650a9b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/vnet_route_tunnel_vxlan.json b/src/sonic-yang-models/tests/yang_model_tests/tests/vnet_route_tunnel_vxlan.json
@@ -33,12 +33,12 @@
 
     "VNET_ROUTE_TUNNEL_TEST_INVALID_NAME_FORMAT": {
         "desc": "VNET route tunnel configuration with invalid name format (missing prefix) in VNET_ROUTE_TUNNEL_LIST table.",
-        "eStrKey":"InvalidValue"
+        "eStr":["does not match pattern"]
     },
 
     "VNET_ROUTE_TUNNEL_TEST_INVALID_PREFIX": {
         "desc": "VNET route tunnel configuration with invalid prefix format in name field.",
-        "eStrKey":"InvalidValue"
+        "eStr":["does not match pattern"]
     },
 
     "VNET_ROUTE_TUNNEL_TEST_MISSING_ENDPOINT": {
@@ -53,6 +53,6 @@
 
     "VNET_ROUTE_TUNNEL_TEST_DUPLICATE_VXLANID": {
         "desc": "VNET route tunnel configuration with duplicate VXLAN ID across entries.",
-        "eStr": "Duplicated instance of \"VNET_ROUTE_TUNNEL_LIST\" list."
+        "eStr": ["VXLAN ID must be unique across all route tunnels"]
     }
 }
diff --git a/src/sonic-yang-models/yang-models/sonic-vnet-route-tunnel-vxlan.yang b/src/sonic-yang-models/yang-models/sonic-vnet-route-tunnel-vxlan.yang
@@ -65,6 +65,10 @@ module sonic-vnet-route-tunnel-vxlan {
                 leaf vxlanid {
                     type stypes:vnid_type;
                     description "A valid and unique vni value in encapsulated packet";
+                    must "not(../VNET_ROUTE_TUNNEL_LIST[name != current()/../name][vxlanid = current()])" 
+                    {
+                        error-message "VXLAN ID must be unique across all route tunnels";
+                    }
                 }
             }
         }