(1) Insert VNET_ROUTE_TUNNEL table in sonic-vnet.yang file and fix test cases

(2) Fix sample data name constraints

Author: miatttao

src/sonic-yang-models/doc/Configuration.md

@@ -2546,23 +2546,24 @@ monitoring sessions for the vnet routes and is optional.
 
 ### VNET_ROUTE_TUNNEL
 
-VNET_ROUTE_TUNNEL table has vnet_name:prefix as the object key, where vnet_name is the name of the VNet and prefix is the prefix associated with the route tunnel. The table includes the following attributes:
-- ENDPOINT: The IP address of the host VM (mandatory), IPv4 address. It is used to identify the endpoint of the tunnel.
-- MAC_ADDRESS: The inner destination MAC address in the encapsulated packet (optional).  It should be a 12-hexadecimal digit value.
+VNET_ROUTE_TUNNEL table has vnet_name|prefix as the object key, where vnet_name is the name of the VNet and prefix is the prefix associated with the route tunnel. The table includes the following attributes:
+- ENDPOINT: The endpoint/nexthop tunnel IP (mandatory). It is used to identify the endpoint of the tunnel.
+- MAC_ADDRESS: The inner destination MAC address in the encapsulated packet (optional).  It should be a 12-hexadeimal digit value.
 - VXLANID: The VNI value in the encapsulated packet (optional). It should be a numeric value.
 
 ```
 {
   "VNET_ROUTE_TUNNEL": {
-    "Vnet1-1:10.0.0.0/24": {
-      "endpoint": "192.168.1.1",
-      "mac_address": "F9:22:83:99:22:A2",
-      "vxlanid": "10011"
+    "Vnet_2000|100.100.1.1/32": {
+        "name": "Vnet_2000|100.100.1.1/32",
+        "endpoint": "192.168.1.1",
+        "mac_address": "F9:22:83:99:22:A2"
     },
-    "Vnetv4_v4-0:10.0.1.0/24": {
-      "endpoint": "192.168.1.2",
-      "mac_address": "F8:22:83:99:22:A2",
-      "vxlanid": "10012"
+    "Vnetv4_v4-0|10.0.1.0/24": {
+        "name": "Vnetv4_v4-0|10.0.1.0/24",
+        "endpoint": "192.168.1.2",
+        "mac_address": "F8:22:83:99:22:A2",
+        "vxlanid": "10012"
     }
   }
 }

src/sonic-yang-models/setup.py

@@ -176,7 +176,6 @@ def run(self):
                          './yang-models/sonic-versions.yang',
                          './yang-models/sonic-vlan.yang',
                          './yang-models/sonic-vnet.yang',
-                         './yang-models/sonic-vnet-route-tunnel-vxlan.yang',
                          './yang-models/sonic-voq-inband-interface.yang',
                          './yang-models/sonic-vxlan.yang',
                          './yang-models/sonic-vrf.yang',

src/sonic-yang-models/tests/files/sample_config_db.json

@@ -2338,7 +2338,8 @@
             }
         },
         "VNET_ROUTE_TUNNEL" : {
-            "vnet1:10.0.0.0/24" : {
+            "vnet1|10.0.0.0/24" : {
+                "name":"vnet1|10.0.0.0/24",
                 "endpoint": "192.168.1.2",
                 "mac_address": "F9:22:83:99:22:A2",
                 "vxlanid": "10011"

src/sonic-yang-models/tests/yang_model_tests/tests/vnet.json

@@ -24,5 +24,56 @@
     "VNET_INVALID_VXLAN_VTEP": {
         "desc": "Missing Vxlan_TUNNEL configuration",
         "eStr" : [ "points to a non-existing leaf" ]
+    },
+    "VNET_ROUTE_TUNNEL_MIN_TEST": {
+        "desc": "Basic VNET route tunnel configuration with minimal required field - endpoint in VNET_ROUTE_TUNNEL_LIST table."
+    },
+
+    "VNET_ROUTE_TUNNEL_MULTI_TEST": {
+        "desc": "Multiple VNET route tunnel configurations for different VNETs in VNET_ROUTE_TUNNEL_LIST table."
+    },
+
+    "VNET_ROUTE_TUNNEL_COMPLETE_TEST": {
+        "desc": "Complete VNET route tunnel configuration with all optional fields (including mac_address and vxlanid)in VNET_ROUTE_TUNNEL_LIST table."
+    },
+
+    "VNET_ROUTE_TUNNEL_TEST_DUPLICATE_NAME": {
+        "desc": "VNET route tunnel configuration with duplicate name keys in VNET_ROUTE_TUNNEL_LIST table.",
+        "eStr": "Duplicated instance of \"VNET_ROUTE_TUNNEL_LIST\" list."
+    },
+
+    "VNET_ROUTE_TUNNEL_TEST_INVALID_ENDPOINT": {
+        "desc": "VNET route tunnel configuration with invalid endpoint IP value (256.256.256.256) in VNET_ROUTE_TUNNEL_LIST table.",
+        "eStr": "Value \"256.256.256.256\" does not satisfy the constraint"
+    },
+
+    "VNET_ROUTE_TUNNEL_TEST_INVALID_MAC": {
+        "desc": "VNET route tunnel configuration with invalid MAC address format (non-hexadecimal characters) in VNET_ROUTE_TUNNEL_LIST table.",
+        "eStr": "Value \"GG:HH:II:JJ:KK:LL\" does not satisfy the constraint \"[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}\""
+    },
+
+    "VNET_ROUTE_TUNNEL_TEST_INVALID_VXLANID": {
+        "desc": "VNET route tunnel configuration with invalid VXLAN ID (exceeding max value of 16777215) in VNET_ROUTE_TUNNEL_LIST table.",
+        "eStr": "Value \"16777216\" does not satisfy the constraint \"1..16777215\""
+    },
+
+    "VNET_ROUTE_TUNNEL_TEST_INVALID_NAME_FORMAT": {
+        "desc": "VNET route tunnel configuration with invalid name format (missing pipe and prefix) in VNET_ROUTE_TUNNEL_LIST table.",
+        "eStr": "Value \"Vnet1\" does not satisfy the constraint \"[^|]+[|]((([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2])))\" (range, length, or pattern)\""
+    },
+
+    "VNET_ROUTE_TUNNEL_TEST_INVALID_PREFIX": {
+        "desc": "VNET route tunnel configuration with invalid prefix format (300.168.1.0/24) in name field.",
+        "eStr": "Value \"Vnet1|300.168.1.0/24\" does not satisfy the constraint \"[^|]+[|]((([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2])))\" (range, length, or pattern)\""
+    },
+
+    "VNET_ROUTE_TUNNEL_TEST_MISSING_ENDPOINT": {
+        "desc": "VNET route tunnel configuration with missing mandatory attribute (endpoint) in VNET_ROUTE_TUNNEL_LIST table.",
+        "eStr": "Missing required element \"endpoint\" in \"VNET_ROUTE_TUNNEL_LIST\"."
+    },
+
+    "VNET_ROUTE_TUNNEL_TEST_NONEXISTENT_VNET": {
+        "desc": "VNET route tunnel configuration referencing a non-existent VNET name, violating the must condition.",
+        "eStr": "VNET name in the key must reference a valid VNET in the VNET table"
     }
 }