matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[yang] update TCP_FLAGS format in sonic-acl.yang (#11270)

Browse Source 
Why I did it
Fix #11224
TCP_FLAGS supports flags/mask pattern.

How I did it
Change the pattern.

How to verify it
Add unit test.
This commit is contained in:
jingwenxie 2022-06-30 10:09:54 +08:00 committed by GitHub
parent dbc6681dbb
commit 859b4793d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sonic-yang-models/tests/yang_model_tests/tests/acl.json
View File

@ -129,5 +129,8 @@
},
"ACL_RULE_WITH_VALID_MIRROR_INGRESS_ACTION": {
"desc": "Configure ACL_RULE with valid mirror action."
},
"ACL_RULE_VALID_TCP_FLAGS": {
"desc": "Configure ACL_RULE with valid TCP_FLAGS."
}
}

40
src/sonic-yang-models/tests/yang_model_tests/tests_config/acl.json
View File

@ -953,7 +953,7 @@
"ACL_TABLE_NAME": "EVERFLOW_DSCP",
"policy_desc": "EVERFLOW_DSCP",
"ports": [
""
""
],
"stage": "ingress",
"type": "MIRROR_DSCP"
@ -981,7 +981,7 @@
"ACL_TABLE_NAME": "EVERFLOW_DSCP",
"policy_desc": "EVERFLOW_DSCP",
"ports": [
""
""
],
"stage": "ingress",
"type": "MIRROR_DSCP"
@ -1003,5 +1003,41 @@
]
}
}
},
"ACL_RULE_VALID_TCP_FLAGS": {
"sonic-acl:sonic-acl": {
"sonic-acl:ACL_RULE": {
"ACL_RULE_LIST": [
{
"ACL_TABLE_NAME": "TCP_FLAGS_TEST",
"ETHER_TYPE": "2048",
"PACKET_ACTION": "DROP",
"PRIORITY": 9981,
"TCP_FLAGS": "0x24",
"RULE_NAME": "Rule_19"
},
{
"ACL_TABLE_NAME": "TCP_FLAGS_TEST",
"ETHER_TYPE": "2048",
"PACKET_ACTION": "DROP",
"PRIORITY": 9981,
"TCP_FLAGS": "0x24/0x24",
"RULE_NAME": "Rule_20"
}
]
},
"sonic-acl:ACL_TABLE": {
"ACL_TABLE_LIST": [
{
"ACL_TABLE_NAME": "TCP_FLAGS_TEST",
"policy_desc": "TCP_FLAGS_TEST",
"ports": [ "" ],
"stage": "INGRESS",
"type": "L3"
}
]
}
}
}
}

2
src/sonic-yang-models/yang-templates/sonic-acl.yang.j2
View File

@ -184,7 +184,7 @@ module sonic-acl {
leaf TCP_FLAGS {
type string {
pattern '0[x][0-9a-fA-F]{1,2}|0[X][0-9a-fA-F]{1,2}';
pattern '0[xX][0-9a-fA-F]{1,2}(/0[xX][0-9a-fA-F]{1,2})?';
}
}