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

[YANG][ACL] Change LAG -> PORTCHANNEL in DB schema (#17062)

Browse Source 
Orchagent uses PORTCHANNEL term when parsing this field. Change the YANG model to align to orchagent.

- Why I did it
When specifying PORTCHANNEL in ACL_TABLE_TYPE table YAGN model validation does not pass, when using term LAG orchagent does not accept such table type.
Fix it by aligning YANG model to orchagent.

- How I did it
Fix in YANG model.

- How to verify it
Create custom ACL table type.

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
This commit is contained in:
Stepan Blyshchak 2023-11-09 19:00:07 +02:00 committed by mssonicbld
parent f233a26686
commit fd10ce1f8b
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sonic-yang-models/doc/Configuration.md
View File

@ -341,7 +341,7 @@ and migration plan
], ],
"BIND_POINTS": [ "BIND_POINTS": [
"PORT", "PORT",
"LAG" "PORTCHANNEL"
] ]
} }
}, },
@ -1804,7 +1804,7 @@ SFLOW
| Field | Description | Mandatory | Default | Reference | | Field | Description | Mandatory | Default | Reference |
|------------------|-----------------------------------------------------------------------------------------|-------------|-----------|-------------------------------------------| |------------------|-----------------------------------------------------------------------------------------|-------------|-----------|-------------------------------------------|
| admin_state | Global sflow admin state | | down | | admin_state | Global sflow admin state | | down |
| sample_direction | Global sflow sample direction | | rx | | | sample_direction | Global sflow sample direction | | rx | |
| polling_interval | The interval within which sFlow data is collected and sent to the configured collectors | | 20 | | | polling_interval | The interval within which sFlow data is collected and sent to the configured collectors | | 20 | |
| agent_id | Interface name | | | PORT:name,PORTCHANNEL:name,MGMT_PORT:name, VLAN:name | | agent_id | Interface name | | | PORT:name,PORTCHANNEL:name,MGMT_PORT:name, VLAN:name |

2
src/sonic-yang-models/tests/files/sample_config_db.json
View File

@ -2315,7 +2315,7 @@
], ],
"BIND_POINTS": [ "BIND_POINTS": [
"PORT", "PORT",
"LAG" "PORTCHANNEL"
] ]
} }
}, },

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

@ -731,7 +731,8 @@
"PACKET_ACTION" "PACKET_ACTION"
], ],
"BIND_POINTS": [ "BIND_POINTS": [
"PORT" "PORT",
"PORTCHANNEL"
] ]
} }
] ]

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

@ -308,7 +308,7 @@ module sonic-acl {
leaf-list BIND_POINTS { leaf-list BIND_POINTS {
type enumeration { type enumeration {
enum PORT; enum PORT;
enum LAG; enum PORTCHANNEL;
} }
min-elements 1; min-elements 1;
} }