Merge pull request #365 from mssonicbld/sonicbld/202305-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305
Azure · May 12, 2024 · 95171c6 · 95171c6
2 parents a0383f2 + 36544eb
commit 95171c6
Show file tree

Hide file tree

Showing 10 changed files with 390 additions and 21 deletions.
diff --git a/src/sonic-yang-mgmt/tests/test_cfghelp.py b/src/sonic-yang-mgmt/tests/test_cfghelp.py
@@ -111,12 +111,12 @@
 Description: ACL_RULE part of config_db.json
 
 key - ACL_TABLE_NAME:RULE_NAME
-+-----------+-----------------------------------------+-------------+-----------+-------------+
-| Field     | Description                             | Mandatory   | Default   | Reference   |
-+===========+=========================================+=============+===========+=============+
-| ICMP_TYPE | Mutually exclusive in group icmp        |             |           |             |
-|           | when IP_TYPE in ANY,IP,IPV4,IPv4ANY,ARP |             |           |             |
-+-----------+-----------------------------------------+-------------+-----------+-------------+
++-----------+-------------------------------------------------+-------------+-----------+-------------+
+| Field     | Description                                     | Mandatory   | Default   | Reference   |
++===========+=================================================+=============+===========+=============+
+| ICMP_TYPE | Mutually exclusive in group icmp                |             |           |             |
+|           | when IP_TYPE in ANY,IP,IPV4,IPv4ANY,IPV4ANY,ARP |             |           |             |
++-----------+-------------------------------------------------+-------------+-----------+-------------+
 
 """
 

diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -7,7 +7,8 @@
         },
         "DHCP_SERVER": {
             "192.0.0.8": {},
-            "192.0.0.8": {}
+            "192.0.0.8": {},
+            "2603:10e1:0:6f4::1": {}
         },
         "DNS_NAMESERVER": {
             "1.1.1.1": {},

diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/acl.json b/src/sonic-yang-models/tests/yang_model_tests/tests/acl.json
@@ -20,6 +20,12 @@
     "ACL_RULE_WITH_VALID_OUT_PORTS": {
         "desc": "Configure ACL_RULE with valid OUT_PORTS."
     },
+    "ACL_RULE_WITH_VALID_ICMPV4_CODE": {
+        "desc": "Configure ACL_RULE with valid ICMPV4 type and code."
+    },
+    "ACL_RULE_WITH_VALID_ICMPV6_CODE": {
+        "desc": "Configure ACL_RULE with valid ICMPV6 type and code."
+    },
     "ACL_TABLE_EMPTY_PORTS": {
         "desc": "Configure ACL_TABLE with empty ports."
     },
@@ -32,6 +38,12 @@
         "desc": "Configure non-existing ACL_TABLE in ACL_RULE.",
         "eStrKey" : "LeafRef"
     },
+    "ACL_RULE_IP_TYPE_SRC_IPV6ANY": {
+        "desc": "Configure IP_TYPE as ipv6any and SRC_IPV6 in ACL_RULE."
+    },
+    "ACL_RULE_IP_TYPE_DST_IPV4ANY": {
+        "desc": "Configure IP_TYPE as ipv4any and DST_IP in ACL_RULE."
+    },
     "ACL_RULE_IP_TYPE_SRC_IPV6_MISMATCH": {
         "desc": "Configure IP_TYPE as ipv4any and SRC_IPV6 in ACL_RULE.",
         "eStrKey" : "When",
@@ -45,6 +57,12 @@
         "eStrKey" : "When",
         "eStr": ["IP_TYPE"]
     },
+    "ACL_RULE_VALID_L4_SRC_PORT_RANGE": {
+        "desc": "Configure l4_src_port_range as 1024-65535 in ACL_RULE"
+    },
+    "ACL_RULE_VALID_L4_DST_PORT_RANGE": {
+        "desc": "Configure l4_src_port_range as 0-65535 in ACL_RULE"
+    },
     "ACL_RULE_WRONG_L4_SRC_PORT_RANGE": {
         "desc": "Configure l4_src_port_range as 99999-99999 in ACL_RULE",
         "eStrKey" : "Pattern"