Refactor(eos_designs): structured_config for network_services route_maps

[Vibhu-gslab]

Change Summary

Refactor eos_designs structured_config for network_services route_maps

Related Issue(s)

Fixes #

Component(s) name

arista.avd.eos_designs

Proposed changes

How to test

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)

[github-actions]

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-5037
# Activate the virtual environment
source test-avd-pr-5037/bin/activate
# Install all requirements including PyAVD
pip install "pyavd[ansible] @ git+https://github.com/Vibhu-gslab/avd.git@refactor_networkservices_route_maps#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/,refactor_networkservices_route_maps --force
# Optional: Install AVD examples
cd test-avd-pr-5037
ansible-playbook arista.avd.install_examples

[Shivani-gslab]

you can remove the usage of strip_empties_from_list here - https://github.com/aristanetworks/avd/pull/5037/files#diff-d2355de0048a356757c66aa448770e31b41c3347735338110535c1c1587c850cL99

and update the methods to append to structured_config.route_maps directly.

route_maps = strip_empties_from_list(
           [
               self._evpn_export_vrf_default_route_map(),
               self._bgp_underlay_peers_route_map(),
               self._redistribute_connected_to_bgp_route_map(),
               self._redistribute_static_to_bgp_route_map(),
           ],
       )

[Vibhu-gslab]

you can remove the usage of strip_empties_from_list here - https://github.com/aristanetworks/avd/pull/5037/files#diff-d2355de0048a356757c66aa448770e31b41c3347735338110535c1c1587c850cL99

and update the methods to append to structured_config.route_maps directly.

route_maps = strip_empties_from_list(
           [
               self._evpn_export_vrf_default_route_map(),
               self._bgp_underlay_peers_route_map(),
               self._redistribute_connected_to_bgp_route_map(),
               self._redistribute_static_to_bgp_route_map(),
           ],
       )

We are using the function _route_maps_vrf_default in router_bgp.py which is expecting a return, if we append it then router_bgp.py code breaks.

[ClausHolbechArista]

you can remove the usage of strip_empties_from_list here - https://github.com/aristanetworks/avd/pull/5037/files#diff-d2355de0048a356757c66aa448770e31b41c3347735338110535c1c1587c850cL99
and update the methods to append to structured_config.route_maps directly.

route_maps = strip_empties_from_list(
           [
               self._evpn_export_vrf_default_route_map(),
               self._bgp_underlay_peers_route_map(),
               self._redistribute_connected_to_bgp_route_map(),
               self._redistribute_static_to_bgp_route_map(),
           ],
       )

We are using the function _route_maps_vrf_default in router_bgp.py which is expecting a return, if we append it then router_bgp.py code breaks.

Maybe we can try to build a small helper function with the "decider logic" which we can call from multiple places, but then insert the route-maps directly into structured config instead of returning.

[github-actions]

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

[github-actions]

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

[github-actions]

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

[github-actions]

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

[Vibhu-gslab]

you can remove the usage of strip_empties_from_list here - https://github.com/aristanetworks/avd/pull/5037/files#diff-d2355de0048a356757c66aa448770e31b41c3347735338110535c1c1587c850cL99
and update the methods to append to structured_config.route_maps directly.

route_maps = strip_empties_from_list(
           [
               self._evpn_export_vrf_default_route_map(),
               self._bgp_underlay_peers_route_map(),
               self._redistribute_connected_to_bgp_route_map(),
               self._redistribute_static_to_bgp_route_map(),
           ],
       )

We are using the function _route_maps_vrf_default in router_bgp.py which is expecting a return, if we append it then router_bgp.py code breaks.

Maybe we can try to build a small helper function with the "decider logic" which we can call from multiple places, but then insert the route-maps directly into structured config instead of returning.

Built a helper function with the decider logic and append rest of the config.

[sonarqubecloud]

Quality Gate failed

Failed conditions
75.7% Coverage on New Code (required ≥ 80%)

See analysis details on SonarQube Cloud