Refactor(eos_designs): Remove dependency on overlay_routing_protocol and evpn_role for WAN routers #4865
Conversation
…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
...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
| return (self.inputs.overlay_routing_protocol or default_overlay_routing_protocol).lower() | ||
|
|
||
| @cached_property | ||
| def overlay_address_families(self: SharedUtils) -> list[str]: | ||
| if self.overlay_routing_protocol in ["ebgp", "ibgp"]: | ||
| if self.overlay_routing_protocol in ["ebgp", "ibgp"] or self.is_wan_router: |
There was a problem hiding this comment.
Do we need this? Would it not be clearer if we add the wan_router handling in the places where this is checked today?
There was a problem hiding this comment.
so in filtered_tenants we are looping over these address families to see if we select a VRF. Which means we would need to check if the af of the vrf.address_families are in the overlay_address_families or if it is as WAN router AND the af is epvn
There was a problem hiding this comment.
otherwise it could work from the point of view of network_services/router_bgp where we could vorce the call to _update_router_bgp_vrf_evpn_or_mpls_cfg for a WAN router
There was a problem hiding this comment.
I would prefer if we remove all ties to overlay_address_families from WAN, since it would be the only way the user could prevent a VRF from going to the LAN in a future state. (one VRF only being on WAN and local interfaces, but not extended to LAN)
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
| @@ -19,6 +19,9 @@ vlan 101 | |||
| vlan 666 | |||
| name VLAN666 | |||
| ! | |||
| vlan 1000 | |||
There was a problem hiding this comment.
this is added because a new SVI was created
python-avd/pyavd/_eos_designs/structured_config/network_services/router_bgp.py
Outdated
Show resolved
Hide resolved
python-avd/pyavd/_eos_designs/structured_config/metadata/cv_pathfinder.py
Outdated
Show resolved
Hide resolved
| vrf default | ||
| ! |
There was a problem hiding this comment.
this should not happen
| @@ -186,6 +186,7 @@ router_bgp: | |||
| redistribute: | |||
| connected: | |||
| enabled: true | |||
| - name: default | |||
There was a problem hiding this comment.
this should not happen
| # the default is currently ibgp for WAN routers but need to change it soon. | ||
| overlay_routing_protocol: none |
There was a problem hiding this comment.
this is probably not needed now that we are setting it to None without the knob. Test this
| @@ -0,0 +1,3 @@ | |||
| --- | |||
| # Setting back to ebgp for Leaves | |||
There was a problem hiding this comment.
if removing the none in CV_PATHFINDER_TESTS then this is not needed anymore
| @@ -64,6 +64,7 @@ def overlay(self: EosDesignsFacts) -> dict | None: | |||
| @cached_property | |||
| def vtep_ip(self: EosDesignsFacts) -> str | None: | |||
| """Exposed in avd_switch_facts.""" | |||
| if self.shared_utils.vtep: | |||
| # TODO: Probably need to handle this differently for WAN router - maybe `dps_ip` is needed. | |||
There was a problem hiding this comment.
@ClausHolbechArista - need to discuss this together
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