Feat(eos_cli_config_gen): Add support for additional dot1x commands. #4191

laxmikantchintakindi · 2024-07-09T05:43:00Z

Change Summary

Add support for additional dot1x commands.

Related Issue(s)

Fixes #4118

Component(s) name

arista.avd.eos_cli_config_gen

Proposed changes

Need to support the following CLI commands.

Switch-level:

dot1x
   mac-based-auth radius av-pair user-name delimiter none lowercase

Interface-level:

interface Ethernet<ID>
  dot1x aaa unresponsive phone action traffic allow
  dot1x aaa unresponsive action traffic allow vlan <VID>
  dot1x mac based access-list

How to test

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)

github-actions · 2024-07-09T05:43:10Z

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-4191
# Activate the virtual environment
source test-avd-pr-4191/bin/activate
# Install all requirements including PyAVD
pip install "pyavd[ansible] @ git+https://github.com/laxmikantchintakindi/avd.git@additional_dot1x#subdirectory=python-avd" --force
# Install Ansible collection
ansible-galaxy collection install git+https://github.com/laxmikantchintakindi/avd.git#/ansible_collections/arista/avd/,additional_dot1x --force
# Optional: Install AVD examples
cd test-avd-pr-4191
ansible-playbook arista.avd.install_examples

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/dot1x.schema.yml

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml

ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dot1x.md

ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/ethernet-interfaces.md

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/dot1x.j2

...llections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/dot1x.schema.yml

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2

Shivani-gslab

Please check for coverage improvement for ethernet_interfaces.dot1x in this PR

github-actions · 2024-07-31T16:22:07Z

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

github-actions · 2024-07-31T18:02:03Z

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

...llections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml

Shivani-gslab

LGTM!

ClausHolbechArista · 2024-08-07T12:29:08Z

...llections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml

@@ -620,7 +633,6 @@ ethernet_interfaces:
      pae:
        mode: authenticator
      authentication_failure:
-        action: allow


why is this removed?

The test for this already exists at other place in this file and there was a warning in coverage report for it being always true.
That's why changed it to reduce the warnings in report.

same for the below 2 reauth_period and tx_period

ClausHolbechArista · 2024-08-07T12:29:16Z

...llections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml

@@ -630,9 +642,7 @@ ethernet_interfaces:
      timeout:
        idle_host: 10
        quiet_period: 10
-        reauth_period: server


why is this removed?

ClausHolbechArista · 2024-08-07T12:29:21Z

...llections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml

        reauth_timeout_ignore: true
-        tx_period: 10


why is this removed?

ClausHolbechArista · 2024-08-07T12:33:12Z

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2

+{%         if ethernet_interface.dot1x.aaa.unresponsive is arista.avd.defined %}
+{%             set aaa_config = "dot1x aaa unresponsive" %}
+{%             if ethernet_interface.dot1x.aaa.unresponsive.phone_action is arista.avd.defined or ethernet_interface.dot1x.aaa.unresponsive.action is arista.avd.defined %}
+{%                 set actions = [{'name': 'phone_action', 'config': aaa_config ~ ' phone action'}, {'name': 'action', 'config': aaa_config ~ ' action'}] %}


This logic make the rest pretty hard to follow. Can we simplify this somehow?
Maybe you could set a tmp variable with action_settings and parse those below - making everything shorter and more readable below.

Simplified the template.

ClausHolbechArista · 2024-08-07T12:35:13Z

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2

