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.

Sign up for GitHub

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

Feat(eos_designs): Add uplink_interface_speed option for default_interfaces #4828

Merged
merged 5 commits into from
Jan 3, 2025
Merged

Feat(eos_designs): Add uplink_interface_speed option for default_interfaces #4828

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
47feef6
Feat(eos_designs): Add speed option for
Dec 18, 2024
4d200b8
Update python-avd/pyavd/_eos_designs/shared_utils/misc.py
laxmikantchintakindi Dec 24, 2024
ec43ec8
Add description for uplink-interface-speed
Dec 24, 2024
e55e5a7
Merge branch 'devel' into feat/eos_designs/default_interface_speed
gmuloc Jan 3, 2025
3e7c149
Merge branch 'devel' into feat/eos_designs/default_interface_speed
gmuloc Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...le_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,27 +100,31 @@ interface Ethernet18
description P2P_LINK_TO_MLAG-OSPF-L3LEAF1A_Ethernet1
no shutdown
mtu 1500
speed forced 40gfull
no switchport
ip address 10.10.101.6/31
!
interface Ethernet19
description P2P_LINK_TO_MH-LEAF1A_Ethernet1
no shutdown
mtu 1500
speed forced 40gfull
no switchport
ip address 10.10.101.0/31
!
interface Ethernet20
description P2P_LINK_TO_MH-LEAF1B_Ethernet1
no shutdown
mtu 1500
speed forced 40gfull
no switchport
ip address 10.10.101.2/31
!
interface Ethernet21
description P2P_LINK_TO_MH-LEAF2A_Ethernet1
no shutdown
mtu 1500
speed forced 40gfull
no switchport
ip address 10.10.101.4/31
!
Expand Down Expand Up @@ -192,6 +196,7 @@ interface Ethernet220
description P2P_LINK_TO_MLAG-OSPF-L3LEAF1B_Ethernet1
no shutdown
mtu 1500
speed forced 40gfull
no switchport
ip address 10.10.101.8/31
!
Expand Down
1 change: 1 addition & 0 deletions ...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1A.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ interface Ethernet1
description P2P_LINK_TO_DC1-SPINE1_Ethernet19
no shutdown
mtu 1500
speed forced 40gfull
no switchport
ip address 10.10.101.1/31
link tracking group LT_GROUP1 upstream
Expand Down
1 change: 1 addition & 0 deletions ...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF1B.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ interface Ethernet1
description P2P_LINK_TO_DC1-SPINE1_Ethernet20
no shutdown
mtu 1500
speed forced 40gfull
no switchport
ip address 10.10.101.3/31
link tracking group LT_GROUP1 upstream
Expand Down
1 change: 1 addition & 0 deletions ...ble_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MH-LEAF2A.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ interface Ethernet1
description P2P_LINK_TO_DC1-SPINE1_Ethernet21
no shutdown
mtu 1500
speed forced 40gfull
no switchport
ip address 10.10.101.5/31
link tracking group Eth-conn-to-router upstream
Expand Down
1 change: 1 addition & 0 deletions ...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-OSPF-L3LEAF1A.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ interface Ethernet1
description P2P_LINK_TO_DC1-SPINE1_Ethernet18
no shutdown
mtu 1500
speed forced 40gfull
no switchport
ip address 10.10.101.7/31
ip ospf network point-to-point
Expand Down
1 change: 1 addition & 0 deletions ...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/MLAG-OSPF-L3LEAF1B.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ interface Ethernet1
description P2P_LINK_TO_DC1-SPINE1_Ethernet220
no shutdown
mtu 1500
speed forced 40gfull
no switchport
ip address 10.10.101.9/31
ip ospf network point-to-point
Expand Down
5 changes: 5 additions & 0 deletions ...ons/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ ethernet_interfaces:
- name: Ethernet18
description: P2P_LINK_TO_MLAG-OSPF-L3LEAF1A_Ethernet1
shutdown: false
speed: forced 40gfull
mtu: 1500
ip_address: 10.10.101.6/31
peer: MLAG-OSPF-L3LEAF1A
Expand All @@ -104,6 +105,7 @@ ethernet_interfaces:
- name: Ethernet19
description: P2P_LINK_TO_MH-LEAF1A_Ethernet1
shutdown: false
speed: forced 40gfull
mtu: 1500
ip_address: 10.10.101.0/31
peer: MH-LEAF1A
Expand All @@ -114,6 +116,7 @@ ethernet_interfaces:
- name: Ethernet20
description: P2P_LINK_TO_MH-LEAF1B_Ethernet1
shutdown: false
speed: forced 40gfull
mtu: 1500
ip_address: 10.10.101.2/31
peer: MH-LEAF1B
Expand All @@ -124,6 +127,7 @@ ethernet_interfaces:
- name: Ethernet21
description: P2P_LINK_TO_MH-LEAF2A_Ethernet1
shutdown: false
speed: forced 40gfull
mtu: 1500
ip_address: 10.10.101.4/31
peer: MH-LEAF2A
Expand Down Expand Up @@ -222,6 +226,7 @@ ethernet_interfaces:
- name: Ethernet220
description: P2P_LINK_TO_MLAG-OSPF-L3LEAF1B_Ethernet1
shutdown: false
speed: forced 40gfull
mtu: 1500
ip_address: 10.10.101.8/31
peer: MLAG-OSPF-L3LEAF1B
Expand Down
1 change: 1 addition & 0 deletions ...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1A.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ethernet_interfaces:
- name: Ethernet1
description: P2P_LINK_TO_DC1-SPINE1_Ethernet19
shutdown: false
speed: forced 40gfull
mtu: 1500
link_tracking_groups:
- name: LT_GROUP1
Expand Down
1 change: 1 addition & 0 deletions ...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF1B.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ethernet_interfaces:
- name: Ethernet1
description: P2P_LINK_TO_DC1-SPINE1_Ethernet20
shutdown: false
speed: forced 40gfull
mtu: 1500
link_tracking_groups:
- name: LT_GROUP1
Expand Down
1 change: 1 addition & 0 deletions ...ions/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MH-LEAF2A.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ethernet_interfaces:
- name: Ethernet1
description: P2P_LINK_TO_DC1-SPINE1_Ethernet21
shutdown: false
speed: forced 40gfull
mtu: 1500
link_tracking_groups:
- name: Eth-conn-to-router
Expand Down
1 change: 1 addition & 0 deletions ...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1A.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ ethernet_interfaces:
- name: Ethernet1
description: P2P_LINK_TO_DC1-SPINE1_Ethernet18
shutdown: false
speed: forced 40gfull
mtu: 1500
ip_address: 10.10.101.7/31
ospf_network_point_to_point: true
Expand Down
1 change: 1 addition & 0 deletions ...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/MLAG-OSPF-L3LEAF1B.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ ethernet_interfaces:
- name: Ethernet1
description: P2P_LINK_TO_DC1-SPINE1_Ethernet220
shutdown: false
speed: forced 40gfull
mtu: 1500
ip_address: 10.10.101.9/31
ospf_network_point_to_point: true
Expand Down
8 changes: 8 additions & 0 deletions ...e_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/group_vars/AVD_LAB.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,48 +91,56 @@ default_interfaces:
uplink_interfaces: [ Ethernet49-54/1 ]
mlag_interfaces: [ Ethernet55-56/1 ]
downlink_interfaces: [ Ethernet1-32/1 ]
uplink_interface_speed: forced 40gfull

