diff --git a/ansible_collections/arista/avd/collections.yml b/ansible_collections/arista/avd/collections.yml index 45cb3f50f74..fad8c9460f5 100644 --- a/ansible_collections/arista/avd/collections.yml +++ b/ansible_collections/arista/avd/collections.yml @@ -1,5 +1,6 @@ # collection requirements leveraged by molecule collections: - - arista.cvp - - arista.eos - - ansible.netcommon + - name: arista.cvp + - name: arista.eos + - name: ansible.netcommon + version: ">=2.4.0,<2.6.0" diff --git a/ansible_collections/arista/avd/docs/release-notes/3.x.x.md b/ansible_collections/arista/avd/docs/release-notes/3.x.x.md index 7a8ddbd9d80..892d55abab3 100644 --- a/ansible_collections/arista/avd/docs/release-notes/3.x.x.md +++ b/ansible_collections/arista/avd/docs/release-notes/3.x.x.md @@ -2,6 +2,14 @@ Documentation for AVD version `3.x.x` [available here](https://www.avd.sh/en/releases-v3.x.x/) +## Release 3.3.3 + +### Fixed issues + +- d0e081944 Fix: Set requirement for ansible.netcommon to <2.6 (#1557) +- 177957356 Fix(eos_designs): Feature interaction issues with evpn_services_l2_only (#1556) +- f60a7f5db Doc(eos_designs): Fix missing max_parallel_uplinks (#1551) + ## Release 3.3.2 ### Fixed issues diff --git a/ansible_collections/arista/avd/galaxy.yml b/ansible_collections/arista/avd/galaxy.yml index abaa2ee6047..0006dd15c0b 100644 --- a/ansible_collections/arista/avd/galaxy.yml +++ b/ansible_collections/arista/avd/galaxy.yml @@ -9,7 +9,7 @@ namespace: arista name: avd # The version of the collection. Must be compatible with semantic versioning -version: 3.3.2 +version: 3.3.3 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md @@ -39,7 +39,7 @@ tags: ['arista', 'network', 'networking', 'eos', 'avd', 'cloudvision', 'cvp'] dependencies: "arista.cvp": ">=3.2.0" "arista.eos": ">=3.1.0" - "ansible.netcommon": ">=2.4.0" + "ansible.netcommon": ">=2.4.0,<2.6.0" # The URL of the originating SCM repository repository: https://github.com/aristanetworks/ansible-avd 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 c389d8b98ce..3947c07e9d8 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 @@ -694,9 +694,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.6 vxlan_interface: Vxlan1: description: DC1-LEAF2A_VTEP @@ -742,3 +739,6 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.6 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 731fc3d0169..72bf2f256db 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 @@ -694,9 +694,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.7 vxlan_interface: Vxlan1: description: DC1-LEAF2B_VTEP @@ -742,3 +739,6 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.7 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 89464213af6..90ed3928a4e 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 @@ -854,9 +854,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.8 vxlan_interface: Vxlan1: description: DC1-SVC3A_VTEP @@ -914,3 +911,6 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.8 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 268c889e62f..41fbf68e79e 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 @@ -835,9 +835,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.9 vxlan_interface: Vxlan1: description: DC1-SVC3B_VTEP @@ -895,3 +892,6 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.9 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md new file mode 100644 index 00000000000..a1680aa1c1e --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-L2LEAF2A.md @@ -0,0 +1,330 @@ +# DC2-POD1-L2LEAF2A +# Table of Contents + +- [Management](#management) + - [Management Interfaces](#management-interfaces) + - [Management API HTTP](#management-api-http) +- [Authentication](#authentication) + - [Local Users](#local-users) +- [Monitoring](#monitoring) + - [SNMP](#snmp) +- [Spanning Tree](#spanning-tree) + - [Spanning Tree Summary](#spanning-tree-summary) + - [Spanning Tree Device Configuration](#spanning-tree-device-configuration) +- [Internal VLAN Allocation Policy](#internal-vlan-allocation-policy) + - [Internal VLAN Allocation Policy Summary](#internal-vlan-allocation-policy-summary) + - [Internal VLAN Allocation Policy Configuration](#internal-vlan-allocation-policy-configuration) +- [VLANs](#vlans) + - [VLANs Summary](#vlans-summary) + - [VLANs Device Configuration](#vlans-device-configuration) +- [Interfaces](#interfaces) + - [Ethernet Interfaces](#ethernet-interfaces) + - [Port-Channel Interfaces](#port-channel-interfaces) +- [Routing](#routing) + - [Service Routing Protocols Model](#service-routing-protocols-model) + - [IP Routing](#ip-routing) + - [IPv6 Routing](#ipv6-routing) + - [Static Routes](#static-routes) +- [Multicast](#multicast) + - [IP IGMP Snooping](#ip-igmp-snooping) +- [Filters](#filters) +- [ACL](#acl) +- [VRF Instances](#vrf-instances) + - [VRF Instances Summary](#vrf-instances-summary) + - [VRF Instances Device Configuration](#vrf-instances-device-configuration) +- [Quality Of Service](#quality-of-service) +- [EOS CLI](#eos-cli) + +# Management + +## Management Interfaces + +### Management Interfaces Summary + +#### IPv4 + +| Management Interface | description | Type | VRF | IP Address | Gateway | +| -------------------- | ----------- | ---- | --- | ---------- | ------- | +| Management1 | oob_management | oob | MGMT | 192.168.1.25/24 | 192.168.1.254 | +| Vlan4092 | L2LEAF_INBAND_MGMT | inband | default | 172.21.210.5/24 | 172.21.210.1 | + +#### IPv6 + +| Management Interface | description | Type | VRF | IPv6 Address | IPv6 Gateway | +| -------------------- | ----------- | ---- | --- | ------------ | ------------ | +| Management1 | oob_management | oob | MGMT | - | - | +| Vlan4092 | L2LEAF_INBAND_MGMT | inband | default | - | - | + +### Management Interfaces Device Configuration + +```eos +! +interface Management1 + description oob_management + no shutdown + vrf MGMT + ip address 192.168.1.25/24 +! +interface Vlan4092 + description L2LEAF_INBAND_MGMT + no shutdown + ip address 172.21.210.5/24 +``` + +## Management API HTTP + +### Management API HTTP Summary + +| HTTP | HTTPS | +| ---- | ----- | +| False | True | + +### Management API VRF Access + +| VRF Name | IPv4 ACL | IPv6 ACL | +| -------- | -------- | -------- | +| MGMT | - | - | + +### Management API HTTP Configuration + +```eos +! +management api http-commands + protocol https + no shutdown + ! + vrf MGMT + no shutdown +``` + +# Authentication + +## Local Users + +### Local Users Summary + +| User | Privilege | Role | +| ---- | --------- | ---- | +| admin | 15 | network-admin | + +### Local Users Device Configuration + +```eos +! +username admin privilege 15 role network-admin secret sha512 $6$eJ5TvI8oru5i9e8G$R1X/SbtGTk9xoEHEBQASc7SC2nHYmi.crVgp2pXuCXwxsXEA81e4E0cXgQ6kX08fIeQzauqhv2kS.RGJFCon5/ +``` + +# Monitoring + +## SNMP + +### SNMP Configuration Summary + +| Contact | Location | SNMP Traps | State | +| ------- | -------- | ---------- | ----- | +| - | TWODC_5STAGE_CLOS DC2 DC2_POD1 DC2-POD1-L2LEAF2A | All | Disabled | + +### SNMP Device Configuration + +```eos +! +snmp-server location TWODC_5STAGE_CLOS DC2 DC2_POD1 DC2-POD1-L2LEAF2A +``` + +# Spanning Tree + +## Spanning Tree Summary + +STP mode: **mstp** + +### MSTP Instance and Priority + +| Instance(s) | Priority | +| -------- | -------- | +| 0 | 8192 | + +## Spanning Tree Device Configuration + +```eos +! +spanning-tree mode mstp +spanning-tree mst 0 priority 8192 +``` + +# Internal VLAN Allocation Policy + +## Internal VLAN Allocation Policy Summary + +| Policy Allocation | Range Beginning | Range Ending | +| ------------------| --------------- | ------------ | +| ascending | 1006 | 1199 | + +## Internal VLAN Allocation Policy Configuration + +```eos +! +vlan internal order ascending range 1006 1199 +``` + +# VLANs + +## VLANs Summary + +| VLAN ID | Name | Trunk Groups | +| ------- | ---- | ------------ | +| 4092 | L2LEAF_INBAND_MGMT | - | + +## VLANs Device Configuration + +```eos +! +vlan 4092 + name L2LEAF_INBAND_MGMT +``` + +# Interfaces + +## Ethernet Interfaces + +### Ethernet Interfaces Summary + +#### L2 + +| Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group | +| --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- | +| Ethernet1 | DC2-POD1-LEAF2A_Ethernet3 | *trunk | *4092 | *- | *- | 1 | + +*Inherited from Port-Channel Interface + +### Ethernet Interfaces Device Configuration + +```eos +! +interface Ethernet1 + description DC2-POD1-LEAF2A_Ethernet3 + no shutdown + channel-group 1 mode active +``` + +## Port-Channel Interfaces + +### Port-Channel Interfaces Summary + +#### L2 + +| Interface | Description | Type | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | +| --------- | ----------- | ---- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | +| Port-Channel1 | DC2-POD1-LEAF2A_Po3 | switched | trunk | 4092 | - | - | - | - | - | - | + +### Port-Channel Interfaces Device Configuration + +```eos +! +interface Port-Channel1 + description DC2-POD1-LEAF2A_Po3 + no shutdown + switchport + switchport trunk allowed vlan 4092 + switchport mode trunk + service-profile QOS-PROFILE +``` + +# Routing +## Service Routing Protocols Model + +Multi agent routing protocol model enabled + +```eos +! +service routing protocols model multi-agent +``` + +## IP Routing + +### IP Routing Summary + +| VRF | Routing Enabled | +| --- | --------------- | +| default | true | +| MGMT | false | + +### IP Routing Device Configuration + +```eos +! +ip routing +no ip routing vrf MGMT +``` +## IPv6 Routing + +### IPv6 Routing Summary + +| VRF | Routing Enabled | +| --- | --------------- | +| default | false | +| MGMT | false | + +## Static Routes + +### Static Routes Summary + +| VRF | Destination Prefix | Next Hop IP | Exit interface | Administrative Distance | Tag | Route Name | Metric | +| --- | ------------------ | ----------------------- | ------------------- | ----------------------------- | ----------------- | ----------------------------- | -------------- | +| MGMT | 0.0.0.0/0 | 192.168.1.254 | - | 1 | - | - | - | +| default | 0.0.0.0/0 | 172.21.210.1 | - | 1 | - | - | - | + +### Static Routes Device Configuration + +```eos +! +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 +ip route 0.0.0.0/0 172.21.210.1 +``` + +# Multicast + +## IP IGMP Snooping + +### IP IGMP Snooping Summary + +| IGMP Snooping | Fast Leave | Interface Restart Query | Proxy | Restart Query Interval | Robustness Variable | +| ------------- | ---------- | ----------------------- | ----- | ---------------------- | ------------------- | +| Enabled | - | - | - | - | - | + +### IP IGMP Snooping Device Configuration + +```eos +``` + +# Filters + +# ACL + +# VRF Instances + +## VRF Instances Summary + +| VRF Name | IP Routing | +| -------- | ---------- | +| MGMT | disabled | + +## VRF Instances Device Configuration + +```eos +! +vrf instance MGMT +``` + +# Quality Of Service + +# EOS CLI + +```eos +! +interface Loopback1011 + description Loopback created from raw_eos_cli under l2leaf defaults in DC2 POD1 + +interface Loopback1111 + description Loopback created from raw_eos_cli under platform_settings vEOS-LAB + +``` diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md index cafe80592ff..a9d10b49147 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF1A.md @@ -521,6 +521,7 @@ ip route vrf MGMT 0.0.0.0/0 192.168.1.254 | 172.16.10.2 | 65102 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | | 172.16.110.1 | 65110.100 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | | 172.16.110.3 | 65111.100 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | +| 172.16.210.4 | 65212 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | | 172.17.210.0 | 65210 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | | 172.17.210.2 | 65210 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | @@ -581,6 +582,9 @@ router bgp 65211 neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.210.4 peer group EVPN-OVERLAY-PEERS + neighbor 172.16.210.4 remote-as 65212 + neighbor 172.16.210.4 description DC2-POD1-LEAF2A neighbor 172.17.210.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.0 remote-as 65210 neighbor 172.17.210.0 description DC2-POD1-SPINE1_Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md new file mode 100644 index 00000000000..e5a4488bae0 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-LEAF2A.md @@ -0,0 +1,612 @@ +# DC2-POD1-LEAF2A +# Table of Contents + +- [Management](#management) + - [Management Interfaces](#management-interfaces) + - [Management API HTTP](#management-api-http) +- [Authentication](#authentication) + - [Local Users](#local-users) +- [Monitoring](#monitoring) + - [SNMP](#snmp) +- [Spanning Tree](#spanning-tree) + - [Spanning Tree Summary](#spanning-tree-summary) + - [Spanning Tree Device Configuration](#spanning-tree-device-configuration) +- [Internal VLAN Allocation Policy](#internal-vlan-allocation-policy) + - [Internal VLAN Allocation Policy Summary](#internal-vlan-allocation-policy-summary) + - [Internal VLAN Allocation Policy Configuration](#internal-vlan-allocation-policy-configuration) +- [VLANs](#vlans) + - [VLANs Summary](#vlans-summary) + - [VLANs Device Configuration](#vlans-device-configuration) +- [Interfaces](#interfaces) + - [Ethernet Interfaces](#ethernet-interfaces) + - [Port-Channel Interfaces](#port-channel-interfaces) + - [Loopback Interfaces](#loopback-interfaces) + - [VLAN Interfaces](#vlan-interfaces) + - [VXLAN Interface](#vxlan-interface) +- [Routing](#routing) + - [Service Routing Protocols Model](#service-routing-protocols-model) + - [Virtual Router MAC Address](#virtual-router-mac-address) + - [IP Routing](#ip-routing) + - [IPv6 Routing](#ipv6-routing) + - [Static Routes](#static-routes) + - [Router BGP](#router-bgp) +- [BFD](#bfd) + - [Router BFD](#router-bfd) +- [Multicast](#multicast) + - [IP IGMP Snooping](#ip-igmp-snooping) +- [Filters](#filters) + - [Prefix-lists](#prefix-lists) + - [Route-maps](#route-maps) +- [ACL](#acl) +- [VRF Instances](#vrf-instances) + - [VRF Instances Summary](#vrf-instances-summary) + - [VRF Instances Device Configuration](#vrf-instances-device-configuration) +- [Quality Of Service](#quality-of-service) +- [EOS CLI](#eos-cli) + +# Management + +## Management Interfaces + +### Management Interfaces Summary + +#### IPv4 + +| Management Interface | description | Type | VRF | IP Address | Gateway | +| -------------------- | ----------- | ---- | --- | ---------- | ------- | +| Management1 | oob_management | oob | MGMT | 192.168.1.24/24 | 192.168.1.254 | + +#### IPv6 + +| Management Interface | description | Type | VRF | IPv6 Address | IPv6 Gateway | +| -------------------- | ----------- | ---- | --- | ------------ | ------------ | +| Management1 | oob_management | oob | MGMT | - | - | + +### Management Interfaces Device Configuration + +```eos +! +interface Management1 + description oob_management + no shutdown + vrf MGMT + ip address 192.168.1.24/24 +``` + +## Management API HTTP + +### Management API HTTP Summary + +| HTTP | HTTPS | +| ---- | ----- | +| False | True | + +### Management API VRF Access + +| VRF Name | IPv4 ACL | IPv6 ACL | +| -------- | -------- | -------- | +| MGMT | - | - | + +### Management API HTTP Configuration + +```eos +! +management api http-commands + protocol https + no shutdown + ! + vrf MGMT + no shutdown +``` + +# Authentication + +## Local Users + +### Local Users Summary + +| User | Privilege | Role | +| ---- | --------- | ---- | +| admin | 15 | network-admin | + +### Local Users Device Configuration + +```eos +! +username admin privilege 15 role network-admin secret sha512 $6$eJ5TvI8oru5i9e8G$R1X/SbtGTk9xoEHEBQASc7SC2nHYmi.crVgp2pXuCXwxsXEA81e4E0cXgQ6kX08fIeQzauqhv2kS.RGJFCon5/ +``` + +# Monitoring + +## SNMP + +### SNMP Configuration Summary + +| Contact | Location | SNMP Traps | State | +| ------- | -------- | ---------- | ----- | +| - | TWODC_5STAGE_CLOS DC2 DC2_POD1 DC2-POD1-LEAF2A | All | Disabled | + +### SNMP Device Configuration + +```eos +! +snmp-server location TWODC_5STAGE_CLOS DC2 DC2_POD1 DC2-POD1-LEAF2A +``` + +# Spanning Tree + +## Spanning Tree Summary + +STP mode: **rstp** + +### Global Spanning-Tree Settings + +- Global RSTP priority: 4096 + +## Spanning Tree Device Configuration + +```eos +! +spanning-tree mode rstp +spanning-tree priority 4096 +``` + +# Internal VLAN Allocation Policy + +## Internal VLAN Allocation Policy Summary + +| Policy Allocation | Range Beginning | Range Ending | +| ------------------| --------------- | ------------ | +| ascending | 1006 | 1199 | + +## Internal VLAN Allocation Policy Configuration + +```eos +! +vlan internal order ascending range 1006 1199 +``` + +# VLANs + +## VLANs Summary + +| VLAN ID | Name | Trunk Groups | +| ------- | ---- | ------------ | +| 4092 | L2LEAF_INBAND_MGMT | - | + +## VLANs Device Configuration + +```eos +! +vlan 4092 + name L2LEAF_INBAND_MGMT +``` + +# Interfaces + +## Ethernet Interfaces + +### Ethernet Interfaces Summary + +#### L2 + +| Interface | Description | Mode | VLANs | Native VLAN | Trunk Group | Channel-Group | +| --------- | ----------- | ---- | ----- | ----------- | ----------- | ------------- | +| Ethernet3 | DC2-POD1-L2LEAF2A_Ethernet1 | *trunk | *4092 | *- | *- | 3 | + +*Inherited from Port-Channel Interface + +#### IPv4 + +| Interface | Description | Type | Channel Group | IP Address | VRF | MTU | Shutdown | ACL In | ACL Out | +| --------- | ----------- | -----| ------------- | ---------- | ----| ---- | -------- | ------ | ------- | +| Ethernet1 | P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet4 | routed | - | 172.17.210.5/31 | default | 1500 | false | - | - | +| Ethernet2 | P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet4 | routed | - | 172.17.210.7/31 | default | 1500 | false | - | - | + +### Ethernet Interfaces Device Configuration + +```eos +! +interface Ethernet1 + description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet4 + no shutdown + mtu 1500 + no switchport + ip address 172.17.210.5/31 + ptp enable + service-profile QOS-PROFILE +! +interface Ethernet2 + description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet4 + no shutdown + mtu 1500 + no switchport + ip address 172.17.210.7/31 + ptp enable + service-profile QOS-PROFILE +! +interface Ethernet3 + description DC2-POD1-L2LEAF2A_Ethernet1 + no shutdown + channel-group 3 mode active +``` + +## Port-Channel Interfaces + +### Port-Channel Interfaces Summary + +#### L2 + +| Interface | Description | Type | Mode | VLANs | Native VLAN | Trunk Group | LACP Fallback Timeout | LACP Fallback Mode | MLAG ID | EVPN ESI | +| --------- | ----------- | ---- | ---- | ----- | ----------- | ------------| --------------------- | ------------------ | ------- | -------- | +| Port-Channel3 | DC2-POD1-L2LEAF2A_Po1 | switched | trunk | 4092 | - | - | - | - | - | - | + +### Port-Channel Interfaces Device Configuration + +```eos +! +interface Port-Channel3 + description DC2-POD1-L2LEAF2A_Po1 + no shutdown + switchport + switchport trunk allowed vlan 4092 + switchport mode trunk + service-profile QOS-PROFILE +``` + +## Loopback Interfaces + +### Loopback Interfaces Summary + +#### IPv4 + +| Interface | Description | VRF | IP Address | +| --------- | ----------- | --- | ---------- | +| Loopback0 | EVPN_Overlay_Peering | default | 172.16.210.4/32 | +| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | 172.18.210.4/32 | + +#### IPv6 + +| Interface | Description | VRF | IPv6 Address | +| --------- | ----------- | --- | ------------ | +| Loopback0 | EVPN_Overlay_Peering | default | - | +| Loopback1 | VTEP_VXLAN_Tunnel_Source | default | - | + + +### Loopback Interfaces Device Configuration + +```eos +! +interface Loopback0 + description EVPN_Overlay_Peering + no shutdown + ip address 172.16.210.4/32 +! +interface Loopback1 + description VTEP_VXLAN_Tunnel_Source + no shutdown + ip address 172.18.210.4/32 +``` + +## VLAN Interfaces + +### VLAN Interfaces Summary + +| Interface | Description | VRF | MTU | Shutdown | +| --------- | ----------- | --- | ---- | -------- | +| Vlan4092 | L2LEAF_INBAND_MGMT | default | 1500 | false | + +#### IPv4 + +| Interface | VRF | IP Address | IP Address Virtual | IP Router Virtual Address | VRRP | ACL In | ACL Out | +| --------- | --- | ---------- | ------------------ | ------------------------- | ---- | ------ | ------- | +| Vlan4092 | default | 172.21.210.2/24 | - | 172.21.210.1 | - | - | - | + + +### VLAN Interfaces Device Configuration + +```eos +! +interface Vlan4092 + description L2LEAF_INBAND_MGMT + no shutdown + mtu 1500 + ip address 172.21.210.2/24 + ip virtual-router address 172.21.210.1 + ip attached-host route export 19 +``` + +## VXLAN Interface + +### VXLAN Interface Summary + +| Setting | Value | +| ------- | ----- | +| Source Interface | Loopback1 | +| UDP port | 4789 | + +### VXLAN Interface Device Configuration + +```eos +! +interface Vxlan1 + description DC2-POD1-LEAF2A_VTEP + vxlan source-interface Loopback1 + vxlan udp-port 4789 +``` + +# Routing +## Service Routing Protocols Model + +Multi agent routing protocol model enabled + +```eos +! +service routing protocols model multi-agent +``` + +## Virtual Router MAC Address + +### Virtual Router MAC Address Summary + +#### Virtual Router MAC Address: 00:1c:73:00:dc:01 + +### Virtual Router MAC Address Configuration + +```eos +! +ip virtual-router mac-address 00:1c:73:00:dc:01 +``` + +## IP Routing + +### IP Routing Summary + +| VRF | Routing Enabled | +| --- | --------------- | +| default | true | +| MGMT | false | + +### IP Routing Device Configuration + +```eos +! +ip routing +no ip routing vrf MGMT +``` +## IPv6 Routing + +### IPv6 Routing Summary + +| VRF | Routing Enabled | +| --- | --------------- | +| default | false | +| MGMT | false | + +## Static Routes + +### Static Routes Summary + +| VRF | Destination Prefix | Next Hop IP | Exit interface | Administrative Distance | Tag | Route Name | Metric | +| --- | ------------------ | ----------------------- | ------------------- | ----------------------------- | ----------------- | ----------------------------- | -------------- | +| MGMT | 0.0.0.0/0 | 192.168.1.254 | - | 1 | - | - | - | + +### Static Routes Device Configuration + +```eos +! +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 +``` + +## Router BGP + +### Router BGP Summary + +| BGP AS | Router ID | +| ------ | --------- | +| 65212| 172.16.210.4 | + +| BGP Tuning | +| ---------- | +| no bgp default ipv4-unicast | +| distance bgp 20 200 200 | +| graceful-restart restart-time 300 | +| graceful-restart | +| maximum-paths 4 ecmp 4 | + +### Router BGP Peer Groups + +#### EVPN-OVERLAY-PEERS + +| Settings | Value | +| -------- | ----- | +| Address Family | evpn | +| Source | Loopback0 | +| BFD | True | +| Ebgp multihop | 5 | +| Send community | all | +| Maximum routes | 0 (no limit) | + +#### IPv4-UNDERLAY-PEERS + +| Settings | Value | +| -------- | ----- | +| Address Family | ipv4 | +| Send community | all | +| Maximum routes | 12000 | + +### BGP Neighbors + +| Neighbor | Remote AS | VRF | Shutdown | Send-community | Maximum-routes | Allowas-in | BFD | +| -------- | --------- | --- | -------- | -------------- | -------------- | ---------- | --- | +| 172.16.210.3 | 65211 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | +| 172.17.210.4 | 65210 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | +| 172.17.210.6 | 65210 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | + +### Router BGP EVPN Address Family + +#### EVPN Peer Groups + +| Peer Group | Activate | +| ---------- | -------- | +| EVPN-OVERLAY-PEERS | True | + +### Router BGP Device Configuration + +```eos +! +router bgp 65212 + router-id 172.16.210.4 + no bgp default ipv4-unicast + distance bgp 20 200 200 + graceful-restart restart-time 300 + graceful-restart + maximum-paths 4 ecmp 4 + neighbor EVPN-OVERLAY-PEERS peer group + neighbor EVPN-OVERLAY-PEERS update-source Loopback0 + neighbor EVPN-OVERLAY-PEERS bfd + neighbor EVPN-OVERLAY-PEERS ebgp-multihop 5 + neighbor EVPN-OVERLAY-PEERS send-community + neighbor EVPN-OVERLAY-PEERS maximum-routes 0 + neighbor IPv4-UNDERLAY-PEERS peer group + neighbor IPv4-UNDERLAY-PEERS send-community + neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 + neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS + neighbor 172.16.210.3 remote-as 65211 + neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.17.210.4 peer group IPv4-UNDERLAY-PEERS + neighbor 172.17.210.4 remote-as 65210 + neighbor 172.17.210.4 description DC2-POD1-SPINE1_Ethernet4 + neighbor 172.17.210.6 peer group IPv4-UNDERLAY-PEERS + neighbor 172.17.210.6 remote-as 65210 + neighbor 172.17.210.6 description DC2-POD1-SPINE2_Ethernet4 + redistribute attached-host + redistribute connected route-map RM-CONN-2-BGP + ! + address-family evpn + neighbor EVPN-OVERLAY-PEERS activate + ! + address-family rt-membership + neighbor EVPN-OVERLAY-PEERS activate + ! + address-family ipv4 + no neighbor EVPN-OVERLAY-PEERS activate + neighbor IPv4-UNDERLAY-PEERS activate +``` + +# BFD + +## Router BFD + +### Router BFD Multihop Summary + +| Interval | Minimum RX | Multiplier | +| -------- | ---------- | ---------- | +| 300 | 300 | 3 | + +### Router BFD Device Configuration + +```eos +! +router bfd + multihop interval 300 min-rx 300 multiplier 3 +``` + +# Multicast + +## IP IGMP Snooping + +### IP IGMP Snooping Summary + +| IGMP Snooping | Fast Leave | Interface Restart Query | Proxy | Restart Query Interval | Robustness Variable | +| ------------- | ---------- | ----------------------- | ----- | ---------------------- | ------------------- | +| Enabled | - | - | - | - | - | + +### IP IGMP Snooping Device Configuration + +```eos +``` + +# Filters + +## Prefix-lists + +### Prefix-lists Summary + +#### PL-L2LEAF-INBAND-MGMT + +| Sequence | Action | +| -------- | ------ | +| 10 | permit 172.21.210.0/24 | + +#### PL-LOOPBACKS-EVPN-OVERLAY + +| Sequence | Action | +| -------- | ------ | +| 10 | permit 172.16.210.0/24 eq 32 | +| 20 | permit 172.18.210.0/24 eq 32 | + +### Prefix-lists Device Configuration + +```eos +! +ip prefix-list PL-L2LEAF-INBAND-MGMT + seq 10 permit 172.21.210.0/24 +! +ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY + seq 10 permit 172.16.210.0/24 eq 32 + seq 20 permit 172.18.210.0/24 eq 32 +``` + +## Route-maps + +### Route-maps Summary + +#### RM-CONN-2-BGP + +| Sequence | Type | Match and/or Set | +| -------- | ---- | ---------------- | +| 10 | permit | match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY | +| 20 | permit | match ip address prefix-list PL-L2LEAF-INBAND-MGMT | + +### Route-maps Device Configuration + +```eos +! +route-map RM-CONN-2-BGP permit 10 + match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY +! +route-map RM-CONN-2-BGP permit 20 + match ip address prefix-list PL-L2LEAF-INBAND-MGMT +``` + +# ACL + +# VRF Instances + +## VRF Instances Summary + +| VRF Name | IP Routing | +| -------- | ---------- | +| MGMT | disabled | + +## VRF Instances Device Configuration + +```eos +! +vrf instance MGMT +``` + +# Quality Of Service + +# EOS CLI + +```eos +! +interface Loopback1010 + description Loopback created from raw_eos_cli under l3leaf defaults in DC2 POD1 + +interface Loopback1111 + description Loopback created from raw_eos_cli under platform_settings vEOS-LAB + +``` diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md index 6e320ab1572..4b249b8b1d7 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE1.md @@ -173,6 +173,7 @@ vlan internal order ascending range 1006 1199 | Ethernet1 | P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet1 | routed | - | 172.16.21.1/31 | default | 1500 | false | - | - | | Ethernet2 | P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet1 | routed | - | 172.16.21.65/31 | default | 1500 | false | - | - | | Ethernet3 | P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet1 | routed | - | 172.17.210.0/31 | default | 1500 | false | - | - | +| Ethernet4 | P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet1 | routed | - | 172.17.210.4/31 | default | 1500 | false | - | - | | Ethernet5 | P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet5 | routed | - | 11.1.1.19/31 | default | 1500 | false | - | - | ### Ethernet Interfaces Device Configuration @@ -206,6 +207,15 @@ interface Ethernet3 ptp enable service-profile QOS-PROFILE ! +interface Ethernet4 + description P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet1 + no shutdown + mtu 1500 + no switchport + ip address 172.17.210.4/31 + ptp enable + service-profile QOS-PROFILE +! interface Ethernet5 description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet5 no shutdown @@ -341,6 +351,7 @@ ip route vrf MGMT 0.0.0.0/0 192.168.1.254 | 172.16.110.1 | 65110.100 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | | 172.16.110.3 | 65111.100 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | | 172.17.210.1 | 65211 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | +| 172.17.210.5 | 65212 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | ### Router BGP EVPN Address Family @@ -395,6 +406,9 @@ router bgp 65210 neighbor 172.17.210.1 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.1 remote-as 65211 neighbor 172.17.210.1 description DC2-POD1-LEAF1A_Ethernet1 + neighbor 172.17.210.5 peer group IPv4-UNDERLAY-PEERS + neighbor 172.17.210.5 remote-as 65212 + neighbor 172.17.210.5 description DC2-POD1-LEAF2A_Ethernet1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE2.md index a18f697c17d..0f5bdeac6db 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE2.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/devices/DC2-POD1-SPINE2.md @@ -171,6 +171,7 @@ vlan internal order ascending range 1006 1199 | Ethernet1 | P2P_LINK_TO_DC2-SUPER-SPINE1_Ethernet2 | routed | - | 172.16.21.3/31 | default | 1500 | false | - | - | | Ethernet2 | P2P_LINK_TO_DC2-SUPER-SPINE2_Ethernet2 | routed | - | 172.16.21.67/31 | default | 1500 | false | - | - | | Ethernet3 | P2P_LINK_TO_DC2-POD1-LEAF1A_Ethernet2 | routed | - | 172.17.210.2/31 | default | 1500 | false | - | - | +| Ethernet4 | P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet2 | routed | - | 172.17.210.6/31 | default | 1500 | false | - | - | | Ethernet5 | P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet4 | routed | - | 200.200.200.201/24 | default | 1498 | false | - | - | ### Ethernet Interfaces Device Configuration @@ -204,6 +205,15 @@ interface Ethernet3 ptp enable service-profile QOS-PROFILE ! +interface Ethernet4 + description P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet2 + no shutdown + mtu 1500 + no switchport + ip address 172.17.210.6/31 + ptp enable + service-profile QOS-PROFILE +! interface Ethernet5 description P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet4 no shutdown @@ -323,6 +333,7 @@ ip route vrf MGMT 0.0.0.0/0 192.168.1.254 | 172.16.21.2 | 65200 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | | 172.16.21.66 | 65200 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | | 172.17.210.3 | 65211 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | +| 172.17.210.7 | 65212 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | | 200.200.200.101 | 65112 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | ### Router BGP Device Configuration @@ -348,6 +359,9 @@ router bgp 65210 neighbor 172.17.210.3 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.3 remote-as 65211 neighbor 172.17.210.3 description DC2-POD1-LEAF1A_Ethernet2 + neighbor 172.17.210.7 peer group IPv4-UNDERLAY-PEERS + neighbor 172.17.210.7 remote-as 65212 + neighbor 172.17.210.7 description DC2-POD1-LEAF2A_Ethernet2 neighbor 200.200.200.101 peer group IPv4-UNDERLAY-PEERS neighbor 200.200.200.101 remote-as 65112 neighbor 200.200.200.101 description DC1-POD2-SPINE2 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-documentation.md b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-documentation.md index 01e0e4d2207..cacf19ecf28 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-documentation.md +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-documentation.md @@ -33,7 +33,9 @@ | DC1 | super-spine | DC1-SUPER-SPINE1 | - | vEOS-LAB | Provisioned | | DC1 | super-spine | DC1-SUPER-SPINE2 | 192.168.1.2/24 | vEOS-LAB | Provisioned | | DC2_POD1 | l2leaf | DC2-POD1-L2LEAF1A | 192.168.1.23/24 | vEOS-LAB | Provisioned | +| DC2_POD1 | l2leaf | DC2-POD1-L2LEAF2A | 192.168.1.25/24 | vEOS-LAB | Provisioned | | DC2_POD1 | l3leaf | DC2-POD1-LEAF1A | 192.168.1.22/24 | vEOS-LAB | Provisioned | +| DC2_POD1 | l3leaf | DC2-POD1-LEAF2A | 192.168.1.24/24 | vEOS-LAB | Provisioned | | DC2_POD1 | spine | DC2-POD1-SPINE1 | 192.168.1.20/24 | vEOS-LAB | Provisioned | | DC2_POD1 | spine | DC2-POD1-SPINE2 | 192.168.1.21/24 | vEOS-LAB | Provisioned | | DC2 | overlay-controller | DC2-RS1 | 192.168.1.18/24 | vEOS-LAB | Provisioned | @@ -50,6 +52,7 @@ | DC1_POD1 | l2leaf | DC1-POD1-L2LEAF2A | 172.21.110.5/24 | Vlan4085 | | DC1_POD1 | l2leaf | DC1-POD1-L2LEAF2B | 172.21.110.6/24 | Vlan4085 | | DC2_POD1 | l2leaf | DC2-POD1-L2LEAF1A | 172.21.210.4/24 | Vlan4092 | +| DC2_POD1 | l2leaf | DC2-POD1-L2LEAF2A | 172.21.210.5/24 | Vlan4092 | # Fabric Topology @@ -97,8 +100,11 @@ | super-spine | DC1-SUPER-SPINE1 | Ethernet6 | super-spine | DC2-SUPER-SPINE1 | Ethernet4 | | super-spine | DC1-SUPER-SPINE2 | Ethernet6 | super-spine | DC2-SUPER-SPINE2 | Ethernet4 | | l2leaf | DC2-POD1-L2LEAF1A | Ethernet1 | l3leaf | DC2-POD1-LEAF1A | Ethernet3 | +| l2leaf | DC2-POD1-L2LEAF2A | Ethernet1 | l3leaf | DC2-POD1-LEAF2A | Ethernet3 | | l3leaf | DC2-POD1-LEAF1A | Ethernet1 | spine | DC2-POD1-SPINE1 | Ethernet3 | | l3leaf | DC2-POD1-LEAF1A | Ethernet2 | spine | DC2-POD1-SPINE2 | Ethernet3 | +| l3leaf | DC2-POD1-LEAF2A | Ethernet1 | spine | DC2-POD1-SPINE1 | Ethernet4 | +| l3leaf | DC2-POD1-LEAF2A | Ethernet2 | spine | DC2-POD1-SPINE2 | Ethernet4 | | spine | DC2-POD1-SPINE1 | Ethernet1 | super-spine | DC2-SUPER-SPINE1 | Ethernet1 | | spine | DC2-POD1-SPINE1 | Ethernet2 | super-spine | DC2-SUPER-SPINE2 | Ethernet1 | | spine | DC2-POD1-SPINE2 | Ethernet1 | super-spine | DC2-SUPER-SPINE1 | Ethernet2 | @@ -121,7 +127,7 @@ | 172.17.20.0/24 | 256 | 8 | 3.13 % | | 172.17.110.0/24 | 256 | 20 | 7.82 % | | 172.17.120.0/24 | 256 | 4 | 1.57 % | -| 172.17.210.0/24 | 256 | 4 | 1.57 % | +| 172.17.210.0/24 | 256 | 8 | 3.13 % | ## Point-To-Point Links Node Allocation @@ -161,6 +167,8 @@ | DC1-SUPER-SPINE2 | Ethernet6 | 11.1.2.2/31 | DC2-SUPER-SPINE2 | Ethernet4 | 11.1.2.3/31 | | DC2-POD1-LEAF1A | Ethernet1 | 172.17.210.1/31 | DC2-POD1-SPINE1 | Ethernet3 | 172.17.210.0/31 | | DC2-POD1-LEAF1A | Ethernet2 | 172.17.210.3/31 | DC2-POD1-SPINE2 | Ethernet3 | 172.17.210.2/31 | +| DC2-POD1-LEAF2A | Ethernet1 | 172.17.210.5/31 | DC2-POD1-SPINE1 | Ethernet4 | 172.17.210.4/31 | +| DC2-POD1-LEAF2A | Ethernet2 | 172.17.210.7/31 | DC2-POD1-SPINE2 | Ethernet4 | 172.17.210.6/31 | | DC2-POD1-SPINE1 | Ethernet1 | 172.16.21.1/31 | DC2-SUPER-SPINE1 | Ethernet1 | 172.16.21.0/31 | | DC2-POD1-SPINE1 | Ethernet2 | 172.16.21.65/31 | DC2-SUPER-SPINE2 | Ethernet1 | 172.16.21.64/31 | | DC2-POD1-SPINE2 | Ethernet1 | 172.16.21.3/31 | DC2-SUPER-SPINE1 | Ethernet2 | 172.16.21.2/31 | @@ -180,7 +188,7 @@ | 172.16.110.0/24 | 256 | 5 | 1.96 % | | 172.16.120.0/24 | 256 | 3 | 1.18 % | | 172.16.200.0/24 | 256 | 2 | 0.79 % | -| 172.16.210.0/24 | 256 | 3 | 1.18 % | +| 172.16.210.0/24 | 256 | 4 | 1.57 % | ## Loopback0 Interfaces Node Allocation @@ -199,6 +207,7 @@ | DC1 | DC1-SUPER-SPINE1 | 172.16.100.1/32 | | DC1 | DC1-SUPER-SPINE2 | 172.16.100.2/32 | | DC2_POD1 | DC2-POD1-LEAF1A | 172.16.210.3/32 | +| DC2_POD1 | DC2-POD1-LEAF2A | 172.16.210.4/32 | | DC2_POD1 | DC2-POD1-SPINE1 | 172.16.210.1/32 | | DC2_POD1 | DC2-POD1-SPINE2 | 172.16.210.2/32 | | DC2 | DC2-RS1 | 172.16.20.1/32 | @@ -212,7 +221,7 @@ | --------------------- | ------------------- | ------------------ | ------------------ | | 172.18.110.0/24 | 256 | 3 | 1.18 % | | 172.18.120.0/24 | 256 | 1 | 0.4 % | -| 172.18.210.0/24 | 256 | 1 | 0.4 % | +| 172.18.210.0/24 | 256 | 2 | 0.79 % | ## VTEP Loopback Node allocation @@ -223,3 +232,4 @@ | DC1_POD1 | DC1-POD1-LEAF2B | 172.18.110.4/32 | | DC1_POD2 | DC1-POD2-LEAF1A | 172.18.120.3/32 | | DC2_POD1 | DC2-POD1-LEAF1A | 172.18.210.3/32 | +| DC2_POD1 | DC2-POD1-LEAF2A | 172.18.210.4/32 | diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-p2p-links.csv b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-p2p-links.csv index 1c74feaaa82..5eb05a1175f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-p2p-links.csv +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-p2p-links.csv @@ -33,6 +33,8 @@ super-spine,DC1-SUPER-SPINE1,Ethernet6,11.1.2.0/31,super-spine,DC2-SUPER-SPINE1, super-spine,DC1-SUPER-SPINE2,Ethernet6,11.1.2.2/31,super-spine,DC2-SUPER-SPINE2,Ethernet4,11.1.2.3/31 l3leaf,DC2-POD1-LEAF1A,Ethernet1,172.17.210.1/31,spine,DC2-POD1-SPINE1,Ethernet3,172.17.210.0/31 l3leaf,DC2-POD1-LEAF1A,Ethernet2,172.17.210.3/31,spine,DC2-POD1-SPINE2,Ethernet3,172.17.210.2/31 +l3leaf,DC2-POD1-LEAF2A,Ethernet1,172.17.210.5/31,spine,DC2-POD1-SPINE1,Ethernet4,172.17.210.4/31 +l3leaf,DC2-POD1-LEAF2A,Ethernet2,172.17.210.7/31,spine,DC2-POD1-SPINE2,Ethernet4,172.17.210.6/31 spine,DC2-POD1-SPINE1,Ethernet1,172.16.21.1/31,super-spine,DC2-SUPER-SPINE1,Ethernet1,172.16.21.0/31 spine,DC2-POD1-SPINE1,Ethernet2,172.16.21.65/31,super-spine,DC2-SUPER-SPINE2,Ethernet1,172.16.21.64/31 spine,DC2-POD1-SPINE2,Ethernet1,172.16.21.3/31,super-spine,DC2-SUPER-SPINE1,Ethernet2,172.16.21.2/31 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-topology.csv b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-topology.csv index c6b9d45b8c7..ee925fecbb2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-topology.csv +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/documentation/fabric/TWODC_5STAGE_CLOS-topology.csv @@ -84,18 +84,24 @@ super-spine,DC1-SUPER-SPINE2,Ethernet4,spine,DC1-POD2-SPINE2,Ethernet2 super-spine,DC1-SUPER-SPINE2,Ethernet5,overlay-controller,DC1-RS2,Ethernet1 super-spine,DC1-SUPER-SPINE2,Ethernet6,super-spine,DC2-SUPER-SPINE2,Ethernet4 l2leaf,DC2-POD1-L2LEAF1A,Ethernet1,l3leaf,DC2-POD1-LEAF1A,Ethernet3 +l2leaf,DC2-POD1-L2LEAF2A,Ethernet1,l3leaf,DC2-POD1-LEAF2A,Ethernet3 l3leaf,DC2-POD1-LEAF1A,Ethernet1,spine,DC2-POD1-SPINE1,Ethernet3 l3leaf,DC2-POD1-LEAF1A,Ethernet2,spine,DC2-POD1-SPINE2,Ethernet3 l3leaf,DC2-POD1-LEAF1A,Ethernet3,l2leaf,DC2-POD1-L2LEAF1A,Ethernet1 l3leaf,DC2-POD1-LEAF1A,Ethernet6,l3leaf,DC1-POD1-LEAF2A,Ethernet7 l3leaf,DC2-POD1-LEAF1A,Ethernet7,l3leaf,DC1-POD1-LEAF2B,Ethernet7 +l3leaf,DC2-POD1-LEAF2A,Ethernet1,spine,DC2-POD1-SPINE1,Ethernet4 +l3leaf,DC2-POD1-LEAF2A,Ethernet2,spine,DC2-POD1-SPINE2,Ethernet4 +l3leaf,DC2-POD1-LEAF2A,Ethernet3,l2leaf,DC2-POD1-L2LEAF2A,Ethernet1 spine,DC2-POD1-SPINE1,Ethernet1,super-spine,DC2-SUPER-SPINE1,Ethernet1 spine,DC2-POD1-SPINE1,Ethernet2,super-spine,DC2-SUPER-SPINE2,Ethernet1 spine,DC2-POD1-SPINE1,Ethernet3,l3leaf,DC2-POD1-LEAF1A,Ethernet1 +spine,DC2-POD1-SPINE1,Ethernet4,l3leaf,DC2-POD1-LEAF2A,Ethernet1 spine,DC2-POD1-SPINE1,Ethernet5,spine,DC1-POD2-SPINE1,Ethernet5 spine,DC2-POD1-SPINE2,Ethernet1,super-spine,DC2-SUPER-SPINE1,Ethernet2 spine,DC2-POD1-SPINE2,Ethernet2,super-spine,DC2-SUPER-SPINE2,Ethernet2 spine,DC2-POD1-SPINE2,Ethernet3,l3leaf,DC2-POD1-LEAF1A,Ethernet2 +spine,DC2-POD1-SPINE2,Ethernet4,l3leaf,DC2-POD1-LEAF2A,Ethernet2 spine,DC2-POD1-SPINE2,Ethernet5,spine,DC1-POD2-SPINE2,Ethernet4 overlay-controller,DC2-RS1,Ethernet1,super-spine,DC2-SUPER-SPINE1,Ethernet3 overlay-controller,DC2-RS1,Ethernet2,super-spine,DC2-SUPER-SPINE1,Ethernet6 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg new file mode 100644 index 00000000000..8d0d5486846 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-L2LEAF2A.cfg @@ -0,0 +1,70 @@ +!RANCID-CONTENT-TYPE: arista +! +vlan internal order ascending range 1006 1199 +! +transceiver qsfp default-mode 4x10G +! +service routing protocols model multi-agent +! +hostname DC2-POD1-L2LEAF2A +! +snmp-server location TWODC_5STAGE_CLOS DC2 DC2_POD1 DC2-POD1-L2LEAF2A +! +spanning-tree mode mstp +spanning-tree mst 0 priority 8192 +! +no aaa root +no enable password +! +username admin privilege 15 role network-admin secret sha512 $6$eJ5TvI8oru5i9e8G$R1X/SbtGTk9xoEHEBQASc7SC2nHYmi.crVgp2pXuCXwxsXEA81e4E0cXgQ6kX08fIeQzauqhv2kS.RGJFCon5/ +! +vlan 4092 + name L2LEAF_INBAND_MGMT +! +vrf instance MGMT +! +interface Port-Channel1 + description DC2-POD1-LEAF2A_Po3 + no shutdown + switchport + switchport trunk allowed vlan 4092 + switchport mode trunk + service-profile QOS-PROFILE +! +interface Ethernet1 + description DC2-POD1-LEAF2A_Ethernet3 + no shutdown + channel-group 1 mode active +! +interface Management1 + description oob_management + no shutdown + vrf MGMT + ip address 192.168.1.25/24 +! +interface Vlan4092 + description L2LEAF_INBAND_MGMT + no shutdown + ip address 172.21.210.5/24 +! +ip routing +no ip routing vrf MGMT +! +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 +ip route 0.0.0.0/0 172.21.210.1 +! +management api http-commands + protocol https + no shutdown + ! + vrf MGMT + no shutdown +! +interface Loopback1011 + description Loopback created from raw_eos_cli under l2leaf defaults in DC2 POD1 + +interface Loopback1111 + description Loopback created from raw_eos_cli under platform_settings vEOS-LAB + +! +end diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF1A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF1A.cfg index fd11b406649..73b6b61c8d8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF1A.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF1A.cfg @@ -190,6 +190,9 @@ router bgp 65211 neighbor 172.16.110.3 peer group EVPN-OVERLAY-PEERS neighbor 172.16.110.3 remote-as 65111.100 neighbor 172.16.110.3 description DC1-POD1-LEAF1A + neighbor 172.16.210.4 peer group EVPN-OVERLAY-PEERS + neighbor 172.16.210.4 remote-as 65212 + neighbor 172.16.210.4 description DC2-POD1-LEAF2A neighbor 172.17.210.0 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.0 remote-as 65210 neighbor 172.17.210.0 description DC2-POD1-SPINE1_Ethernet3 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF2A.cfg new file mode 100644 index 00000000000..32539150b29 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-LEAF2A.cfg @@ -0,0 +1,161 @@ +!RANCID-CONTENT-TYPE: arista +! +vlan internal order ascending range 1006 1199 +! +transceiver qsfp default-mode 4x10G +! +service routing protocols model multi-agent +! +hostname DC2-POD1-LEAF2A +! +snmp-server location TWODC_5STAGE_CLOS DC2 DC2_POD1 DC2-POD1-LEAF2A +! +spanning-tree mode rstp +spanning-tree priority 4096 +! +no aaa root +no enable password +! +username admin privilege 15 role network-admin secret sha512 $6$eJ5TvI8oru5i9e8G$R1X/SbtGTk9xoEHEBQASc7SC2nHYmi.crVgp2pXuCXwxsXEA81e4E0cXgQ6kX08fIeQzauqhv2kS.RGJFCon5/ +! +vlan 4092 + name L2LEAF_INBAND_MGMT +! +vrf instance MGMT +! +interface Port-Channel3 + description DC2-POD1-L2LEAF2A_Po1 + no shutdown + switchport + switchport trunk allowed vlan 4092 + switchport mode trunk + service-profile QOS-PROFILE +! +interface Ethernet1 + description P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet4 + no shutdown + mtu 1500 + no switchport + ip address 172.17.210.5/31 + ptp enable + service-profile QOS-PROFILE +! +interface Ethernet2 + description P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet4 + no shutdown + mtu 1500 + no switchport + ip address 172.17.210.7/31 + ptp enable + service-profile QOS-PROFILE +! +interface Ethernet3 + description DC2-POD1-L2LEAF2A_Ethernet1 + no shutdown + channel-group 3 mode active +! +interface Loopback0 + description EVPN_Overlay_Peering + no shutdown + ip address 172.16.210.4/32 +! +interface Loopback1 + description VTEP_VXLAN_Tunnel_Source + no shutdown + ip address 172.18.210.4/32 +! +interface Management1 + description oob_management + no shutdown + vrf MGMT + ip address 192.168.1.24/24 +! +interface Vlan4092 + description L2LEAF_INBAND_MGMT + no shutdown + mtu 1500 + ip address 172.21.210.2/24 + ip virtual-router address 172.21.210.1 + ip attached-host route export 19 +! +interface Vxlan1 + description DC2-POD1-LEAF2A_VTEP + vxlan source-interface Loopback1 + vxlan udp-port 4789 +! +ip virtual-router mac-address 00:1c:73:00:dc:01 +! +ip routing +no ip routing vrf MGMT +! +ip prefix-list PL-L2LEAF-INBAND-MGMT + seq 10 permit 172.21.210.0/24 +! +ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY + seq 10 permit 172.16.210.0/24 eq 32 + seq 20 permit 172.18.210.0/24 eq 32 +! +ip route vrf MGMT 0.0.0.0/0 192.168.1.254 +! +route-map RM-CONN-2-BGP permit 10 + match ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY +! +route-map RM-CONN-2-BGP permit 20 + match ip address prefix-list PL-L2LEAF-INBAND-MGMT +! +router bfd + multihop interval 300 min-rx 300 multiplier 3 +! +router bgp 65212 + router-id 172.16.210.4 + no bgp default ipv4-unicast + distance bgp 20 200 200 + graceful-restart restart-time 300 + graceful-restart + maximum-paths 4 ecmp 4 + neighbor EVPN-OVERLAY-PEERS peer group + neighbor EVPN-OVERLAY-PEERS update-source Loopback0 + neighbor EVPN-OVERLAY-PEERS bfd + neighbor EVPN-OVERLAY-PEERS ebgp-multihop 5 + neighbor EVPN-OVERLAY-PEERS send-community + neighbor EVPN-OVERLAY-PEERS maximum-routes 0 + neighbor IPv4-UNDERLAY-PEERS peer group + neighbor IPv4-UNDERLAY-PEERS send-community + neighbor IPv4-UNDERLAY-PEERS maximum-routes 12000 + neighbor 172.16.210.3 peer group EVPN-OVERLAY-PEERS + neighbor 172.16.210.3 remote-as 65211 + neighbor 172.16.210.3 description DC2-POD1-LEAF1A + neighbor 172.17.210.4 peer group IPv4-UNDERLAY-PEERS + neighbor 172.17.210.4 remote-as 65210 + neighbor 172.17.210.4 description DC2-POD1-SPINE1_Ethernet4 + neighbor 172.17.210.6 peer group IPv4-UNDERLAY-PEERS + neighbor 172.17.210.6 remote-as 65210 + neighbor 172.17.210.6 description DC2-POD1-SPINE2_Ethernet4 + redistribute attached-host + redistribute connected route-map RM-CONN-2-BGP + ! + address-family evpn + neighbor EVPN-OVERLAY-PEERS activate + ! + address-family rt-membership + neighbor EVPN-OVERLAY-PEERS activate + ! + address-family ipv4 + no neighbor EVPN-OVERLAY-PEERS activate + neighbor IPv4-UNDERLAY-PEERS activate +! +management api http-commands + protocol https + no shutdown + ! + vrf MGMT + no shutdown +! +interface Loopback1010 + description Loopback created from raw_eos_cli under l3leaf defaults in DC2 POD1 + +interface Loopback1111 + description Loopback created from raw_eos_cli under platform_settings vEOS-LAB + +! +end diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE1.cfg index bd4b6abac16..4a851fdbcea 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE1.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE1.cfg @@ -46,6 +46,15 @@ interface Ethernet3 ptp enable service-profile QOS-PROFILE ! +interface Ethernet4 + description P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet1 + no shutdown + mtu 1500 + no switchport + ip address 172.17.210.4/31 + ptp enable + service-profile QOS-PROFILE +! interface Ethernet5 description P2P_LINK_TO_DC1-POD2-SPINE1_Ethernet5 no shutdown @@ -119,6 +128,9 @@ router bgp 65210 neighbor 172.17.210.1 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.1 remote-as 65211 neighbor 172.17.210.1 description DC2-POD1-LEAF1A_Ethernet1 + neighbor 172.17.210.5 peer group IPv4-UNDERLAY-PEERS + neighbor 172.17.210.5 remote-as 65212 + neighbor 172.17.210.5 description DC2-POD1-LEAF2A_Ethernet1 redistribute connected route-map RM-CONN-2-BGP ! address-family evpn diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE2.cfg index b75d87c627c..f91357ca595 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE2.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/configs/DC2-POD1-SPINE2.cfg @@ -46,6 +46,15 @@ interface Ethernet3 ptp enable service-profile QOS-PROFILE ! +interface Ethernet4 + description P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet2 + no shutdown + mtu 1500 + no switchport + ip address 172.17.210.6/31 + ptp enable + service-profile QOS-PROFILE +! interface Ethernet5 description P2P_LINK_TO_DC1-POD2-SPINE2_Ethernet4 no shutdown @@ -95,6 +104,9 @@ router bgp 65210 neighbor 172.17.210.3 peer group IPv4-UNDERLAY-PEERS neighbor 172.17.210.3 remote-as 65211 neighbor 172.17.210.3 description DC2-POD1-LEAF1A_Ethernet2 + neighbor 172.17.210.7 peer group IPv4-UNDERLAY-PEERS + neighbor 172.17.210.7 remote-as 65212 + neighbor 172.17.210.7 description DC2-POD1-LEAF2A_Ethernet2 neighbor 200.200.200.101 peer group IPv4-UNDERLAY-PEERS neighbor 200.200.200.101 remote-as 65112 neighbor 200.200.200.101 description DC1-POD2-SPINE2 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2A.yml index 6d03dbfbed2..cee53b80336 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2A.yml @@ -703,13 +703,6 @@ router_bfd: ip_igmp_snooping: globally_enabled: true ip_virtual_router_mac_address: 00:1c:73:00:dc:01 -virtual_source_nat_vrfs: - vrf_with_loopbacks_dc1_pod1_only: - ip_address: 10.102.101.4 - vrf_with_loopbacks_from_overlapping_pool: - ip_address: 10.100.0.4 - vrf_with_loopbacks_from_pod_pools: - ip_address: 10.101.101.4 vxlan_interface: Vxlan1: description: DC1-POD1-LEAF2A_VTEP @@ -737,6 +730,13 @@ vxlan_interface: vni: 1100 vrf_with_loopbacks_from_pod_pools: vni: 1101 +virtual_source_nat_vrfs: + vrf_with_loopbacks_dc1_pod1_only: + ip_address: 10.102.101.4 + vrf_with_loopbacks_from_overlapping_pool: + ip_address: 10.100.0.4 + vrf_with_loopbacks_from_pod_pools: + ip_address: 10.101.101.4 domain_list: - structured-config.set.on.node - structured-config.set.under.vrf.common-vrf diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml index 41802e3547a..7d67ccbcb79 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD1-LEAF2B.yml @@ -710,13 +710,6 @@ ip_virtual_router_mac_address: 00:1c:73:00:dc:01 struct_cfg: domain_list: - structured-config.set.under.vrf.common-vrf -virtual_source_nat_vrfs: - vrf_with_loopbacks_dc1_pod1_only: - ip_address: 10.102.101.5 - vrf_with_loopbacks_from_overlapping_pool: - ip_address: 10.100.0.5 - vrf_with_loopbacks_from_pod_pools: - ip_address: 10.101.101.5 vxlan_interface: Vxlan1: description: DC1-POD1-LEAF2B_VTEP @@ -744,5 +737,12 @@ vxlan_interface: vni: 1100 vrf_with_loopbacks_from_pod_pools: vni: 1101 +virtual_source_nat_vrfs: + vrf_with_loopbacks_dc1_pod1_only: + ip_address: 10.102.101.5 + vrf_with_loopbacks_from_overlapping_pool: + ip_address: 10.100.0.5 + vrf_with_loopbacks_from_pod_pools: + ip_address: 10.101.101.5 domain_list: - structured-config.set.under.vrf.common-vrf diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-LEAF1A.yml index 1433485ac5b..df20407b4b2 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC1-POD2-LEAF1A.yml @@ -397,11 +397,6 @@ vlan_interfaces: struct_cfg: domain_list: - structured-config.set.under.vrf.common-vrf -virtual_source_nat_vrfs: - vrf_with_loopbacks_from_overlapping_pool: - ip_address: 10.100.0.3 - vrf_with_loopbacks_from_pod_pools: - ip_address: 10.101.102.3 vxlan_interface: Vxlan1: description: DC1-POD2-LEAF1A_VTEP @@ -428,5 +423,10 @@ vxlan_interface: vni: 1100 vrf_with_loopbacks_from_pod_pools: vni: 1101 +virtual_source_nat_vrfs: + vrf_with_loopbacks_from_overlapping_pool: + ip_address: 10.100.0.3 + vrf_with_loopbacks_from_pod_pools: + ip_address: 10.101.102.3 domain_list: - structured-config.set.under.vrf.common-vrf diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-L2LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-L2LEAF2A.yml new file mode 100644 index 00000000000..18e710a3956 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-L2LEAF2A.yml @@ -0,0 +1,74 @@ +static_routes: +- vrf: MGMT + destination_address_prefix: 0.0.0.0/0 + gateway: 192.168.1.254 +- destination_address_prefix: 0.0.0.0/0 + gateway: 172.21.210.1 +service_routing_protocols_model: multi-agent +ip_routing: true +vlan_internal_order: + allocation: ascending + range: + beginning: 1006 + ending: 1199 +snmp_server: + location: TWODC_5STAGE_CLOS DC2 DC2_POD1 DC2-POD1-L2LEAF2A +spanning_tree: + mode: mstp + mst_instances: + '0': + priority: 8192 +local_users: + admin: + privilege: 15 + role: network-admin + sha512_password: $6$eJ5TvI8oru5i9e8G$R1X/SbtGTk9xoEHEBQASc7SC2nHYmi.crVgp2pXuCXwxsXEA81e4E0cXgQ6kX08fIeQzauqhv2kS.RGJFCon5/ +vrfs: + MGMT: + ip_routing: false +management_interfaces: + Management1: + description: oob_management + shutdown: false + vrf: MGMT + ip_address: 192.168.1.25/24 + gateway: 192.168.1.254 + type: oob + Vlan4092: + description: L2LEAF_INBAND_MGMT + shutdown: false + mtu: 1500 + ip_address: 172.21.210.5/24 + gateway: 172.21.210.1 + type: inband +management_api_http: + enable_vrfs: + MGMT: {} + enable_https: true +eos_cli: "interface Loopback1011\n description Loopback created from raw_eos_cli under l2leaf defaults in DC2 POD1\n\ninterface Loopback1111\n\ + \ description Loopback created from raw_eos_cli under platform_settings vEOS-LAB\n" +ethernet_interfaces: + Ethernet1: + peer: DC2-POD1-LEAF2A + peer_interface: Ethernet3 + peer_type: l3leaf + description: DC2-POD1-LEAF2A_Ethernet3 + type: switched + shutdown: false + channel_group: + id: 1 + mode: active +port_channel_interfaces: + Port-Channel1: + description: DC2-POD1-LEAF2A_Po3 + type: switched + shutdown: false + vlans: 4092 + mode: trunk + service_profile: QOS-PROFILE +ip_igmp_snooping: + globally_enabled: true +vlans: + 4092: + tenant: system + name: L2LEAF_INBAND_MGMT diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml index 16683c10f38..6cbbd232601 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF1A.yml @@ -55,6 +55,10 @@ router_bgp: peer_group: EVPN-OVERLAY-PEERS description: DC1-RS2 remote_as: '65102' + 172.16.210.4: + peer_group: EVPN-OVERLAY-PEERS + description: DC2-POD1-LEAF2A + remote_as: '65212' 11.1.0.38: remote_as: '65120' description: DC1-POD1-LEAF2B @@ -296,11 +300,6 @@ ip_virtual_router_mac_address: 00:1c:73:00:dc:01 struct_cfg: domain_list: - structured-config.set.under.vrf.common-vrf -virtual_source_nat_vrfs: - vrf_with_loopbacks_from_overlapping_pool: - ip_address: 10.100.0.3 - vrf_with_loopbacks_from_pod_pools: - ip_address: 10.101.201.3 vxlan_interface: Vxlan1: description: DC2-POD1-LEAF1A_VTEP @@ -316,6 +315,11 @@ vxlan_interface: vni: 1100 vrf_with_loopbacks_from_pod_pools: vni: 1101 +virtual_source_nat_vrfs: + vrf_with_loopbacks_from_overlapping_pool: + ip_address: 10.100.0.3 + vrf_with_loopbacks_from_pod_pools: + ip_address: 10.101.201.3 vlans: 4092: tenant: system diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF2A.yml new file mode 100644 index 00000000000..b30bfcc6851 --- /dev/null +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-LEAF2A.yml @@ -0,0 +1,192 @@ +router_bgp: + as: '65212' + router_id: 172.16.210.4 + bgp_defaults: + - no bgp default ipv4-unicast + - distance bgp 20 200 200 + - graceful-restart restart-time 300 + - graceful-restart + - maximum-paths 4 ecmp 4 + peer_groups: + IPv4-UNDERLAY-PEERS: + type: ipv4 + maximum_routes: 12000 + send_community: all + EVPN-OVERLAY-PEERS: + type: evpn + update_source: Loopback0 + bfd: true + ebgp_multihop: '5' + send_community: all + maximum_routes: 0 + address_family_ipv4: + peer_groups: + IPv4-UNDERLAY-PEERS: + activate: true + EVPN-OVERLAY-PEERS: + activate: false + redistribute_routes: + connected: + route_map: RM-CONN-2-BGP + attached-host: {} + neighbors: + 172.17.210.4: + peer_group: IPv4-UNDERLAY-PEERS + remote_as: '65210' + description: DC2-POD1-SPINE1_Ethernet4 + 172.17.210.6: + peer_group: IPv4-UNDERLAY-PEERS + remote_as: '65210' + description: DC2-POD1-SPINE2_Ethernet4 + 172.16.210.3: + peer_group: EVPN-OVERLAY-PEERS + description: DC2-POD1-LEAF1A + remote_as: '65211' + address_family_evpn: + peer_groups: + EVPN-OVERLAY-PEERS: + activate: true + address_family_rtc: + peer_groups: + EVPN-OVERLAY-PEERS: + activate: true +static_routes: +- vrf: MGMT + destination_address_prefix: 0.0.0.0/0 + gateway: 192.168.1.254 +service_routing_protocols_model: multi-agent +ip_routing: true +vlan_internal_order: + allocation: ascending + range: + beginning: 1006 + ending: 1199 +snmp_server: + location: TWODC_5STAGE_CLOS DC2 DC2_POD1 DC2-POD1-LEAF2A +spanning_tree: + mode: rstp + rstp_priority: 4096 +local_users: + admin: + privilege: 15 + role: network-admin + sha512_password: $6$eJ5TvI8oru5i9e8G$R1X/SbtGTk9xoEHEBQASc7SC2nHYmi.crVgp2pXuCXwxsXEA81e4E0cXgQ6kX08fIeQzauqhv2kS.RGJFCon5/ +vrfs: + MGMT: + ip_routing: false +management_interfaces: + Management1: + description: oob_management + shutdown: false + vrf: MGMT + ip_address: 192.168.1.24/24 + gateway: 192.168.1.254 + type: oob +management_api_http: + enable_vrfs: + MGMT: {} + enable_https: true +eos_cli: "interface Loopback1010\n description Loopback created from raw_eos_cli under l3leaf defaults in DC2 POD1\n\ninterface Loopback1111\n\ + \ description Loopback created from raw_eos_cli under platform_settings vEOS-LAB\n" +ethernet_interfaces: + Ethernet1: + peer: DC2-POD1-SPINE1 + peer_interface: Ethernet4 + peer_type: spine + description: P2P_LINK_TO_DC2-POD1-SPINE1_Ethernet4 + mtu: 1500 + service_profile: QOS-PROFILE + ptp: + enable: true + type: routed + shutdown: false + ip_address: 172.17.210.5/31 + Ethernet2: + peer: DC2-POD1-SPINE2 + peer_interface: Ethernet4 + peer_type: spine + description: P2P_LINK_TO_DC2-POD1-SPINE2_Ethernet4 + mtu: 1500 + service_profile: QOS-PROFILE + ptp: + enable: true + type: routed + shutdown: false + ip_address: 172.17.210.7/31 + Ethernet3: + peer: DC2-POD1-L2LEAF2A + peer_interface: Ethernet1 + peer_type: l2leaf + description: DC2-POD1-L2LEAF2A_Ethernet1 + type: switched + shutdown: false + channel_group: + id: 3 + mode: active +port_channel_interfaces: + Port-Channel3: + description: DC2-POD1-L2LEAF2A_Po1 + type: switched + shutdown: false + vlans: 4092 + mode: trunk + service_profile: QOS-PROFILE +loopback_interfaces: + Loopback0: + description: EVPN_Overlay_Peering + shutdown: false + ip_address: 172.16.210.4/32 + Loopback1: + description: VTEP_VXLAN_Tunnel_Source + shutdown: false + ip_address: 172.18.210.4/32 +prefix_lists: + PL-LOOPBACKS-EVPN-OVERLAY: + sequence_numbers: + 10: + action: permit 172.16.210.0/24 eq 32 + 20: + action: permit 172.18.210.0/24 eq 32 + PL-L2LEAF-INBAND-MGMT: + sequence_numbers: + 10: + action: permit 172.21.210.0/24 +route_maps: + RM-CONN-2-BGP: + sequence_numbers: + 10: + type: permit + match: + - ip address prefix-list PL-LOOPBACKS-EVPN-OVERLAY + 20: + type: permit + match: + - ip address prefix-list PL-L2LEAF-INBAND-MGMT +router_bfd: + multihop: + interval: 300 + min_rx: 300 + multiplier: 3 +ip_igmp_snooping: + globally_enabled: true +vxlan_interface: + Vxlan1: + description: DC2-POD1-LEAF2A_VTEP + vxlan: + source_interface: Loopback1 + udp_port: 4789 +vlans: + 4092: + tenant: system + name: L2LEAF_INBAND_MGMT +vlan_interfaces: + Vlan4092: + description: L2LEAF_INBAND_MGMT + shutdown: false + mtu: 1500 + ip_address: 172.21.210.2/24 + ip_virtual_router_addresses: + - 172.21.210.1 + ip_attached_host_route_export: + distance: 19 +ip_virtual_router_mac_address: 00:1c:73:00:dc:01 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE1.yml index 5a1e6cc2c38..d826d1286f8 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE1.yml @@ -42,6 +42,10 @@ router_bgp: peer_group: IPv4-UNDERLAY-PEERS remote_as: '65211' description: DC2-POD1-LEAF1A_Ethernet1 + 172.17.210.5: + peer_group: IPv4-UNDERLAY-PEERS + remote_as: '65212' + description: DC2-POD1-LEAF2A_Ethernet1 172.16.110.3: peer_group: EVPN-OVERLAY-PEERS description: DC1-POD1-LEAF1A @@ -146,6 +150,18 @@ ethernet_interfaces: type: routed shutdown: false ip_address: 172.17.210.0/31 + Ethernet4: + peer: DC2-POD1-LEAF2A + peer_interface: Ethernet1 + peer_type: l3leaf + description: P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet1 + mtu: 1500 + service_profile: QOS-PROFILE + ptp: + enable: true + type: routed + shutdown: false + ip_address: 172.17.210.4/31 Ethernet5: peer: DC1-POD2-SPINE1 peer_interface: Ethernet5 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml index 61798811f9a..d07bb32ec69 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/intended/structured_configs/DC2-POD1-SPINE2.yml @@ -32,6 +32,10 @@ router_bgp: peer_group: IPv4-UNDERLAY-PEERS remote_as: '65211' description: DC2-POD1-LEAF1A_Ethernet2 + 172.17.210.7: + peer_group: IPv4-UNDERLAY-PEERS + remote_as: '65212' + description: DC2-POD1-LEAF2A_Ethernet2 200.200.200.101: remote_as: '65112' description: DC1-POD2-SPINE2 @@ -110,6 +114,18 @@ ethernet_interfaces: type: routed shutdown: false ip_address: 172.17.210.2/31 + Ethernet4: + peer: DC2-POD1-LEAF2A + peer_interface: Ethernet2 + peer_type: l3leaf + description: P2P_LINK_TO_DC2-POD1-LEAF2A_Ethernet2 + mtu: 1500 + service_profile: QOS-PROFILE + ptp: + enable: true + type: routed + shutdown: false + ip_address: 172.17.210.6/31 Ethernet5: peer: DC1-POD2-SPINE2 peer_interface: Ethernet4 diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/inventory/group_vars/DC2_POD1.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/inventory/group_vars/DC2_POD1.yml index c54114a89bd..aa3ffa55cde 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/inventory/group_vars/DC2_POD1.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/inventory/group_vars/DC2_POD1.yml @@ -75,6 +75,18 @@ l3leaf: mgmt_ip: 192.168.1.22/24 uplink_switch_interfaces: ['Ethernet3', 'Ethernet3'] + # Single leaf with l2only combined with inband management parent + RACK2_SINGLE: + evpn_role: client + evpn_route_servers: [ DC2-POD1-LEAF1A ] + bgp_as: 65212 + evpn_services_l2_only: true + nodes: + DC2-POD1-LEAF2A: + id: 2 + mgmt_ip: 192.168.1.24/24 + uplink_switch_interfaces: ['Ethernet4', 'Ethernet4'] + # In DC2 we define all variables via defaults if possible l2leaf: defaults: @@ -95,3 +107,10 @@ l2leaf: id: 1 mgmt_ip: 192.168.1.23/24 uplink_switch_interfaces: ['Ethernet3'] + RACK2_SINGLE: + uplink_switches: ['DC2-POD1-LEAF2A'] + nodes: + DC2-POD1-L2LEAF2A: + id: 2 + mgmt_ip: 192.168.1.25/24 + uplink_switch_interfaces: ['Ethernet3'] diff --git a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/inventory/hosts.yml b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/inventory/hosts.yml index 7509e47a97e..b3d20c4178f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/inventory/hosts.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs-twodc-5stage-clos/inventory/hosts.yml @@ -104,6 +104,12 @@ all: DC2-POD1-L2LEAF1A: type: l2leaf ansible_port: 8023 + DC2-POD1-LEAF2A: + type: l3leaf + ansible_port: 8024 + DC2-POD1-L2LEAF2A: + type: l2leaf + ansible_port: 8025 vars: ansible_host: 10.83.28.157 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/documentation/devices/evpn_services_l2_only_true.md b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/documentation/devices/evpn_services_l2_only_true.md index b2e1886fb27..8cc5d6bfa1f 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/documentation/devices/evpn_services_l2_only_true.md +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/documentation/devices/evpn_services_l2_only_true.md @@ -36,9 +36,6 @@ - [VRF Instances](#vrf-instances) - [VRF Instances Summary](#vrf-instances-summary) - [VRF Instances Device Configuration](#vrf-instances-device-configuration) -- [Virtual Source NAT](#virtual-source-nat) - - [Virtual Source NAT Summary](#virtual-source-nat-summary) - - [Virtual Source NAT Configuration](#virtual-source-nat-configuration) - [Quality Of Service](#quality-of-service) # Management @@ -658,19 +655,4 @@ route-map RM-CONN-2-BGP permit 10 vrf instance MGMT ``` -# Virtual Source NAT - -## Virtual Source NAT Summary - -| Source NAT VRF | Source NAT IP Address | -| -------------- | --------------------- | -| Tenant_A_OP_Zone | 10.255.1.109 | - -## Virtual Source NAT Configuration - -```eos -! -ip address virtual source-nat vrf Tenant_A_OP_Zone address 10.255.1.109 -``` - # Quality Of Service diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_true.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_true.cfg index c32bd3f4c91..e4c5a2da190 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_true.cfg +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/evpn_services_l2_only_true.cfg @@ -118,8 +118,6 @@ interface Vxlan1 vxlan vlan 311 vni 30311 vxlan vlan 350 vni 30350 ! -ip address virtual source-nat vrf Tenant_A_OP_Zone address 10.255.1.109 -! ip routing no ip routing vrf MGMT ! diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml index 5bfc8931103..158e077d165 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2A.yml @@ -678,9 +678,6 @@ vlan_interfaces: shutdown: false vrf: Tenant_C_OP_Zone ip_address_virtual: 10.3.11.1/24 -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.10 vxlan_interface: Vxlan1: description: DC1-LEAF2A_VTEP @@ -729,3 +726,6 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.10 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml index 4daba263d30..7d136f409dd 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-LEAF2B.yml @@ -678,9 +678,6 @@ vlan_interfaces: shutdown: false vrf: Tenant_C_OP_Zone ip_address_virtual: 10.3.11.1/24 -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.11 vxlan_interface: Vxlan1: description: DC1-LEAF2B_VTEP @@ -729,3 +726,6 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.11 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 c7365e6671f..ea8bfc0017c 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 @@ -1418,9 +1418,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.12 vxlan_interface: Vxlan1: description: DC1-SVC3A_VTEP @@ -1482,6 +1479,9 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.12 monitor_sessions: - name: MonitoringSessionServer18WithDest sources: 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 53a691769a9..60c7f4cd550 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 @@ -1383,9 +1383,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.13 vxlan_interface: Vxlan1: description: DC1-SVC3B_VTEP @@ -1447,6 +1444,9 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.13 monitor_sessions: - name: MonitoringSessionServer18WithDest sources: diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml index 698770c6537..b6d4e4373ac 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml @@ -212,9 +212,6 @@ vlan_interfaces: shutdown: false vrf: Tenant_X_OP_Zone ip_address_virtual: 10.1.10.1/24 -virtual_source_nat_vrfs: - Tenant_X_OP_Zone: - ip_address: 10.255.1.33 vxlan_interface: Vxlan1: description: MH-LEAF1A_VTEP @@ -226,6 +223,9 @@ vxlan_interface: vni: 11310 vrfs: Tenant_X_OP_Zone: {} +virtual_source_nat_vrfs: + Tenant_X_OP_Zone: + ip_address: 10.255.1.33 port_channel_interfaces: Port-Channel11: description: ROUTER02_WITH_SUBIF_Testing L2 subinterfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml index f244faa5134..02a23e26837 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml @@ -212,9 +212,6 @@ vlan_interfaces: shutdown: false vrf: Tenant_X_OP_Zone ip_address_virtual: 10.1.10.1/24 -virtual_source_nat_vrfs: - Tenant_X_OP_Zone: - ip_address: 10.255.1.34 vxlan_interface: Vxlan1: description: MH-LEAF1B_VTEP @@ -226,6 +223,9 @@ vxlan_interface: vni: 11310 vrfs: Tenant_X_OP_Zone: {} +virtual_source_nat_vrfs: + Tenant_X_OP_Zone: + ip_address: 10.255.1.34 port_channel_interfaces: Port-Channel11: description: ROUTER02_WITH_SUBIF_Testing L2 subinterfaces diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml index cf57bcc46ba..27178c44471 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml @@ -219,9 +219,6 @@ vlan_interfaces: shutdown: false vrf: Tenant_X_OP_Zone ip_address_virtual: 10.1.10.1/24 -virtual_source_nat_vrfs: - Tenant_X_OP_Zone: - ip_address: 10.255.1.35 vxlan_interface: Vxlan1: description: MH-LEAF2A_VTEP @@ -233,3 +230,6 @@ vxlan_interface: vni: 11310 vrfs: Tenant_X_OP_Zone: {} +virtual_source_nat_vrfs: + Tenant_X_OP_Zone: + ip_address: 10.255.1.35 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml index 4f16443c51c..8b04b78af8a 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_false.yml @@ -561,9 +561,6 @@ vlan_interfaces: shutdown: false vrf: Tenant_C_WAN_Zone ip_address_virtual: 10.3.50.1/24 -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.109 vxlan_interface: Vxlan1: description: evpn_services_l2_only_false_VTEP @@ -626,3 +623,6 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.109 diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml index cdededa78e8..f160dfec6f1 100644 --- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml +++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/evpn_services_l2_only_true.yml @@ -257,9 +257,6 @@ ip_igmp_snooping: vlans: 120: enabled: false -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.109 vxlan_interface: Vxlan1: description: evpn_services_l2_only_true_VTEP diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml index ad9611a3149..349c5333eaf 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml @@ -739,9 +739,6 @@ vlan_interfaces: shutdown: false vrf: Tenant_C_OP_Zone ip_address_virtual: 10.3.11.1/24 -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.10 vxlan_interface: Vxlan1: description: DC1-LEAF2A_VTEP @@ -796,3 +793,6 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.10 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml index 2541d651284..c77afcba448 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml @@ -739,9 +739,6 @@ vlan_interfaces: shutdown: false vrf: Tenant_C_OP_Zone ip_address_virtual: 10.3.11.1/24 -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.11 vxlan_interface: Vxlan1: description: DC1-LEAF2B_VTEP @@ -796,3 +793,6 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.11 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 a60dddac0f9..ee35579d0d9 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 @@ -1352,9 +1352,6 @@ ip_igmp_snooping: 161: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.12 vxlan_interface: Vxlan1: description: DC1-SVC3A_VTEP @@ -1420,3 +1417,6 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.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 1884da84e42..29899bf4816 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 @@ -1352,9 +1352,6 @@ ip_igmp_snooping: 161: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.13 vxlan_interface: Vxlan1: description: DC1-SVC3B_VTEP @@ -1420,3 +1417,6 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.13 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml index 78d6b74dbd1..e1a7030b42f 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml @@ -774,9 +774,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.6 vxlan_interface: Vxlan1: description: DC1-LEAF2A_VTEP @@ -826,3 +823,6 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.6 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml index 6a3d8d38eb6..e37452c922b 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml @@ -774,9 +774,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.7 vxlan_interface: Vxlan1: description: DC1-LEAF2B_VTEP @@ -826,3 +823,6 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.7 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml index ab8c582a40f..a94b7005b93 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml @@ -1098,9 +1098,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.8 vxlan_interface: Vxlan1: description: DC1-SVC3A_VTEP @@ -1162,3 +1159,6 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.8 diff --git a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml index 05c7a7584d9..e6a24a9a1c7 100644 --- a/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml @@ -1079,9 +1079,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.9 vxlan_interface: Vxlan1: description: DC1-SVC3B_VTEP @@ -1143,3 +1140,6 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.9 diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml index fd6087c78d2..14c0e9b6899 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml @@ -685,9 +685,6 @@ vlan_interfaces: shutdown: false vrf: Tenant_C_OP_Zone ip_address_virtual: 10.3.11.1/24 -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.10 vxlan_interface: Vxlan1: description: DC1-LEAF2A_VTEP @@ -736,6 +733,9 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.10 ntp: local_interface: name: Management1 diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml index 2ed4265aa4f..d4f32028cbd 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_ebgp_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml @@ -685,9 +685,6 @@ vlan_interfaces: shutdown: false vrf: Tenant_C_OP_Zone ip_address_virtual: 10.3.11.1/24 -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.11 vxlan_interface: Vxlan1: description: DC1-LEAF2B_VTEP @@ -736,6 +733,9 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.11 ntp: local_interface: name: Management1 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 662854e42cb..c6d795e996c 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 @@ -1276,9 +1276,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.12 vxlan_interface: Vxlan1: description: DC1-SVC3A_VTEP @@ -1340,6 +1337,9 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.12 ntp: local_interface: name: Management1 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 99157e9a0f0..20daf9748cf 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 @@ -1276,9 +1276,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.13 vxlan_interface: Vxlan1: description: DC1-SVC3B_VTEP @@ -1340,6 +1337,9 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.13 ntp: local_interface: name: Management1 diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml index 57f35ca0a9e..b68d0f69440 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2A.yml @@ -783,9 +783,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.6 vxlan_interface: Vxlan1: description: DC1-LEAF2A_VTEP @@ -835,6 +832,9 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.6 ntp: local_interface: name: Management1 diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml index 1191ba6c237..d515a28d99c 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-LEAF2B.yml @@ -783,9 +783,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.7 vxlan_interface: Vxlan1: description: DC1-LEAF2B_VTEP @@ -835,6 +832,9 @@ vxlan_interface: vni: 20 Tenant_C_OP_Zone: vni: 30 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.7 ntp: local_interface: name: Management1 diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml index 39dc0e320ed..7078a2894ae 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3A.yml @@ -1107,9 +1107,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.8 vxlan_interface: Vxlan1: description: DC1-SVC3A_VTEP @@ -1171,6 +1168,9 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.8 ntp: local_interface: name: Management1 diff --git a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml index 99a5701fb88..00699099fbb 100644 --- a/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml +++ b/ansible_collections/arista/avd/molecule/upgrade_v2.x_to_v3.0_evpn_underlay_rfc5549_overlay_ebgp/intended/structured_configs/DC1-SVC3B.yml @@ -1088,9 +1088,6 @@ ip_igmp_snooping: 120: enabled: false ip_virtual_router_mac_address: 00:dc:00:00:00:0a -virtual_source_nat_vrfs: - Tenant_A_OP_Zone: - ip_address: 10.255.1.9 vxlan_interface: Vxlan1: description: DC1-SVC3B_VTEP @@ -1152,6 +1149,9 @@ vxlan_interface: vni: 30 Tenant_C_WAN_Zone: vni: 31 +virtual_source_nat_vrfs: + Tenant_A_OP_Zone: + ip_address: 10.255.1.9 ntp: local_interface: name: Management1 diff --git a/ansible_collections/arista/avd/roles/eos_designs/doc/fabric-topology.md b/ansible_collections/arista/avd/roles/eos_designs/doc/fabric-topology.md index eff086f7259..c43ab746846 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/doc/fabric-topology.md +++ b/ansible_collections/arista/avd/roles/eos_designs/doc/fabric-topology.md @@ -199,6 +199,9 @@ defaults <- node_group <- node_group.node <- node # Number of interfaces towards uplink switches | Optional max_uplink_switches: < integer > + # Number of parallel links towards uplink switches | Optional + max_parallel_uplinks: < integer > + # Enable PTP on uplink links | Optional uplink_ptp: enable: < boolean > diff --git a/ansible_collections/arista/avd/roles/eos_designs/templates/inband_management/ip-virtual-router-mac-address.j2 b/ansible_collections/arista/avd/roles/eos_designs/templates/inband_management/ip-virtual-router-mac-address.j2 new file mode 100644 index 00000000000..63b0c9ec1b0 --- /dev/null +++ b/ansible_collections/arista/avd/roles/eos_designs/templates/inband_management/ip-virtual-router-mac-address.j2 @@ -0,0 +1,4 @@ +{# Set virtual router mac address unless it will be set in network services #} +{% if not (switch.network_services_l2 is arista.avd.defined(true) and switch.network_services_l3 is arista.avd.defined(true)) %} +ip_virtual_router_mac_address: {{ switch.virtual_router_mac_address | lower }} +{% endif %} diff --git a/ansible_collections/arista/avd/roles/eos_designs/templates/inband_management/main.j2 b/ansible_collections/arista/avd/roles/eos_designs/templates/inband_management/main.j2 index bd9682aa838..d568b458e11 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/templates/inband_management/main.j2 +++ b/ansible_collections/arista/avd/roles/eos_designs/templates/inband_management/main.j2 @@ -14,6 +14,8 @@ {% include 'inband_management/parent-vlan-interfaces.j2' %} +{% include 'inband_management/ip-virtual-router-mac-address.j2' %} + {% if switch.underlay_router is arista.avd.defined(true) and switch.underlay_routing_protocol == "ebgp" %} {% include 'inband_management/parent-router-bgp.j2' %} diff --git a/ansible_collections/arista/avd/roles/eos_designs/templates/network_services/main.j2 b/ansible_collections/arista/avd/roles/eos_designs/templates/network_services/main.j2 index ecf0f609d84..0040110b455 100644 --- a/ansible_collections/arista/avd/roles/eos_designs/templates/network_services/main.j2 +++ b/ansible_collections/arista/avd/roles/eos_designs/templates/network_services/main.j2 @@ -49,8 +49,14 @@ {% include 'network_services/router-bgp.j2' %} -{% include 'network_services/virtual-source-nat-vrfs.j2' %} - {% include 'network_services/vxlan-interface.j2' %} {% endif %} + +{# VTEP and L2 and L3 #} +{% if switch.vtep is arista.avd.defined(true) and + switch.network_services_l2 is arista.avd.defined(true) and + switch.network_services_l3 is arista.avd.defined(true) %} +{% include 'network_services/virtual-source-nat-vrfs.j2' %} + +{% endif %}