From f72a6314e8534f6fbae1f506be99f1600a5446d0 Mon Sep 17 00:00:00 2001 From: Stepan Blyschak Date: Fri, 20 Oct 2023 19:18:00 +0300 Subject: [PATCH] [YANG][ACL] Change LAG -> PORTCHANNEL in DB schema Orchagent uses PORTCHANNEL term when parsing this field. Change the YANG model to align to orchagent. Signed-off-by: Stepan Blyschak --- src/sonic-yang-models/doc/Configuration.md | 4 ++-- src/sonic-yang-models/tests/files/sample_config_db.json | 2 +- .../tests/yang_model_tests/tests_config/acl.json | 3 ++- src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md index b42b3672c7b..85e19ab12a9 100644 --- a/src/sonic-yang-models/doc/Configuration.md +++ b/src/sonic-yang-models/doc/Configuration.md @@ -343,7 +343,7 @@ and migration plan ], "BIND_POINTS": [ "PORT", - "LAG" + "PORTCHANNEL" ] } }, @@ -1855,7 +1855,7 @@ SFLOW | 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 | | | 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 | diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json index 0d2827ae48a..b831142ec4c 100644 --- a/src/sonic-yang-models/tests/files/sample_config_db.json +++ b/src/sonic-yang-models/tests/files/sample_config_db.json @@ -2379,7 +2379,7 @@ ], "BIND_POINTS": [ "PORT", - "LAG" + "PORTCHANNEL" ] } }, 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 index 49dad6497fe..aa908fdb754 100644 --- 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 @@ -731,7 +731,8 @@ "PACKET_ACTION" ], "BIND_POINTS": [ - "PORT" + "PORT", + "PORTCHANNEL" ] } ] diff --git a/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 b/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 index 264421c7cdf..513c467094f 100644 --- a/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 +++ b/src/sonic-yang-models/yang-templates/sonic-acl.yang.j2 @@ -308,7 +308,7 @@ module sonic-acl { leaf-list BIND_POINTS { type enumeration { enum PORT; - enum LAG; + enum PORTCHANNEL; } min-elements 1; }