Feat(eos_designs): Refactor topology data models for AVD v3.0

[ClausHolbechArista]

Change Summary

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)
• Code style update (formatting, renaming)
• Refactoring (no functional changes)
• Documentation content changes
• Other (please describe):

Related Issue(s)

Fixes #

Component(s) name

arista.avd.eos_designs

Proposed changes

Behavioral changes

• l3leaf will no longer have spine asn hardcoded on underlay peer-group, but instead specified per uplink switch.
• raw_eos_cli defined under tenants.vrfs.<vrf>.raw_eos_cli is no longer rendered on l2leaf
• structured_config defined under tenants.vrfs.<vrf>.raw_eos_cli is no longer rendered on l2leaf
• Rewording in fabric documentation
  • "Uplink IPv4 Pool" instead of "P2P Summary"
  • "VTEPs only" instead of "Leafs Only"

New features

• inheritance for all settings from <switch_type_key>.defaults->switch_type_key>.node_groups.<node_group>->switch_type_key>.node_groups.<node_group>.nodes.<node>
• Support for evpn setting per network service (vrfs,svis,l2vlans) to allow non-vxlan enabled services
• Update upgrade_tools to upgrade variables from AVD v2.x to v3.0 during the play

Data model changes

All changes below can be handles automatically by the upgrade_tools role.

Changes to spine data model

• Change from spine.platform to spine.defaults.platform
• Change from spine.bgp_as to spine.defaults.bgp_as
• Change from overlay_loopback_network_summary to spine.defaults.loopback_ipv4_pool
• Change from spine.uplinks_to_super_spine_interfaces to spine.defaults.uplink_interfaces
• New spine.defaults.uplink_switches variable based on keys in super_spine.nodes
• Change from max_super_spines to spine.defaults.max_uplink_switches
• Change from max_spine_to_super_spine_links to spine.defaults.max_parallel_uplinks
• Change from super_spine_underlay_p2p_network_summary to spine.defaults.uplink_ipv4_pool
• Change from p2p_uplinks_ptp to spine.defaults.uplink_ptp
• Change from spine_bgp_defaults to spine.defaults.bgp_defaults
• Change from isis_site_id.0000 to spine.defaults.isis_system_id_prefix
• New spine.defaults.isis_maximum_paths based on max_spines * max_l3leaf_to_spine_links
• Change from spine.nodes.{{ node }}.super_spine_interfaces to spine.nodes.{{ node }}.uplink_switch_interfaces

Changes to l3leaf data model

• Change from overlay_loopback_network_summary to l3leaf.defaults.loopback_ipv4_pool
• New loopback_network_offset variable based on max_spines or length of spine.nodes
• Change from vtep_loopback_network_summary to l3leaf.defaults.vtep_loopback_ipv4_pool
• Change from l3leaf.defaults.uplink_to_spine_interfaces to l3leaf.defaults.uplink_interfaces
• Change from l3leaf.defaults.spines to l3leaf.defaults.uplink_switches
• Change from max_spines to l3leaf.defaults.max_uplink_switches
• Change from max_l3leaf_to_spine_links to l3leaf.defaults.max_parallel_uplinks
• Change from underlay_p2p_network_summary to l3leaf.defaults.uplink_ipv4_pool
• Change from p2p_uplinks_ptp.* to l3leaf.defaults.uplink_ptp.*
• Change from l3leaf.defaults.p2p_link_interface_speed to l3leaf.defaults.uplink_interface_speed
• Change from leaf_bgp_defaults to l3leaf.defaults.bgp_defaults
• Change from isis_site_id.0001 to l3leaf.defaults.isis_system_id_prefix
• New l3leaf.defaults.isis_maximum_paths based on max_spines * max_l3leaf_to_spine_links
• Change from l3leaf.node_groups.{{ node_group }}.uplink_to_spine_interfaces to l3leaf.node_groups.{{ node_group }}.uplink_interfaces
• Change from l3leaf.node_groups.{{ node_group }}.spines to l3leaf.node_groups.{{ node_group }}.uplink_switches
• Change from l3leaf.node_groups.{{ node_group }}.p2p_link_interface_speed to l3leaf.node_groups.{{ node_group }}.uplink_interface_speed
• Change from l3leaf.node_groups.{{ node_group }}.nodes.{{ node }}.spine_interfaces to l3leaf.node_groups.{{ node_group }}.nodes.{{ node }}.uplink_switch_interfaces
• Change from l3leaf.node_groups.{{ node_group }}.nodes.{{ node }}.uplink_to_spine_interfaces to l3leaf.node_groups.{{ node_group }}.nodes.{{ node }}.uplink_interfaces
• Change from l3leaf.node_groups.{{ node_group }}.nodes.{{ node }}.spines to l3leaf.node_groups.{{ node_group }}.nodes.{{ node }}.uplink_switches

