Fix comments

Fix comments

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Author: lolyu

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

@@ -91,6 +91,7 @@ Table of Contents
          * [XCVRD_LOG](#xcvrd_log)
          * [PASSWORD_HARDENING](#password_hardening)
          * [SSH_SERVER](#ssh_server)
+         * [SUBNET_DECAP](#subnet_decap)
          * [SYSTEM_DEFAULTS table](#systemdefaults-table)
          * [RADIUS](#radius)
          * [Static DNS](#static-dns)
@@ -2814,6 +2815,20 @@ The method could be:
 }
 ```
 
+### SUBNET_DECAP
+
+The **SUBNET_DECAP** table is used for subnet decap configuration.
+
+```
+"SUBNET_DECAP": {
+    "AZURE": {
+        "status": "enable",
+        "src_ip": "10.10.10.0/24",
+        "src_ip_v6": "20c1:ba8::/64"
+    }
+}
+```
+
 ### SYSTEM_DEFAULTS table
 To have a better management of the features in SONiC, a new table `SYSTEM_DEFAULTS` is introduced.
 

src/sonic-yang-models/setup.py

@@ -167,6 +167,7 @@ def run(self):
                          './yang-models/sonic-system-tacacs.yang',
                          './yang-models/sonic-system-radius.yang',
                          './yang-models/sonic-system-ldap.yang',
+                         './yang-models/sonic-subnet-decap.yang',
                          './yang-models/sonic-telemetry.yang',
                          './yang-models/sonic-telemetry_client.yang',
                          './yang-models/sonic-gnmi.yang',

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

@@ -5,6 +5,13 @@
                     "vni" : "100"
                 }
         },
+        "SUBNET_DECAP": {
+            "AZURE": {
+                "status": "enable",
+                "src_ip": "10.10.10.0/24",
+                "src_ip_v6": "20c1:ba8::/64"
+            }
+        },
         "DHCP_SERVER": {
             "192.0.0.8": {},
             "192.0.0.8": {},
@@ -2762,13 +2769,6 @@
 		"log_verbosity": "notice"
 	    }
 	},
-    "SUBNET_DECAP": {
-        "AZURE": {
-            "status": "enable",
-            "src_ip": "10.10.10.0/24",
-            "src_ip_v6": "20c1:ba8::/64"
-        }
-    },
 	"GRPCCLIENT": {
             "config": {
                 "type": "secure",

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

@@ -10,7 +10,7 @@
     },
     "SUBNET_DECAP_INVALID_STATUS_TEST": {
         "desc": "Configure SUBNET_DECAP table with invalid status.",
-        "eStrKey": "Pattern"
+        "eStrKey": "InvalidValue"
     },
     "SUBNET_DECAP_INVALID_IPV4": {
         "desc": "Configure SUBNET_DECAP table with invalid src ipv4 prefix.",
@@ -19,5 +19,13 @@
     "SUBNET_DECAP_INVALID_IPV6": {
         "desc": "Configure SUBNET_DECAP table with invalid src ipv6 prefix.",
         "eStrKey": "Pattern"
+    },
+    "SUBNET_DECAP_NO_IPV4": {
+        "desc": "Configure SUBNET_DECAP table without src ipv4 prefix.",
+        "eStrKey": "Mandatory"
+    },
+    "SUBNET_DECAP_NO_IPV6": {
+        "desc": "Configure SUBNET_DECAP table without src ipv6 prefix.",
+        "eStrKey": "Mandatory"
     }
 }

src/sonic-yang-models/tests/yang_model_tests/tests_config/subnet_decap.json

@@ -81,5 +81,31 @@
                 ]
             }
         }
+    },
+    "SUBNET_DECAP_NO_IPV4": {
+        "sonic-subnet-decap:sonic-subnet-decap": {
+            "sonic-subnet-decap:SUBNET_DECAP": {
+                "SUBNET_DECAP_LIST": [
+                    {
+                        "name": "AZURE",
+                        "status": "enable",
+                        "src_ip_v6": "20c1:ba8::/64"
+                    }
+                ]
+            }
+        }
+    },
+    "SUBNET_DECAP_NO_IPV6": {
+        "sonic-subnet-decap:sonic-subnet-decap": {
+            "sonic-subnet-decap:SUBNET_DECAP": {
+                "SUBNET_DECAP_LIST": [
+                    {
+                        "name": "AZURE",
+                        "status": "enable",
+                        "src_ip": "10.10.10.0/24"
+                    }
+                ]
+            }
+        }
     }
 }

src/sonic-yang-models/yang-models/sonic-subnet-decap.yang

@@ -10,6 +10,10 @@ module sonic-subnet-decap {
         prefix inet;
     }
 
+    import sonic-types {
+        prefix stypes;
+    }
+
     description "Subnet decap configuration for SONiC OS.";
 
     revision 2024-12-19 {
@@ -31,21 +35,21 @@ module sonic-subnet-decap {
                 }
 
                 leaf status {
-					type string {
-						pattern "enable|disable";
-					}
-                    default "disable";
+                    type stypes:mode-status;
+                    default disable;
                     description "Subnet Decap status.";
                 }
 
                 leaf src_ip {
                     type inet:ipv4-prefix;
                     description "Subnet decap term source IPv4 prefix.";
+                    mandatory true;
                 }
 
                 leaf src_ip_v6 {
                     type inet:ipv6-prefix;
                     description "Subnet decap term source IPv6 prefix.";
+                    mandatory true;
                 }
             }
         }