Merge branch 'main' into symbolic_import_branch_172

tests/integration/system/nsf/BUILD.bazel

@@ -0,0 +1,36 @@
+# Copyright 2024 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.
+
+# This package has the integration tests along with the utilities for testing NSF in PINs.
+
+package(
+    default_visibility = ["//visibility:public"],
+    licenses = ["notice"],
+)
+
+cc_library(
+    name = "util",
+    testonly = True,
+    srcs = ["util.cc"],
+    hdrs = ["util.h"],
+    deps = [
+        "//gutil:status",
+        "//tests/integration/system/nsf/interfaces:component_validator",
+        "//thinkit:generic_testbed",
+        "@com_github_p4lang_p4runtime//:p4info_cc_proto",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings:string_view",
+        "@com_google_absl//absl/types:span",
+    ],
+)

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

@@ -0,0 +1,63 @@
+# Copyright 2024 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.
+
+# This package implements the various component validators for PINs NSF tests.
+#
+# Note: These are dummy validators added as example of ComponentValidators implementation.
+# Component owners need to have their own implementations and register to be used by the NSF Upgrade
+# tests.
+
+package(
+    default_visibility = ["//visibility:public"],
+    licenses = ["notice"],
+)
+
+cc_library(
+    name = "sai_validator",
+    testonly = True,
+    hdrs = ["sai_validator.h"],
+    deps = [
+        "//tests/integration/system/nsf/interfaces:component_validator",
+        "//thinkit:generic_testbed",
+        "@com_github_google_glog//:glog",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings:string_view",
+    ],
+)
+
+cc_library(
+    name = "swss_validator",
+    testonly = True,
+    hdrs = ["swss_validator.h"],
+    deps = [
+        "//tests/integration/system/nsf/interfaces:component_validator",
+        "//thinkit:generic_testbed",
+        "@com_github_google_glog//:glog",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings:string_view",
+    ],
+)
+
+cc_library(
+    name = "syncd_validator",
+    testonly = True,
+    hdrs = ["syncd_validator.h"],
+    deps = [
+        "//tests/integration/system/nsf/interfaces:component_validator",
+        "//thinkit:generic_testbed",
+        "@com_github_google_glog//:glog",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings:string_view",
+    ],
+)

tests/integration/system/nsf/component_validators/sai_validator.h

@@ -0,0 +1,44 @@
+// Copyright 2024 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_COMPONENT_VALIDATORS_SAI_VALIDATOR_H_
+#define PINS_TESTS_INTEGRATION_SYSTEM_NSF_COMPONENT_VALIDATORS_SAI_VALIDATOR_H_
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
+#include "glog/logging.h"
+#include "tests/integration/system/nsf/interfaces/component_validator.h"
+#include "thinkit/generic_testbed.h"
+
+namespace pins_test {
+
+// Dummy validators added as example of ComponentValidators implementation.
+// Component owners need to have their own implementations and register to be
+// used by the NSF Upgrade tests.
+class SaiValidator : public ComponentValidator {
+  absl::Status OnInit(absl::string_view version,
+                      thinkit::GenericTestbed& testbed) override {
+    LOG(INFO) << "Sai Init";
+    return absl::OkStatus();
+  }
+  absl::Status OnFlowCleanup(absl::string_view version,
+                             thinkit::GenericTestbed& testbed) override {
+    LOG(INFO) << "Sai Flow Cleanup";
+    return absl::OkStatus();
+  }
+};
+
+}  // namespace pins_test
+
+#endif  // PINS_TESTS_INTEGRATION_SYSTEM_NSF_COMPONENT_VALIDATORS_SAI_VALIDATOR_H_

tests/integration/system/nsf/component_validators/swss_validator.h

@@ -0,0 +1,44 @@
+// Copyright 2024 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_COMPONENT_VALIDATORS_SWSS_VALIDATOR_H_
+#define PINS_TESTS_INTEGRATION_SYSTEM_NSF_COMPONENT_VALIDATORS_SWSS_VALIDATOR_H_
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
+#include "glog/logging.h"
+#include "tests/integration/system/nsf/interfaces/component_validator.h"
+#include "thinkit/generic_testbed.h"
+
+namespace pins_test {
+
+// Dummy validators added as example of ComponentValidators implementation.
+// Component owners need to have their own implementations and register to be
+// used by the NSF Upgrade tests.
+class SwssValidator : public ComponentValidator {
+  absl::Status OnInit(absl::string_view version,
+                      thinkit::GenericTestbed& testbed) override {
+    LOG(INFO) << "Swss Init";
+    return absl::OkStatus();
+  }
+  absl::Status OnFlowProgram(absl::string_view version,
+                             thinkit::GenericTestbed& testbed) override {
+    LOG(INFO) << "Swss Flow Program";
+    return absl::OkStatus();
+  }
+};
+
+}  // namespace pins_test
+
+#endif  // PINS_TESTS_INTEGRATION_SYSTEM_NSF_COMPONENT_VALIDATORS_SWSS_VALIDATOR_H_

tests/integration/system/nsf/component_validators/syncd_validator.h

