[Thinkit] Update P4Info configuration API calls. Remove thread-unsafe TryCancel method; migrate users to Finish and make it safe.remove deprecated P4RuntimeSession API.Adds StreamableStatusOr utility and removed absl::StatusOr operator<< overloads.

Author: kishanps

tests/forwarding/watch_port_test.cc

@@ -581,6 +581,10 @@ void WatchPortTestFixture::TearDown() {
     ASSERT_OK(testbed.SaveSwitchLogs("before_reboot_"));
     LOG(INFO) << "Switch is in critical state, rebooting the switch.";
     pins_test::TestGnoiSystemColdReboot(testbed.GetMirrorTestbed().Sut());
+    EXPECT_OK(control_p4_session_->Finish());
+    if (receive_packet_thread_.joinable()) {
+      receive_packet_thread_.join();
+    }
     pins_test::TestGnoiSystemColdReboot(
         testbed.GetMirrorTestbed().ControlSwitch());
 
@@ -593,6 +597,23 @@ void WatchPortTestFixture::TearDown() {
     EXPECT_OK(pdpi::ClearTableEntries(sut_p4_session_.get()));
     EXPECT_OK(sut_p4_session_->Finish());
   }
+  // Stop RPC sessions.
+  if (control_p4_session_ != nullptr) {
+    EXPECT_OK(pdpi::ClearTableEntries(control_p4_session_.get()));
+    EXPECT_OK(control_p4_session_->Finish());
+  }
+  if (receive_packet_thread_.joinable()) {
+    receive_packet_thread_.join();
+  }
+  if (control_gnmi_stub_) {
+    ASSERT_OK_AND_ASSIGN(const auto port_name_per_port_id,
+                         GetPortNamePerPortId(*control_gnmi_stub_));
+    // Restore the admin state to UP.
+    for (const auto& [port_id, name] : port_name_per_port_id) {
+      EXPECT_OK(SetInterfaceAdminState(*control_gnmi_stub_, name,
+                                       InterfaceState::kUp));
+    }
+  }
 
   testbed.TearDown();
 }

tests/mtu_tests/BUILD.bazel

@@ -48,6 +48,7 @@ cc_library(
         "//p4_pdpi/packetlib:packetlib_cc_proto",
         "//sai_p4/instantiations/google:sai_pd_cc_proto",
         "//tests/forwarding:util",
+        "//tests/lib:switch_test_setup_helpers",
         "//thinkit:control_device",
         "//thinkit:generic_testbed",
         "//thinkit:generic_testbed_fixture",

tests/mtu_tests/mtu_tests.cc

@@ -38,6 +38,7 @@
 #include "sai_p4/instantiations/google/instantiations.h"
 #include "sai_p4/instantiations/google/sai_pd.pb.h"
 #include "tests/forwarding/util.h"
+#include "tests/lib/switch_test_setup_helpers.h"
 #include "thinkit/control_device.h"
 #include "thinkit/generic_testbed.h"
 #include "thinkit/proto/generic_testbed.pb.h"
@@ -252,10 +253,10 @@ TEST_P(MtuRoutingTestFixture, MtuTest) {
   ASSERT_TRUE(absl::SimpleAtoi(state_path_response, &orig_mtu));
 
   // Set up a route between the source and destination interfaces.
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<pdpi::P4RuntimeSession> p4_session,
-      pdpi::P4RuntimeSession::CreateWithP4InfoAndClearTables(
-          testbed_->Sut(), MtuRoutingTestFixture::GetParam().p4_info));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<pdpi::P4RuntimeSession> p4_session,
+                       pins_test::ConfigureSwitchAndReturnP4RuntimeSession(
+                           testbed_->Sut(), /*gnmi_config=*/std::nullopt,
+                           MtuRoutingTestFixture::GetParam().p4_info));
   P4rtProgrammingContext p4rt_context(p4_session.get(),
                                       pdpi::SetMetadataAndSendPiWriteRequest);
   ASSERT_OK(SetupRoute(&p4rt_context));
@@ -319,10 +320,10 @@ TEST_P(MtuRoutingTestFixture, VerifyTrafficWithMtuChangeTest) {
              std::to_string(kMtu4500));
 
   // Set up a route between the source and destination interfaces.
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<pdpi::P4RuntimeSession> p4_session,
-      pdpi::P4RuntimeSession::CreateWithP4InfoAndClearTables(
-          testbed_->Sut(), MtuRoutingTestFixture::GetParam().p4_info));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<pdpi::P4RuntimeSession> p4_session,
+                       pins_test::ConfigureSwitchAndReturnP4RuntimeSession(
+                           testbed_->Sut(), /*gnmi_config=*/std::nullopt,
+                           MtuRoutingTestFixture::GetParam().p4_info));
   P4rtProgrammingContext p4rt_context(p4_session.get(),
                                       pdpi::SetMetadataAndSendPiWriteRequest);
   ASSERT_OK(SetupRoute(&p4rt_context));

tests/qos/BUILD.bazel

@@ -165,6 +165,8 @@ cc_test(
     deps = [
         ":gnmi_parsers",
         "//gutil:proto",
+        "//gutil:status",
+        "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_protobuf//:protobuf",
     ],
@@ -210,6 +212,7 @@ cc_library(
     hdrs = ["packet_in_receiver.h"],
     deps = [
         "//p4_pdpi:p4_runtime_session",
-	"@com_google_absl//absl/synchronization",
+        "@com_google_absl//absl/synchronization",
+        "@com_google_absl//absl/time",
     ],
 )