[sonic-acl.yang] Add new ACL key BTH_OPCODE and AETH_SYNDROME (#13340)

Junchao-Mellanox · web-flow · commit b59f3888ff15 · 2023-01-29T13:44:35.000+02:00
- Why I did it
Add new ACL key BTH_OPCODE and AETH_SYNDROME

- How I did it
Add new ACL key BTH_OPCODE and AETH_SYNDROME

- How to verify it
manual test
unit test
diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -314,6 +314,14 @@
                 "PACKET_ACTION": "DROP",
                 "IP_TYPE": "IPv4ANY",
                 "SRC_IP": "1.1.1.1/32"
+            },
+            "DATAACL|RULE1": {
+                "PRIORITY": "999",
+                "PACKET_ACTION": "FORWARD",
+                "IP_TYPE": "IPv4ANY",
+                "SRC_IP": "1.1.1.1/32",
+                "BTH_OPCODE": "0x11/0xbf",
+                "AETH_SYNDROME": "0x60/0x60"
             }
         },
         "DEVICE_METADATA": {
@@ -2076,7 +2084,9 @@
                  "matches": [
                      "IN_PORTS",
                      "OUT_PORTS",
-                     "SRC_IP"
+                     "SRC_IP",
+                     "BTH_OPCODE",
+                     "AETH_SYNDROME"
                  ],
                  "actions": [
                      "PACKET_ACTION",
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
@@ -132,5 +132,13 @@
     },
     "ACL_RULE_VALID_TCP_FLAGS": {
         "desc": "Configure ACL_RULE with valid TCP_FLAGS."
+    },
+    "ACL_RULE_WRONG_BTH_OPCODE": {
+        "desc": "Configure invalid BTH_OPCODE in decimal format.",
+        "eStrKey" : "Pattern"
+    },
+    "ACL_RULE_WRONG_AETH_SYNDROME": {
+        "desc": "Configure invalid AETH_SYNDROME in decimal format.",
+        "eStrKey" : "Pattern"
     }
 }
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
@@ -1039,5 +1039,59 @@
                 ]
             }
         }
+    },
+    "ACL_RULE_WRONG_BTH_OPCODE": {
+        "sonic-acl:sonic-acl": {
+            "sonic-acl:ACL_RULE": {
+                "ACL_RULE_LIST": [
+                    {
+                        "ACL_TABLE_NAME": "BTH_OPCODE_TEST",
+                        "ETHER_TYPE": "2048",
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": 9981,
+                        "BTH_OPCODE": "0x24",
+                        "RULE_NAME": "Rule_19"
+                    }
+                ]
+            },
+            "sonic-acl:ACL_TABLE": {
+                "ACL_TABLE_LIST": [
+                    {
+                        "ACL_TABLE_NAME": "BTH_OPCODE_TEST",
+                        "policy_desc": "BTH_OPCODE_TEST",
+                        "ports": [ "" ],
+                        "stage": "INGRESS",
+                        "type": "L3"
+                    }
+                ]
+            }
+        }
+    },
+    "ACL_RULE_WRONG_AETH_SYNDROME": {
+        "sonic-acl:sonic-acl": {
+            "sonic-acl:ACL_RULE": {
+                "ACL_RULE_LIST": [
+                    {
+                        "ACL_TABLE_NAME": "AETH_SYNDROME_TEST",
+                        "ETHER_TYPE": "2048",
+                        "PACKET_ACTION": "DROP",
+                        "PRIORITY": 9981,
+                        "AETH_SYNDROME": "0x24",
+                        "RULE_NAME": "Rule_19"
+                    }
+                ]
+            },
+            "sonic-acl:ACL_TABLE": {
+                "ACL_TABLE_LIST": [
+                    {
+                        "ACL_TABLE_NAME": "AETH_SYNDROME_TEST",
+                        "policy_desc": "AETH_SYNDROME_TEST",
+                        "ports": [ "" ],
+                        "stage": "INGRESS",
+                        "type": "L3"
+                    }
+                ]
+            }
+        }
     }
 }
diff --git a/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 b/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2
@@ -268,6 +268,20 @@ module sonic-acl {
 						range "0..1";
 					}
 				}
+
+				leaf BTH_OPCODE {
+				        description "RoCEv2 BTH OPCODE field";
+					type string {
+						pattern '0[xX][0-9a-fA-F]{1,2}/0[xX][0-9a-fA-F]{1,2}';
+					}
+				}
+
+				leaf AETH_SYNDROME {
+				        description "RoCEv2 AETH SYNDROME field";
+					type string {
+						pattern '0[xX][0-9a-fA-F]{1,2}/0[xX][0-9a-fA-F]{1,2}';
+					}
+				}
 			}
 			/* end of ACL_RULE_LIST */
 		}

Original file line number	Diff line number	Diff line change
`@@ -132,5 +132,13 @@`
`132`	`132`	`},`
`133`	`133`	`"ACL_RULE_VALID_TCP_FLAGS": {`
`134`	`134`	`"desc": "Configure ACL_RULE with valid TCP_FLAGS."`
	`135`	`+ },`
	`136`	`+ "ACL_RULE_WRONG_BTH_OPCODE": {`
	`137`	`+ "desc": "Configure invalid BTH_OPCODE in decimal format.",`
	`138`	`+ "eStrKey" : "Pattern"`
	`139`	`+ },`
	`140`	`+ "ACL_RULE_WRONG_AETH_SYNDROME": {`
	`141`	`+ "desc": "Configure invalid AETH_SYNDROME in decimal format.",`
	`142`	`+ "eStrKey" : "Pattern"`
`135`	`143`	`}`
`136`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,20 @@ module sonic-acl {`
`268`	`268`	`range "0..1";`
`269`	`269`	`}`
`270`	`270`	`}`
	`271`	`+`
	`272`	`+ leaf BTH_OPCODE {`
	`273`	`+ description "RoCEv2 BTH OPCODE field";`
	`274`	`+ type string {`
	`275`	`+ pattern '0[xX][0-9a-fA-F]{1,2}/0[xX][0-9a-fA-F]{1,2}';`
	`276`	`+ }`
	`277`	`+ }`
	`278`	`+`
	`279`	`+ leaf AETH_SYNDROME {`
	`280`	`+ description "RoCEv2 AETH SYNDROME field";`
	`281`	`+ type string {`
	`282`	`+ pattern '0[xX][0-9a-fA-F]{1,2}/0[xX][0-9a-fA-F]{1,2}';`
	`283`	`+ }`
	`284`	`+ }`
`271`	`285`	`}`
`272`	`286`	`/* end of ACL_RULE_LIST */`
`273`	`287`	`}`