Changes to l2leaf data model

• Change from l2leaf.defaults.parent_l3leafs to l2leaf.defaults.uplink_switches
• Change from l2leaf_inband_management_subnet to l2leaf.defaults.inband_management_subnet
• Change from l2leaf_inband_management_vlan to l2leaf.defaults.inband_management_vlan
• Change from l2leaf.defaults.p2p_link_interface_speed to l2leaf.defaults.uplink_interface_speed
• Change from l2leaf.node_groups.{{ node_group }}.parent_l3leafs to l2leaf.node_groups.{{ node_group }}.uplink_switches
• Change from l2leaf.node_groups.{{ node_group }}.p2p_link_interface_speed to l2leaf.node_groups.{{ node_group }}.uplink_interface_speed
• Change from l2leaf.node_groups.{{ node_group }}.nodes.{{ node }}.l3leaf_interfaces to l2leaf.node_groups.{{ node_group }}.nodes.{{ node }}.uplink_switch_interfaces
• Change from l2leaf.node_groups.{{ node_group }}.nodes.{{ node }}.parent_l3leafs to l2leaf.node_groups.{{ node_group }}.nodes.{{ node }}.uplink_switches

Changes to super-spine data model

• Change from super_spine.bgp_as to super_spine.defaults.bgp_as

• Change from super_spine.platform to super_spine.defaults.platform

• Change from super_spine_loopback_network_summary to super_spine.defaults.loopback_ipv4_pool

• Change from super_spine_bgp_defaults to super_spine.defaults.bgp_defaults

• Change from overlay_controller.bgp_as to overlay_controller.defaults.bgp_as

• Change from overlay_controller.platform to overlay_controller.defaults.platform

• Change from overlay_controller_loopback_network_summary to overlay_controller.defaults.loopback_ipv4_pool

• Change from overlay_controller_p2p_bfd to overlay_controller.defaults.uplink_bfd

• Change from overlay_controller.defaults.uplink_to_remote_switches to overlay_controller.defaults.uplink_interfaces

• Change from overlay_controller.defaults.remote_switches to overlay_controller.defaults.uplink_switches

• Change from max_overlay_controller_to_switch_links (default=2) to overlay_controller.defaults.max_uplink_switches
  (old algorithm expected max_overlay_controller_to_switch_links to be the sum of links to all uplink switches)

• Change from overlay_controller_p2p_network_summary to overlay_controller.defaults.uplink_ipv4_pool

• Change from overlay_controller_bgp_defaults to overlay_controller.defaults.bgp_defaults

• Change from overlay_controller.nodes.{{ node }}.remote_switches_interfaces to overlay_controller.nodes.{{ node }}.uplink_switch_interfaces

• Change from overlay_controller.nodes.{{ node }}.uplink_to_remote_switches to overlay_controller.defaults.uplink_interfaces

• Change from overlay_controller.nodes.{{ node }}.remote_switches to overlay_controller.defaults.uplink_switches

Changes to spine to super-spine p2p IP adressing

For existing fabrics this be reverted by overriding the ip addressing templates as
done automatically by the upgrade role:

switch_type_keys:
  spine:
    type: spine
    default_evpn_role: server
    ip_addressing:
      p2p_uplinks_ip: 'designs/l3ls-evpn/ip-addressing/avd-v2-spine-p2p-uplinks-ip.j2'
      p2p_uplinks_peer_ip: 'designs/l3ls-evpn/ip-addressing/avd-v2-spine-p2p-uplinks-peer-ip.j2'
  l3leaf:
    type: l3leaf
    connected_endpoints: true
    default_evpn_role: client
    mlag_support: true
    network_services:
      l2: true
      l3: true
    vtep: true
  l2leaf:
    type: l2leaf
    connected_endpoints: true
    mlag_support: true
    network_services:
      l2: true
    underlay_router: false
    uplink_type: port-channel
  super_spine:
    type: super-spine
  overlay_controller:
    type: overlay-controller

Changes to evpn_rd_type and evpn_rt_type data models

• Change evpn_rd_type.admin_subfield value from "spine_asn" to
• Change evpn_rd_type.admin_subfield value from "leaf_asn" to "bgp_as"
• Change evpn_rt_type.admin_subfield value from "spine_asn" to
• Change evpn_rt_type.admin_subfield value from "leaf_asn" to "bgp_as"

How to test

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.
• I have updated the documentation accordingly.
• I have updated molecule CI testing accordingly
• All new and existing tests passed (pre-commit, make linting and make sanity-lint).

[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.

[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.

[carlbuchmann]

LGTM!