Reenable IPv6 BGP neighbor check during warm-reboot (sonic-net#8937)

* Revert "Temporarily disable checking IPv6 BGP routing on neighbors for warm-reboot (sonic-net#8735)"

This reverts commit ff4bbf3.

* Revert "Remove the bgp_v6 check, which adds failure since the IPv6 BGP doesn't come up (sonic-net#8746)"

This reverts commit 5db3a06.

ansible/roles/test/files/ptftests/arista.py

@@ -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
@@ -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")
 

ansible/roles/test/files/ptftests/sonic.py

@@ -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
@@ -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: