diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md index 5b321b6dba2..aad43fd841c 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md @@ -776,9 +776,6 @@ router bgp 65101 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.97 next-hop address-family ipv6 ! vrf VRF11 rd 10.255.0.3:11 @@ -787,9 +784,6 @@ router bgp 65101 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.97 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md index e3a1561cf73..52811a73959 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md @@ -776,9 +776,6 @@ router bgp 65101 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.96 next-hop address-family ipv6 ! vrf VRF11 rd 10.255.0.4:11 @@ -787,9 +784,6 @@ router bgp 65101 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.96 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md index 1e7bceb9049..24f58f9a967 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md @@ -776,9 +776,6 @@ router bgp 65102 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.101 next-hop address-family ipv6 ! vrf VRF11 rd 10.255.0.5:11 @@ -787,9 +784,6 @@ router bgp 65102 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.101 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md index 84878031aa8..347eb1a559c 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md @@ -776,9 +776,6 @@ router bgp 65102 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.100 next-hop address-family ipv6 ! vrf VRF11 rd 10.255.0.6:11 @@ -787,9 +784,6 @@ router bgp 65102 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.100 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1a.cfg b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1a.cfg index 8298614e944..9ea29e82a77 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1a.cfg +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1a.cfg @@ -333,9 +333,6 @@ router bgp 65101 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.97 next-hop address-family ipv6 ! vrf VRF11 rd 10.255.0.3:11 @@ -344,9 +341,6 @@ router bgp 65101 router-id 10.255.0.3 neighbor 10.255.1.97 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.97 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1b.cfg b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1b.cfg index dedbfdf662d..29b5de8fd18 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1b.cfg +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf1b.cfg @@ -333,9 +333,6 @@ router bgp 65101 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.96 next-hop address-family ipv6 ! vrf VRF11 rd 10.255.0.4:11 @@ -344,9 +341,6 @@ router bgp 65101 router-id 10.255.0.4 neighbor 10.255.1.96 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.96 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2a.cfg b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2a.cfg index 216ac48a84c..9ec16d68e30 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2a.cfg +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2a.cfg @@ -333,9 +333,6 @@ router bgp 65102 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.101 next-hop address-family ipv6 ! vrf VRF11 rd 10.255.0.5:11 @@ -344,9 +341,6 @@ router bgp 65102 router-id 10.255.0.5 neighbor 10.255.1.101 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.101 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2b.cfg b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2b.cfg index 65092bb6df0..5facc6fb727 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2b.cfg +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/configs/dc1-leaf2b.cfg @@ -333,9 +333,6 @@ router bgp 65102 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.100 next-hop address-family ipv6 ! vrf VRF11 rd 10.255.0.6:11 @@ -344,9 +341,6 @@ router bgp 65102 router-id 10.255.0.6 neighbor 10.255.1.100 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.1.100 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml index 83c271676c8..92fa663b3a4 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml @@ -81,12 +81,6 @@ router_bgp: neighbors: 10.255.1.97: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.1.97: - next_hop: - address_family_ipv6: - enabled: false VRF11: router_id: 10.255.0.3 rd: 10.255.0.3:11 @@ -102,12 +96,6 @@ router_bgp: neighbors: 10.255.1.97: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.1.97: - next_hop: - address_family_ipv6: - enabled: false vlans: 11: tenant: TENANT1 diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml index c4d4793b294..3e2f80be9d4 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml @@ -81,12 +81,6 @@ router_bgp: neighbors: 10.255.1.96: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.1.96: - next_hop: - address_family_ipv6: - enabled: false VRF11: router_id: 10.255.0.4 rd: 10.255.0.4:11 @@ -102,12 +96,6 @@ router_bgp: neighbors: 10.255.1.96: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.1.96: - next_hop: - address_family_ipv6: - enabled: false vlans: 11: tenant: TENANT1 diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml index f879a34cdd1..138689994a5 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml @@ -81,12 +81,6 @@ router_bgp: neighbors: 10.255.1.101: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.1.101: - next_hop: - address_family_ipv6: - enabled: false VRF11: router_id: 10.255.0.5 rd: 10.255.0.5:11 @@ -102,12 +96,6 @@ router_bgp: neighbors: 10.255.1.101: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.1.101: - next_hop: - address_family_ipv6: - enabled: false vlans: 11: tenant: TENANT1 diff --git a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml index bb55c4b8b03..46b97dbef21 100644 --- a/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml +++ b/ansible_collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml @@ -81,12 +81,6 @@ router_bgp: neighbors: 10.255.1.100: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.1.100: - next_hop: - address_family_ipv6: - enabled: false VRF11: router_id: 10.255.0.6 rd: 10.255.0.6:11 @@ -102,12 +96,6 @@ router_bgp: neighbors: 10.255.1.100: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.1.100: - next_hop: - address_family_ipv6: - enabled: false vlans: 11: tenant: TENANT1 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-v4-evpn.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-v4-evpn.yml index f3f53fb23b3..2ef69f7b35b 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-v4-evpn.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-v4-evpn.yml @@ -182,8 +182,8 @@ router_bgp: enabled: false originate: true # this should not get added to the configuration networks: - - prefix: 10.0.0.0/8 - - prefix: 100.64.0.0/10 + 10.0.0.0/8: + 100.64.0.0/10: route_map: RM-10.2.3.4 peer_groups: TEST_PEER_GRP: diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md index 8964ed6163d..006fafa7dbe 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md @@ -793,9 +793,6 @@ router bgp 65104 router-id 192.168.255.10 neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.11 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.10:21 @@ -804,9 +801,6 @@ router bgp 65104 router-id 192.168.255.10 neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.11 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.10:31 @@ -815,9 +809,6 @@ router bgp 65104 router-id 192.168.255.10 neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.11 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md index ef851c34150..8926b576992 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md @@ -793,9 +793,6 @@ router bgp 65104 router-id 192.168.255.11 neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.10 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.11:21 @@ -804,9 +801,6 @@ router bgp 65104 router-id 192.168.255.11 neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.10 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.11:31 @@ -815,9 +809,6 @@ router bgp 65104 router-id 192.168.255.11 neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.10 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md index e3bad3c19ac..8081be0eb20 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md @@ -1047,9 +1047,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.6:13 @@ -1058,9 +1055,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.6:10 @@ -1069,9 +1063,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.6:11 @@ -1080,9 +1071,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.6:20 @@ -1091,9 +1079,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.6:30 @@ -1102,9 +1087,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md index 241c66c3359..0920d3b8821 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2B.md @@ -1047,9 +1047,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.7:13 @@ -1058,9 +1055,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.7:10 @@ -1069,9 +1063,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.7:11 @@ -1080,9 +1071,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.7:20 @@ -1091,9 +1079,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.7:30 @@ -1102,9 +1087,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md index ae999de63a2..6f555e08579 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3A.md @@ -1179,9 +1179,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.8:13 @@ -1190,9 +1187,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.8:10 @@ -1201,9 +1195,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.8:14 @@ -1212,9 +1203,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.8:11 @@ -1223,9 +1211,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.8:20 @@ -1234,9 +1219,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.8:21 @@ -1245,9 +1227,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.8:30 @@ -1256,9 +1235,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.8:31 @@ -1267,9 +1243,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md index 924f9c514a6..e776c084dd0 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SVC3B.md @@ -1164,9 +1164,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.9:13 @@ -1175,9 +1172,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.9:10 @@ -1186,9 +1180,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.9:14 @@ -1197,9 +1188,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.9:11 @@ -1208,9 +1196,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.9:20 @@ -1219,9 +1204,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.9:21 @@ -1230,9 +1212,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.9:30 @@ -1241,9 +1220,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.9:31 @@ -1252,9 +1228,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1A.cfg index b55e2c82d18..47d24ab6634 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1A.cfg @@ -308,9 +308,6 @@ router bgp 65104 router-id 192.168.255.10 neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.11 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.10:21 @@ -319,9 +316,6 @@ router bgp 65104 router-id 192.168.255.10 neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.11 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.10:31 @@ -330,9 +324,6 @@ router bgp 65104 router-id 192.168.255.10 neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.11 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1B.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1B.cfg index 21544f69db6..735fcf5ee3b 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-BL1B.cfg @@ -308,9 +308,6 @@ router bgp 65104 router-id 192.168.255.11 neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.10 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.11:21 @@ -319,9 +316,6 @@ router bgp 65104 router-id 192.168.255.11 neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.10 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.11:31 @@ -330,9 +324,6 @@ router bgp 65104 router-id 192.168.255.11 neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.10 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2A.cfg index eac7a05987a..15e51a15c19 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2A.cfg @@ -500,9 +500,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.6:13 @@ -511,9 +508,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.6:10 @@ -522,9 +516,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.6:11 @@ -533,9 +524,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.6:20 @@ -544,9 +532,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.6:30 @@ -555,9 +540,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2B.cfg index 6f8a3b37284..a166a5ec02f 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-LEAF2B.cfg @@ -500,9 +500,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.7:13 @@ -511,9 +508,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.7:10 @@ -522,9 +516,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.7:11 @@ -533,9 +524,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.7:20 @@ -544,9 +532,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.7:30 @@ -555,9 +540,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg index c99b3424041..a48e9eaaed0 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3A.cfg @@ -598,9 +598,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.8:13 @@ -609,9 +606,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.8:10 @@ -620,9 +614,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.8:14 @@ -631,9 +622,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.8:11 @@ -642,9 +630,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.8:20 @@ -653,9 +638,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.8:21 @@ -664,9 +646,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.8:30 @@ -675,9 +654,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.8:31 @@ -686,9 +662,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3B.cfg index 74595e44d31..306e165aad1 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SVC3B.cfg @@ -585,9 +585,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.9:13 @@ -596,9 +593,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.9:10 @@ -607,9 +601,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.9:14 @@ -618,9 +609,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.9:11 @@ -629,9 +617,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.9:20 @@ -640,9 +625,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.9:21 @@ -651,9 +633,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.9:30 @@ -662,9 +641,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.9:31 @@ -673,9 +649,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1A.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1A.yml index 87dc5506028..5ea07617963 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1A.yml @@ -95,12 +95,6 @@ router_bgp: neighbors: 10.255.251.11: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.11: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.10 rd: 192.168.255.10:21 @@ -116,12 +110,6 @@ router_bgp: neighbors: 10.255.251.11: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.11: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.10 rd: 192.168.255.10:31 @@ -137,12 +125,6 @@ router_bgp: neighbors: 10.255.251.11: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.11: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_WAN_Zone: rd: 192.168.255.10:14 diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1B.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1B.yml index 96514b92058..4208e55d13a 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-BL1B.yml @@ -95,12 +95,6 @@ router_bgp: neighbors: 10.255.251.10: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.10: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.11 rd: 192.168.255.11:21 @@ -116,12 +110,6 @@ router_bgp: neighbors: 10.255.251.10: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.10: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.11 rd: 192.168.255.11:31 @@ -137,12 +125,6 @@ router_bgp: neighbors: 10.255.251.10: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.10: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_WAN_Zone: rd: 192.168.255.11:14 diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2A.yml index eda2806804d..231e314b741 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2A.yml @@ -95,12 +95,6 @@ router_bgp: neighbors: 10.255.251.3: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.3: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.6 rd: 192.168.255.6:13 @@ -116,12 +110,6 @@ router_bgp: neighbors: 10.255.251.3: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.3: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.6 rd: 192.168.255.6:10 @@ -137,12 +125,6 @@ router_bgp: neighbors: 10.255.251.3: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.3: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.6 rd: 192.168.255.6:11 @@ -158,12 +140,6 @@ router_bgp: neighbors: 10.255.251.3: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.3: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.6 rd: 192.168.255.6:20 @@ -179,12 +155,6 @@ router_bgp: neighbors: 10.255.251.3: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.3: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.6 rd: 192.168.255.6:30 @@ -200,12 +170,6 @@ router_bgp: neighbors: 10.255.251.3: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.3: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: 192.168.255.6:12 diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2B.yml index 8c30951f92b..6b45abc9d03 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-LEAF2B.yml @@ -95,12 +95,6 @@ router_bgp: neighbors: 10.255.251.2: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.2: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.7 rd: 192.168.255.7:13 @@ -116,12 +110,6 @@ router_bgp: neighbors: 10.255.251.2: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.2: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.7 rd: 192.168.255.7:10 @@ -137,12 +125,6 @@ router_bgp: neighbors: 10.255.251.2: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.2: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.7 rd: 192.168.255.7:11 @@ -158,12 +140,6 @@ router_bgp: neighbors: 10.255.251.2: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.2: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.7 rd: 192.168.255.7:20 @@ -179,12 +155,6 @@ router_bgp: neighbors: 10.255.251.2: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.2: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.7 rd: 192.168.255.7:30 @@ -200,12 +170,6 @@ router_bgp: neighbors: 10.255.251.2: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.2: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: 192.168.255.7:12 diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3A.yml index ba9fc85485f..4cf0d806dcb 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3A.yml @@ -95,12 +95,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.8 rd: 192.168.255.8:13 @@ -116,12 +110,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.8 rd: 192.168.255.8:10 @@ -137,12 +125,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.8 rd: 192.168.255.8:14 @@ -158,12 +140,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.8 rd: 192.168.255.8:11 @@ -179,12 +155,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.8 rd: 192.168.255.8:20 @@ -200,12 +170,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.8 rd: 192.168.255.8:21 @@ -221,12 +185,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.8 rd: 192.168.255.8:30 @@ -242,12 +200,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.8 rd: 192.168.255.8:31 @@ -263,12 +215,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: 192.168.255.8:12 diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3B.yml index 83117076dae..026bc84748a 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SVC3B.yml @@ -95,12 +95,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.9 rd: 192.168.255.9:13 @@ -116,12 +110,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.9 rd: 192.168.255.9:10 @@ -137,12 +125,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.9 rd: 192.168.255.9:14 @@ -158,12 +140,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.9 rd: 192.168.255.9:11 @@ -179,12 +155,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.9 rd: 192.168.255.9:20 @@ -200,12 +170,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.9 rd: 192.168.255.9:21 @@ -221,12 +185,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.9 rd: 192.168.255.9:30 @@ -242,12 +200,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.9 rd: 192.168.255.9:31 @@ -263,12 +215,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: 192.168.255.9:12 diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml index 1f507cd7986..56c018f4605 100644 --- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml +++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml @@ -107,18 +107,14 @@ CVP_CONFIGLETS: \ !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.10:14\n route-target\ \ import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.10\n\ \ neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.11\ - \ next-hop address-family ipv6\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.10:21\n\ - \ route-target import evpn 21:21\n route-target export evpn 21:21\n\ + \ connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.10:21\n \ + \ route-target import evpn 21:21\n route-target export evpn 21:21\n \ + \ router-id 192.168.255.10\n neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.10:31\n\ + \ route-target import evpn 31:31\n route-target export evpn 31:31\n\ \ router-id 192.168.255.10\n neighbor 10.255.251.11 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.11 next-hop address-family ipv6\n !\n vrf Tenant_C_WAN_Zone\n\ - \ rd 192.168.255.10:31\n route-target import evpn 31:31\n route-target\ - \ export evpn 31:31\n router-id 192.168.255.10\n neighbor 10.255.251.11\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.11 next-hop address-family\ - \ ipv6\n!\nmanagement api http-commands\n protocol https\n no shutdown\n \ - \ !\n vrf MGMT\n no shutdown\n!\nend\n" + \ redistribute connected\n!\nmanagement api http-commands\n protocol https\n\ + \ no shutdown\n !\n vrf MGMT\n no shutdown\n!\nend\n" AVD_DC1-BL1B: "!RANCID-CONTENT-TYPE: arista\n!\ndaemon TerminAttr\n exec /usr/bin/TerminAttr\ \ -cvaddr=192.168.200.11:9910 -cvauth=key,telarista -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata\ \ -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs\n no shutdown\n\ @@ -227,18 +223,14 @@ CVP_CONFIGLETS: \ !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.11:14\n route-target\ \ import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.11\n\ \ neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.10\ - \ next-hop address-family ipv6\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.11:21\n\ - \ route-target import evpn 21:21\n route-target export evpn 21:21\n\ + \ connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.11:21\n \ + \ route-target import evpn 21:21\n route-target export evpn 21:21\n \ + \ router-id 192.168.255.11\n neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.11:31\n\ + \ route-target import evpn 31:31\n route-target export evpn 31:31\n\ \ router-id 192.168.255.11\n neighbor 10.255.251.10 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.10 next-hop address-family ipv6\n !\n vrf Tenant_C_WAN_Zone\n\ - \ rd 192.168.255.11:31\n route-target import evpn 31:31\n route-target\ - \ export evpn 31:31\n router-id 192.168.255.11\n neighbor 10.255.251.10\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.10 next-hop address-family\ - \ ipv6\n!\nmanagement api http-commands\n protocol https\n no shutdown\n \ - \ !\n vrf MGMT\n no shutdown\n!\nend\n" + \ redistribute connected\n!\nmanagement api http-commands\n protocol https\n\ + \ no shutdown\n !\n vrf MGMT\n no shutdown\n!\nend\n" AVD_DC1-L2LEAF1A: "!RANCID-CONTENT-TYPE: arista\n!\ndaemon TerminAttr\n exec /usr/bin/TerminAttr\ \ -cvaddr=192.168.200.11:9910 -cvauth=key,telarista -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata\ \ -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs\n no shutdown\n\ @@ -583,32 +575,24 @@ CVP_CONFIGLETS: \ activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_APP_Zone\n\ \ rd 192.168.255.6:12\n route-target import evpn 12:12\n route-target\ \ export evpn 12:12\n router-id 192.168.255.6\n neighbor 10.255.251.3\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.3 next-hop address-family\ - \ ipv6\n !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.6:13\n route-target\ - \ import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.6\n\ + \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n vrf\ + \ Tenant_A_DB_Zone\n rd 192.168.255.6:13\n route-target import evpn\ + \ 13:13\n route-target export evpn 13:13\n router-id 192.168.255.6\n\ \ neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.3\ - \ next-hop address-family ipv6\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.6:10\n\ - \ route-target import evpn 10:10\n route-target export evpn 10:10\n\ - \ router-id 192.168.255.6\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.3 next-hop address-family ipv6\n !\n vrf Tenant_A_WEB_Zone\n\ - \ rd 192.168.255.6:11\n route-target import evpn 11:11\n route-target\ - \ export evpn 11:11\n router-id 192.168.255.6\n neighbor 10.255.251.3\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.3 next-hop address-family\ - \ ipv6\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.6:20\n route-target\ - \ import evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.6\n\ + \ connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.6:10\n route-target\ + \ import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.6\n\ \ neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.3\ - \ next-hop address-family ipv6\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.6:30\n\ + \ connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.6:11\n \ + \ route-target import evpn 11:11\n route-target export evpn 11:11\n \ + \ router-id 192.168.255.6\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.6:20\n\ + \ route-target import evpn 20:20\n route-target export evpn 20:20\n\ + \ router-id 192.168.255.6\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.6:30\n\ \ route-target import evpn 30:30\n route-target export evpn 30:30\n\ \ router-id 192.168.255.6\n neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.3 next-hop address-family ipv6\n!\nmanagement api http-commands\n\ - \ protocol https\n no shutdown\n !\n vrf MGMT\n no shutdown\n!\n\ - end\n" + \ redistribute connected\n!\nmanagement api http-commands\n protocol https\n\ + \ no shutdown\n !\n vrf MGMT\n no shutdown\n!\nend\n" AVD_DC1-LEAF2B: "!RANCID-CONTENT-TYPE: arista\n!\ndaemon TerminAttr\n exec /usr/bin/TerminAttr\ \ -cvaddr=192.168.200.11:9910 -cvauth=key,telarista -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata\ \ -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs\n no shutdown\n\ @@ -770,32 +754,24 @@ CVP_CONFIGLETS: \ activate\n neighbor MLAG-IPv4-UNDERLAY-PEER activate\n !\n vrf Tenant_A_APP_Zone\n\ \ rd 192.168.255.7:12\n route-target import evpn 12:12\n route-target\ \ export evpn 12:12\n router-id 192.168.255.7\n neighbor 10.255.251.2\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.2 next-hop address-family\ - \ ipv6\n !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.7:13\n route-target\ - \ import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.7\n\ + \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n vrf\ + \ Tenant_A_DB_Zone\n rd 192.168.255.7:13\n route-target import evpn\ + \ 13:13\n route-target export evpn 13:13\n router-id 192.168.255.7\n\ \ neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.2\ - \ next-hop address-family ipv6\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.7:10\n\ - \ route-target import evpn 10:10\n route-target export evpn 10:10\n\ - \ router-id 192.168.255.7\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.2 next-hop address-family ipv6\n !\n vrf Tenant_A_WEB_Zone\n\ - \ rd 192.168.255.7:11\n route-target import evpn 11:11\n route-target\ - \ export evpn 11:11\n router-id 192.168.255.7\n neighbor 10.255.251.2\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.2 next-hop address-family\ - \ ipv6\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.7:20\n route-target\ - \ import evpn 20:20\n route-target export evpn 20:20\n router-id 192.168.255.7\n\ + \ connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.7:10\n route-target\ + \ import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.7\n\ \ neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.2\ - \ next-hop address-family ipv6\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.7:30\n\ + \ connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.7:11\n \ + \ route-target import evpn 11:11\n route-target export evpn 11:11\n \ + \ router-id 192.168.255.7\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.7:20\n\ + \ route-target import evpn 20:20\n route-target export evpn 20:20\n\ + \ router-id 192.168.255.7\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.7:30\n\ \ route-target import evpn 30:30\n route-target export evpn 30:30\n\ \ router-id 192.168.255.7\n neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.2 next-hop address-family ipv6\n!\nmanagement api http-commands\n\ - \ protocol https\n no shutdown\n !\n vrf MGMT\n no shutdown\n!\n\ - end\n" + \ redistribute connected\n!\nmanagement api http-commands\n protocol https\n\ + \ no shutdown\n !\n vrf MGMT\n no shutdown\n!\nend\n" AVD_DC1-SPINE1: "!RANCID-CONTENT-TYPE: arista\n!\ndaemon TerminAttr\n exec /usr/bin/TerminAttr\ \ -cvaddr=192.168.200.11:9910 -cvauth=key,telarista -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata\ \ -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs\n no shutdown\n\ @@ -1270,44 +1246,32 @@ CVP_CONFIGLETS: \ activate\n !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.8:12\n route-target\ \ import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.8\n\ \ neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.7\ - \ next-hop address-family ipv6\n !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.8:13\n\ - \ route-target import evpn 13:13\n route-target export evpn 13:13\n\ - \ router-id 192.168.255.8\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.7 next-hop address-family ipv6\n !\n vrf Tenant_A_OP_Zone\n\ - \ rd 192.168.255.8:10\n route-target import evpn 10:10\n route-target\ - \ export evpn 10:10\n router-id 192.168.255.8\n neighbor 10.255.251.7\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.7 next-hop address-family\ - \ ipv6\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.8:14\n route-target\ - \ import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.8\n\ + \ connected\n !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.8:13\n route-target\ + \ import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.8\n\ + \ neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ + \ connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.8:10\n route-target\ + \ import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.8\n\ \ neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.7\ - \ next-hop address-family ipv6\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.8:11\n\ + \ connected\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.8:14\n \ + \ route-target import evpn 14:14\n route-target export evpn 14:14\n \ + \ router-id 192.168.255.8\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.8:11\n\ \ route-target import evpn 11:11\n route-target export evpn 11:11\n\ \ router-id 192.168.255.8\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.7 next-hop address-family ipv6\n !\n vrf Tenant_B_OP_Zone\n\ - \ rd 192.168.255.8:20\n route-target import evpn 20:20\n route-target\ - \ export evpn 20:20\n router-id 192.168.255.8\n neighbor 10.255.251.7\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.7 next-hop address-family\ - \ ipv6\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.8:21\n route-target\ - \ import evpn 21:21\n route-target export evpn 21:21\n router-id 192.168.255.8\n\ - \ neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.7\ - \ next-hop address-family ipv6\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.8:30\n\ + \ redistribute connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.8:20\n\ + \ route-target import evpn 20:20\n route-target export evpn 20:20\n\ + \ router-id 192.168.255.8\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.8:21\n\ + \ route-target import evpn 21:21\n route-target export evpn 21:21\n\ + \ router-id 192.168.255.8\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.8:30\n\ \ route-target import evpn 30:30\n route-target export evpn 30:30\n\ \ router-id 192.168.255.8\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.7 next-hop address-family ipv6\n !\n vrf Tenant_C_WAN_Zone\n\ - \ rd 192.168.255.8:31\n route-target import evpn 31:31\n route-target\ - \ export evpn 31:31\n router-id 192.168.255.8\n neighbor 10.255.251.7\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.7 next-hop address-family\ - \ ipv6\n!\nmanagement api http-commands\n protocol https\n no shutdown\n \ - \ !\n vrf MGMT\n no shutdown\n!\nend\n" + \ redistribute connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.8:31\n\ + \ route-target import evpn 31:31\n route-target export evpn 31:31\n\ + \ router-id 192.168.255.8\n neighbor 10.255.251.7 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n!\nmanagement api http-commands\n protocol https\n\ + \ no shutdown\n !\n vrf MGMT\n no shutdown\n!\nend\n" AVD_DC1-SVC3B: "!RANCID-CONTENT-TYPE: arista\n!\ndaemon TerminAttr\n exec /usr/bin/TerminAttr\ \ -cvaddr=192.168.200.11:9910 -cvauth=key,telarista -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata\ \ -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs\n no shutdown\n\ @@ -1494,44 +1458,32 @@ CVP_CONFIGLETS: \ activate\n !\n vrf Tenant_A_APP_Zone\n rd 192.168.255.9:12\n route-target\ \ import evpn 12:12\n route-target export evpn 12:12\n router-id 192.168.255.9\n\ \ neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.6\ - \ next-hop address-family ipv6\n !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.9:13\n\ - \ route-target import evpn 13:13\n route-target export evpn 13:13\n\ - \ router-id 192.168.255.9\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.6 next-hop address-family ipv6\n !\n vrf Tenant_A_OP_Zone\n\ - \ rd 192.168.255.9:10\n route-target import evpn 10:10\n route-target\ - \ export evpn 10:10\n router-id 192.168.255.9\n neighbor 10.255.251.6\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.6 next-hop address-family\ - \ ipv6\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.9:14\n route-target\ - \ import evpn 14:14\n route-target export evpn 14:14\n router-id 192.168.255.9\n\ + \ connected\n !\n vrf Tenant_A_DB_Zone\n rd 192.168.255.9:13\n route-target\ + \ import evpn 13:13\n route-target export evpn 13:13\n router-id 192.168.255.9\n\ + \ neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ + \ connected\n !\n vrf Tenant_A_OP_Zone\n rd 192.168.255.9:10\n route-target\ + \ import evpn 10:10\n route-target export evpn 10:10\n router-id 192.168.255.9\n\ \ neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.6\ - \ next-hop address-family ipv6\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.9:11\n\ + \ connected\n !\n vrf Tenant_A_WAN_Zone\n rd 192.168.255.9:14\n \ + \ route-target import evpn 14:14\n route-target export evpn 14:14\n \ + \ router-id 192.168.255.9\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_A_WEB_Zone\n rd 192.168.255.9:11\n\ \ route-target import evpn 11:11\n route-target export evpn 11:11\n\ \ router-id 192.168.255.9\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.6 next-hop address-family ipv6\n !\n vrf Tenant_B_OP_Zone\n\ - \ rd 192.168.255.9:20\n route-target import evpn 20:20\n route-target\ - \ export evpn 20:20\n router-id 192.168.255.9\n neighbor 10.255.251.6\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.6 next-hop address-family\ - \ ipv6\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.9:21\n route-target\ - \ import evpn 21:21\n route-target export evpn 21:21\n router-id 192.168.255.9\n\ - \ neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute\ - \ connected\n !\n address-family ipv4\n no neighbor 10.255.251.6\ - \ next-hop address-family ipv6\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.9:30\n\ + \ redistribute connected\n !\n vrf Tenant_B_OP_Zone\n rd 192.168.255.9:20\n\ + \ route-target import evpn 20:20\n route-target export evpn 20:20\n\ + \ router-id 192.168.255.9\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_B_WAN_Zone\n rd 192.168.255.9:21\n\ + \ route-target import evpn 21:21\n route-target export evpn 21:21\n\ + \ router-id 192.168.255.9\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n !\n vrf Tenant_C_OP_Zone\n rd 192.168.255.9:30\n\ \ route-target import evpn 30:30\n route-target export evpn 30:30\n\ \ router-id 192.168.255.9\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n\ - \ redistribute connected\n !\n address-family ipv4\n no\ - \ neighbor 10.255.251.6 next-hop address-family ipv6\n !\n vrf Tenant_C_WAN_Zone\n\ - \ rd 192.168.255.9:31\n route-target import evpn 31:31\n route-target\ - \ export evpn 31:31\n router-id 192.168.255.9\n neighbor 10.255.251.6\ - \ peer group MLAG-IPv4-UNDERLAY-PEER\n redistribute connected\n !\n\ - \ address-family ipv4\n no neighbor 10.255.251.6 next-hop address-family\ - \ ipv6\n!\nmanagement api http-commands\n protocol https\n no shutdown\n \ - \ !\n vrf MGMT\n no shutdown\n!\nend\n" + \ redistribute connected\n !\n vrf Tenant_C_WAN_Zone\n rd 192.168.255.9:31\n\ + \ route-target import evpn 31:31\n route-target export evpn 31:31\n\ + \ router-id 192.168.255.9\n neighbor 10.255.251.6 peer group MLAG-IPv4-UNDERLAY-PEER\n\ + \ redistribute connected\n!\nmanagement api http-commands\n protocol https\n\ + \ no shutdown\n !\n vrf MGMT\n no shutdown\n!\nend\n" CVP_TOPOLOGY: DC1_BL1: devices: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg index e54bf40114e..bdce6b119d6 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1A.cfg @@ -187,9 +187,6 @@ router bgp 65101 router-id 192.168.255.21 neighbor 10.255.240.11 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.240.11 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg index b43270c355d..b5e565c149a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/CUSTOM-TEMPLATES-L3LEAF1B.cfg @@ -187,9 +187,6 @@ router bgp 65101 router-id 192.168.255.22 neighbor 10.255.240.10 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.240.10 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg index 2045f5a1213..160daf60111 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3A.cfg @@ -941,9 +941,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 65103:13 @@ -952,9 +949,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 65103:9 @@ -963,9 +957,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 65103:14 @@ -976,9 +967,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 65103:11 @@ -987,9 +975,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 172.31.11.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 172.31.11.7 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 65103:20 @@ -998,9 +983,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 65103:21 @@ -1009,9 +991,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 65103:30 @@ -1020,9 +999,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 65103:31 @@ -1031,9 +1007,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg index 5f83e826bf6..d08651970cd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SVC3B.cfg @@ -915,9 +915,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 65103:13 @@ -926,9 +923,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 65103:9 @@ -937,9 +931,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 65103:14 @@ -950,9 +941,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 65103:11 @@ -961,9 +949,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 172.31.11.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 172.31.11.6 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 65103:20 @@ -972,9 +957,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 65103:21 @@ -983,9 +965,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 65103:30 @@ -994,9 +973,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 65103:31 @@ -1005,9 +981,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg index 46b32caafbd..6f9828107da 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1A.cfg @@ -629,9 +629,6 @@ router bgp 65110 router-id 192.168.255.21 neighbor 10.255.251.25 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.25 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.21:13 @@ -640,9 +637,6 @@ router bgp 65110 router-id 192.168.255.21 neighbor 10.255.251.25 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.25 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.21:9 @@ -651,9 +645,6 @@ router bgp 65110 router-id 192.168.255.21 neighbor 10.255.251.25 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.25 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.21:14 @@ -664,9 +655,6 @@ router bgp 65110 router-id 192.168.255.21 neighbor 10.255.251.25 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.25 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.21:11 @@ -675,9 +663,6 @@ router bgp 65110 router-id 192.168.255.21 neighbor 172.31.11.25 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 172.31.11.25 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.21:20 @@ -686,9 +671,6 @@ router bgp 65110 router-id 192.168.255.21 neighbor 10.255.251.25 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.25 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.21:21 @@ -697,9 +679,6 @@ router bgp 65110 router-id 192.168.255.21 neighbor 10.255.251.25 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.25 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.21:30 @@ -708,9 +687,6 @@ router bgp 65110 router-id 192.168.255.21 neighbor 10.255.251.25 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.25 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.21:31 @@ -719,9 +695,6 @@ router bgp 65110 router-id 192.168.255.21 neighbor 10.255.251.25 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.25 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg index 5c9dbb4c869..2c20d19372d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1_UNDEPLOYED_LEAF1B.cfg @@ -629,9 +629,6 @@ router bgp 65111 router-id 192.168.255.22 neighbor 10.255.251.24 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.24 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.22:13 @@ -640,9 +637,6 @@ router bgp 65111 router-id 192.168.255.22 neighbor 10.255.251.24 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.24 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.22:9 @@ -651,9 +645,6 @@ router bgp 65111 router-id 192.168.255.22 neighbor 10.255.251.24 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.24 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.22:14 @@ -664,9 +655,6 @@ router bgp 65111 router-id 192.168.255.22 neighbor 10.255.251.24 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.24 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.22:11 @@ -675,9 +663,6 @@ router bgp 65111 router-id 192.168.255.22 neighbor 172.31.11.24 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 172.31.11.24 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.22:20 @@ -686,9 +671,6 @@ router bgp 65111 router-id 192.168.255.22 neighbor 10.255.251.24 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.24 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.22:21 @@ -697,9 +679,6 @@ router bgp 65111 router-id 192.168.255.22 neighbor 10.255.251.24 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.24 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.22:30 @@ -708,9 +687,6 @@ router bgp 65111 router-id 192.168.255.22 neighbor 10.255.251.24 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.24 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.22:31 @@ -719,9 +695,6 @@ router bgp 65111 router-id 192.168.255.22 neighbor 10.255.251.24 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.24 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg index f0df354af9c..5606457bb6f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1A.cfg @@ -982,9 +982,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf MULTICAST_DISABLED_310_311 rd 192.168.255.3:13 @@ -993,9 +990,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf MULTICAST_ENABLED_1_2 rd 192.168.255.3:21 @@ -1004,9 +998,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf MULTICAST_ENABLED_3_DISABLED_4 rd 192.168.255.3:22 @@ -1015,9 +1006,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf MULTICAST_ENABLED_110_111 rd 192.168.255.3:11 @@ -1026,9 +1014,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf MULTICAST_ENABLED_210_DISABLED_211 rd 192.168.255.3:12 @@ -1037,9 +1022,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf TEN_C_L3_MULTICAST_DISABLED_330_331 rd 192.168.255.3:33 @@ -1048,9 +1030,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf TEN_C_L3_MULTICAST_ENABLED_130_131 rd 192.168.255.3:31 @@ -1060,9 +1039,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 rd 192.168.255.3:32 @@ -1072,9 +1048,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf TEN_D_L3_MULTICAST_DISABLED_240_241 rd 192.168.255.3:42 @@ -1083,9 +1056,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 rd 192.168.255.3:41 @@ -1095,9 +1065,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE rd 192.168.255.3:55 @@ -1107,9 +1074,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES rd 192.168.255.3:60 @@ -1121,9 +1085,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf TEN_E_L3_MULTICAST_TRANSIT rd 192.168.255.3:52 @@ -1135,9 +1096,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! vrf TEN_E_PEG_L3_MULTICAST_ENABLED rd 192.168.255.3:51 @@ -1147,9 +1105,6 @@ router bgp 65101 router-id 192.168.255.3 neighbor 10.255.251.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.1 next-hop address-family ipv6 ! router multicast ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg index 0ef322f0d0c..5afb5c6738f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/EVPN-MULTICAST-L3LEAF1B.cfg @@ -982,9 +982,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf MULTICAST_DISABLED_310_311 rd 192.168.255.4:13 @@ -993,9 +990,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf MULTICAST_ENABLED_1_2 rd 192.168.255.4:21 @@ -1004,9 +998,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf MULTICAST_ENABLED_3_DISABLED_4 rd 192.168.255.4:22 @@ -1015,9 +1006,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf MULTICAST_ENABLED_110_111 rd 192.168.255.4:11 @@ -1026,9 +1014,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf MULTICAST_ENABLED_210_DISABLED_211 rd 192.168.255.4:12 @@ -1037,9 +1022,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf TEN_C_L3_MULTICAST_DISABLED_330_331 rd 192.168.255.4:33 @@ -1048,9 +1030,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf TEN_C_L3_MULTICAST_ENABLED_130_131 rd 192.168.255.4:31 @@ -1060,9 +1039,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231 rd 192.168.255.4:32 @@ -1072,9 +1048,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf TEN_D_L3_MULTICAST_DISABLED_240_241 rd 192.168.255.4:42 @@ -1083,9 +1056,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141 rd 192.168.255.4:41 @@ -1095,9 +1065,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE rd 192.168.255.4:55 @@ -1107,9 +1074,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES rd 192.168.255.4:60 @@ -1121,9 +1085,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf TEN_E_L3_MULTICAST_TRANSIT rd 192.168.255.4:52 @@ -1135,9 +1096,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! vrf TEN_E_PEG_L3_MULTICAST_ENABLED rd 192.168.255.4:51 @@ -1147,9 +1105,6 @@ router bgp 65101 router-id 192.168.255.4 neighbor 10.255.251.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.0 next-hop address-family ipv6 ! router multicast ipv4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg index b7345b91746..d6de1fca457 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1a.cfg @@ -392,9 +392,6 @@ router bgp 65001 router-id 192.168.250.9 neighbor 10.255.247.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.247.1 next-hop address-family ipv6 ! vrf TG_200 rd 192.168.250.9:200 @@ -403,9 +400,6 @@ router bgp 65001 router-id 192.168.250.9 neighbor 10.255.247.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.247.1 next-hop address-family ipv6 ! vrf TG_300 rd 192.168.250.9:300 @@ -414,9 +408,6 @@ router bgp 65001 router-id 192.168.250.9 neighbor 10.255.247.1 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.247.1 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg index dae60350553..0aa564b2fa0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf1b.cfg @@ -372,9 +372,6 @@ router bgp 65001 router-id 192.168.250.10 neighbor 10.255.247.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.247.0 next-hop address-family ipv6 ! vrf TG_200 rd 192.168.250.10:200 @@ -383,9 +380,6 @@ router bgp 65001 router-id 192.168.250.10 neighbor 10.255.247.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.247.0 next-hop address-family ipv6 ! vrf TG_300 rd 192.168.250.10:300 @@ -394,9 +388,6 @@ router bgp 65001 router-id 192.168.250.10 neighbor 10.255.247.0 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.247.0 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg index 843c2fedc61..aff4b047dcb 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2a.cfg @@ -198,9 +198,6 @@ router bgp 65002 router-id 192.168.250.11 neighbor 10.255.247.5 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.247.5 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg index 361dca59320..583f75a096a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/trunk-group-tests-l3leaf2b.cfg @@ -193,9 +193,6 @@ router bgp 65002 router-id 192.168.250.12 neighbor 10.255.247.4 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.247.4 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml index 772e344b6d8..aea2c8ba242 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1A.yml @@ -66,12 +66,6 @@ router_bgp: neighbors: 10.255.240.11: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.240.11: - next_hop: - address_family_ipv6: - enabled: false vlans: 110: tenant: CUSTOM_TEMPLATES_TENANT diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml index 3bf87cea929..e6f0c55c1c8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/CUSTOM-TEMPLATES-L3LEAF1B.yml @@ -66,12 +66,6 @@ router_bgp: neighbors: 10.255.240.10: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.240.10: - next_hop: - address_family_ipv6: - enabled: false vlans: 110: tenant: CUSTOM_TEMPLATES_TENANT diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml index 4f94c216c14..d272366d818 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3A.yml @@ -100,12 +100,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.12 rd: '65103:13' @@ -121,12 +115,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.12 rd: '65103:9' @@ -142,12 +130,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.12 rd: '65103:14' @@ -165,12 +147,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.12 rd: '65103:11' @@ -186,12 +162,6 @@ router_bgp: neighbors: 172.31.11.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 172.31.11.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.12 rd: '65103:20' @@ -207,12 +177,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.12 rd: '65103:21' @@ -228,12 +192,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.12 rd: '65103:30' @@ -249,12 +207,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.12 rd: '65103:31' @@ -270,12 +222,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: '65103:12' diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml index 9774f98d1f6..03ab68c72cf 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SVC3B.yml @@ -100,12 +100,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.13 rd: '65103:13' @@ -121,12 +115,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.13 rd: '65103:9' @@ -142,12 +130,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.13 rd: '65103:14' @@ -165,12 +147,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.13 rd: '65103:11' @@ -186,12 +162,6 @@ router_bgp: neighbors: 172.31.11.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 172.31.11.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.13 rd: '65103:20' @@ -207,12 +177,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.13 rd: '65103:21' @@ -228,12 +192,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.13 rd: '65103:30' @@ -249,12 +207,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.13 rd: '65103:31' @@ -270,12 +222,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: '65103:12' diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml index ea3b4413a23..5b9ccb6732c 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1A.yml @@ -100,12 +100,6 @@ router_bgp: neighbors: 10.255.251.25: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.25: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.21 rd: 192.168.255.21:13 @@ -121,12 +115,6 @@ router_bgp: neighbors: 10.255.251.25: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.25: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.21 rd: 192.168.255.21:9 @@ -142,12 +130,6 @@ router_bgp: neighbors: 10.255.251.25: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.25: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.21 rd: 192.168.255.21:14 @@ -165,12 +147,6 @@ router_bgp: neighbors: 10.255.251.25: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.25: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.21 rd: 192.168.255.21:11 @@ -186,12 +162,6 @@ router_bgp: neighbors: 172.31.11.25: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 172.31.11.25: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.21 rd: 192.168.255.21:20 @@ -207,12 +177,6 @@ router_bgp: neighbors: 10.255.251.25: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.25: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.21 rd: 192.168.255.21:21 @@ -228,12 +192,6 @@ router_bgp: neighbors: 10.255.251.25: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.25: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.21 rd: 192.168.255.21:30 @@ -249,12 +207,6 @@ router_bgp: neighbors: 10.255.251.25: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.25: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.21 rd: 192.168.255.21:31 @@ -270,12 +222,6 @@ router_bgp: neighbors: 10.255.251.25: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.25: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: 192.168.255.21:12 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml index 814004a4af3..9a27074bef0 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1_UNDEPLOYED_LEAF1B.yml @@ -100,12 +100,6 @@ router_bgp: neighbors: 10.255.251.24: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.24: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.22 rd: 192.168.255.22:13 @@ -121,12 +115,6 @@ router_bgp: neighbors: 10.255.251.24: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.24: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.22 rd: 192.168.255.22:9 @@ -142,12 +130,6 @@ router_bgp: neighbors: 10.255.251.24: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.24: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.22 rd: 192.168.255.22:14 @@ -165,12 +147,6 @@ router_bgp: neighbors: 10.255.251.24: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.24: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.22 rd: 192.168.255.22:11 @@ -186,12 +162,6 @@ router_bgp: neighbors: 172.31.11.24: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 172.31.11.24: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.22 rd: 192.168.255.22:20 @@ -207,12 +177,6 @@ router_bgp: neighbors: 10.255.251.24: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.24: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.22 rd: 192.168.255.22:21 @@ -228,12 +192,6 @@ router_bgp: neighbors: 10.255.251.24: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.24: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.22 rd: 192.168.255.22:30 @@ -249,12 +207,6 @@ router_bgp: neighbors: 10.255.251.24: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.24: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.22 rd: 192.168.255.22:31 @@ -270,12 +222,6 @@ router_bgp: neighbors: 10.255.251.24: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.24: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: 192.168.255.22:12 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml index c2a43543809..4e775643d52 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1A.yml @@ -66,12 +66,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false MULTICAST_ENABLED_110_111: router_id: 192.168.255.3 rd: 192.168.255.3:11 @@ -87,12 +81,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false MULTICAST_ENABLED_210_DISABLED_211: router_id: 192.168.255.3 rd: 192.168.255.3:12 @@ -108,12 +96,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false MULTICAST_DISABLED_5_6: router_id: 192.168.255.3 rd: 192.168.255.3:23 @@ -129,12 +111,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false MULTICAST_ENABLED_1_2: router_id: 192.168.255.3 rd: 192.168.255.3:21 @@ -150,12 +126,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false MULTICAST_ENABLED_3_DISABLED_4: router_id: 192.168.255.3 rd: 192.168.255.3:22 @@ -171,12 +141,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false TEN_C_L3_MULTICAST_DISABLED_330_331: router_id: 192.168.255.3 rd: 192.168.255.3:33 @@ -193,12 +157,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false TEN_C_L3_MULTICAST_ENABLED_130_131: router_id: 192.168.255.3 rd: 192.168.255.3:31 @@ -215,12 +173,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231: router_id: 192.168.255.3 rd: 192.168.255.3:32 @@ -237,12 +189,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false TEN_D_L3_MULTICAST_DISABLED_240_241: router_id: 192.168.255.3 rd: 192.168.255.3:42 @@ -259,12 +205,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141: router_id: 192.168.255.3 rd: 192.168.255.3:41 @@ -281,12 +221,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE: router_id: 192.168.255.3 rd: 192.168.255.3:55 @@ -303,12 +237,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES: router_id: 192.168.255.3 rd: 192.168.255.3:60 @@ -325,12 +253,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false evpn_multicast_address_family: ipv4: transit: true @@ -350,12 +272,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false evpn_multicast_address_family: ipv4: transit: true @@ -375,12 +291,6 @@ router_bgp: neighbors: 10.255.251.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.1: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: MULTICAST_DISABLED_310_311: rd: 192.168.255.3:13 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml index 4b37f20f2e6..62d74ab1d68 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/EVPN-MULTICAST-L3LEAF1B.yml @@ -66,12 +66,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false MULTICAST_ENABLED_110_111: router_id: 192.168.255.4 rd: 192.168.255.4:11 @@ -87,12 +81,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false MULTICAST_ENABLED_210_DISABLED_211: router_id: 192.168.255.4 rd: 192.168.255.4:12 @@ -108,12 +96,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false MULTICAST_DISABLED_5_6: router_id: 192.168.255.4 rd: 192.168.255.4:23 @@ -129,12 +111,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false MULTICAST_ENABLED_1_2: router_id: 192.168.255.4 rd: 192.168.255.4:21 @@ -150,12 +126,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false MULTICAST_ENABLED_3_DISABLED_4: router_id: 192.168.255.4 rd: 192.168.255.4:22 @@ -171,12 +141,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false TEN_C_L3_MULTICAST_DISABLED_330_331: router_id: 192.168.255.4 rd: 192.168.255.4:33 @@ -193,12 +157,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false TEN_C_L3_MULTICAST_ENABLED_130_131: router_id: 192.168.255.4 rd: 192.168.255.4:31 @@ -215,12 +173,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false TEN_C_L3_MULTICAST_ENABLED_230_DISABLED_231: router_id: 192.168.255.4 rd: 192.168.255.4:32 @@ -237,12 +189,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false TEN_D_L3_MULTICAST_DISABLED_240_241: router_id: 192.168.255.4 rd: 192.168.255.4:42 @@ -259,12 +205,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false TEN_D_L3_MULTICAST_ENABLED_140_DISABLED_141: router_id: 192.168.255.4 rd: 192.168.255.4:41 @@ -281,12 +221,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false TEN_E_L3_MULTICAST_ENABLED_PEG_OVERRIDE: router_id: 192.168.255.4 rd: 192.168.255.4:55 @@ -303,12 +237,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false TEN_E_L3_MULTICAST_EVPN_PEG_RP_NODES: router_id: 192.168.255.4 rd: 192.168.255.4:60 @@ -325,12 +253,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false evpn_multicast_address_family: ipv4: transit: true @@ -350,12 +272,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false evpn_multicast_address_family: ipv4: transit: true @@ -375,12 +291,6 @@ router_bgp: neighbors: 10.255.251.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.0: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: MULTICAST_DISABLED_310_311: rd: 192.168.255.4:13 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml index 9ffd7d8d1f3..1cc415e32df 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1a.yml @@ -58,12 +58,6 @@ router_bgp: neighbors: 10.255.247.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.247.1: - next_hop: - address_family_ipv6: - enabled: false TG_200: router_id: 192.168.250.9 rd: 192.168.250.9:200 @@ -79,12 +73,6 @@ router_bgp: neighbors: 10.255.247.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.247.1: - next_hop: - address_family_ipv6: - enabled: false TG_300: router_id: 192.168.250.9 rd: 192.168.250.9:300 @@ -100,12 +88,6 @@ router_bgp: neighbors: 10.255.247.1: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.247.1: - next_hop: - address_family_ipv6: - enabled: false vlans: 100: tenant: TRUNK_GROUP_TESTS diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml index 30ac09c78cd..8db3aaa159d 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf1b.yml @@ -58,12 +58,6 @@ router_bgp: neighbors: 10.255.247.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.247.0: - next_hop: - address_family_ipv6: - enabled: false TG_200: router_id: 192.168.250.10 rd: 192.168.250.10:200 @@ -79,12 +73,6 @@ router_bgp: neighbors: 10.255.247.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.247.0: - next_hop: - address_family_ipv6: - enabled: false TG_300: router_id: 192.168.250.10 rd: 192.168.250.10:300 @@ -100,12 +88,6 @@ router_bgp: neighbors: 10.255.247.0: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.247.0: - next_hop: - address_family_ipv6: - enabled: false vlans: 100: tenant: TRUNK_GROUP_TESTS diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml index d9186ebb4d7..4b3736ea5e2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2a.yml @@ -58,12 +58,6 @@ router_bgp: neighbors: 10.255.247.5: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.247.5: - next_hop: - address_family_ipv6: - enabled: false vlans: 200: tenant: TRUNK_GROUP_TESTS diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml index e85dffa4acd..1fe83188a85 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/trunk-group-tests-l3leaf2b.yml @@ -58,12 +58,6 @@ router_bgp: neighbors: 10.255.247.4: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.247.4: - next_hop: - address_family_ipv6: - enabled: false vlans: 200: tenant: TRUNK_GROUP_TESTS diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests_v4.0/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests_v4.0/intended/structured_configs/DC1-SVC3A.yml index b7b4f8570d6..8a93cc47024 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests_v4.0/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests_v4.0/intended/structured_configs/DC1-SVC3A.yml @@ -100,12 +100,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.12 rd: '65103:13' @@ -121,12 +115,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.12 rd: '65103:9' @@ -142,12 +130,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.12 rd: '65103:14' @@ -165,12 +147,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.12 rd: '65103:11' @@ -186,12 +162,6 @@ router_bgp: neighbors: 172.31.11.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 172.31.11.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.12 rd: '65103:20' @@ -207,12 +177,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.12 rd: '65103:21' @@ -228,12 +192,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.12 rd: '65103:30' @@ -249,12 +207,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.12 rd: '65103:31' @@ -270,12 +222,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: '65103:12' diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests_v4.0/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests_v4.0/intended/structured_configs/DC1-SVC3B.yml index 8f273bdb516..61689464438 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests_v4.0/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests_v4.0/intended/structured_configs/DC1-SVC3B.yml @@ -100,12 +100,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.13 rd: '65103:13' @@ -121,12 +115,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.13 rd: '65103:9' @@ -142,12 +130,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.13 rd: '65103:14' @@ -165,12 +147,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.13 rd: '65103:11' @@ -186,12 +162,6 @@ router_bgp: neighbors: 172.31.11.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 172.31.11.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.13 rd: '65103:20' @@ -207,12 +177,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.13 rd: '65103:21' @@ -228,12 +192,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.13 rd: '65103:30' @@ -249,12 +207,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.13 rd: '65103:31' @@ -270,12 +222,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: '65103:12' diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md index dd03d7c0b75..f16c7eebd62 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md @@ -1487,9 +1487,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.12:13 @@ -1498,9 +1495,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.12:10 @@ -1509,9 +1503,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.12:14 @@ -1523,9 +1514,6 @@ router bgp 65103 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected redistribute static - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.12:11 @@ -1534,9 +1522,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.12:20 @@ -1545,9 +1530,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.12:21 @@ -1556,9 +1538,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.12:30 @@ -1567,9 +1546,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.12:31 @@ -1578,9 +1554,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md index 6f61ec41f37..d5d11468bca 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md @@ -1487,9 +1487,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.13:13 @@ -1498,9 +1495,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.13:10 @@ -1509,9 +1503,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.13:14 @@ -1523,9 +1514,6 @@ router bgp 65103 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected redistribute static - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.13:11 @@ -1534,9 +1522,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.13:20 @@ -1545,9 +1530,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.13:21 @@ -1556,9 +1538,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.13:30 @@ -1567,9 +1546,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.13:31 @@ -1578,9 +1554,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg index b148416fa1e..35b58fa7749 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg @@ -847,9 +847,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.12:13 @@ -858,9 +855,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.12:10 @@ -869,9 +863,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.12:14 @@ -883,9 +874,6 @@ router bgp 65103 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected redistribute static - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.12:11 @@ -894,9 +882,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.12:20 @@ -905,9 +890,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.12:21 @@ -916,9 +898,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.12:30 @@ -927,9 +906,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.12:31 @@ -938,9 +914,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.252.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg index ee1dbd58117..31073a31bde 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg @@ -847,9 +847,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.13:13 @@ -858,9 +855,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.13:10 @@ -869,9 +863,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.13:14 @@ -883,9 +874,6 @@ router bgp 65103 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected redistribute static - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.13:11 @@ -894,9 +882,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.13:20 @@ -905,9 +890,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.13:21 @@ -916,9 +898,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.13:30 @@ -927,9 +906,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.13:31 @@ -938,9 +914,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.252.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml index a174f860fd4..2f287d92c52 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml @@ -99,12 +99,6 @@ router_bgp: neighbors: 10.255.252.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:13 @@ -120,12 +114,6 @@ router_bgp: neighbors: 10.255.252.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:10 @@ -141,12 +129,6 @@ router_bgp: neighbors: 10.255.252.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:14 @@ -165,12 +147,6 @@ router_bgp: neighbors: 10.255.252.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:11 @@ -186,12 +162,6 @@ router_bgp: neighbors: 10.255.252.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:20 @@ -207,12 +177,6 @@ router_bgp: neighbors: 10.255.252.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:21 @@ -228,12 +192,6 @@ router_bgp: neighbors: 10.255.252.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:30 @@ -249,12 +207,6 @@ router_bgp: neighbors: 10.255.252.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:31 @@ -270,12 +222,6 @@ router_bgp: neighbors: 10.255.252.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.7: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: 192.168.255.12:12 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml index 7b0ff281c3f..e400e501fdc 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml @@ -99,12 +99,6 @@ router_bgp: neighbors: 10.255.252.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:13 @@ -120,12 +114,6 @@ router_bgp: neighbors: 10.255.252.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:10 @@ -141,12 +129,6 @@ router_bgp: neighbors: 10.255.252.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:14 @@ -165,12 +147,6 @@ router_bgp: neighbors: 10.255.252.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:11 @@ -186,12 +162,6 @@ router_bgp: neighbors: 10.255.252.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:20 @@ -207,12 +177,6 @@ router_bgp: neighbors: 10.255.252.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:21 @@ -228,12 +192,6 @@ router_bgp: neighbors: 10.255.252.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:30 @@ -249,12 +207,6 @@ router_bgp: neighbors: 10.255.252.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:31 @@ -270,12 +222,6 @@ router_bgp: neighbors: 10.255.252.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.252.6: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: 192.168.255.13:12 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md index ef90a270fba..b233d4b6447 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2A.md @@ -746,9 +746,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md index 1c54905e770..a60094fa714 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-LEAF2B.md @@ -746,9 +746,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md index a6f4d4d8eaf..2fc841a3726 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3A.md @@ -739,9 +739,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.252.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md index e4e2adb0f3e..643d73c3e1c 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/documentation/devices/DC1-SVC3B.md @@ -739,9 +739,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.252.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg index f97416d795a..d930d1717bd 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2A.cfg @@ -245,9 +245,6 @@ router bgp 65102 router-id 192.168.255.6 neighbor 10.255.251.3 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.3 next-hop address-family ipv6 ! router ospf 101 router-id 192.168.255.6 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg index 293d19711fa..717ba67a3ee 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-LEAF2B.cfg @@ -245,9 +245,6 @@ router bgp 65102 router-id 192.168.255.7 neighbor 10.255.251.2 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.2 next-hop address-family ipv6 ! router ospf 101 router-id 192.168.255.7 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3A.cfg index a06e2389248..b0ce9c28628 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3A.cfg @@ -240,9 +240,6 @@ router bgp 65103 router-id 192.168.255.8 neighbor 10.255.252.7 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.7 next-hop address-family ipv6 ! router ospf 101 router-id 192.168.255.8 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3B.cfg index 8c37c1fe088..b1cb4322d85 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/configs/DC1-SVC3B.cfg @@ -240,9 +240,6 @@ router bgp 65103 router-id 192.168.255.9 neighbor 10.255.252.6 peer group MLAG-IPv4-UNDERLAY-PEER redistribute connected - ! - address-family ipv4 - no neighbor 10.255.252.6 next-hop address-family ipv6 ! router ospf 101 router-id 192.168.255.9 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml index 108201f0d5d..b10dc0a7553 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml @@ -70,12 +70,6 @@ router_bgp: neighbors: 10.255.251.3: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.3: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_B_OP_Zone: rd: 192.168.255.6:20 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml index 5dbc9b698ba..0dc0a15882d 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml @@ -70,12 +70,6 @@ router_bgp: neighbors: 10.255.251.2: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.251.2: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_B_OP_Zone: rd: 192.168.255.7:20 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml index a88b766ed53..c2d133e8e05 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml @@ -70,12 +70,6 @@ router_bgp: neighbors: 10.255.252.7: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.252.7: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_B_OP_Zone: rd: 192.168.255.8:20 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml index a05eea78c5d..10d588714e0 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ospf_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml @@ -70,12 +70,6 @@ router_bgp: neighbors: 10.255.252.6: peer_group: MLAG-IPv4-UNDERLAY-PEER - address_family_ipv4: - neighbors: - 10.255.252.6: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_B_OP_Zone: rd: 192.168.255.9:20 diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md index 819c025c558..d5e02e10478 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3A.md @@ -1424,9 +1424,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.12:13 @@ -1435,9 +1432,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.12:10 @@ -1446,9 +1440,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.12:14 @@ -1459,9 +1450,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.12:11 @@ -1470,9 +1458,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.12:20 @@ -1481,9 +1466,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.12:21 @@ -1492,9 +1474,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.12:30 @@ -1503,9 +1482,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.12:31 @@ -1514,9 +1490,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md index a68a294be6c..8795336ad7b 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/documentation/devices/DC1-SVC3B.md @@ -1424,9 +1424,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.13:13 @@ -1435,9 +1432,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.13:10 @@ -1446,9 +1440,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.13:14 @@ -1459,9 +1450,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.13:11 @@ -1470,9 +1458,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.13:20 @@ -1481,9 +1466,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.13:21 @@ -1492,9 +1474,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.13:30 @@ -1503,9 +1482,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.13:31 @@ -1514,9 +1490,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ``` # BFD diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg index 9ac31327997..051aae4860f 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3A.cfg @@ -791,9 +791,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.12:13 @@ -802,9 +799,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.12:10 @@ -813,9 +807,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.12:14 @@ -826,9 +817,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.12:11 @@ -837,9 +825,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.12:20 @@ -848,9 +833,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.12:21 @@ -859,9 +841,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.12:30 @@ -870,9 +849,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.12:31 @@ -881,9 +857,6 @@ router bgp 65103 router-id 192.168.255.12 neighbor 10.255.251.7 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.7 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg index 7855e39105f..1451c8d19ad 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/configs/DC1-SVC3B.cfg @@ -791,9 +791,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_DB_Zone rd 192.168.255.13:13 @@ -802,9 +799,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_OP_Zone rd 192.168.255.13:10 @@ -813,9 +807,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_WAN_Zone rd 192.168.255.13:14 @@ -826,9 +817,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_A_WEB_Zone rd 192.168.255.13:11 @@ -837,9 +825,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_B_OP_Zone rd 192.168.255.13:20 @@ -848,9 +833,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_B_WAN_Zone rd 192.168.255.13:21 @@ -859,9 +841,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_C_OP_Zone rd 192.168.255.13:30 @@ -870,9 +849,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! vrf Tenant_C_WAN_Zone rd 192.168.255.13:31 @@ -881,9 +857,6 @@ router bgp 65103 router-id 192.168.255.13 neighbor 10.255.251.6 peer group MLAG-PEERS redistribute connected - ! - address-family ipv4 - no neighbor 10.255.251.6 next-hop address-family ipv6 ! management api http-commands protocol https diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml index ac38e11c61b..5aacdee4f7c 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml @@ -101,12 +101,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:13 @@ -122,12 +116,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:10 @@ -143,12 +131,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:14 @@ -166,12 +148,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:11 @@ -187,12 +163,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:20 @@ -208,12 +178,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:21 @@ -229,12 +193,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:30 @@ -250,12 +208,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.12 rd: 192.168.255.12:31 @@ -271,12 +223,6 @@ router_bgp: neighbors: 10.255.251.7: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.7: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: 192.168.255.12:12 diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml index 66d3f3d3c81..65b5259db98 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml @@ -101,12 +101,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_DB_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:13 @@ -122,12 +116,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_OP_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:10 @@ -143,12 +131,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WAN_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:14 @@ -166,12 +148,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_A_WEB_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:11 @@ -187,12 +163,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_OP_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:20 @@ -208,12 +178,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_B_WAN_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:21 @@ -229,12 +193,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_OP_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:30 @@ -250,12 +208,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false Tenant_C_WAN_Zone: router_id: 192.168.255.13 rd: 192.168.255.13:31 @@ -271,12 +223,6 @@ router_bgp: neighbors: 10.255.251.6: peer_group: MLAG-PEERS - address_family_ipv4: - neighbors: - 10.255.251.6: - next_hop: - address_family_ipv6: - enabled: false vlan_aware_bundles: Tenant_A_APP_Zone: rd: 192.168.255.13:12 diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/Input Variables.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/Input Variables.md index dbc96aa25ae..0816c2e6b88 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/Input Variables.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/Input Variables.md @@ -4352,6 +4352,20 @@ router_bfd: | [        default_originate](## "router_bgp.address_family_ipv4.neighbors.[].default_originate") | Dictionary | | | | | | [          always](## "router_bgp.address_family_ipv4.neighbors.[].default_originate.always") | Boolean | | | | | | [          route_map](## "router_bgp.address_family_ipv4.neighbors.[].default_originate.route_map") | String | | | | | +| [  address_family_ipv4_multicast](## "router_bgp.address_family_ipv4_multicast") | Dictionary | | | | | +| [    peer_groups](## "router_bgp.address_family_ipv4_multicast.peer_groups") | List, items: Dictionary | | | | | +| [      - name](## "router_bgp.address_family_ipv4_multicast.peer_groups.[].name") | String | Required, Unique | | | Peer-group name | +| [        activate](## "router_bgp.address_family_ipv4_multicast.peer_groups.[].activate") | Boolean | | | | | +| [        route_map_in](## "router_bgp.address_family_ipv4_multicast.peer_groups.[].route_map_in") | String | | | | Inbound route-map name | +| [        route_map_out](## "router_bgp.address_family_ipv4_multicast.peer_groups.[].route_map_out") | String | | | | Outbound route-map name | +| [    neighbors](## "router_bgp.address_family_ipv4_multicast.neighbors") | List, items: Dictionary | | | | | +| [      - ip_address](## "router_bgp.address_family_ipv4_multicast.neighbors.[].ip_address") | String | Required, Unique | | | | +| [        activate](## "router_bgp.address_family_ipv4_multicast.neighbors.[].activate") | Boolean | | | | | +| [        route_map_in](## "router_bgp.address_family_ipv4_multicast.neighbors.[].route_map_in") | String | | | | Inbound route-map name | +| [        route_map_out](## "router_bgp.address_family_ipv4_multicast.neighbors.[].route_map_out") | String | | | | Outbound route-map name | +| [    redistribute_routes](## "router_bgp.address_family_ipv4_multicast.redistribute_routes") | List, items: Dictionary | | | | | +| [      - source_protocol](## "router_bgp.address_family_ipv4_multicast.redistribute_routes.[].source_protocol") | String | Required, Unique | | | | +| [        route_map](## "router_bgp.address_family_ipv4_multicast.redistribute_routes.[].route_map") | String | | | | | | [  address_family_ipv6](## "router_bgp.address_family_ipv6") | Dictionary | | | | | | [    networks](## "router_bgp.address_family_ipv6.networks") | List, items: Dictionary | | | | | | [      - prefix](## "router_bgp.address_family_ipv6.networks.[].prefix") | String | Required, Unique | | | IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I" | @@ -4373,20 +4387,6 @@ router_bfd: | [    redistribute_routes](## "router_bgp.address_family_ipv6.redistribute_routes") | List, items: Dictionary | | | | | | [      - source_protocol](## "router_bgp.address_family_ipv6.redistribute_routes.[].source_protocol") | String | Required, Unique | | | | | [        route_map](## "router_bgp.address_family_ipv6.redistribute_routes.[].route_map") | String | | | | | -| [  address_family_ipv4_multicast](## "router_bgp.address_family_ipv4_multicast") | Dictionary | | | | | -| [    peer_groups](## "router_bgp.address_family_ipv4_multicast.peer_groups") | List, items: Dictionary | | | | | -| [      - name](## "router_bgp.address_family_ipv4_multicast.peer_groups.[].name") | String | Required, Unique | | | Peer-group name | -| [        activate](## "router_bgp.address_family_ipv4_multicast.peer_groups.[].activate") | Boolean | | | | | -| [        route_map_in](## "router_bgp.address_family_ipv4_multicast.peer_groups.[].route_map_in") | String | | | | Inbound route-map name | -| [        route_map_out](## "router_bgp.address_family_ipv4_multicast.peer_groups.[].route_map_out") | String | | | | Outbound route-map name | -| [    neighbors](## "router_bgp.address_family_ipv4_multicast.neighbors") | List, items: Dictionary | | | | | -| [      - ip_address](## "router_bgp.address_family_ipv4_multicast.neighbors.[].ip_address") | String | Required, Unique | | | | -| [        activate](## "router_bgp.address_family_ipv4_multicast.neighbors.[].activate") | Boolean | | | | | -| [        route_map_in](## "router_bgp.address_family_ipv4_multicast.neighbors.[].route_map_in") | String | | | | Inbound route-map name | -| [        route_map_out](## "router_bgp.address_family_ipv4_multicast.neighbors.[].route_map_out") | String | | | | Outbound route-map name | -| [    redistribute_routes](## "router_bgp.address_family_ipv4_multicast.redistribute_routes") | List, items: Dictionary | | | | | -| [      - source_protocol](## "router_bgp.address_family_ipv4_multicast.redistribute_routes.[].source_protocol") | String | Required, Unique | | | | -| [        route_map](## "router_bgp.address_family_ipv4_multicast.redistribute_routes.[].route_map") | String | | | | | | [  address_family_vpn_ipv4](## "router_bgp.address_family_vpn_ipv4") | Dictionary | | | | | | [    domain_identifier](## "router_bgp.address_family_vpn_ipv4.domain_identifier") | String | | | | | | [    peer_groups](## "router_bgp.address_family_vpn_ipv4.peer_groups") | List, items: Dictionary | | | | | @@ -4817,38 +4817,38 @@ router_bgp: default_originate: always: route_map: - address_family_ipv6: - networks: - - prefix: - route_map: + address_family_ipv4_multicast: peer_groups: - name: activate: route_map_in: route_map_out: - prefix_list_in: - prefix_list_out: neighbors: - ip_address: activate: route_map_in: route_map_out: - prefix_list_in: - prefix_list_out: redistribute_routes: - source_protocol: route_map: - address_family_ipv4_multicast: + address_family_ipv6: + networks: + - prefix: + route_map: peer_groups: - name: activate: route_map_in: route_map_out: + prefix_list_in: + prefix_list_out: neighbors: - ip_address: activate: route_map_in: route_map_out: + prefix_list_in: + prefix_list_out: redistribute_routes: - source_protocol: route_map: diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json index 28e6a02e889..e98d86f667b 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json @@ -9789,32 +9789,9 @@ "additionalProperties": false, "title": "Address Family IPv4" }, - "address_family_ipv6": { + "address_family_ipv4_multicast": { "type": "object", "properties": { - "networks": { - "type": "array", - "items": { - "type": "object", - "properties": { - "prefix": { - "description": "IPv4 prefix \"A.B.C.D/E\" or IPv6 prefix \"A:B:C:D:E:F:G:H/I\"", - "type": "string", - "title": "Prefix" - }, - "route_map": { - "description": "Route-map name", - "type": "string", - "title": "Route Map" - } - }, - "additionalProperties": false, - "required": [ - "prefix" - ] - }, - "title": "Networks" - }, "peer_groups": { "type": "array", "items": { @@ -9838,16 +9815,6 @@ "type": "string", "description": "Outbound route-map name", "title": "Route Map Out" - }, - "prefix_list_in": { - "type": "string", - "description": "Inbound prefix-list name", - "title": "Prefix List In" - }, - "prefix_list_out": { - "type": "string", - "description": "Outbound prefix-list name", - "title": "Prefix List Out" } }, "additionalProperties": false, @@ -9879,16 +9846,6 @@ "type": "string", "description": "Outbound route-map name", "title": "Route Map Out" - }, - "prefix_list_in": { - "type": "string", - "description": "Inbound prefix-list name", - "title": "Prefix List In" - }, - "prefix_list_out": { - "type": "string", - "description": "Outbound prefix-list name", - "title": "Prefix List Out" } }, "additionalProperties": false, @@ -9921,11 +9878,34 @@ } }, "additionalProperties": false, - "title": "Address Family IPv6" + "title": "Address Family IPv4 Multicast" }, - "address_family_ipv4_multicast": { + "address_family_ipv6": { "type": "object", "properties": { + "networks": { + "type": "array", + "items": { + "type": "object", + "properties": { + "prefix": { + "description": "IPv4 prefix \"A.B.C.D/E\" or IPv6 prefix \"A:B:C:D:E:F:G:H/I\"", + "type": "string", + "title": "Prefix" + }, + "route_map": { + "description": "Route-map name", + "type": "string", + "title": "Route Map" + } + }, + "additionalProperties": false, + "required": [ + "prefix" + ] + }, + "title": "Networks" + }, "peer_groups": { "type": "array", "items": { @@ -9949,6 +9929,16 @@ "type": "string", "description": "Outbound route-map name", "title": "Route Map Out" + }, + "prefix_list_in": { + "type": "string", + "description": "Inbound prefix-list name", + "title": "Prefix List In" + }, + "prefix_list_out": { + "type": "string", + "description": "Outbound prefix-list name", + "title": "Prefix List Out" } }, "additionalProperties": false, @@ -9980,6 +9970,16 @@ "type": "string", "description": "Outbound route-map name", "title": "Route Map Out" + }, + "prefix_list_in": { + "type": "string", + "description": "Inbound prefix-list name", + "title": "Prefix List In" + }, + "prefix_list_out": { + "type": "string", + "description": "Outbound prefix-list name", + "title": "Prefix List Out" } }, "additionalProperties": false, @@ -10012,7 +10012,7 @@ } }, "additionalProperties": false, - "title": "Address Family IPv4 Multicast" + "title": "Address Family IPv6" }, "address_family_vpn_ipv4": { "type": "object", diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml index e898fbac82e..e1d91bc008d 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml @@ -6793,23 +6793,9 @@ keys: type: bool route_map: type: str - address_family_ipv6: + address_family_ipv4_multicast: type: dict keys: - networks: - type: list - primary_key: prefix - convert_types: - - dict - items: - type: dict - keys: - prefix: - description: IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I" - type: str - route_map: - description: Route-map name - type: str peer_groups: type: list primary_key: name @@ -6829,12 +6815,6 @@ keys: route_map_out: type: str description: Outbound route-map name - prefix_list_in: - type: str - description: Inbound prefix-list name - prefix_list_out: - type: str - description: Outbound prefix-list name neighbors: type: list primary_key: ip_address @@ -6853,12 +6833,6 @@ keys: route_map_out: type: str description: Outbound route-map name - prefix_list_in: - type: str - description: Inbound prefix-list name - prefix_list_out: - type: str - description: Outbound prefix-list name redistribute_routes: type: list primary_key: source_protocol @@ -6871,9 +6845,23 @@ keys: type: str route_map: type: str - address_family_ipv4_multicast: + address_family_ipv6: type: dict keys: + networks: + type: list + primary_key: prefix + convert_types: + - dict + items: + type: dict + keys: + prefix: + description: IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I" + type: str + route_map: + description: Route-map name + type: str peer_groups: type: list primary_key: name @@ -6893,6 +6881,12 @@ keys: route_map_out: type: str description: Outbound route-map name + prefix_list_in: + type: str + description: Inbound prefix-list name + prefix_list_out: + type: str + description: Outbound prefix-list name neighbors: type: list primary_key: ip_address @@ -6911,6 +6905,12 @@ keys: route_map_out: type: str description: Outbound route-map name + prefix_list_in: + type: str + description: Inbound prefix-list name + prefix_list_out: + type: str + description: Outbound prefix-list name redistribute_routes: type: list primary_key: source_protocol diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/router_bgp.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/router_bgp.schema.yml index d61a9a71d80..54a5cf27d9e 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/router_bgp.schema.yml +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/router_bgp.schema.yml @@ -898,23 +898,9 @@ keys: type: bool route_map: type: str - address_family_ipv6: + address_family_ipv4_multicast: type: dict keys: - networks: - type: list - primary_key: prefix - convert_types: - - dict - items: - type: dict - keys: - prefix: - description: IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I" - type: str - route_map: - description: Route-map name - type: str peer_groups: type: list primary_key: name @@ -934,12 +920,6 @@ keys: route_map_out: type: str description: Outbound route-map name - prefix_list_in: - type: str - description: Inbound prefix-list name - prefix_list_out: - type: str - description: Outbound prefix-list name neighbors: type: list primary_key: ip_address @@ -958,12 +938,6 @@ keys: route_map_out: type: str description: Outbound route-map name - prefix_list_in: - type: str - description: Inbound prefix-list name - prefix_list_out: - type: str - description: Outbound prefix-list name redistribute_routes: type: list primary_key: source_protocol @@ -976,9 +950,23 @@ keys: type: str route_map: type: str - address_family_ipv4_multicast: + address_family_ipv6: type: dict keys: + networks: + type: list + primary_key: prefix + convert_types: + - dict + items: + type: dict + keys: + prefix: + description: IPv4 prefix "A.B.C.D/E" or IPv6 prefix "A:B:C:D:E:F:G:H/I" + type: str + route_map: + description: Route-map name + type: str peer_groups: type: list primary_key: name @@ -998,6 +986,12 @@ keys: route_map_out: type: str description: Outbound route-map name + prefix_list_in: + type: str + description: Inbound prefix-list name + prefix_list_out: + type: str + description: Outbound prefix-list name neighbors: type: list primary_key: ip_address @@ -1016,6 +1010,12 @@ keys: route_map_out: type: str description: Outbound route-map name + prefix_list_in: + type: str + description: Inbound prefix-list name + prefix_list_out: + type: str + description: Outbound prefix-list name redistribute_routes: type: list primary_key: source_protocol diff --git a/ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/router_bgp.py b/ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/router_bgp.py index 7aa9c18efa3..dfc89624a55 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/router_bgp.py +++ b/ansible_collections/arista/avd/roles/eos_designs/python_modules/network_services/router_bgp.py @@ -184,27 +184,24 @@ def _router_bgp_vrfs(self) -> dict | None: ip_address = self._mlag_peer_ibgp_ip bgp_vrf.setdefault("neighbors", {})[ip_address] = {"peer_group": self._peer_group_mlag_ipv4_underlay_peer_name} - # raise Exception(bgp_vrf) - if self._underlay_rfc5549: + if self._underlay_rfc5549(): bgp_vrf.setdefault("address_family_ipv4", {}).setdefault("neighbors", {}).update( { ip_address: { "next_hop": { "address_family_ipv6": { "enabled": False, - } - }, - } + } + }, + } } ) address_families = {} for bgp_peer in vrf["bgp_peers"]: peer_ip = bgp_peer.pop("ip_address") - address_family = f"ipv{ipaddress.ip_address(peer_ip).version}" address_families.setdefault(address_family, {}).setdefault("neighbors", {})[peer_ip] = {"activate": True} - if bgp_peer.get("set_ipv4_next_hop") is not None or bgp_peer.get("set_ipv6_next_hop") is not None: route_map = f"RM-{vrf_name}-{peer_ip}-SET-NEXT-HOP-OUT" bgp_peer["route_map_out"] = route_map