Skip to content

Reenable IPv6 BGP neighbor check during warm-reboot #8937

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

Merged
saiarcot895 merged 2 commits into from
Jul 14, 2023
Merged

Reenable IPv6 BGP neighbor check during warm-reboot #8937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c58f7a9
Revert "Temporarily disable checking IPv6 BGP routing on neighbors fo…
saiarcot895 Jun 30, 2023
856e1f8
Revert "Remove the bgp_v6 check, which adds failure since the IPv6 BG…
saiarcot895 Jun 30, 2023
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
9 changes: 3 additions & 6 deletions ansible/roles/test/files/ptftests/arista.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,7 @@ def run(self):
'interfaces']['Port-Channel1']['lastStatusChangeTimestamp']
samples[cur_time] = sample

# TODO: Disabling v6_routing_ok check due to IPv6 FRR issue. Re-add v6_routing_ok once either:
# * https://github.com/FRRouting/frr/issues/13587 is fixed and the fix gets merged into SONiC, or
# * https://github.com/sonic-net/sonic-buildimage/pull/12853 is reverted
while not (quit_enabled and v4_routing_ok):
while not (quit_enabled and v4_routing_ok and v6_routing_ok):
cmd = None
# quit command was received, we don't process next commands
# but wait for v4_routing_ok and v6_routing_ok
Expand Down Expand Up @@ -262,8 +259,8 @@ def run(self):
data, "lacp", "LACP session")
cli_data['bgp_v4'] = self.check_series_status(
data, "bgp_route_v4", "BGP v4 routes")
# TODO: same as above for v6_routing_ok
cli_data['bgp_v6'] = (1, 0)
cli_data['bgp_v6'] = self.check_series_status(
data, "bgp_route_v6", "BGP v6 routes")
cli_data['po'] = self.check_change_time(
samples, "po_changetime", "PortChannel interface")

Expand Down
8 changes: 2 additions & 6 deletions ansible/roles/test/files/ptftests/sonic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,7 @@ def run(self):
lacp_thread.setDaemon(True)
lacp_thread.start()

# TODO: Disabling v6_routing_ok check due to IPv6 FRR issue. Re-add v6_routing_ok once either:
# * https://github.com/FRRouting/frr/issues/13587 is fixed and the fix gets merged into SONiC, or
# * https://github.com/sonic-net/sonic-buildimage/pull/12853 is reverted
while not (quit_enabled and v4_routing_ok):
while not (quit_enabled and v4_routing_ok and v6_routing_ok):
cmd = None
# quit command was received, we don't process next commands
# but wait for v4_routing_ok and v6_routing_ok
Expand Down Expand Up @@ -194,8 +191,7 @@ def run(self):
# cli_data['lacp'] = self.check_series_status(data, "lacp", "LACP session")
cli_data['lacp'] = (0, 0)
cli_data['bgp_v4'] = self.check_series_status(data, "bgp_route_v4", "BGP v4 routes")
# TODO: same as above for v6_routing_ok
cli_data['bgp_v6'] = (1, 0)
cli_data['bgp_v6'] = self.check_series_status(data, "bgp_route_v6", "BGP v6 routes")
cli_data['po'] = self.check_lag_flaps("PortChannel1", log_lines, start_time)

if 'route_timeout' in log_data:
Expand Down