From 75302cf1e94236dbd3b16cc3e9212e5d69088653 Mon Sep 17 00:00:00 2001 From: gmuloc Date: Thu, 10 Oct 2024 23:39:44 +0200 Subject: [PATCH] Test: Moleculing the molecule --- .../structured_configs/inet-cloud.yml | 4 +- .../structured_configs/mpls-cloud.yml | 6 +- .../structured_configs/site1-border1.yml | 6 +- .../structured_configs/site1-border2.yml | 6 +- .../structured_configs/site1-wan1.yml | 6 +- .../structured_configs/site1-wan2.yml | 6 +- .../structured_configs/site2-leaf1.yml | 6 +- .../structured_configs/site2-leaf2.yml | 6 +- .../structured_configs/site2-wan1.yml | 6 +- .../structured_configs/site2-wan2.yml | 246 +++++++++--------- 10 files changed, 149 insertions(+), 149 deletions(-) diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/inet-cloud.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/inet-cloud.yml index 04ab6b2aea5..6f5e391a566 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/inet-cloud.yml +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/inet-cloud.yml @@ -9,6 +9,8 @@ router_bgp: maximum_paths: paths: 4 ecmp: 4 + redistribute_routes: + - source_protocol: connected peer_groups: - name: IPv4-UNDERLAY-PEERS type: ipv4 @@ -18,8 +20,6 @@ router_bgp: peer_groups: - name: IPv4-UNDERLAY-PEERS activate: true - redistribute_routes: - - source_protocol: connected neighbors: - ip_address: 100.64.21.2 remote_as: '65000' diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/mpls-cloud.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/mpls-cloud.yml index bfd676c43a7..96f44b9b74b 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/mpls-cloud.yml +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/mpls-cloud.yml @@ -9,6 +9,9 @@ router_bgp: maximum_paths: paths: 4 ecmp: 4 + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP peer_groups: - name: IPv4-UNDERLAY-PEERS type: ipv4 @@ -28,9 +31,6 @@ router_bgp: activate: true - name: EVPN-OVERLAY-PEERS activate: false - redistribute_routes: - - source_protocol: connected - route_map: RM-CONN-2-BGP address_family_evpn: peer_groups: - name: EVPN-OVERLAY-PEERS diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-border1.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-border1.yml index 6611187bc75..102d5a09ce8 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-border1.yml +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-border1.yml @@ -9,6 +9,9 @@ router_bgp: maximum_paths: paths: 4 ecmp: 4 + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP peer_groups: - name: MLAG-IPv4-UNDERLAY-PEER type: ipv4 @@ -52,9 +55,6 @@ router_bgp: remote_as: '65000' peer: site1-wan2 description: site1-wan2_Ethernet1 - redistribute_routes: - - source_protocol: connected - route_map: RM-CONN-2-BGP vrfs: - name: BLUE router_id: 192.168.255.5 diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-border2.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-border2.yml index 6eb6131c2ee..49681466d59 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-border2.yml +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-border2.yml @@ -9,6 +9,9 @@ router_bgp: maximum_paths: paths: 4 ecmp: 4 + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP peer_groups: - name: MLAG-IPv4-UNDERLAY-PEER type: ipv4 @@ -52,9 +55,6 @@ router_bgp: remote_as: '65000' peer: site1-wan2 description: site1-wan2_Ethernet2 - redistribute_routes: - - source_protocol: connected - route_map: RM-CONN-2-BGP vrfs: - name: BLUE router_id: 192.168.255.6 diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan1.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan1.yml index 51822a4edbe..5dc3037898a 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan1.yml +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan1.yml @@ -8,6 +8,9 @@ router_bgp: ipv4_unicast: false maximum_paths: paths: 16 + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP peer_groups: - name: IPv4-UNDERLAY-PEERS type: ipv4 @@ -37,9 +40,6 @@ router_bgp: activate: true - name: WAN-OVERLAY-PEERS activate: false - redistribute_routes: - - source_protocol: connected - route_map: RM-CONN-2-BGP neighbors: - ip_address: 10.0.1.8 peer_group: IPv4-UNDERLAY-PEERS diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan2.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan2.yml index 8b310d2b989..2be76a9cee0 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan2.yml +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site1-wan2.yml @@ -8,6 +8,9 @@ router_bgp: ipv4_unicast: false maximum_paths: paths: 16 + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP peer_groups: - name: IPv4-UNDERLAY-PEERS type: ipv4 @@ -37,9 +40,6 @@ router_bgp: activate: true - name: WAN-OVERLAY-PEERS activate: false - redistribute_routes: - - source_protocol: connected - route_map: RM-CONN-2-BGP neighbors: - ip_address: 10.0.1.12 peer_group: IPv4-UNDERLAY-PEERS diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-leaf1.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-leaf1.yml index 118b4819e79..46d5f6553b5 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-leaf1.yml +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-leaf1.yml @@ -9,6 +9,9 @@ router_bgp: maximum_paths: paths: 4 ecmp: 4 + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP peer_groups: - name: MLAG-IPv4-UNDERLAY-PEER type: ipv4 @@ -47,9 +50,6 @@ router_bgp: remote_as: '65000' peer: site2-wan1 description: site2-wan1_Ethernet1 - redistribute_routes: - - source_protocol: connected - route_map: RM-CONN-2-BGP vrfs: - name: BLUE router_id: 192.168.255.9 diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-leaf2.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-leaf2.yml index 11990e9f02f..31fdf26a6ff 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-leaf2.yml +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-leaf2.yml @@ -9,6 +9,9 @@ router_bgp: maximum_paths: paths: 4 ecmp: 4 + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP peer_groups: - name: MLAG-IPv4-UNDERLAY-PEER type: ipv4 @@ -47,9 +50,6 @@ router_bgp: remote_as: '65000' peer: site2-wan2 description: site2-wan2_Ethernet1 - redistribute_routes: - - source_protocol: connected - route_map: RM-CONN-2-BGP vrfs: - name: BLUE router_id: 192.168.255.10 diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-wan1.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-wan1.yml index bb3f30818c1..427e49b8300 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-wan1.yml +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-wan1.yml @@ -8,6 +8,9 @@ router_bgp: ipv4_unicast: false maximum_paths: paths: 16 + redistribute_routes: + - source_protocol: connected + route_map: RM-CONN-2-BGP peer_groups: - name: IPv4-UNDERLAY-PEERS type: ipv4 @@ -34,9 +37,6 @@ router_bgp: activate: true - name: WAN-OVERLAY-PEERS activate: false - redistribute_routes: - - source_protocol: connected - route_map: RM-CONN-2-BGP neighbors: - ip_address: 10.0.2.12 peer_group: IPv4-UNDERLAY-PEERS diff --git a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-wan2.yml b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-wan2.yml index 897a1eb25c0..350f6afbe1b 100644 --- a/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-wan2.yml +++ b/ansible_collections/arista/avd/examples/cv-pathfinder/intended/structured_configs/site2-wan2.yml @@ -8,49 +8,20 @@ router_bgp: ipv4_unicast: false maximum_paths: paths: 16 - peer_groups: - - name: IPv4-UNDERLAY-PEERS - type: ipv4 - maximum_routes: 12000 - send_community: all - route_map_in: RM-BGP-UNDERLAY-PEERS-IN - route_map_out: RM-BGP-UNDERLAY-PEERS-OUT - - name: WAN-OVERLAY-PEERS - type: wan - update_source: Dps1 - bfd: true - password: htm4AZe9mIQOO1uiMuGgYQ== - send_community: all - maximum_routes: 0 - remote_as: '65000' - ttl_maximum_hops: 1 - bfd_timers: - interval: 1000 - min_rx: 1000 - multiplier: 10 - address_family_ipv4: - peer_groups: - - name: IPv4-UNDERLAY-PEERS - activate: true - - name: WAN-OVERLAY-PEERS - activate: false - neighbors: - - ip_address: 100.64.21.1 - activate: true redistribute_routes: - source_protocol: connected route_map: RM-CONN-2-BGP neighbors: - - ip_address: 10.0.2.14 - peer_group: IPv4-UNDERLAY-PEERS - remote_as: '65102' - peer: site2-leaf2 - description: site2-leaf2_Ethernet3 - ip_address: 100.64.21.1 remote_as: '65666' description: REGION2-INTERNET-CORP_inet-site2-wan2_inet-cloud_Ethernet7 route_map_in: RM-BGP-100.64.21.1-IN route_map_out: RM-BGP-100.64.21.1-OUT + - ip_address: 10.0.2.14 + peer_group: IPv4-UNDERLAY-PEERS + remote_as: '65102' + peer: site2-leaf2 + description: site2-leaf2_Ethernet3 - ip_address: 192.168.42.1 peer_group: WAN-OVERLAY-PEERS peer: pf1 @@ -68,6 +39,35 @@ router_bgp: send_community: all route_map_in: RM-WAN-HA-PEER-IN route_map_out: RM-WAN-HA-PEER-OUT + address_family_ipv4: + neighbors: + - ip_address: 100.64.21.1 + activate: true + peer_groups: + - name: IPv4-UNDERLAY-PEERS + activate: true + - name: WAN-OVERLAY-PEERS + activate: false + peer_groups: + - name: IPv4-UNDERLAY-PEERS + type: ipv4 + maximum_routes: 12000 + send_community: all + route_map_in: RM-BGP-UNDERLAY-PEERS-IN + route_map_out: RM-BGP-UNDERLAY-PEERS-OUT + - name: WAN-OVERLAY-PEERS + type: wan + update_source: Dps1 + bfd: true + password: htm4AZe9mIQOO1uiMuGgYQ== + send_community: all + maximum_routes: 0 + remote_as: '65000' + ttl_maximum_hops: 1 + bfd_timers: + interval: 1000 + min_rx: 1000 + multiplier: 10 vrfs: - name: BLUE router_id: 192.168.255.8 @@ -212,90 +212,28 @@ management_api_http: enable_vrfs: - name: MGMT enable_https: true -ntp: - local_interface: - name: Management1 - vrf: MGMT - servers: - - name: 0.pool.ntp.org - vrf: MGMT - preferred: true -ethernet_interfaces: -- name: Ethernet1 - peer: site2-leaf2 - peer_interface: Ethernet3 - peer_type: l3leaf - description: P2P_site2-leaf2_Ethernet3 - shutdown: false - mtu: 9214 - switchport: - enabled: false - flow_tracker: - hardware: FLOW-TRACKER - ip_address: 10.0.2.15/31 -- name: Ethernet1.100 - peer: site2-leaf2 - peer_interface: Ethernet3.100 - peer_type: l3leaf - vrf: BLUE - description: P2P_site2-leaf2_Ethernet3.100_VRF_BLUE - shutdown: false - encapsulation_dot1q: - vlan: 100 - flow_tracker: - hardware: FLOW-TRACKER - mtu: 9214 - ip_address: 10.0.2.15/31 -- name: Ethernet1.101 - peer: site2-leaf2 - peer_interface: Ethernet3.101 - peer_type: l3leaf - vrf: RED - description: P2P_site2-leaf2_Ethernet3.101_VRF_RED - shutdown: false - encapsulation_dot1q: - vlan: 101 - flow_tracker: - hardware: FLOW-TRACKER - mtu: 9214 - ip_address: 10.0.2.15/31 -- name: Ethernet4 - peer_type: l3_interface - peer: inet-cloud - peer_interface: Ethernet7 - ip_address: 100.64.21.2/24 - shutdown: false - switchport: - enabled: false - description: REGION2-INTERNET-CORP_inet-site2-wan2_inet-cloud_Ethernet7 - access_group_in: ACL-INTERNET-IN_Ethernet4 - flow_tracker: - hardware: FLOW-TRACKER -- name: Ethernet5 - switchport: - enabled: false - peer_type: l3_interface - peer: site2-wan1 - shutdown: false - description: WAN_HA_site2-wan1_Ethernet5 - ip_address: 10.42.0.1/31 - flow_tracker: null - mtu: 9194 -loopback_interfaces: -- name: Loopback0 - description: ROUTER_ID - shutdown: false - ip_address: 192.168.255.8/32 prefix_lists: +- name: ALLOW-DEFAULT + sequence_numbers: + - sequence: 10 + action: permit 0.0.0.0/0 - name: PL-LOOPBACKS-EVPN-OVERLAY sequence_numbers: - sequence: 10 action: permit 192.168.255.0/24 eq 32 -- name: ALLOW-DEFAULT +route_maps: +- name: RM-BGP-100.64.21.1-IN sequence_numbers: - sequence: 10 - action: permit 0.0.0.0/0 -route_maps: + type: permit + match: + - ip address prefix-list ALLOW-DEFAULT + set: + - community no-advertise additive +- name: RM-BGP-100.64.21.1-OUT + sequence_numbers: + - sequence: 10 + type: deny - name: RM-CONN-2-BGP sequence_numbers: - sequence: 10 @@ -323,18 +261,6 @@ route_maps: - metric 50 - sequence: 20 type: permit -- name: RM-BGP-100.64.21.1-IN - sequence_numbers: - - sequence: 10 - type: permit - match: - - ip address prefix-list ALLOW-DEFAULT - set: - - community no-advertise additive -- name: RM-BGP-100.64.21.1-OUT - sequence_numbers: - - sequence: 10 - type: deny - name: RM-EVPN-SOO-IN sequence_numbers: - sequence: 10 @@ -376,6 +302,80 @@ route_maps: type: permit match: - extcommunity ECL-EVPN-SOO +ntp: + local_interface: + name: Management1 + vrf: MGMT + servers: + - name: 0.pool.ntp.org + vrf: MGMT + preferred: true +ethernet_interfaces: +- name: Ethernet1 + peer: site2-leaf2 + peer_interface: Ethernet3 + peer_type: l3leaf + description: P2P_site2-leaf2_Ethernet3 + shutdown: false + mtu: 9214 + switchport: + enabled: false + flow_tracker: + hardware: FLOW-TRACKER + ip_address: 10.0.2.15/31 +- name: Ethernet1.100 + peer: site2-leaf2 + peer_interface: Ethernet3.100 + peer_type: l3leaf + vrf: BLUE + description: P2P_site2-leaf2_Ethernet3.100_VRF_BLUE + shutdown: false + encapsulation_dot1q: + vlan: 100 + flow_tracker: + hardware: FLOW-TRACKER + mtu: 9214 + ip_address: 10.0.2.15/31 +- name: Ethernet1.101 + peer: site2-leaf2 + peer_interface: Ethernet3.101 + peer_type: l3leaf + vrf: RED + description: P2P_site2-leaf2_Ethernet3.101_VRF_RED + shutdown: false + encapsulation_dot1q: + vlan: 101 + flow_tracker: + hardware: FLOW-TRACKER + mtu: 9214 + ip_address: 10.0.2.15/31 +- name: Ethernet4 + peer_type: l3_interface + peer: inet-cloud + peer_interface: Ethernet7 + ip_address: 100.64.21.2/24 + shutdown: false + switchport: + enabled: false + description: REGION2-INTERNET-CORP_inet-site2-wan2_inet-cloud_Ethernet7 + access_group_in: ACL-INTERNET-IN_Ethernet4 + flow_tracker: + hardware: FLOW-TRACKER +- name: Ethernet5 + switchport: + enabled: false + peer_type: l3_interface + peer: site2-wan1 + shutdown: false + description: WAN_HA_site2-wan1_Ethernet5 + ip_address: 10.42.0.1/31 + flow_tracker: null + mtu: 9194 +loopback_interfaces: +- name: Loopback0 + description: ROUTER_ID + shutdown: false + ip_address: 192.168.255.8/32 agents: - name: KernelFib environment_variables: