[Thinkit] Create milestones for controlling test behavior in PINs NSF integration tests.Implement OTG traffic helper for the NSF Upgrade test skeleton.

tests/integration/system/nsf/BUILD.bazel

@@ -34,3 +34,41 @@ cc_library(
         "@com_google_absl//absl/types:span",
     ],
 )
+
+cc_library(
+    name = "upgrade_test",
+    testonly = True,
+    srcs = ["upgrade_test.cc"],
+    hdrs = ["upgrade_test.h"],
+    deps = [
+        ":milestone",
+        ":util",
+        "//gutil:status_matchers",
+        "//gutil:testing",
+        "//tests/integration/system/nsf/interfaces:component_validator",
+        "//tests/integration/system/nsf/interfaces:flow_programmer",
+        "//tests/integration/system/nsf/interfaces:test_params",
+        "//tests/integration/system/nsf/interfaces:traffic_helper",
+        "//thinkit:generic_testbed",
+        "//thinkit:generic_testbed_fixture",
+        "//thinkit/proto:generic_testbed_cc_proto",
+        "@com_github_google_glog//:glog",
+        "@com_github_p4lang_p4runtime//:p4info_cc_proto",
+        "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
+        "@com_google_absl//absl/flags:flag",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings:string_view",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
+cc_library(
+    name = "milestone",
+    srcs = ["milestone.cc"],
+    hdrs = ["milestone.h"],
+    deps = [
+        "@com_github_google_glog//:glog",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings:string_view",
+    ],
+)

tests/integration/system/nsf/milestone.cc

@@ -0,0 +1,59 @@
+// 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.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "tests/integration/system/nsf/milestone.h"
+
+#include <string>
+#include <tuple>
+#include <vector>
+
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
+#include "glog/logging.h"
+
+namespace pins_test {
+
+namespace {
+
+std::vector<std::tuple<NsfMilestone, std::string>> MilestoneToStringMapping() {
+  return {
+      {NsfMilestone::kAll, "all"},
+      {NsfMilestone::kShutdown, "shutdown"},
+      {NsfMilestone::kBootup, "bootup"},
+  };
+}
+
+}  // namespace
+
+bool AbslParseFlag(absl::string_view milestone_text, NsfMilestone* milestone,
+                   std::string* error) {
+  for (auto& [milestone_, string] : MilestoneToStringMapping()) {
+    if (string == milestone_text) {
+      *milestone = milestone_;
+      return true;
+    }
+  }
+  absl::StrAppend(error, "unknown milestone: '", milestone_text, "'");
+  return false;
+}
+
+std::string AbslUnparseFlag(NsfMilestone milestone) {
+  for (auto& [milestone_, string] : MilestoneToStringMapping()) {
+    if (milestone_ == milestone) return string;
+  }
+  LOG(DFATAL) << "invalid milestone: " << static_cast<int>(milestone);
+  return "<invalid_milestone>";
+}
+
+}  // namespace pins_test

tests/integration/system/nsf/milestone.h

@@ -0,0 +1,36 @@
+// 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.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef PINS_TESTS_INTEGRATION_SYSTEM_NSF_MILESTONE_H_
+#define PINS_TESTS_INTEGRATION_SYSTEM_NSF_MILESTONE_H_
+
+#include <string>
+
+#include "absl/strings/string_view.h"
+
+namespace pins_test {
+
+enum class NsfMilestone {
+  kAll,  // All NSF milestones in one.
+  kShutdown,
+  kBootup,
+};
+
+bool AbslParseFlag(absl::string_view milestone_text, NsfMilestone* milestone,
+                   std::string* error);
+std::string AbslUnparseFlag(NsfMilestone milestone);
+
+}  // namespace pins_test
+
+#endif  // PINS_TESTS_INTEGRATION_SYSTEM_NSF_MILESTONE_H_

tests/integration/system/nsf/traffic_helpers/BUILD.bazel

@@ -33,10 +33,17 @@ cc_library(
 cc_library(
     name = "otg_helper",
     testonly = True,
+    srcs = ["otg_helper.cc"],
     hdrs = ["otg_helper.h"],
     deps = [
+        "//gutil:status",
+        "//lib/utils:generic_testbed_utils",
         "//tests/integration/system/nsf/interfaces:traffic_helper",
         "//thinkit:generic_testbed",
+        "@com_github_grpc_grpc//:grpc++",
+        "@com_github_otg_models//:otg_cc_proto",
+        "@com_github_otg_models//:otg_grpc_proto",
         "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings",
     ],
 )

tests/integration/system/nsf/traffic_helpers/otg_helper.cc

@@ -0,0 +1,199 @@
+// 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.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "tests/integration/system/nsf/traffic_helpers/otg_helper.h"
+
+#include <cmath>
+#include <cstdint>
+#include <string>
+#include <vector>
+
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_join.h"
+#include "artifacts/otg.grpc.pb.h"
+#include "artifacts/otg.pb.h"
+#include "grpcpp/client_context.h"
+#include "gutil/status.h"
+#include "lib/utils/generic_testbed_utils.h"
+#include "thinkit/generic_testbed.h"
+
+namespace pins_test {
+
+absl::Status OtgHelper::StartTraffic(thinkit::GenericTestbed& testbed) {
+  ASSIGN_OR_RETURN(std::vector<InterfaceLink> up_links,
+                   GetUpLinks(GetAllTrafficGeneratorLinks, testbed));
+  if (up_links.size() <= 2) {
+    return absl::InvalidArgumentError(
+        "Test requires at least 2 SUT ports connected to a Software (Host) or "
+        "Hardware (Ixia) Traffic Generator");
+  }
+
+  // Create config.
+  otg::SetConfigRequest set_config_request;
+  otg::SetConfigResponse set_config_response;
+  grpc::ClientContext set_config_context;
+  auto* config = set_config_request.mutable_config();
+
+  // Randomly pick source and destination hosts.
+  const std::string otg_src_port = up_links.front().peer_interface;
+  const std::string otg_dst_port = up_links.back().peer_interface;
+  const std::string otg_src_mac = up_links.front().peer_mac_address;
+  const std::string otg_dst_mac = up_links.back().peer_mac_address;
+  const std::string otg_src_ip = up_links.front().peer_ipv6_address;
+  const std::string otg_dst_ip = up_links.back().peer_ipv6_address;
+  const std::string otg_src_loc = up_links.front().peer_traffic_location;
+  const std::string otg_dst_loc = up_links.back().peer_traffic_location;
+
+  // Add ports.
+  auto* src_port = config->add_ports();
+  auto* dst_port = config->add_ports();
+  src_port->set_name(otg_src_port);
+  dst_port->set_name(otg_dst_port);
+  src_port->set_location(otg_src_loc);
+  dst_port->set_location(otg_dst_loc);
+
+  // Set layer1.
+  auto* layer1 = config->add_layer1();
+  layer1->set_name("ly");
+  layer1->add_port_names(otg_src_port);
+  layer1->add_port_names(otg_dst_port);
+
+  // Set speed.
+  layer1->set_speed(otg::Layer1::Speed::speed_1_gbps);
+
+  // Set MTU.
+  layer1->set_mtu(9000);
+
+  // Create flow.
+  auto* flow = config->add_flows();
+  flow->set_name("Host Traffic flow");
+
+  // Set Tx / Rx ports.
+  flow->mutable_tx_rx()->set_choice(otg::FlowTxRx::Choice::port);
+  flow->mutable_tx_rx()->mutable_port()->set_tx_name(otg_src_port);
+  flow->mutable_tx_rx()->mutable_port()->set_rx_name(otg_dst_port);
+
+  // Set packet size.
+  flow->mutable_size()->set_choice(otg::FlowSize::Choice::fixed);
+  flow->mutable_size()->set_fixed(256);
+
+  // Set transmission duration.
+  flow->mutable_duration()->set_choice(otg::FlowDuration::Choice::continuous);
+
+  // Set transmission rate.
+  flow->mutable_rate()->set_choice(otg::FlowRate::Choice::percentage);
+  flow->mutable_rate()->set_percentage(10);
+
+  // Set capture metrics.
+  flow->mutable_metrics()->set_enable(true);
+  flow->mutable_metrics()->set_loss(false);
+  flow->mutable_metrics()->set_timestamps(true);
+  flow->mutable_metrics()->mutable_latency()->set_enable(true);
+  flow->mutable_metrics()->mutable_latency()->set_mode(
+      otg::FlowLatencyMetrics::Mode::cut_through);
+
+  // Set ethernet header.
+  auto* eth_packet = flow->add_packet();
+  eth_packet->set_choice(otg::FlowHeader::Choice::ethernet);
+  eth_packet->mutable_ethernet()->mutable_src()->set_choice(
+      otg::PatternFlowEthernetSrc::Choice::value);
+  eth_packet->mutable_ethernet()->mutable_dst()->set_choice(
+      otg::PatternFlowEthernetDst::Choice::value);
+  eth_packet->mutable_ethernet()->mutable_src()->set_value(otg_src_mac);
+  eth_packet->mutable_ethernet()->mutable_dst()->set_value(otg_dst_mac);
+
+  // Set IP header.
+  auto* ip_packet = flow->add_packet();
+  ip_packet->set_choice(otg::FlowHeader::Choice::ipv6);
+  ip_packet->mutable_ipv6()->mutable_src()->set_choice(
+      otg::PatternFlowIpv6Src::Choice::value);
+  ip_packet->mutable_ipv6()->mutable_dst()->set_choice(
+      otg::PatternFlowIpv6Dst::Choice::value);
+  ip_packet->mutable_ipv6()->mutable_src()->set_value(otg_src_ip);
+  ip_packet->mutable_ipv6()->mutable_dst()->set_value(otg_dst_ip);
+
+  // Set the config.
+  otg::Openapi::StubInterface* stub = testbed.GetTrafficClient();
+  RETURN_IF_ERROR(gutil::GrpcStatusToAbslStatus(stub->SetConfig(
+      &set_config_context, set_config_request, &set_config_response)));
+
+  // Start the traffic.
+  otg::SetControlStateRequest request;
+  otg::SetControlStateResponse response;
+  grpc::ClientContext context;
+  request.mutable_control_state()->set_choice(
+      otg::ControlState::Choice::traffic);
+  request.mutable_control_state()->mutable_traffic()->set_choice(
+      otg::StateTraffic::Choice::flow_transmit);
+  request.mutable_control_state()
+      ->mutable_traffic()
+      ->mutable_flow_transmit()
+      ->set_state(otg::StateTrafficFlowTransmit::State::start);
+  return gutil::GrpcStatusToAbslStatus(
+      stub->SetControlState(&context, request, &response));
+}
+
+absl::Status OtgHelper::StopTraffic(thinkit::GenericTestbed& testbed) {
+  return absl::UnimplementedError("Stopping traffic is not implemented.");
+}
+
+absl::Status OtgHelper::ValidateTraffic(int error_margin,
+                                        thinkit::GenericTestbed& testbed) {
+  otg::Openapi::StubInterface* stub = testbed.GetTrafficClient();
+  otg::GetMetricsRequest metrics_req;
+  otg::GetMetricsResponse metrics_res;
+  grpc::ClientContext metrics_ctx;
+
+  metrics_req.mutable_metrics_request()->set_choice(
+      otg::MetricsRequest::Choice::flow);
+  RETURN_IF_ERROR(gutil::GrpcStatusToAbslStatus(
+      stub->GetMetrics(&metrics_ctx, metrics_req, &metrics_res)));
+
+  // Verify flow metrics is not empty.
+  if (metrics_res.metrics_response().flow_metrics().empty()) {
+    return absl::InternalError(
+        "Cannot validate traffic as no flow metrics received.");
+  }
+
+  // Verify transmission completion and no frames or bytes drops for each flow.
+  std::vector<std::string> errors;
+  for (const auto& flow_metric :
+       metrics_res.metrics_response().flow_metrics()) {
+    uint64_t bytes_drop = flow_metric.bytes_tx() - flow_metric.bytes_rx();
+    uint64_t frames_drop = flow_metric.frames_tx() - flow_metric.frames_rx();
+    uint64_t bytes_drop_percent = (bytes_drop / flow_metric.bytes_tx()) * 100;
+    float_t frames_drop_percent = (frames_drop / flow_metric.frames_tx()) * 100;
+    bool transmission_stopped =
+        flow_metric.transmit() == otg::FlowMetric::Transmit::stopped;
+
+    if (bytes_drop_percent <= error_margin &&
+        frames_drop_percent <= error_margin)
+      continue;
+
+    errors.push_back(absl::StrCat(
+        "Flow name:\t\t", flow_metric.name(), "\nBytes dropped:\t\t",
+        bytes_drop, "\nFrames dropped:\t\t", frames_drop,
+        transmission_stopped
+            ? ""
+            : "\nTransmission not completed within the expected time."));
+  }
+
+  if (errors.empty()) return absl::OkStatus();
+  return absl::InternalError(absl::StrCat(
+      "Following errors were observed while validating traffic:\n\n",
+      absl::StrJoin(errors, "\n\n")));
+}
+
+}  // namespace pins_test

tests/integration/system/nsf/traffic_helpers/otg_helper.h

@@ -23,16 +23,10 @@ namespace pins_test {
 
 class OtgHelper : public TrafficHelper {
  public:
-  absl::Status StartTraffic(thinkit::GenericTestbed& testbed) override {
-    return absl::OkStatus();
-  };
-  absl::Status StopTraffic(thinkit::GenericTestbed& testbed) override {
-    return absl::OkStatus();
-  };
+  absl::Status StartTraffic(thinkit::GenericTestbed& testbed) override;
+  absl::Status StopTraffic(thinkit::GenericTestbed& testbed) override;
   absl::Status ValidateTraffic(int error_margin,
-                               thinkit::GenericTestbed& testbed) override {
-    return absl::OkStatus();
-  };
+                               thinkit::GenericTestbed& testbed) override;
 };
 
 }  // namespace pins_test