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): GTSM configuration to limit the TTL permitted for bgp peering to 1 for WAN #3607

Merged
merged 6 commits into from
Feb 19, 2024
Merged

Feat(eos_designs): GTSM configuration to limit the TTL permitted for bgp peering to 1 for WAN #3607

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4a3b22
Feat(eos_designs):Limit TTL permitted for BGP peering to 1 for WAN
amitsagar-arsita Feb 9, 2024
921dd94
Merge branch 'aristanetworks:devel' into ttl_max_hops
amitsagar-arsita Feb 13, 2024
d617fe6
Feat(eos_designs):Addressing comments. Adding a schema element for tt…
amitsagar-arsita Feb 13, 2024
eca7a76
Merge branch 'devel' into ttl_max_hops
amitsagar-arsita Feb 13, 2024
b0d3e3e
Merge branch 'devel' into ttl_max_hops
amitsagar-arsita Feb 19, 2024
c56ce8b
Test: Exercise new schema key in molecule
gmuloc Feb 19, 2024
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
1 change: 1 addition & 0 deletions ...a/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-edge-no-default-policy.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS remote-as 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
Expand Down
1 change: 1 addition & 0 deletions ..._collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-edge.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS remote-as 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
Expand Down
2 changes: 2 additions & 0 deletions ...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-rr1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,15 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS route-reflector-client
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
neighbor WAN-RR-OVERLAY-PEERS peer group
neighbor WAN-RR-OVERLAY-PEERS remote-as 65000
neighbor WAN-RR-OVERLAY-PEERS update-source Dps1
neighbor WAN-RR-OVERLAY-PEERS bfd
neighbor WAN-RR-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-RR-OVERLAY-PEERS send-community
neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0
neighbor 192.168.131.2 peer group WAN-RR-OVERLAY-PEERS
Expand Down
2 changes: 2 additions & 0 deletions ...e_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/autovpn-rr2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,15 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS route-reflector-client
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
neighbor WAN-RR-OVERLAY-PEERS peer group
neighbor WAN-RR-OVERLAY-PEERS remote-as 65000
neighbor WAN-RR-OVERLAY-PEERS update-source Dps1
neighbor WAN-RR-OVERLAY-PEERS bfd
neighbor WAN-RR-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-RR-OVERLAY-PEERS send-community
neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0
neighbor 192.168.131.1 peer group WAN-RR-OVERLAY-PEERS
Expand Down
1 change: 1 addition & 0 deletions ...ecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-common-path-group.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS remote-as 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
Expand Down
1 change: 1 addition & 0 deletions ...molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge-no-default-policy.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS remote-as 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
Expand Down
1 change: 1 addition & 0 deletions ...ctions/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-edge.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS remote-as 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
Expand Down
1 change: 1 addition & 0 deletions .../arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,7 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS route-reflector-client
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
Expand Down
2 changes: 2 additions & 0 deletions ...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder1.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,13 +287,15 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS route-reflector-client
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
neighbor WAN-RR-OVERLAY-PEERS peer group
neighbor WAN-RR-OVERLAY-PEERS remote-as 65000
neighbor WAN-RR-OVERLAY-PEERS update-source Dps1
neighbor WAN-RR-OVERLAY-PEERS bfd
neighbor WAN-RR-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-RR-OVERLAY-PEERS send-community
neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0
neighbor 6.6.6.6 peer group WAN-RR-OVERLAY-PEERS
Expand Down
2 changes: 2 additions & 0 deletions ...arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-pathfinder2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,13 +300,15 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS route-reflector-client
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
neighbor WAN-RR-OVERLAY-PEERS peer group
neighbor WAN-RR-OVERLAY-PEERS remote-as 65000
neighbor WAN-RR-OVERLAY-PEERS update-source Dps1
neighbor WAN-RR-OVERLAY-PEERS bfd
neighbor WAN-RR-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-RR-OVERLAY-PEERS send-community
neighbor WAN-RR-OVERLAY-PEERS maximum-routes 0
neighbor 6.6.6.6 peer group WAN-RR-OVERLAY-PEERS
Expand Down
1 change: 1 addition & 0 deletions ...ons/arista/avd/molecule/eos_designs_unit_tests/intended/configs/cv-pathfinder-transit.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ router bgp 65000
neighbor WAN-OVERLAY-PEERS remote-as 65000
neighbor WAN-OVERLAY-PEERS update-source Dps1
neighbor WAN-OVERLAY-PEERS bfd
neighbor WAN-OVERLAY-PEERS ttl maximum-hops 1
neighbor WAN-OVERLAY-PEERS password 7 htm4AZe9mIQOO1uiMuGgYQ==
neighbor WAN-OVERLAY-PEERS send-community
neighbor WAN-OVERLAY-PEERS maximum-routes 0
Expand Down
1 change: 1 addition & 0 deletions ...ule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge-no-default-policy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
address_family_evpn:
peer_groups:
- name: WAN-OVERLAY-PEERS
Expand Down
1 change: 1 addition & 0 deletions ...s/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-edge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
address_family_evpn:
peer_groups:
- name: WAN-OVERLAY-PEERS
Expand Down
2 changes: 2 additions & 0 deletions ...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
route_reflector_client: true
- name: WAN-RR-OVERLAY-PEERS
type: wan
Expand All @@ -35,6 +36,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
address_family_evpn:
peer_groups:
- name: WAN-OVERLAY-PEERS
Expand Down
2 changes: 2 additions & 0 deletions ...ns/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/autovpn-rr2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
route_reflector_client: true
- name: WAN-RR-OVERLAY-PEERS
type: wan
Expand All @@ -35,6 +36,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
address_family_evpn:
peer_groups:
- name: WAN-OVERLAY-PEERS
Expand Down
1 change: 1 addition & 0 deletions ...esigns_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-common-path-group.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
address_family_evpn:
peer_groups:
- name: WAN-OVERLAY-PEERS
Expand Down
1 change: 1 addition & 0 deletions ...s_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge-no-default-policy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
address_family_evpn:
peer_groups:
- name: WAN-OVERLAY-PEERS
Expand Down
1 change: 1 addition & 0 deletions ...ta/avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-edge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
address_family_evpn:
peer_groups:
- name: WAN-OVERLAY-PEERS
Expand Down
1 change: 1 addition & 0 deletions .../molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
route_reflector_client: true
address_family_evpn:
peer_groups:
Expand Down
2 changes: 2 additions & 0 deletions ...molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
route_reflector_client: true
- name: WAN-RR-OVERLAY-PEERS
type: wan
Expand All @@ -38,6 +39,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
address_family_evpn:
peer_groups:
- name: WAN-OVERLAY-PEERS
Expand Down
2 changes: 2 additions & 0 deletions ...molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-pathfinder2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
route_reflector_client: true
- name: WAN-RR-OVERLAY-PEERS
type: wan
Expand All @@ -38,6 +39,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
address_family_evpn:
peer_groups:
- name: WAN-OVERLAY-PEERS
Expand Down
1 change: 1 addition & 0 deletions ...avd/molecule/eos_designs_unit_tests/intended/structured_configs/cv-pathfinder-transit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ router_bgp:
send_community: all
maximum_routes: 0
remote_as: '65000'
ttl_maximum_hops: 1
address_family_evpn:
peer_groups:
- name: WAN-OVERLAY-PEERS
Expand Down
6 changes: 4 additions & 2 deletions ansible_collections/arista/avd/roles/eos_designs/python_modules/overlay/router_bgp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def _peer_groups(self) -> list | None:
peer_group_config = {"remote_as": self.shared_utils.bgp_as}
if self.shared_utils.wan_role:
# WAN OVERLAY peer group
# TODO Add TTL max hop to the peer group on the Pathfinder once agreed upon
peer_group_config["ttl_maximum_hops"] = 1
if self.shared_utils.wan_role == "server":
peer_group_config["route_reflector_client"] = True
peer_groups.append(
Expand All @@ -147,10 +147,12 @@ def _peer_groups(self) -> list | None:
peer_groups.append({**self._generate_base_peer_group("mpls", "rr_overlay_peers"), "remote_as": self.shared_utils.bgp_as})

if self._is_wan_server_with_peers:
wan_rr_overlay_peer_grp_config = {"remote_as": self.shared_utils.bgp_as}
wan_rr_overlay_peer_grp_config["ttl_maximum_hops"] = 1
amitsagar-arsita marked this conversation as resolved.
Show resolved Hide resolved
peer_groups.append(
amitsagar-arsita marked this conversation as resolved.
Show resolved Hide resolved
{
**self._generate_base_peer_group("wan", "wan_rr_overlay_peers", update_source=self.shared_utils.vtep_loopback),
"remote_as": self.shared_utils.bgp_as,
**wan_rr_overlay_peer_grp_config,
}
)

Expand Down
Loading