Merge branch 'main' of https://github.com/VSuryaprasad-HCL/sonic-pins …

…into symbolic_import_branch_77
sonic-net · Nov 6, 2024 · 6e17672 · 6e17672
2 parents ca1adab + 36eb891
commit 6e17672
Show file tree

Hide file tree

Showing 52 changed files with 6,697 additions and 2,590 deletions.
diff --git a/dvaas/packet_injection.cc b/dvaas/packet_injection.cc
@@ -134,7 +134,7 @@ absl::StatusOr<PacketTestRuns> SendTestPacketsAndCollectOutputs(
       const Packet& packet = packet_test_vector.input().packet();
 
       // Inject to egress of control switch.
-      RETURN_IF_ERROR(gpins::InjectEgressPacket(
+      RETURN_IF_ERROR(pins::InjectEgressPacket(
           packet.port(), absl::HexStringToBytes(packet.hex()),
           control_ir_p4info, &control_switch, injection_delay));
     } else {

diff --git a/lib/pins_control_device.cc b/lib/pins_control_device.cc
@@ -162,7 +162,7 @@ absl::Status PinsControlDevice::SendPacket(
         "No P4RuntimeSession exists; Likely failed to establish another "
         "P4RuntimeSession.");
   }
-  return gpins::InjectEgressPacket(interface_name_to_port_id_[interface],
+  return pins::InjectEgressPacket(interface_name_to_port_id_[interface],
                                    std::string(packet), ir_p4_info_,
                                    control_session_.get(), packet_delay);
 }

diff --git a/p4_fuzzer/fuzzer_tests.cc b/p4_fuzzer/fuzzer_tests.cc
diff --git a/p4_symbolic/ir/BUILD.bazel b/p4_symbolic/ir/BUILD.bazel
@@ -79,13 +79,53 @@ cc_library(
         "ir.h",
     ],
     deps = [
+        ":cfg",
         ":ir_cc_proto",
-        ":table_entries",
         "//gutil:status",
         "//p4_symbolic/bmv2:bmv2_cc_proto",
         "@com_github_p4lang_p4runtime//:p4info_cc_proto",
+        "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/container:flat_hash_set",
+        "@com_google_absl//absl/container:node_hash_map",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings",
+    ],
+)
+
+cc_library(
+    name = "cfg",
+    srcs = [
+        "cfg.cc",
+        "ir.h",  # needed for the definition of EndOfPipeline
+    ],
+    hdrs = ["cfg.h"],
+    deps = [
+        ":ir_cc_proto",
+        "//gutil:status",
+        "//p4_symbolic/bmv2:bmv2_cc_proto",
+        "@com_google_absl//absl/container:btree",
+        "@com_google_absl//absl/container:flat_hash_set",
+        "@com_google_absl//absl/container:node_hash_map",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings",
+    ],
+)
+
+cc_test(
+    name = "cfg_test",
+    srcs = ["cfg_test.cc"],
+    deps = [
+        ":cfg",
+        ":ir",
+        ":ir_cc_proto",
+        "//gutil:proto",
+        "//gutil:status_matchers",
+        "@com_google_absl//absl/container:btree",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
-        "@com_google_protobuf//:protobuf",
+        "@com_google_googletest//:gtest_main",
     ],
 )