[YANG SONIC-ACL] Fix Yang definition of ACL_TABLE_TYPE (#16247) (#16472)

mssonicbld · lizhijianrd · web-flow · commit 86b4d38bd31d · 2023-09-06T16:09:17.000-07:00
How I did it
Update Yang definition of ACL_TABLE_TYPE.
Update existing testcase.
Add new testcase to cover lowercase key scenario.

How to verify it
Verified by building sonic_yang_models-1.0-py3-none-any.whl. While building the target package, unit tests were run and passed.

Co-authored-by: Zhijian Li &lt;zhijianli@microsoft.com&gt;
diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -1965,16 +1965,16 @@
          },
          "ACL_TABLE_TYPE": {
              "CUSTOM_L3": {
-                 "matches": [
+                 "MATCHES": [
                      "IN_PORTS",
                      "OUT_PORTS",
                      "SRC_IP"
                  ],
-                 "actions": [
+                 "ACTIONS": [
                      "PACKET_ACTION",
                      "MIRROR_INGRESS_ACTION"
                  ],
-                 "bind_points": [
+                 "BIND_POINTS": [
                      "PORT",
                      "LAG"
                  ]
diff --git a/src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py b/src/sonic-yang-models/tests/yang_model_tests/test_yang_model.py
@@ -48,6 +48,7 @@ def initTest(self):
             'Range': ['does not satisfy', 'range'],
             'MinElements': ['Too few'],
             'MaxElements': ['Too many'],
+            'UnknownElement': ['Unknown element'],
             'None': []
         }
 
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
@@ -98,14 +98,18 @@
         "eStrKey": "MinElements"
     },
     "ACL_TABLE_CUSTOM_TABLE_TYPE_NO_ACTIONS": {
-        "desc": "ACL_TABLE LOAD TABLE TYPE SUCCESSFULLY WITH NO ACTIONS.",
+        "desc": "ACL_TABLE LOAD TABLE TYPE WITH NO ACTIONS.",
         "eStrKey" : "Verify",
         "verify": {
             "xpath": "/sonic-acl:sonic-acl/ACL_TABLE_TYPE/ACL_TABLE_TYPE_LIST[ACL_TABLE_TYPE_NAME='CUSTOM_L3']/ACL_TABLE_TYPE_NAME",
-            "key": "sonic-acl:actions",
+            "key": "sonic-acl:ACTIONS",
             "value": [""]
         }
     },
+    "ACL_TABLE_CUSTOM_TABLE_TYPE_LOWERCASE_KEY": {
+        "desc": "ACL_TABLE LOAD TABLE TYPE WITH KEY ACTIONS/BIND_POINTS/MATCHES WRITTEN IN LOWERCASE.",
+        "eStrKey": "UnknownElement"
+    },
     "ACL_TABLE_L2_ACL_FIELDS": {
         "desc": "Configure L2 ACL with proper rule fields"
     },
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/acl.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/acl.json
@@ -723,14 +723,14 @@
                 "ACL_TABLE_TYPE_LIST": [
                     {
                         "ACL_TABLE_TYPE_NAME": "CUSTOM_L3",
-                        "matches": [
+                        "MATCHES": [
                             "SRC_IP",
                             "IN_PORTS"
                         ],
-                        "actions": [
+                        "ACTIONS": [
                             "PACKET_ACTION"
                         ],
-                        "bind_points": [
+                        "BIND_POINTS": [
                             "PORT"
                         ]
                     }
@@ -772,10 +772,10 @@
                 "ACL_TABLE_TYPE_LIST": [
                     {
                         "ACL_TABLE_TYPE_NAME": "CUSTOM_L3",
-                        "actions": [
+                        "ACTIONS": [
                             "PACKET_ACTION"
                         ],
-                        "bind_points": [
+                        "BIND_POINTS": [
                             "PORT"
                         ]
                     }
@@ -817,11 +817,11 @@
                 "ACL_TABLE_TYPE_LIST": [
                     {
                         "ACL_TABLE_TYPE_NAME": "CUSTOM_L3",
-                        "matches": [
+                        "MATCHES": [
                             "SRC_IP",
                             "IN_PORTS"
                         ],
-                        "actions": [
+                        "ACTIONS": [
                             "PACKET_ACTION"
                         ]
                     }
@@ -845,6 +845,52 @@
         }
     },
     "ACL_TABLE_CUSTOM_TABLE_TYPE_NO_ACTIONS": {
+        "sonic-acl:sonic-acl": {
+            "sonic-acl:ACL_TABLE": {
+                "ACL_TABLE_LIST": [
+                    {
+                        "ACL_TABLE_NAME": "NO-NSW-PACL-V6",
+                        "policy_desc": "Filter IPv6",
+                        "ports": [
+                            "Ethernet0"
+                        ],
+                        "stage": "EGRESS",
+                        "type": "CUSTOM_L3"
+                    }
+                ]
+            },
+            "sonic-acl:ACL_TABLE_TYPE": {
+                "ACL_TABLE_TYPE_LIST": [
+                    {
+                        "ACL_TABLE_TYPE_NAME": "CUSTOM_L3",
+                        "MATCHES": [
+                            "SRC_IP",
+                            "IN_PORTS"
+                        ],
+                        "BIND_POINTS": [
+                            "PORT"
+                        ]
+                    }
+                ]
+            }
+        },
+        "sonic-port:sonic-port": {
+            "sonic-port:PORT": {
+                "PORT_LIST": [
+                    {
+                        "admin_status": "up",
+                        "alias": "eth0",
+                        "description": "Ethernet0",
+                        "lanes": "0,1,2,3",
+                        "mtu": 9000,
+                        "name": "Ethernet0",
+                        "speed": 25000
+                    }
+                ]
+            }
+        }
+    },
+    "ACL_TABLE_CUSTOM_TABLE_TYPE_LOWERCASE_KEY": {
         "sonic-acl:sonic-acl": {
             "sonic-acl:ACL_TABLE": {
                 "ACL_TABLE_LIST": [
@@ -867,6 +913,9 @@
                             "SRC_IP",
                             "IN_PORTS"
                         ],
+                        "actions": [
+                            "PACKET_ACTION"
+                        ],
                         "bind_points": [
                             "PORT"
                         ]
diff --git a/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 b/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2
@@ -281,17 +281,17 @@ module sonic-acl {
 					type string;
 				}
 
-				leaf-list matches {
+				leaf-list MATCHES {
 					type string;
 					min-elements 1;
 				}
 
-				leaf-list actions {
+				leaf-list ACTIONS {
 					type string;
 					default "";
 				}
 
-				leaf-list bind_points {
+				leaf-list BIND_POINTS {
 					type enumeration {
 						enum PORT;
 						enum LAG;

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ def initTest(self):`
`48`	`48`	`'Range': ['does not satisfy', 'range'],`
`49`	`49`	`'MinElements': ['Too few'],`
`50`	`50`	`'MaxElements': ['Too many'],`
	`51`	`+ 'UnknownElement': ['Unknown element'],`
`51`	`52`	`'None': []`
`52`	`53`	`}`
`53`	`54`
Original file line number	Diff line number	Diff line change
`@@ -281,17 +281,17 @@ module sonic-acl {`
`281`	`281`	`type string;`
`282`	`282`	`}`
`283`	`283`
`284`		`- leaf-list matches {`
	`284`	`+ leaf-list MATCHES {`
`285`	`285`	`type string;`
`286`	`286`	`min-elements 1;`
`287`	`287`	`}`
`288`	`288`
`289`		`- leaf-list actions {`
	`289`	`+ leaf-list ACTIONS {`
`290`	`290`	`type string;`
`291`	`291`	`default "";`
`292`	`292`	`}`
`293`	`293`
`294`		`- leaf-list bind_points {`
	`294`	`+ leaf-list BIND_POINTS {`
`295`	`295`	`type enumeration {`
`296`	`296`	`enum PORT;`
`297`	`297`	`enum LAG;`