Skip to content
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

Jump to bottom

Add config and state for individual Ethernet port priority in a LAG #943

Merged
merged 10 commits into from
Dec 12, 2023
Merged

Add config and state for individual Ethernet port priority in a LAG #943

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ac0e6b1
Add LACP port priority #940
marius-ore Aug 18, 2023
faad653
Fix versions, ordering, remove default
marius-ore Aug 18, 2023
5cdabc2
add config container to LACP aggregate interface member
marius-ore Aug 28, 2023
e86f152
replaced repeated definition with 'uses' statement
marius-ore Sep 7, 2023
61107fe
Merge branch 'master' into master
dplore Nov 28, 2023
feb80f7
Update release/models/lacp/openconfig-lacp.yang
dplore Nov 28, 2023
6a56180
Update release/models/lacp/openconfig-lacp.yang
dplore Nov 28, 2023
efcce3f
indent
dplore Dec 11, 2023
e02bd72
bump version
dplore Dec 11, 2023
42ff19a
Merge branch 'master' into master
dplore Dec 11, 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
67 changes: 66 additions & 1 deletion release/models/interfaces/openconfig-if-aggregate.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,16 @@ module openconfig-if-aggregate {
description
"Model for managing aggregated (aka bundle, LAG) interfaces.";

oc-ext:openconfig-version "2.4.4";
oc-ext:openconfig-version "2.5.0";

revision "2023-08-15" {
description
"Deprecate ethernet interface's aggregate-id and move it into a separate
container for individual interface link aggregation parameters at
/interfaces/interface/ethernet/aggregation. Add port-priority to said
container";
reference "2.5.0";
}

revision "2022-06-28" {
description
Expand Down Expand Up @@ -204,12 +213,61 @@ module openconfig-if-aggregate {
type leafref {
path "/oc-if:interfaces/oc-if:interface/oc-if:name";
}
status deprecated;
description
"Specify the logical aggregate interface to which
this interface belongs";
}
}

grouping aggregation-ethernet-config {
description
"Adds configuration items for dedicated aggregation container
for Ethernet interfaces belonging to a logical aggregate / LAG";

leaf aggregate-id {
dplore marked this conversation as resolved.
Show resolved Hide resolved
type leafref {
path "/oc-if:interfaces/oc-if:interface/oc-if:name";
}
description
"Specify the logical aggregate interface to which
this interface belongs";
}

leaf port-priority {
type uint16;
description
"This interface's priority in its aggregate interface";
}
}

grouping aggregation-ethernet-top {
description
"Top level configuration and state data for Ethernet interface's
aggregation parameters";

container aggregation {
description
"Configuration and operational state data for Ethernet interface's
aggregation parameters";

container config {
description
"Configuration for interface's aggregation parameters";

uses aggregation-ethernet-config;
}

container state {
config false;
description
"Operational state for interface's aggregation parameters";

uses aggregation-ethernet-config;
dplore marked this conversation as resolved.
Show resolved Hide resolved
}
}
}

// data definition statements

// augment statements
Expand All @@ -226,6 +284,13 @@ module openconfig-if-aggregate {
}
}

augment "/oc-if:interfaces/oc-if:interface/oc-eth:ethernet" {
description
"Adds LAG settings container for individual Ethernet interfaces";

uses aggregation-ethernet-top;
}

augment "/oc-if:interfaces/oc-if:interface/oc-eth:ethernet/" +
"oc-eth:config" {
description
Expand Down
20 changes: 19 additions & 1 deletion release/models/lacp/openconfig-lacp.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,13 @@ module openconfig-lacp {
managing aggregate interfaces. It works in conjunction with
the OpenConfig interfaces and aggregate interfaces models.";

oc-ext:openconfig-version "1.2.0";
oc-ext:openconfig-version "1.3.0";

revision "2023-08-15" {
description
"Add actor and partner port priority state.";
reference "1.3.0";
}

revision "2021-07-20" {
description
Expand Down Expand Up @@ -245,6 +251,18 @@ module openconfig-lacp {
timestamp in nanoseconds relative to the Unix Epoch
(Jan 1, 1970 00:00:00 UTC).";
}

leaf port-priority {
marius-ore marked this conversation as resolved.
Show resolved Hide resolved
type uint16;
description
"Port priority in the aggregate interface.";
}

leaf partner-port-priority {
type uint16;
description
"Partner port's priority in its aggregate interface.";
}
}

grouping aggregation-lacp-members-statistics {
Expand Down
Loading