Refactor(eos_designs): Remove dependency on overlay_routing_protocol and evpn_role for WAN routers #4865
+3,013
−301
Conversation
This file contains 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
…and evpn_role for WAN routers
github-actions
bot
added
state: CI Updated
|
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-4865
# Activate the virtual environment
source test-avd-pr-4865/bin/activate
# Install all requirements including PyAVD
pip install "pyavd[ansible] @ git+https://github.com/gmuloc/avd.git@relax-wan-default-requirements#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/gmuloc/avd.git#/ansible_collections/arista/avd/,relax-wan-default-requirements --force
# Optional: Install AVD examples
cd test-avd-pr-4865
ansible-playbook arista.avd.install_examples |
python-avd/pyavd/_eos_designs/structured_config/overlay/route_maps.py
Outdated
Show resolved
Hide resolved
for more information, see https://pre-commit.ci
ClausHolbechArista
requested changes
Jan 22, 2025
...avd/pyavd/_eos_designs/schema/schema_fragments/wan_use_evpn_node_settings_for_lan.schema.yml
Outdated
Show resolved
Hide resolved
...avd/pyavd/_eos_designs/schema/schema_fragments/wan_use_evpn_node_settings_for_lan.schema.yml
Outdated
Show resolved
Hide resolved
...avd/pyavd/_eos_designs/schema/schema_fragments/wan_use_evpn_node_settings_for_lan.schema.yml
Outdated
Show resolved
Hide resolved
python-avd/pyavd/_eos_designs/structured_config/overlay/router_bgp.py
Outdated
Show resolved
Hide resolved
python-avd/pyavd/_eos_designs/structured_config/overlay/router_bgp.py
Outdated
Show resolved
Hide resolved
python-avd/pyavd/_eos_designs/structured_config/metadata/cv_pathfinder.py
Outdated
Show resolved
Hide resolved
python-avd/pyavd/_eos_designs/structured_config/overlay/router_bgp.py
Outdated
Show resolved
Hide resolved
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
...lecule/eos_designs_unit_tests/inventory/host_vars/cv-pathfinder-edge-wan-use-evpn-on-lan.yml
Show resolved
Hide resolved
...avd/pyavd/_eos_designs/schema/schema_fragments/wan_use_evpn_node_settings_for_lan.schema.yml
Outdated
Show resolved
Hide resolved
ansible_collections/arista/avd/roles/eos_designs/docs/how-to/wan.md
Outdated
Show resolved
Hide resolved
ansible_collections/arista/avd/roles/eos_designs/docs/how-to/wan.md
Outdated
Show resolved
Hide resolved
…evpn_node_settings_for_lan.schema.yml Co-authored-by: Claus Holbech <[email protected]>
gmuloc
commented
Feb 11, 2025
...ions/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/CV_PATHFINDER_TESTS.yml
Outdated
Show resolved
Hide resolved
.../molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-wan-use-evpn-on-lan.cfg
Show resolved
Hide resolved
ansible_collections/arista/avd/roles/eos_designs/docs/how-to/wan.md
Outdated
Show resolved
Hide resolved
ansible_collections/arista/avd/roles/eos_designs/docs/how-to/wan.md
Outdated
Show resolved
Hide resolved
for more information, see https://pre-commit.ci
ClausHolbechArista
approved these changes
Feb 11, 2025
gmuloc
added
the
one approval
| @@ -37,7 +37,9 @@ def route_maps(self: AvdStructuredConfigOverlayProtocol) -> None: | |||
| route_maps_item.sequence_numbers.append_new(sequence=20, type="permit") | |||
| self.structured_config.route_maps.append(route_maps_item) | |||
|
|
|||
| elif self.shared_utils.overlay_routing_protocol == "ibgp" and self.shared_utils.overlay_vtep and self.shared_utils.evpn_role != "server": | |||
| elif ( | |||
There was a problem hiding this comment.
Suggested change
| elif ( | |
| if ( |
There was a problem hiding this comment.
this is less efficient as it means we need to look at both and they are mutually exclusive.
Is there a reason for your suggestion?
There was a problem hiding this comment.
with evpn gateway feature, a router can have overlay as ebgp and but be a wan_client.
As such we will have to emit both ibgp(wan_client) and ebgp sections of config .
|
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.
Change Summary
This is a stepping stone PR to introduce EVPN GW between DPS and VXLAN in PR #4831
Since the intro of the WAN routers, the overlay_routing_protocol HAD to be
ibgpand theevpn_roleHAD to be the same as thewan_role. Making both keys being essentially ignored.This PR decorelates and "relax" the requirements.
It introduces a new boolean that continue to ignore the keys and it is enabled by default in order to prevent extra configuration to be generated. the knob is added as PREVIEW
Component(s) name
arista.avd.eos_designsProposed changes
How to test
Checklist
User Checklit
Repository Checklist