Add changes to arriba_test

Author: kishanps

sdn_tests/pins_ondatra/tests/thinkit/BUILD.bazel

@@ -107,7 +107,8 @@ cc_test(
     ],
     deps = [
         "@com_github_sonic_net_sonic_pins//dvaas:test_vector_cc_proto",
-        "@com_github_sonic_net_sonic_pins//gutil:status",
+#        "@com_github_sonic_net_sonic_pins//gutil:status",
+        "@com_github_sonic_net_sonic_pins//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",

sdn_tests/pins_ondatra/tests/thinkit/arriba_test.cc

@@ -10,17 +10,53 @@
 #include "dvaas/test_vector.pb.h"
 #include "glog/logging.h"
 #include "gtest/gtest.h"
-#include "gutil/status.h"
-#include "gutil/status.h"
+// #include "gutil/status.h"
+#include "gutil/testing.h"
 #include "infrastructure/thinkit/ondatra_params.h"
 #include "thinkit/mirror_testbed_fixture.h"
 
 ABSL_FLAG(std::vector<std::string>, arriba_test_vector_files, {},
           "Paths to files containing ArribaTestVector textprotos.");
+ABSL_FLAG(double, expected_minimum_success_rate, 1.0,
+          "Expected minimum success rate for the packet vectors.");
+ABSL_FLAG(
+    bool, wait_for_all_enabled_interfaces_to_be_up, true,
+    "If true, waits for all enabled ports to be up on SUT and control switch.");
+ABSL_FLAG(
+    absl::Duration, max_expected_packet_in_flight_duration, absl::Seconds(3),
+    R"(Maximum time expected it takes to receive output packets either from SUT
+    or control switch in response to an injected input packet. Beyond that,
+    the input packet might be considered dropped.)");
 
 namespace pins_test {
 namespace {
 
+// Unsolicited packets that, for the time being, are acceptable in a PINS
+// testbeds.
+inline bool AlpineIsExpectedUnsolicitedPacket(const packetlib::Packet& packet) {
+  if (packet.headers().size() == 3 &&
+      packet.headers(2).icmp_header().type() == "0x85") {
+    return true;
+  }
+  // TODO Switch generates IPV6 hop_by_hop packets.
+  if (packet.headers().size() == 2 &&
+      packet.headers(1).ipv6_header().next_header() == "0x00") {
+    return true;
+  }
+  // Switch generates LACP packets if LAGs are present.
+  if (packet.headers().size() == 1 &&
+      packet.headers(0).ethernet_header().ethertype() == "0x8809") {
+    return true;
+  }
+  // Alpine's deployment environment sends ARP packets.
+  if (!packet.headers().empty() &&
+      packet.headers(0).ethernet_header().ethertype() == "0x0806") {
+    LOG(INFO) << "ALPINE: ARP packet";
+    return true;
+  }
+  return false;
+}
+
 // Returns one test instance per test vector textproto file provided through the
 // `--arriba_test_vector_files` flag.
 absl::StatusOr<std::vector<ArribaTestParams>> GetTestInstances() {
@@ -36,10 +72,26 @@ absl::StatusOr<std::vector<ArribaTestParams>> GetTestInstances() {
   std::vector<ArribaTestParams> test_instances;
   for (const std::string& test_vector_file :
        absl::GetFlag(FLAGS_arriba_test_vector_files)) {
+    dvaas::ArribaTestVector arriba_test_vector;
+    arriba_test_vector =
+        gutil::ParseProtoFileOrDie<dvaas::ArribaTestVector>(test_vector_file);
 
     test_instances.push_back(ArribaTestParams{
         .mirror_testbed = std::shared_ptr<thinkit::MirrorTestbedInterface>(
             mirror_testbed_params.mirror_testbed),
+        .arriba_test_vector = arriba_test_vector,
+        .validation_params =
+            {
+                .expected_minimum_success_rate =
+                    absl::GetFlag(FLAGS_expected_minimum_success_rate),
+                .max_expected_packet_in_flight_duration =
+                    absl::GetFlag(FLAGS_max_expected_packet_in_flight_duration),
+                .is_expected_unsolicited_packet =
+                    AlpineIsExpectedUnsolicitedPacket,
+            },
+        .wait_for_all_enabled_interfaces_to_be_up =
+            absl::GetFlag(FLAGS_wait_for_all_enabled_interfaces_to_be_up),
+        .description = test_vector_file,
     });
   }
   return test_instances;
@@ -48,6 +100,7 @@ absl::StatusOr<std::vector<ArribaTestParams>> GetTestInstances() {
 std::vector<ArribaTestParams> GetTestInstancesOrDie() {
   absl::StatusOr<std::vector<ArribaTestParams>> test_instances =
       GetTestInstances();
+  CHECK_OK(test_instances.status());  // Crash OK.
   return *test_instances;
 }