Update AAA module with Accounting changes #559
+563
−3
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stalabi1
reviewed
Jun 5, 2025
| @@ -39,6 +39,9 @@ | |||
|
|
|||
| AAA_AUTHENTICATION_PATH = '/data/openconfig-system:system/aaa/authentication/config' | |||
| AAA_AUTHORIZATION_PATH = '/data/openconfig-system:system/aaa/authorization' | |||
| AAA_COMMANDS_ACCOUNTING_PATH = '/data/openconfig-system:system/aaa/accounting/openconfig-system-ext:commands/config' | |||
| AAA_SESSION_ACCOUNTING_PATH = '/data/openconfig-system:system/aaa/accounting/openconfig-system-ext:session/config' | |||
| AA_AUTHORIZATION_PATH = '/data/openconfig-system:system/aaa/authorization' | |||
There was a problem hiding this comment.
Suggested change
| AA_AUTHORIZATION_PATH = '/data/openconfig-system:system/aaa/authorization' |
duplicate
ArunSaravananBalachandran
requested changes
Jun 6, 2025
| @@ -0,0 +1,3 @@ | |||
| --- | |||
| minor_changes: | |||
| - sonic_aaa - Add Accounting support for AAA module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/559). | |||
There was a problem hiding this comment.
Suggested change
| - sonic_aaa - Add Accounting support for AAA module (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/559). | |
| - sonic_aaa - Add support for accounting options (https://github.com/ansible-collections/dellemc.enterprise_sonic/pull/559). |
| description: | ||
| - AAA accounting configuration. | ||
| type: dict | ||
| version_added: 3.1.0 |
There was a problem hiding this comment.
Suggested change
| version_added: 3.1.0 | |
| version_added: 3.2.0 |
Comment on lines
+370
to
+371
| requests.append(self.get_delete_request(AAA_COMMANDS_ACCOUNTING_PATH, None)) | ||
| requests.append(self.get_delete_request(AAA_SESSION_ACCOUNTING_PATH, None)) |
There was a problem hiding this comment.
Please delete only if accounting config is present.
Suggested change
| requests.append(self.get_delete_request(AAA_COMMANDS_ACCOUNTING_PATH, None)) | |
| requests.append(self.get_delete_request(AAA_SESSION_ACCOUNTING_PATH, None)) | |
| if commands.get('accounting'): | |
| requests.append(self.get_delete_request(AAA_COMMANDS_ACCOUNTING_PATH, None)) | |
| requests.append(self.get_delete_request(AAA_SESSION_ACCOUNTING_PATH, None)) |
Comment on lines
+667
to
+668
| if not accounting: | ||
| data.pop('accounting') |
There was a problem hiding this comment.
Suggested change
| if not accounting: | |
| data.pop('accounting') | |
| if not accounting: | |
| data.pop('accounting') |
| @@ -560,3 +656,13 @@ def remove_default_entries(self, data): | |||
| authentication.pop('login_mfa_console') | |||
| if not authentication: | |||
| data.pop('authentication') | |||
| accounting = data.get('accounting') | |||
| if accounting: | |||
| < 10000 span class="blob-code-inner blob-code-marker-addition"> for acct_key in ['commands_accounting', 'session_accounting']: | |||
There was a problem hiding this comment.
Suggested change
| for acct_key in ['commands_accounting', 'session_accounting']: | |
| for acct_key in ('commands_accounting', 'session_accounting'): |
| suboptions: | ||
| accounting_method: | ||
| description: | ||
| - Specifies the order of methods in which to perform accounting. |
There was a problem hiding this comment.
Suggested change
| - Specifies the order of methods in which to perform accounting. | |
| - Specifies the methods in which to perform accounting. |
| - STOP_ONLY | ||
| accounting_console_exempt: | ||
| description: | ||
| - Exempts accounting of events from console. |
There was a problem hiding this comment.
Suggested change
| - Exempts accounting of events from console. | |
| - Exempt accounting of events from console. |
| - STOP_ONLY | ||
| accounting_console_exempt: | ||
| description: | ||
| - Exempts accounting of events from console. |
There was a problem hiding this comment.
Suggested change
| - Exempts accounting of events from console. | |
| - Exempt accounting of events from console. |
Comment on lines
+130
to
+131
| - START_STOP | ||
| - STOP_ONLY |
There was a problem hiding this comment.
Please change the choices to 'start-stop' and 'stop-only'
| accounting = base_cfg.get('accounting') | ||
| if accounting: | ||
| accounting_dict = {} | ||
| for acct_type in ['commands_accounting', 'session_accounting']: |
There was a problem hiding this comment.
Suggested change
| for acct_type in ['commands_accounting', 'session_accounting']: | |
| for acct_type in ('commands_accounting', 'session_accounting'): |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
Added Accounting support to the AAA module.
ISSUE TYPE
COMPONENT NAME
sonic_aaa
OUTPUT
regression-2025-05-14-08-15-00.pdf
Checklist:**