Skip to content

Add accounting-method and authorization-method leaf-lists inside the /system/aaa/accounting/events/event and /system/aaa/authorization/events/event lists, respectively. #1332

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add accounting-method and authorization-method leaf-lists inside the /system/aaa/accounting/events/event and /system/aaa/authorization/events/event lists, respectively. #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7028545
Moved accounting-method and authorization-method leaf-lists
LeonGWang Jul 8, 2025
15938fe
Added back the original accounting-method and authorization-method le…
LeonGWang Jul 9, 2025
9f151cb
Update version to 1.1.0 for submodules openconfig-aaa-radius.yang and…
LeonGWang Jul 17, 2025
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
10 changes: 9 additions & 1 deletion release/models/system/openconfig-aaa-radius.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,15 @@ submodule openconfig-aaa-radius {
related to the RADIUS protocol for authentication,
authorization, and accounting.";

oc-ext:openconfig-version "1.0.0";
oc-ext:openconfig-version "1.1.0";

revision "2025-07-04" {
description
"Add accounting-method and authorization-method leaf-lists
inside accounting/events/event and authorization/events/event
lists, respectively.";
reference "1.1.0";
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No actual change in this file (maybe vestigal from earlier drafts?). Same with the tacacs file.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually only added in the latest draft to satisfy a linter check which states submodules openconfig-aaa-radius.yang and openconfig-aaa-tacacs.yang don't share the same version as the main openconfig-aaa.yang module.


revision "2022-07-29" {
description
Expand Down
10 changes: 9 additions & 1 deletion release/models/system/openconfig-aaa-tacacs.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,15 @@ submodule openconfig-aaa-tacacs {
related to the TACACS+ protocol for authentication,
authorization, and accounting.";

oc-ext:openconfig-version "1.0.0";
oc-ext:openconfig-version "1.1.0";

revision "2025-07-04" {
description
"Add accounting-method and authorization-method leaf-lists
inside accounting/events/event and authorization/events/event
lists, respectively.";
reference "1.1.0";
}

revision "2022-07-29" {
description
Expand Down
30 changes: 22 additions & 8 deletions release/models/system/openconfig-aaa.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,15 @@ module openconfig-aaa {
Portions of this model reuse data definitions or structure from
RFC 7317 - A YANG Data Model for System Management";

oc-ext:openconfig-version "1.0.0";
oc-ext:openconfig-version "1.1.0";

revision "2025-07-04" {
description
"Add accounting-method and authorization-method leaf-lists
inside accounting/events/event and authorization/events/event
lists, respectively.";
reference "1.1.0";
}

revision "2022-07-29" {
description
Expand Down Expand Up @@ -467,7 +475,7 @@ module openconfig-aaa {
base oc-aaa-types:AAA_METHOD_TYPE;
}
type string;
//TODO: in YANG 1.1 this should be converted to a leafref to
//TODO: in YANG 1.1 this should be converted to a leafref to
//point to the server group name.
}
ordered-by user;
Expand Down Expand Up @@ -547,6 +555,7 @@ module openconfig-aaa {
"Configuration data for accounting events";

uses aaa-accounting-events-config;
uses aaa-accounting-methods-common;
}

container state {
Expand All @@ -557,6 +566,7 @@ module openconfig-aaa {

uses aaa-accounting-events-config;
uses aaa-accounting-events-state;
uses aaa-accounting-methods-common;
}
}
}
Expand All @@ -566,8 +576,9 @@ module openconfig-aaa {
description
"Configuration data for event accounting";

uses aaa-accounting-methods-common;

uses aaa-accounting-methods-common {
status deprecated;
}
}

grouping aaa-accounting-state {
Expand Down Expand Up @@ -605,10 +616,9 @@ module openconfig-aaa {
}
}

grouping aaa-authorization-methods-config {
grouping aaa-authorization-methods-common {
description
"Common definitions for authorization methods for global
and per-event type";
"Common definitions for authorization methods";

leaf-list authorization-method {
type union {
Expand Down Expand Up @@ -674,6 +684,7 @@ module openconfig-aaa {
"Configuration data for each authorized event";

uses aaa-authorization-events-config;
uses aaa-authorization-methods-common;
}

container state {
Expand All @@ -684,6 +695,7 @@ module openconfig-aaa {

uses aaa-authorization-events-config;
uses aaa-authorization-events-state;
uses aaa-authorization-methods-common;
}
}
}
Expand All @@ -693,7 +705,9 @@ module openconfig-aaa {
description
"Configuration data for AAA authorization";

uses aaa-authorization-methods-config;
uses aaa-authorization-methods-common {
status deprecated;
}
}

grouping aaa-authorization-state {
Expand Down
Loading