+{%                                     set action_apply_config = action_apply_config ~ " timeout " ~ ethernet_interface.dot1x.aaa.unresponsive[action.name].cached_results_timeout.time_duration ~ " " ~ ethernet_interface.dot1x.aaa.unresponsive[action.name].cached_results_timeout.time_duration_unit %}
+{%                                 endif %}
+{%                             endif %}
+{%                             if ethernet_interface.dot1x.aaa.unresponsive[action.name].traffic_allow is arista.avd.defined(true) or


I think this if just contributes to cluttering the template. Please look into simplifying the nesting. It is ok if we have to give the traffic allow part of the string in multiple places.

ClausHolbechArista · 2024-08-07T12:37:47Z

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/dot1x.j2

@@ -99,6 +99,9 @@ dot1x
   radius av-pair framed-mtu {{ dot1x.radius_av_pair.framed_mtu }}
 {%             endif %}
 {%         endif %}
+{%         if dot1x.mac_based_auth_radius.delimiter is arista.avd.defined and dot1x.mac_based_auth_radius.mac_string_letter_case is arista.avd.defined %}


The CLI is very different than the variable. I think you should change the model to be av_pair_user_name_delimiter since there could be other options coming later.

same for case. Maybe find a better variable name there too. av_pair_user_name_case maybe? (please check wording on EOS)

I updated the schema as below:
radius_av_pair_username_format:
delimiter:
mac_string_case:

EOS shows below description for lowercase/uppercase setting.

s1-leaf2(config-dot1x)#mac-based-auth radius av-pair user-name delimiter colon ?
lowercase MAC address string in lowercase
uppercase MAC address string in uppercase

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2

for more information, see https://pre-commit.ci

….jsonschema.json

sonarcloud · 2024-08-13T07:16:11Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

github-actions · 2024-08-23T07:50:38Z

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

github-actions bot assigned laxmikantchintakindi Jul 9, 2024

github-actions bot added 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 labels Jul 9, 2024

Vibhu-gslab reviewed Jul 9, 2024

View reviewed changes

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/dot1x.schema.yml Outdated Show resolved Hide resolved

Shivani-gslab reviewed Jul 9, 2024

View reviewed changes

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml Show resolved Hide resolved

Shivani-gslab reviewed Jul 9, 2024

View reviewed changes

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/ethernet_interfaces.schema.yml Show resolved Hide resolved

MaheshGSLAB reviewed Jul 9, 2024

View reviewed changes

laxmikantchintakindi marked this pull request as ready for review July 11, 2024 05:56

laxmikantchintakindi requested review from a team as code owners July 11, 2024 05:56

laxmikantchintakindi force-pushed the additional_dot1x branch from 9556189 to b04741f Compare July 16, 2024 12:43

Shivani-gslab requested changes Jul 18, 2024

View reviewed changes

laxmikantchintakindi force-pushed the additional_dot1x branch 2 times, most recently from 19b4587 to 3ba8917 Compare July 22, 2024 05:53

MaheshGSLAB approved these changes Jul 22, 2024

View reviewed changes

Shivani-gslab reviewed Jul 25, 2024

View reviewed changes

laxmikantchintakindi force-pushed the additional_dot1x branch 2 times, most recently from 1a67696 to a71b650 Compare July 26, 2024 07:13

laxmikantchintakindi marked this pull request as draft July 26, 2024 08:19

laxmikantchintakindi force-pushed the additional_dot1x branch from 15552b7 to 38a4a1e Compare July 29, 2024 11:29

laxmikantchintakindi marked this pull request as ready for review July 29, 2024 11:29

laxmikantchintakindi force-pushed the additional_dot1x branch from e874322 to af9bdb3 Compare July 30, 2024 08:24

github-actions bot added the state: conflict PR with conflict label Jul 31, 2024

laxmikantchintakindi force-pushed the additional_dot1x branch from af9bdb3 to 4978972 Compare July 31, 2024 18:01

github-actions bot removed the state: conflict PR with conflict label Jul 31, 2024

Shivani-gslab force-pushed the additional_dot1x branch from 9a8f3b9 to 72aaa8b Compare August 5, 2024 10:29

Shivani-gslab requested changes Aug 5, 2024

View reviewed changes

...llections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/ethernet-interfaces.yml Show resolved Hide resolved

laxmikantchintakindi force-pushed the additional_dot1x branch from 0f31dae to bf2e0de Compare August 6, 2024 06:04

Shivani-gslab marked this pull request as draft August 6, 2024 13:55

Shivani-gslab marked this pull request as ready for review August 6, 2024 14:10

Shivani-gslab approved these changes Aug 6, 2024

View reviewed changes

ClausHolbechArista requested changes Aug 7, 2024

View reviewed changes

laxmikantchintakindi marked this pull request as draft August 8, 2024 09:25

laxmikantchintakindi force-pushed the additional_dot1x branch from 11fdc4f to 96b3505 Compare August 8, 2024 15:50

Vibhu-gslab reviewed Aug 9, 2024

View reviewed changes

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/ethernet-interfaces.j2 Show resolved Hide resolved

laxmikantchintakindi marked this pull request as ready for review August 12, 2024 13:11

Laxmikant Chintakindi and others added 12 commits August 13, 2024 12:45

Feat(eos_cli_config_gen): Add support for additional dot1x commands.

1665bf6

Address multiple comments.

2ec7eed

Fix

79b2a49

Adding missing tests from coverage report.

1587a6e

[pre-commit.ci] auto fixes from pre-commit.com hooks

ec46752

for more information, see https://pre-commit.ci

Delete python-avd/pyavd/_eos_designs/schema/eos_designs.jsonschema.json

9a6e385

Delete python-avd/pyavd/_eos_cli_config_gen/schema/eos_cli_config_gen…

50c6d3a

….jsonschema.json

Improve coverage.

ae70580

Make template simpler.

49c6675

Fix the template for traffic commands.

df43bc8

Change key name for av pair username format.

f98557c

Adding big keyword into a variable.

27ba7b8

Shivani-gslab force-pushed the additional_dot1x branch from fa6d0b6 to 27ba7b8 Compare August 13, 2024 07:15

laxmikantchintakindi requested a review from ClausHolbechArista August 21, 2024 06:32

github-actions bot added the state: conflict PR with conflict label Aug 23, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat(eos_cli_config_gen): Add support for additional dot1x commands. #4191

Feat(eos_cli_config_gen): Add support for additional dot1x commands. #4191

laxmikantchintakindi commented Jul 9, 2024 •

edited

Loading

github-actions bot commented Jul 9, 2024

Shivani-gslab left a comment •

edited

Loading

github-actions bot commented Jul 31, 2024

github-actions bot commented Jul 31, 2024

Shivani-gslab left a comment

ClausHolbechArista Aug 7, 2024

Shivani-gslab Aug 7, 2024

ClausHolbechArista Aug 7, 2024

ClausHolbechArista Aug 7, 2024

ClausHolbechArista Aug 7, 2024

laxmikantchintakindi Aug 9, 2024

ClausHolbechArista Aug 7, 2024

laxmikantchintakindi Aug 9, 2024

ClausHolbechArista Aug 7, 2024

ClausHolbechArista Aug 7, 2024

laxmikantchintakindi Aug 9, 2024

sonarcloud bot commented Aug 13, 2024

github-actions bot commented Aug 23, 2024

Feat(eos_cli_config_gen): Add support for additional dot1x commands. #4191

Are you sure you want to change the base?

Feat(eos_cli_config_gen): Add support for additional dot1x commands. #4191

Conversation

laxmikantchintakindi commented Jul 9, 2024 • edited Loading

Change Summary

Related Issue(s)

Component(s) name

Proposed changes

How to test

Checklist

User Checklist

Repository Checklist

github-actions bot commented Jul 9, 2024

Shivani-gslab left a comment • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Jul 31, 2024

github-actions bot commented Jul 31, 2024

Shivani-gslab left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Aug 13, 2024

Quality Gate passed

github-actions bot commented Aug 23, 2024

laxmikantchintakindi commented Jul 9, 2024 •

edited

Loading

Shivani-gslab left a comment •

edited

Loading