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

Refactor(eos_cli_config_gen): Add support for MPLS RSVP #4634

Draft
wants to merge 18 commits into
base: devel
Choose a base branch
from
Draft

Refactor(eos_cli_config_gen): Add support for MPLS RSVP #4634

wants to merge 18 commits into from

Conversation

Vibhu-gslab
Copy link
Contributor

@Vibhu-gslab Vibhu-gslab commented Oct 23, 2024 •
edited
Loading

Change Summary

Add support for MPLS RSVP

Related Issue(s)

Fixes #https://github.com/aristanetworks/avd-internal/issues/149

Component(s) name

arista.avd.eos_cli_config_gen

Proposed changes

Adding MPLS RSVP support in eos_cli_config_gen

Checklist

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)

@Vibhu-gslab Vibhu-gslab self-assigned this Oct 23, 2024
@github-actions GitHub Actions
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-4634
# Activate the virtual environment
source test-avd-pr-4634/bin/activate
# Install all requirements including PyAVD
pip install "pyavd[ansible] @ git+https://github.com/Vibhu-gslab/avd.git@rsvp#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/Vibhu-gslab/avd.git#/ansible_collections/arista/avd/,rsvp --force
# Optional: Install AVD examples
cd test-avd-pr-4634
ansible-playbook arista.avd.install_examples

@github-actions 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 Oct 23, 2024
MaheshGSLAB
MaheshGSLAB reviewed Oct 25, 2024
View reviewed changes
python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml Outdated Show resolved Hide resolved
python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml Outdated Show resolved Hide resolved
python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml Outdated Show resolved Hide resolved
python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml Outdated Show resolved Hide resolved
python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml Outdated Show resolved Hide resolved
python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml Outdated Show resolved Hide resolved
python-avd/tox.ini Outdated Show resolved Hide resolved
python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mpls.j2 Outdated Show resolved Hide resolved
...ions/arista/avd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md Outdated Show resolved Hide resolved
ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/mpls.cfg Outdated Show resolved Hide resolved
@github-actions github-actions bot added the state: conflict PR with conflict label Nov 8, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Nov 8, 2024

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

@github-actions GitHub Actions
Copy link

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

@github-actions github-actions bot removed the state: conflict PR with conflict label Nov 12, 2024
@github-actions GitHub Actions
Copy link

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

@github-actions github-actions bot added the state: conflict PR with conflict label Nov 13, 2024
@github-actions GitHub Actions
Copy link

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

@github-actions github-actions bot removed the state: conflict PR with conflict label Nov 14, 2024
@github-actions GitHub Actions
Copy link

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

MaheshGSLAB
MaheshGSLAB reviewed Nov 14, 2024
View reviewed changes
python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml Outdated
Comment on lines 164 to 165
Fast-reroute bypass configuration.
Interval between each re-optimization attempt.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Fast-reroute bypass configuration.
Interval between each re-optimization attempt.
Interval between each re-optimization attempt in seconds.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed!

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml Outdated
enabled:
type: bool
required: true
grace_period_recovery:
Copy link
Contributor

Choose a reason for hiding this comment

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

can we add timer key and under that add the key recovery and restart. As per EOS

Copy link
Contributor

Choose a reason for hiding this comment

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

also add the description for recovery and restart

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed!

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml
- str
min: 1
max: 320
role_speaker:
Copy link
Contributor

Choose a reason for hiding this comment

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

same as above comment

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed!

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml Outdated
type: dict
keys:
interval:
description: Time between hello messages.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
description: Time between hello messages.
description: Time between hello messages in seconds.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed!

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml Outdated
enabled:
type: bool
timer_recovery:
description: Time stale states will be preserved after restart.
Copy link
Contributor

Choose a reason for hiding this comment

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

add the time unit as seconds on description

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed!

python-avd/pyavd/_eos_cli_config_gen/schema/schema_fragments/mpls.schema.yml
- str
min: 1
max: 320
p2mp_enabled:
Copy link
Contributor

Choose a reason for hiding this comment

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

!
   p2mp
      disabled

p2mp_enabled will just render then p2mp command. Not sure that we should render the disabled command under p2mp or not.
cc: @ClausHolbechArista @gmuloc

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mpls.j2 Outdated
{% set with_neighbor_ipv4_address = mpls.rsvp.neighbors | selectattr('ip_address', 'arista.avd.defined') | arista.avd.natural_sort('ip_address') %}
{% set with_neighbor_ipv6_address = mpls.rsvp.neighbors | selectattr('ipv6_address', 'arista.avd.defined') | arista.avd.natural_sort('ipv6_address') %}
{% set sorted_ip_addresses = with_neighbor_ipv4_address | list + with_neighbor_ipv6_address | list %}
{% for neighbor in sorted_ip_addresses %}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
{% for neighbor in sorted_ip_addresses %}
{% for neighbor in sorted_ip_addresses | arista.avd.default([]) %}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed!

python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/mpls.j2
disabled
{% endif %}
{% if mpls.rsvp.shutdown is arista.avd.defined(true) %}
shutdown
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 shutdown is default one, we should have no shutdown also.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added no shutdown for false condition

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Nov 18, 2024

Quality Gate Passed 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 SonarQube Cloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@laxmikantchintakindi laxmikantchintakindi laxmikantchintakindi left review comments

@MaheshGSLAB MaheshGSLAB MaheshGSLAB left review comments

At least 2 approving reviews are required to merge this pull request.

Assignees

@Vibhu-gslab Vibhu-gslab

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Vibhu-gslab @MaheshGSLAB @laxmikantchintakindi