Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cut(eos_designs): Remove the deprecated ipv6_address_virtual key from SVI settings #4314

Merged
merged 8 commits into from
Aug 6, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ The following data model keys have been removed from `eos_designs` in v5.0.0.
| port_profiles[].port_channel.short_esi | port_profiles[].ethernet_segment.short_esi |
| old key 3.1(defs_node_type) | new key(TODO) |
| old key 3.2(defs_node_type) | new key(TODO) |
| old key 4(defs_svi_settings) | new key(TODO) |
| <network_services_key>[].vrfs[].svis[].ipv6_address_virtual | <network_services_key>[].vrfs[].svis[].ipv6_address_virtuals |
| svi_profiles[].ipv6_address_virtual | svi_profiles[].ipv6_address_virtuals |
| old key 5(ptp) | new key(TODO) |

## Changes to role `arista.avd.eos_cli_config_gen`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ hostname host2
no enable password
no aaa root
!
vlan 110
name Tenant_A_OP_Zone_1
!
vlan 111
name Tenant_A_OP_Zone_2
!
Expand All @@ -29,29 +26,17 @@ interface Loopback0
no shutdown
ip address 10.42.0.102/32
!
interface Vlan110
description Tenant_A_OP_Zone_1
no shutdown
vrf TENANT_B_WAN
ip helper-address 1.1.1.1 vrf MGMT source-interface lo100
ipv6 enable
ipv6 address virtual 2001:db8:413::1/64
!
interface Vlan111
description Tenant_A_OP_Zone_2
no shutdown
vrf TENANT_B_WAN
ip helper-address 1.1.1.1 vrf MGMT source-interface lo100
ipv6 enable
ipv6 address virtual 2001:db8:310::1/64
ipv6 address virtual 2001:db8:311::1/64
!
ip virtual-router mac-address 00:1c:73:00:dc:01
!
ip routing
no ip routing vrf MGMT
ip routing vrf TENANT_B_WAN
ipv6 unicast-routing vrf TENANT_B_WAN
!
ip prefix-list PL-LOOPBACKS-EVPN-OVERLAY
seq 10 permit 10.42.0.0/24 eq 32
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ vrfs:
- name: TENANT_B_WAN
tenant: TENANT_B
ip_routing: true
ipv6_routing: true
management_api_http:
enable_vrfs:
- name: MGMT
Expand Down Expand Up @@ -79,9 +78,6 @@ router_bfd:
min_rx: 300
multiplier: 3
vlans:
- id: 110
name: Tenant_A_OP_Zone_1
tenant: TENANT_B
- id: 111
name: Tenant_A_OP_Zone_2
tenant: TENANT_B
Expand All @@ -92,28 +88,12 @@ ip_igmp_snooping:
globally_enabled: true
ip_virtual_router_mac_address: 00:1c:73:00:dc:01
vlan_interfaces:
- name: Vlan110
tenant: TENANT_B
description: Tenant_A_OP_Zone_1
shutdown: false
ipv6_enable: true
ipv6_address_virtuals:
- 2001:db8:413::1/64
vrf: TENANT_B_WAN
ip_helpers:
- ip_helper: 1.1.1.1
source_interface: lo100
vrf: MGMT
- name: Vlan111
tenant: TENANT_B
tags:
- opzone
description: Tenant_A_OP_Zone_2
shutdown: false
ipv6_enable: true
ipv6_address_virtuals:
- 2001:db8:310::1/64
- 2001:db8:311::1/64
vrf: TENANT_B_WAN
ip_helpers:
- ip_helper: 1.1.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ svi_profiles:
mtu: 1560
enabled: false
ip_address_virtual: 10.4.13.254/24
ipv6_address_virtual: 2001:db8:413::1/64
# Testing "ip_helpers" as dict of dict
# Dict type is deprecated in 4.0.0. To be removed in 5.0.0
ip_helpers:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,11 @@ tenants:
# Testing "svis" as dict of dict
# Dict type is deprecated in 4.0.0. To be removed in 5.0.0
svis:
110:
vni_override: 50110
name: Tenant_A_OP_Zone_1
enabled: True
# Testing ipv6_address_virtual alone
# ipv6_address_virtual deprecated in 4.0.0. To be removed in 5.0.0
ipv6_address_virtual: 2001:db8:413::1/64
111:
vni_override: 50111
name: Tenant_A_OP_Zone_2
tags: ['opzone']
enabled: True
# Testing ipv6_address_virtual in combination with the new ipv6_address_virtuals to see that both are configured
# ipv6_address_virtual deprecated in 4.0.0. To be removed in 5.0.0
ipv6_address_virtual: 2001:db8:310::1/64
ipv6_address_virtuals:
- 2001:db8:311::1/64
# Testing "ip_helpers" as dict of dict
# Dict type is deprecated in 4.0.0. To be removed in 5.0.0
ip_helpers:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading