[Thinkit] Export pushed P4Info as test artifacts for P4Info push test.Don't craft packets with UDP headers if UDP port is already reserved.Increase BERT test duration when disabling the ports during the test.Skip BERT on certain links.

Author: kishanps

tests/forwarding/BUILD.bazel

@@ -454,11 +454,14 @@ cc_library(
         ":util",
         "//dvaas:test_vector_cc_proto",
         "//gutil:collections",
+        "//gutil:status",
         "//gutil:status_matchers",
         "//gutil:testing",
         "//lib/gnmi:gnmi_helper",
+        "//lib/gnmi:openconfig_cc_proto",
         "//lib/p4rt:p4rt_port",
         "//lib/validator:validator_lib",
+        "//p4_pdpi:ir",
         "//p4_pdpi:ir_cc_proto",
         "//p4_pdpi:p4_runtime_session",
         "//p4_pdpi:pd",
@@ -468,6 +471,7 @@ cc_library(
         "//sai_p4/instantiations/google:sai_pd_cc_proto",
         "//tests:thinkit_sanity_tests",
         "//tests/lib:p4rt_fixed_table_programming_helper",
+        "//tests/lib:switch_test_setup_helpers",
         "//thinkit:mirror_testbed",
         "//thinkit:mirror_testbed_fixture",
         "//thinkit:switch",

tests/forwarding/p4info_push_test.cc

@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -31,13 +31,16 @@ namespace {
 // Sends P4Info to the switch and makes sure it works.
 TEST_P(P4InfoPushTestFixture, P4InfoPushTest) {
   LOG(INFO) << "Test started";
-
+  ASSERT_OK(GetParam()
+                .mirror_testbed->GetMirrorTestbed()
+                .Environment()
+                .StoreTestArtifact("pushed_p4info.pb.txt", GetParam().p4info));
   // Push the gNMI configuration and P4Info to the SUT.
   LOG(INFO) << "Pushing gNMI config & P4info";
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<pdpi::P4RuntimeSession> sut_p4rt_session,
-      pins_test::ConfigureSwitchAndReturnP4RuntimeSession(
-          GetTestbed().Sut(), GetParam().gnmi_config, GetParam().p4info));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<pdpi::P4RuntimeSession> sut_p4rt_session,
+                       pins_test::ConfigureSwitchAndReturnP4RuntimeSession(
+                           GetParam().mirror_testbed->GetMirrorTestbed().Sut(),
+                           GetParam().gnmi_config, GetParam().p4info));
 
   // Pull P4Info, make sure it is the same as the pushed one.
   LOG(INFO) << "Pulling P4Info";

tests/forwarding/p4info_push_test.h

@@ -17,36 +17,27 @@
 
 #include <string>
 
-#include "gutil/status_matchers.h"
-#include "tests/thinkit_sanity_tests.h"
-#include "thinkit/mirror_testbed.h"
 #include "thinkit/mirror_testbed_fixture.h"
 
 namespace pins {
 
 struct P4InfoPushTestParams {
   std::string description;
   // TODO: use GenericTestbed instead.
-  thinkit::MirrorTestbedInterface *testbed_interface;
-  std::string gnmi_config;
+  std::shared_ptr<thinkit::MirrorTestbedInterface> mirror_testbed;
+  // The test assumes that the switch is pre-configured if no `gnmi_config` is
+  // given (default), or otherwise pushes the given config before starting.
+  std::optional<std::string> gnmi_config;
   p4::config::v1::P4Info p4info;
 };
 
 class P4InfoPushTestFixture
     : public testing::TestWithParam<P4InfoPushTestParams> {
-protected:
-  void SetUp() override { testbed_interface_->SetUp(); }
-  void TearDown() override { testbed_interface_->TearDown(); }
-
-  thinkit::MirrorTestbed &GetTestbed() {
-    return testbed_interface_->GetMirrorTestbed();
-  }
-
-private:
-  std::unique_ptr<thinkit::MirrorTestbedInterface> testbed_interface_ =
-      absl::WrapUnique(GetParam().testbed_interface);
+ protected:
+  void SetUp() override { GetParam().mirror_testbed->SetUp(); }
+  void TearDown() override { GetParam().mirror_testbed->TearDown(); }
 };
 
-} // namespace pins
+}  // namespace pins
 
-#endif // PINS_TESTS_FORWARDING_P4INFO_PUSH_TEST_H_
+#endif  // PINS_TESTS_FORWARDING_P4INFO_PUSH_TEST_H_