Migrating punt_qos_test.cc from IxNetwork to OTG.

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

Author: kishanps

lib/otg_helper.cc

@@ -96,13 +96,6 @@ otg::FlowIpv6& AddIPv6Header(otg::Flow& flow, absl::string_view src_ipv6,
   return *ipv6_header;
 }
 
-void SetIPv6Priority(otg::FlowIpv6& ip_packet, int dscp, int ecn) {
-  int traffic_class_value = (dscp << 2) | ecn;
-  ip_packet.mutable_traffic_class()->set_choice(
-      otg::PatternFlowIpv6TrafficClass::Choice::value);
-  ip_packet.mutable_traffic_class()->set_value(traffic_class_value);
-}
-
 absl::Status SetTrafficTransmissionState(
     otg::Openapi::StubInterface& otg_stub,
     otg::StateTrafficFlowTransmit::State::Enum transmission_state) {

lib/otg_helper.h

@@ -35,8 +35,6 @@ void SetIPv4Priority(otg::FlowIpv4& ip_packet, int dscp, int ecn);
 otg::FlowIpv6& AddIPv6Header(otg::Flow& flow, absl::string_view src_ipv6,
                              absl::string_view dst_ipv6);
 
-void SetIPv6Priority(otg::FlowIpv6& ip_packet, int dscp, int ecn);
-
 absl::Status SetTrafficTransmissionState(
     otg::Openapi::StubInterface& otg_stub,
     otg::StateTrafficFlowTransmit::State::Enum transmission_state);

lib/otg_helper_test.cc

@@ -151,16 +151,6 @@ TEST(OtgHelperTest, AddIPv6HeaderTest) {
   EXPECT_THAT(ipv6_header, EqualsProto(flow.packet(0).ipv6()));
 }
 
-TEST(OtgHelperTest, SetIPv6PriorityTest) {
-  otg::FlowIpv6 ipv6_header;
-
-  SetIPv6Priority(ipv6_header, /*dscp=*/10, /*ecn=*/1);
-
-  EXPECT_THAT(ipv6_header, EqualsProto(R"pb(
-                traffic_class { choice: value value: 41 }
-              )pb"));
-}
-
 TEST(OtgHelperTest, SetTrafficTransmissionStateSuccess) {
   otg::MockOpenapiStub mock_stub;
 

tests/qos/BUILD.bazel

@@ -109,7 +109,7 @@ cc_library(
         "//gutil/gutil:status",
         "//gutil/gutil:status_matchers",
         "//gutil/gutil:testing",
-        "//lib:otg_helper",
+        "//lib:ixia_helper",
         "//lib/gnmi:gnmi_helper",
         "//lib/gnmi:openconfig_cc_proto",
         "//lib/utils:generic_testbed_utils",
@@ -122,6 +122,7 @@ cc_library(
         "//sai_p4/instantiations/google:instantiations",
         "//sai_p4/instantiations/google:sai_pd_cc_proto",
         "//sai_p4/instantiations/google/test_tools:test_entries",
+        "//tests/forwarding:util",
         "//tests/gnmi:util",
         "//tests/integration/system/nsf:util",
         "//tests/integration/system/nsf/interfaces:testbed",
@@ -133,13 +134,11 @@ 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_cc_proto",
-        "@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",
         "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/status",
@@ -148,6 +147,7 @@ cc_library(
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/time",
+        "@com_google_absl//absl/types:optional",
         "@com_google_googletest//:gtest",
     ],
     alwayslink = True,