- types: [ spine ]
platforms: [ "7[58]00R3", 7500R ]
uplink_interfaces: [ Ethernet1/31-34/1 ]
mlag_interfaces: [ Ethernet1/35-36/1 ]
downlink_interfaces: [ Ethernet1/1-30/1 ]
uplink_interface_speed: forced 40gfull

- types: [ spine, l3leaf ]
platforms: [ "7050[SC]X3" ]
uplink_interfaces: [ Ethernet49-52/1 ]
mlag_interfaces: [ Ethernet53-54/1 ]
downlink_interfaces: [ Ethernet1-30/1 ]
uplink_interface_speed: forced 40gfull

- types: [ l3leaf, spine ]
platforms: [ VEOS, vEOS, vEOS.*, VEOS.* ]
uplink_interfaces: [ Ethernet27-34 ]
mlag_interfaces: [ Ethernet35-36 ]
downlink_interfaces: [ Ethernet1-26 ]
uplink_interface_speed: forced 40gfull

- types: [ l3leaf ]
platforms: [ default ]
uplink_interfaces: [ Ethernet49-52/1 ]
mlag_interfaces: [ Ethernet53-54/1 ]
downlink_interfaces: [ Ethernet1-30/1 ]
uplink_interface_speed: forced 40gfull

- types: [ l3leaf ]
platforms: [ 7280R, 7280R2, my_custom_platform ]
uplink_interfaces: [ Ethernet49-56/1 ]
mlag_interfaces: [ Ethernet57-58/1 ]
downlink_interfaces: [ Ethernet1-30/1 ]
uplink_interface_speed: forced 40gfull

- types: [ l3leaf ]
platforms: [ 7368.* ]
uplink_interfaces: [ Ethernet1/9-14/1 ]
mlag_interfaces: [ Ethernet1/15-16/1 ]
downlink_interfaces: [ Ethernet1/1-8/1 ]
uplink_interface_speed: forced 40gfull

- types: [ l3leaf ]
platforms: [ 7300X3 ]
uplink_interfaces: [ Ethernet1/27-30/1 ]
mlag_interfaces: [ Ethernet1/31-32/1 ]
downlink_interfaces: [ Ethernet1/1-26/1 ]
uplink_interface_speed: forced 40gfull

# Custom platform with Management42 as the management interface
custom_platform_settings:
Expand Down
2 changes: 2 additions & 0 deletions ansible_collections/arista/avd/roles/eos_designs/docs/tables/default-interfaces.md
View file
Open in desktop

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

4 changes: 4 additions & 0 deletions python-avd/pyavd/_eos_designs/schema/__init__.py
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions python-avd/pyavd/_eos_designs/schema/schema_fragments/default_interfaces.schema.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ keys:
items:
type: str
description: Interface range or interface.
uplink_interface_speed:
type: str
Vibhu-gslab marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 1 addition & 2 deletions python-avd/pyavd/_eos_designs/shared_utils/misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ def fabric_name(self: SharedUtils) -> str:

@cached_property
def uplink_interface_speed(self: SharedUtils) -> str | None:
# Keeping since we will need it when adding speed support under default interfaces.
return self.node_config.uplink_interface_speed
return self.node_config.uplink_interface_speed or self.default_interfaces.uplink_interface_speed
laxmikantchintakindi marked this conversation as resolved.
Show resolved Hide resolved

@cached_property
def uplink_switch_interface_speed(self: SharedUtils) -> str | None:
Expand Down
Loading