[Thinkit]: Modifications for arbitration test (sonic-net#21716)

sreeiyer-1 · web-flow · commit 68fb8eed9ed8 · 2026-01-23T16:33:59.000-08:00
The set of changes required for the arbitration test to work. This goes with sonic-net/sonic-pins#1670 commited in sonic-pins. In pins_deps.bzl, the sonic-pins is upgraded to the latest. This required upgrading of a few packages. The arbitration test required the addition of the util files and the upgrade of googletest. The gutil directory has moved in the sonic-pins depo. The new path is updated in several files. Signed-off-by: Sree Iyer <sbiyer@google.com> Signed-off-by: Sreemoolanathan Iyer <sbiyer@google.com>
diff --git a/sdn_tests/pins_ondatra/infrastructure/thinkit/BUILD.bazel b/sdn_tests/pins_ondatra/infrastructure/thinkit/BUILD.bazel
@@ -54,7 +54,7 @@ cc_library(
     hdrs = ["thinkit.h"],
     deps = [
         ":thinkit_cgo.cc",
-        "@com_github_sonic_net_sonic_pins//gutil:status",
+        "@com_github_sonic_net_sonic_pins//gutil/gutil:status",
         "@com_github_openconfig_ondatra//proto:ondatra_cc_proto",
         "@com_github_openconfig_ondatra//proxy/proto:reservation_cc_proto",
         "@com_google_absl//absl/status",
@@ -88,7 +88,7 @@ cc_library(
     deps = [
         ":cthinkit",
         ":ondatra_generic_testbed",
-        "@com_github_sonic_net_sonic_pins//gutil:status_matchers",
+        "@com_github_sonic_net_sonic_pins//gutil/gutil:status_matchers",
         "@com_github_sonic_net_sonic_pins//lib:basic_switch",
         "@com_github_sonic_net_sonic_pins//lib:pins_control_device",
         "@com_github_sonic_net_sonic_pins//lib/gnmi:gnmi_helper",
@@ -117,10 +117,10 @@ cc_test(
     deps = [
         ":cthinkit",
         ":ondatra_generic_testbed_fixture",
-        "@com_github_sonic_net_sonic_pins//gutil:proto_matchers",
-        "@com_github_sonic_net_sonic_pins//gutil:status",
-        "@com_github_sonic_net_sonic_pins//gutil:status_matchers",
-        "@com_github_sonic_net_sonic_pins//gutil:testing",
+        "@com_github_sonic_net_sonic_pins//gutil/gutil:proto_matchers",
+        "@com_github_sonic_net_sonic_pins//gutil/gutil:status",
+        "@com_github_sonic_net_sonic_pins//gutil/gutil:status_matchers",
+        "@com_github_sonic_net_sonic_pins//gutil/gutil:testing",
         "@com_github_sonic_net_sonic_pins//thinkit:generic_testbed",
         "@com_github_sonic_net_sonic_pins//thinkit/proto:generic_testbed_cc_proto",
         "@com_github_gnmi//proto/gnmi:gnmi_cc_grpc_proto",
@@ -160,7 +160,7 @@ cc_library(
     deps = [
         ":cthinkit",
         ":ondatra_mirror_testbed",
-        "@com_github_sonic_net_sonic_pins//gutil:status_matchers",
+        "@com_github_sonic_net_sonic_pins//gutil/gutil:status_matchers",
         "@com_github_sonic_net_sonic_pins//lib:basic_switch",
         "@com_github_sonic_net_sonic_pins//lib/gnmi:gnmi_helper",
         "@com_github_sonic_net_sonic_pins//thinkit:mirror_testbed",
diff --git a/sdn_tests/pins_ondatra/infrastructure/thinkit/ondatra_generic_testbed_fixture.cc b/sdn_tests/pins_ondatra/infrastructure/thinkit/ondatra_generic_testbed_fixture.cc
@@ -32,8 +32,8 @@
 #include "github.com/openconfig/ondatra/proto/testbed.pb.h"
 #include "github.com/openconfig/ondatra/proxy/proto/reservation.pb.h"
 #include "gmock/gmock.h"
-#include "gutil/status.h"
-#include "gutil/status_matchers.h"
+#include "gutil/gutil/status.h"
+#include "gutil/gutil/status_matchers.h"
 #include "lib/basic_switch.h"
 #include "lib/gnmi/gnmi_helper.h"
 #include "lib/pins_control_device.h"
diff --git a/sdn_tests/pins_ondatra/infrastructure/thinkit/ondatra_generic_testbed_fixture_test.cc b/sdn_tests/pins_ondatra/infrastructure/thinkit/ondatra_generic_testbed_fixture_test.cc
@@ -35,10 +35,10 @@
 #include "grpcpp/support/status.h"
 #include "grpcpp/support/sync_stream.h"
 #include "gtest/gtest.h"
-#include "gutil/proto_matchers.h"
-#include "gutil/status.h"
-#include "gutil/status_matchers.h"
-#include "gutil/testing.h"
+#include "gutil/gutil/proto_matchers.h"
+#include "gutil/gutil/status.h"
+#include "gutil/gutil/status_matchers.h"
+#include "gutil/gutil/testing.h"
 #include "infrastructure/thinkit/thinkit.h"
 #include "p4/v1/p4runtime.grpc.pb.h"
 #include "p4/v1/p4runtime.pb.h"
diff --git a/sdn_tests/pins_ondatra/infrastructure/thinkit/ondatra_mirror_testbed_fixture.cc b/sdn_tests/pins_ondatra/infrastructure/thinkit/ondatra_mirror_testbed_fixture.cc
@@ -30,8 +30,8 @@
 #include "github.com/openconfig/ondatra/proxy/proto/reservation.pb.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "gutil/status.h"
-#include "gutil/status_matchers.h"
+#include "gutil/gutil/status.h"
+#include "gutil/gutil/status_matchers.h"
 #include "lib/basic_switch.h"
 #include "lib/gnmi/gnmi_helper.h"
 #include "infrastructure/thinkit/ondatra_mirror_testbed.h"
diff --git a/sdn_tests/pins_ondatra/infrastructure/thinkit/thinkit.cc b/sdn_tests/pins_ondatra/infrastructure/thinkit/thinkit.cc
@@ -24,7 +24,7 @@
 #include "github.com/openconfig/ondatra/proto/testbed.pb.h"
 #include "github.com/openconfig/ondatra/proxy/proto/reservation.pb.h"
 #include "google/protobuf/message.h"
-#include "gutil/status.h"
+#include "gutil/gutil/status.h"
 #include "infrastructure/thinkit/thinkit_cgo.h"
 
 namespace pins_test {
diff --git a/sdn_tests/pins_ondatra/pins_deps.bzl b/sdn_tests/pins_ondatra/pins_deps.bzl
@@ -6,7 +6,8 @@ def pins_deps():
         git_repository(
           name = "com_github_sonic_net_sonic_pins",
           remote = "https://github.com/sonic-net/sonic-pins.git",
-          commit = "356fd830c741ed0f377139534eac737c2aa56e59" # main as on march 27, 2025
+          # Updates to December 9, 2025
+          commit = "ce8d3b3d6d08298ba3b03614b2e29eb40729d734",
         )
     if not native.existing_rule("com_github_grpc_grpc"):
         http_archive(
@@ -30,9 +31,9 @@ def pins_deps():
     if not native.existing_rule("com_google_googletest"):
         http_archive(
             name = "com_google_googletest",
-            urls = ["https://github.com/google/googletest/archive/release-1.11.0.tar.gz"],
-            strip_prefix = "googletest-release-1.11.0",
-            sha256 = "b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5",
+            urls = ["https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz"],
+            strip_prefix = "googletest-1.14.0",
+            sha256 = "8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7",
         )
     if not native.existing_rule("com_google_benchmark"):
         http_archive(
@@ -118,17 +119,18 @@ def pins_deps():
         # rather than a release.
         http_archive(
             name = "com_github_p4lang_p4runtime",
-            # 90553b9 is the newest commit on main as of 2023-10-09.
-            urls = ["https://github.com/p4lang/p4runtime/archive/f0e9f33818b74f0009daa44160926e568f1eaa4d.zip"],
-            strip_prefix = "p4runtime-f0e9f33818b74f0009daa44160926e568f1eaa4d/proto",
-            sha256 = "97b43996ada83484bfa3f9be205d6b6fd75b9ed6985839414ee72110d369cd53",
+            # Updates to https://github.com/p4lang/p4runtime/pull/566 on October 16, 2025
+            urls = ["https://github.com/p4lang/p4runtime/archive/f5187a26cd8745cae1b8a48bcdddddc00ec85e22.zip"],
+            strip_prefix = "p4runtime-f5187a26cd8745cae1b8a48bcdddddc00ec85e22/proto",
+            sha256 = "ec894c1458a3a9504e98e4f6cc0683ddb2307d1aa229807819b2d8edab963b04",
         )
     if not native.existing_rule("com_github_p4lang_p4_constraints"):
         http_archive(
             name = "com_github_p4lang_p4_constraints",
-            urls = ["https://github.com/p4lang/p4-constraints/archive/19be9f88dd843e9012a46e8e0e764d545d649f67.zip"],
-            strip_prefix = "p4-constraints-19be9f88dd843e9012a46e8e0e764d545d649f67",
-            sha256 = "48cbe4e5831a54d78b79f33ae41fc9648f0731f055572e3568845805eea01cfa",
+            # Updates to https://github.com/p4lang/p4-constraints/pull/142 on April 29, 2024
+            urls = ["https://github.com/p4lang/p4-constraints/archive/d26400c0061c6eca43f48309ccfcec750c313337.zip"],
+            strip_prefix = "p4-constraints-d26400c0061c6eca43f48309ccfcec750c313337",
+            sha256 = "8bb2954680ded0f21d405ae79c5c7e893fcfa96b0236f22047154e07e536c9bd",
         )
     if not native.existing_rule("com_github_nlohmann_json"):
         http_archive(
diff --git a/sdn_tests/pins_ondatra/tests/thinkit/BUILD.bazel b/sdn_tests/pins_ondatra/tests/thinkit/BUILD.bazel
@@ -5,6 +5,18 @@ package(
     licenses = ["notice"],
 )
 
+cc_library(
+    name = "util",
+    testonly = 1,
+    srcs = ["util.cc"],
+    hdrs = ["util.h"],
+    deps = [
+        "@com_github_sonic_net_sonic_pins//gutil/gutil:testing",
+        "@com_github_p4lang_p4runtime//:p4info_cc_proto",
+        "@com_google_absl//absl/flags:flag",
+    ],
+)
+
 cc_test(
     name = "random_blackbox_events_test",
     timeout = "long",
@@ -42,15 +54,13 @@ cc_test(
         "notap",
     ],
     deps = [
-        "@com_github_sonic_net_sonic_pins//gutil:testing",
+        ":util",
         "//infrastructure/thinkit:ondatra_params",
-        "@com_github_sonic_net_sonic_pins//p4_pdpi:p4_runtime_session",
         "@com_github_sonic_net_sonic_pins//tests/forwarding:arbitration_test",
-        "@com_github_sonic_net_sonic_pins//thinkit:mirror_testbed",
         "@com_github_sonic_net_sonic_pins//thinkit:mirror_testbed_fixture",
+        "@com_github_google_glog//:glog",
         "@com_github_grpc_grpc//:grpc++",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
-        "@com_google_absl//absl/flags:flag",
         "@com_google_googletest//:gtest_main",
     ],
     linkopts = ["-lresolv"],
@@ -71,7 +81,7 @@ cc_test(
         "notap",
     ],
     deps = [
-        "@com_github_sonic_net_sonic_pins//gutil:testing",
+        "@com_github_sonic_net_sonic_pins//gutil/gutil:testing",
         "//infrastructure/thinkit:ondatra_params",
         "@com_github_sonic_net_sonic_pins//tests/forwarding:configure_mirror_testbed_test",
         "@com_github_sonic_net_sonic_pins//thinkit:mirror_testbed_fixture",
@@ -97,7 +107,7 @@ cc_test(
     ],
     deps = [
         "@com_github_sonic_net_sonic_pins//dvaas:test_vector_cc_proto",
-        "@com_github_sonic_net_sonic_pins//gutil:testing",
+        "@com_github_sonic_net_sonic_pins//gutil/gutil:testing",
         "//infrastructure/thinkit:ondatra_params",
         "@com_github_sonic_net_sonic_pins//tests/forwarding:arriba_test",
         "@com_github_sonic_net_sonic_pins//thinkit:mirror_testbed_fixture",
diff --git a/sdn_tests/pins_ondatra/tests/thinkit/arbitration_test.cc b/sdn_tests/pins_ondatra/tests/thinkit/arbitration_test.cc
@@ -1,33 +1,31 @@
 #include "tests/forwarding/arbitration_test.h"
 
 #include <memory>
-#include <string>
 #include <utility>
 
-#include "absl/flags/flag.h"
+#include "glog/logging.h"
 #include "gtest/gtest.h"
 #include "infrastructure/thinkit/ondatra_params.h"
 #include "p4/v1/p4runtime.pb.h"
-#include "p4_pdpi/p4_runtime_session.h"
-#include "thinkit/mirror_testbed.h"
+#include "tests/thinkit/util.h"
 #include "thinkit/mirror_testbed_fixture.h"
 
-ABSL_FLAG(
-    std::string, p4info_file, "",
-    "Path to the file containing the textproto of the P4Info to be pushed");
-
 namespace pins {
 namespace {
 
 INSTANTIATE_TEST_SUITE_P(
     pinsArbitrationTest, ArbitrationTestFixture, testing::Values([]() {
-      thinkit::MirrorTestbedFixtureParams mirror_testbed_params =
-          *pins::GetOndatraMirrorTestbedFixtureParams();
+      absl::StatusOr<thinkit::MirrorTestbedFixtureParams> params =
+          pins::GetOndatraMirrorTestbedFixtureParams();
+      if (!params.ok()) {
+        LOG(FATAL) << "Failed to fetch params, status: "  // Crash OK
+                   << params.status();
+      }
       return ArbitrationTestParams{
           .mirror_testbed = std::shared_ptr<thinkit::MirrorTestbedInterface>(
-              mirror_testbed_params.mirror_testbed),
-          .gnmi_config = std::move(mirror_testbed_params.gnmi_config),
-          .p4info = std::move(mirror_testbed_params.p4_info)};
+              params->mirror_testbed),
+          .gnmi_config = std::move(params->gnmi_config),
+          .p4info = pins_test::GetP4InfoFromFlag()};
     }()));
 
 }  // namespace
diff --git a/sdn_tests/pins_ondatra/tests/thinkit/arriba_test.cc b/sdn_tests/pins_ondatra/tests/thinkit/arriba_test.cc
@@ -9,7 +9,7 @@
 #include "dvaas/test_vector.pb.h"
 #include "glog/logging.h"
 #include "gtest/gtest.h"
-#include "gutil/testing.h"
+#include "gutil/gutil/testing.h"
 #include "infrastructure/thinkit/ondatra_params.h"
 #include "thinkit/mirror_testbed_fixture.h"
 
diff --git a/sdn_tests/pins_ondatra/tests/thinkit/configure_mirror_testbed_test.cc b/sdn_tests/pins_ondatra/tests/thinkit/configure_mirror_testbed_test.cc
@@ -6,7 +6,7 @@
 #include "absl/flags/flag.h"
 #include "gtest/gtest.h"
 #include "absl/strings/string_view.h"
-#include "gutil/testing.h"
+#include "gutil/gutil/testing.h"
 #include "infrastructure/thinkit/ondatra_params.h"
 #include "p4/config/v1/p4info.pb.h"
 #include "thinkit/mirror_testbed_fixture.h"
diff --git a/sdn_tests/pins_ondatra/tests/thinkit/random_blackbox_events_test.cc b/sdn_tests/pins_ondatra/tests/thinkit/random_blackbox_events_test.cc
@@ -1,3 +1,8 @@
+#include <cstdlib>
+#include <optional>
+#include <string>
+
+#include "absl/container/flat_hash_set.h"
 #include "absl/status/statusor.h"
 #include "gtest/gtest.h"
 #include "infrastructure/thinkit/ondatra_params.h"
@@ -7,9 +12,39 @@
 namespace pins_test {
 namespace {
 
+// TODO(PINS) - update this env variable based on the test environment
+bool IsAlpineTestbed() { return std::getenv("pins_alpine_env") != nullptr; }
+
 INSTANTIATE_TEST_SUITE_P(
-    pinsIntegrationTest, RandomBlackboxEventsTest,
-    testing::Values(*pins::GetOndatraGenericTestbedFixtureParams()));
+    pinsIntegrationTest, RandomBlackboxEventsTest, testing::Values([] {
+      thinkit::GenericTestbedFixtureParams params =
+          *pins::GetOndatraGenericTestbedFixtureParams();
+      return RandomBlackboxEventsTestParams{
+          .testbed_interface = params.testbed_interface,
+          .p4_info = std::nullopt,
+          .fuzzer_config_params = {
+              .qos_queues = {"0x0", "0x1", "0x2", "0x3", "0x4", "0x5", "0x6",
+                             "0x7"},
+              .role = "sdn_controller",
+              .mutate_update_probability = 0.1f,
+              .tables_for_which_to_not_exceed_resource_guarantees =
+                  {"vrf_table", "mirror_session_table"},
+              .disabled_fully_qualified_names =
+              // TODO(PINS) - Remove once Alpine supports multicast
+              IsAlpineTestbed()
+                  ? absl::flat_hash_set<
+                        std::string>{{"egress.packet_rewrites.multicast_"
+                                      "rewrites.multicast_router_"
+                                      "interface_table"}}
+                  : absl::flat_hash_set<std::string>{},
+              // TODO(PINS): Remove once P4RT translated types
+              // are supported by P4-constraints.
+              .ignore_constraints_on_tables =
+                  {
+                      "ingress.routing_lookup.vrf_table",
+                  },
+          }};
+    }()));
 
 }  // namespace
 }  // namespace pins_test
diff --git a/sdn_tests/pins_ondatra/tests/thinkit/util.cc b/sdn_tests/pins_ondatra/tests/thinkit/util.cc
@@ -0,0 +1,23 @@
+#include "tests/thinkit/util.h"
+
+#include <optional>
+#include <string>
+
+#include "absl/flags/flag.h"
+#include "gutil/gutil/testing.h"
+
+ABSL_FLAG(
+    std::string, pins_p4info_file, "",
+    "Path to the file containing the textproto of the P4Info to be pushed");
+
+namespace pins_test {
+
+std::optional<p4::config::v1::P4Info> GetP4InfoFromFlag() {
+  std::string p4info_file = absl::GetFlag(FLAGS_pins_p4info_file);
+  if (p4info_file.empty()) {
+    return std::nullopt;
+  }
+  return gutil::ParseProtoFileOrDie<p4::config::v1::P4Info>(p4info_file);
+}
+
+}  // namespace pins_test
diff --git a/sdn_tests/pins_ondatra/tests/thinkit/util.h b/sdn_tests/pins_ondatra/tests/thinkit/util.h
@@ -0,0 +1,20 @@
+#ifndef PINS_TESTS_UTIL_H_
+#define PINS_TESTS_UTIL_H_
+
+#include <optional>
+#include <string>
+
+#include "absl/flags/declare.h"
+#include "p4/config/v1/p4info.pb.h"
+
+ABSL_DECLARE_FLAG(std::string, pins_p4info_file);
+
+namespace pins_test {
+
+// If the p4info_file flag is set, returns the P4Info from the file.
+// Otherwise returns std::nullopt.
+std::optional<p4::config::v1::P4Info> GetP4InfoFromFlag();
+
+}  // namespace pins_test
+
+#endif  // PINS_TESTS_UTIL_H_