@@ -0,0 +1,49 @@
+// Copyright 2024 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_COMPONENT_VALIDATORS_SYNCD_VALIDATOR_H_
+#define PINS_TESTS_INTEGRATION_SYSTEM_NSF_COMPONENT_VALIDATORS_SYNCD_VALIDATOR_H_
+
+#include "absl/status/status.h"
+#include "absl/strings/string_view.h"
+#include "glog/logging.h"
+#include "tests/integration/system/nsf/interfaces/component_validator.h"
+#include "thinkit/generic_testbed.h"
+
+namespace pins_test {
+
+// Dummy validators added as example of ComponentValidators implementation.
+// Component owners need to have their own implementations and register to be
+// used by the NSF Upgrade tests.
+class SyncdValidator : public ComponentValidator {
+  absl::Status OnInit(absl::string_view version,
+                      thinkit::GenericTestbed& testbed) override {
+    LOG(INFO) << "Syncd Init";
+    return absl::OkStatus();
+  }
+  absl::Status OnFlowProgram(absl::string_view version,
+                             thinkit::GenericTestbed& testbed) override {
+    LOG(INFO) << "Syncd Flow Program";
+    return absl::OkStatus();
+  }
+  absl::Status OnFlowCleanup(absl::string_view version,
+                             thinkit::GenericTestbed& testbed) override {
+    LOG(INFO) << "Syncd Flow Cleanup";
+    return absl::OkStatus();
+  }
+};
+
+}  // namespace pins_test
+
+#endif  // PINS_TESTS_INTEGRATION_SYSTEM_NSF_COMPONENT_VALIDATORS_SYNCD_VALIDATOR_H_

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

@@ -0,0 +1,53 @@
+# Copyright 2024 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
+#
+#     https://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.
+
+# This package implements the various flow programmers for PINs NSF tests.
+
+package(
+    default_visibility = ["//visibility:public"],
+    licenses = ["notice"],
+)
+
+cc_library(
+    name = "static_programmer",
+    testonly = True,
+    hdrs = ["static_programmer.h"],
+    deps = [
+        "//tests/integration/system/nsf/interfaces:flow_programmer",
+        "//thinkit:generic_testbed",
+        "@com_google_absl//absl/status",
+    ],
+)
+
+cc_library(
+    name = "fuzzer_replay_programmer",
+    testonly = True,
+    hdrs = ["fuzzer_replay_programmer.h"],
+    deps = [
+        "//tests/integration/system/nsf/interfaces:flow_programmer",
+        "//thinkit:generic_testbed",
+        "@com_google_absl//absl/status",
+    ],
+)
+
+cc_library(
+    name = "replay_programmer",
+    testonly = True,
+    hdrs = ["replay_programmer.h"],
+    deps = [
+        "//tests/integration/system/nsf/interfaces:flow_programmer",
+        "//thinkit:generic_testbed",
+        "@com_google_absl//absl/status",
+    ],
+)

tests/integration/system/nsf/flow_programmers/fuzzer_replay_programmer.h

@@ -0,0 +1,37 @@
+// Copyright 2024 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_FLOW_PROGRAMMERS_FUZZER_REPLAY_PROGRAMMER_H_
+#define PINS_TESTS_INTEGRATION_SYSTEM_NSF_FLOW_PROGRAMMERS_FUZZER_REPLAY_PROGRAMMER_H_
+
+#include "absl/status/status.h"
+#include "tests/integration/system/nsf/interfaces/flow_programmer.h"
+#include "thinkit/generic_testbed.h"
+
+namespace pins_test {
+
+class FuzzerReplayProgrammer : public FlowProgrammer {
+ public:
+  absl::Status ProgramFlows(IpVersion ip_version, Protocol protocol,
+                            thinkit::GenericTestbed& testbed) override {
+    return absl::OkStatus();
+  };
+  absl::Status ClearFlows(thinkit::GenericTestbed& testbed) override {
+    return absl::OkStatus();
+  };
+};
+
+}  // namespace pins_test
+
+#endif  // PINS_TESTS_INTEGRATION_SYSTEM_NSF_FLOW_PROGRAMMERS_FUZZER_REPLAY_PROGRAMMER_H_

tests/integration/system/nsf/flow_programmers/replay_programmer.h

@@ -0,0 +1,37 @@
+// Copyright 2024 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_FLOW_PROGRAMMERS_REPLAY_PROGRAMMER_H_
+#define PINS_TESTS_INTEGRATION_SYSTEM_NSF_FLOW_PROGRAMMERS_REPLAY_PROGRAMMER_H_
+
+#include "absl/status/status.h"
+#include "tests/integration/system/nsf/interfaces/flow_programmer.h"
+#include "thinkit/generic_testbed.h"
+
+namespace pins_test {
+
+class ReplayProgrammer : public FlowProgrammer {
+ public:
+  absl::Status ProgramFlows(IpVersion ip_version, Protocol protocol,
+                            thinkit::GenericTestbed& testbed) override {
+    return absl::OkStatus();
+  };
+  absl::Status ClearFlows(thinkit::GenericTestbed& testbed) override {
+    return absl::OkStatus();
+  };
+};
+
+}  // namespace pins_test
+
+#endif  // PINS_TESTS_INTEGRATION_SYSTEM_NSF_FLOW_PROGRAMMERS_REPLAY_PROGRAMMER_H_