Skip to content

[yang]Add missing fields in PortChannel yang model #14045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiluo-msft merged 2 commits into from
Mar 2, 2023
Merged

[yang]Add missing fields in PortChannel yang model #14045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eba83b
[yang]Add missing fields in PortChannel yang model
dgsudharsan Mar 1, 2023
210a228
Merge remote-tracking branch 'upstream/master' into lag_yang_fix
dgsudharsan Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/sonic-yang-models/doc/Configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,7 +1422,9 @@ name as object key and member list as attribute.
"members": [
"Ethernet56"
],
"mtu": "9100"
"mtu": "9100",
"fallback": "false",
"fast_rate": "true"
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/sonic-yang-models/tests/files/sample_config_db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@
"admin_status": "up",
"min_links": "2",
"mtu": "9100",
"tpid": "0x8100"
"tpid": "0x8100",
"fast_rate": "false",
"fallback" : "true"
}
},
"PORTCHANNEL_INTERFACE": {
Expand Down
10 changes: 10 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/portchannel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@
"eStrKey" : "Pattern",
"eStr": ["0x8100|0x9100|0x9200|0x88a8|0x88A8"]
},
"PORT_CHANNEL_INVALID_FALLBACK": {
"desc": "INCORRECT PORTCHANNEL FALLBACK IN PORT_CHANNEL TABLE.",
"eStrKey" : "Pattern",
"eStr": ["false|true|False|True"]
},
"PORT_CHANNEL_INVALID_FAST_RATE": {
"desc": "INCORRECT PORTCHANNEL FAST_RATE IN PORT_CHANNEL TABLE.",
"eStrKey" : "Pattern",
"eStr": ["false|true|False|True"]
},
"PORTCHANNEL_INTERFACE_IP_ADDR_TEST": {
"desc": "Configure IP address on PORTCHANNEL_INTERFACE table."
},
Expand Down
34 changes: 33 additions & 1 deletion src/sonic-yang-models/tests/yang_model_tests/tests_config/portchannel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
"mtu": "9100",
"tpid": "0x8100",
"lacp_key": "auto",
"name": "PortChannel0001"
"name": "PortChannel0001",
"fast_rate": "false",
"fallback" : "false"
}
]
}
Expand Down Expand Up @@ -116,6 +118,36 @@
}
}
},
"PORT_CHANNEL_INVALID_FALLBACK": {
"sonic-portchannel:sonic-portchannel": {
"sonic-portchannel:PORTCHANNEL": {
"PORTCHANNEL_LIST": [
{
"admin_status": "up",
"mtu": "9100",
"tpid": "0x9100",
"name": "PortChannel0001",
"fallback": "enabled"
}
]
}
}
},
"PORT_CHANNEL_INVALID_FAST_RATE": {
"sonic-portchannel:sonic-portchannel": {
"sonic-portchannel:PORTCHANNEL": {
"PORTCHANNEL_LIST": [
{
"admin_status": "up",
"mtu": "9100",
"tpid": "0x9100",
"name": "PortChannel0001",
"fast_rate": "TRUE"
}
]
}
}
},
"PORTCHANNEL_INTERFACE_IP_ADDR_TEST": {
"sonic-portchannel:sonic-portchannel": {
"sonic-portchannel:PORTCHANNEL": {
Expand Down
9 changes: 9 additions & 0 deletions src/sonic-yang-models/yang-models/sonic-portchannel.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,15 @@ module sonic-portchannel {
type stypes:tpid_type;
}

leaf fallback {
description "Enable LACP fallback feature";
type stypes:boolean_type;
}
leaf fast_rate {
description "Enable LACP fast rate";
type stypes:boolean_type;
}

} /* end of list PORTCHANNEL_LIST */

} /* end of container PORTCHANNEL */
Expand Down