Correcting the _underlay_rfc5549 method call and molecule output

aristanetworks · Jul 21, 2023 · 002e19b · 002e19b
1 parent 927cfdb
commit 002e19b
Show file tree

Hide file tree

Showing 87 changed files with 216 additions and 2,067 deletions.
diff --git a/...lections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1a.md b/...lections/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/...lections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf1b.md b/...lections/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/...lections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2a.md b/...lections/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/...lections/arista/avd/examples/single-dc-l3ls/documentation/devices/dc1-leaf2b.md b/...lections/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
@@ -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
@@ -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
@@ -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
@@ -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/...collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1a.yml b/...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/...collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf1b.yml b/...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/...collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2a.yml b/...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/...collections/arista/avd/examples/single-dc-l3ls/intended/structured_configs/dc1-leaf2b.yml b/...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/...ections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/router-bgp-v4-evpn.yml b/...ections/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/...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1A.md b/...ons/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/...ons/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-BL1B.md b/...ons/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/...s/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-LEAF2A.md b/...s/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