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.

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

Refactor(eos_cli_config_gen): Improve the aaa accounting j2 template #4636

Open
wants to merge 5 commits into
base: devel
Choose a base branch
from

Conversation

MaheshGSLAB
Copy link
Contributor

@MaheshGSLAB MaheshGSLAB commented Oct 23, 2024

Change Summary

Improve the aaa accounting j2 template.

  • Fix the variable error incase command type is not define.
  • Improve the j2 template for default/console commands and exec.

Related Issue(s)

Fixes #4630

Component(s) name

arista.avd.eos_cli_config_gen

Proposed changes

  • Fix the variable error incase command type is not define.
  • Improve the j2 template for default/console commands and exec.

How to test

Run molecule with different type of inputs in aaa_accounting

Checklist

User Checklist

  • N/A

Repository Checklist

  • My code has been rebased from devel before I start
  • I have read the CONTRIBUTING document.
  • My change requires a change to the documentation and documentation have been updated accordingly.
  • I have updated molecule CI testing accordingly. (check the box if not applicable)

@MaheshGSLAB MaheshGSLAB self-assigned this Oct 23, 2024
@github-actions github-actions bot added the state: CI Updated CI scenario have been updated in the PR label Oct 23, 2024
Copy link

Review docs on Read the Docs

To test this pull request:

# Create virtual environment for this testing below the current directory
python -m venv test-avd-pr-4636
# Activate the virtual environment
source test-avd-pr-4636/bin/activate
# Install all requirements including PyAVD
pip install "pyavd[ansible] @ git+https://github.com/MaheshGSLAB/ansible-avd.git@issue-4630#subdirectory=python-avd" --force
# Point Ansible collections path to the Python virtual environment
export ANSIBLE_COLLECTIONS_PATH=$VIRTUAL_ENV/ansible_collections
# Install Ansible collection
ansible-galaxy collection install git+https://github.com/MaheshGSLAB/ansible-avd.git#/ansible_collections/arista/avd/,issue-4630 --force
# Optional: Install AVD examples
cd test-avd-pr-4636
ansible-playbook arista.avd.install_examples

Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the state: conflict PR with conflict label Oct 30, 2024
Copy link

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions github-actions bot removed the state: conflict PR with conflict label Oct 30, 2024
@MaheshGSLAB MaheshGSLAB marked this pull request as ready for review November 4, 2024 06:02
@MaheshGSLAB MaheshGSLAB requested review from a team as code owners November 4, 2024 06:02
@@ -44,3 +55,11 @@ aaa_accounting:
type: start-stop
logging: false
group: TACACS
# It should not include logging into command
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add reasoning why, so these are easier to follow in the future.

@@ -6,48 +6,50 @@
{# eos - aaa accounting #}
{% if aaa_accounting is arista.avd.defined %}
{% if aaa_accounting.exec.console.type is arista.avd.defined %}
Copy link
Contributor

Choose a reason for hiding this comment

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

I think, the type key should be required here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It could be breaking change but yes ideally as per j2 and EOS it should be a required key
cc @gmuloc @ClausHolbechArista

@github-actions github-actions bot added role: eos_cli_config_gen issue related to eos_cli_config_gen role state: Documentation role Updated labels Nov 7, 2024
Copy link

sonarcloud bot commented Nov 7, 2024

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
role: eos_cli_config_gen issue related to eos_cli_config_gen role state: CI Updated CI scenario have been updated in the PR state: Documentation role Updated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix the aaa accounting template for 'aaa_accounting_commands_commands_console_cli' is undefined" error
4 participants