Separate the platform json file on control switch from SUT.

Signed-off-by: SRAVANI KANASANI <[email protected]>

Author: kishanps

tests/integration/system/nsf/BUILD.bazel

@@ -107,6 +107,7 @@ cc_library(
         "//gutil/gutil:status_matchers",
         "//lib/gnmi:gnmi_helper",
         "//lib/validator:validator_lib",
+        "//sai_p4/instantiations/google:instantiations",
         "//tests/integration/system/nsf/interfaces:component_validator",
         "//tests/integration/system/nsf/interfaces:flow_programmer",
         "//tests/integration/system/nsf/interfaces:image_config_params",

tests/integration/system/nsf/upgrade_test.cc

@@ -39,6 +39,7 @@
 #include "lib/validator/validator_lib.h"
 #include "p4/config/v1/p4info.pb.h"
 #include "p4/v1/p4runtime.pb.h"
+#include "sai_p4/instantiations/google/instantiations.h"
 #include "tests/integration/system/nsf/compare_p4flows.h"
 #include "tests/integration/system/nsf/interfaces/component_validator.h"
 #include "tests/integration/system/nsf/interfaces/flow_programmer.h"

tests/qos/BUILD.bazel

@@ -40,10 +40,9 @@ cc_library(
         "//gutil/gutil:status_matchers",
         "//gutil/gutil:testing",
         "//gutil/gutil:version",
-        "//lib:otg_helper",
+        "//lib:ixia_helper",
         "//lib/gnmi:gnmi_helper",
         "//lib/gnmi:openconfig_cc_proto",
-        "//lib/utils:generic_testbed_utils",
         "//p4_pdpi:ir",
         "//p4_pdpi:ir_cc_proto",
         "//p4_pdpi:p4_runtime_session",
@@ -72,8 +71,6 @@ cc_library(
         "//thinkit/proto:generic_testbed_cc_proto",
         "@com_github_gnmi//proto/gnmi:gnmi_cc_grpc_proto",
         "@com_github_gnmi//proto/gnmi:gnmi_cc_proto",
-        "@com_github_grpc_grpc//:grpc++_unsecure",
-        "@com_github_otg_models//:otg_grpc_proto",
         "@com_github_p4lang_p4runtime//:p4info_cc_proto",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
         "@com_google_absl//absl/base:core_headers",
@@ -89,6 +86,7 @@ cc_library(
         "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:optional",
+        "@com_google_absl//absl/types:variant",
         "@com_google_googletest//:gtest",
         "@com_google_protobuf//:protobuf",
     ],