Skip to content

[Comb] Move files from p4_infra/p4_pdpi/utils to p4_infra/p4_pdpi. #1686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ksravani-hcl wants to merge 20 commits into
base: main
Choose a base branch
from
Draft

[Comb] Move files from p4_infra/p4_pdpi/utils to p4_infra/p4_pdpi. #1686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e3b58d6
[P4RT] Use zmq to send msgs to OrchAgent instead of redis notifications.
kishanps Jan 10, 2024
6e92398
[P4RT] Clean up experimental_send in notification producer.
kishanps Jan 18, 2024
c985099
[P4RT] Separate entry update -> AppDB parsing and DB installation.
kishanps Jan 18, 2024
71236ed
Adding ipv6_address to p4_pdpi
kishanps Nov 12, 2025
0aa917c
Initializing P4RuntimeSession together with a MockP4RuntimeStub which…
kishanps Nov 13, 2025
f738888
Adding p4_infra/p4_pdpi/references file to sonic-pins
kishanps Nov 17, 2025
39a95cc
Adding p4_infra/p4_pdpi/testing/mock_p4_runtime_server_test and p4_in…
kishanps Nov 18, 2025
7b2aaa5
Adding p4_infra/p4_pdpi/utils/annotation_parser file to sonic-pins
kishanps Nov 18, 2025
ee0b8f4
Adding p4_infra/p4_pdpi/packetlib/packetlib_unit_test test file to so…
kishanps Nov 19, 2025
09f96c1
Adding p4_infra/p4_pdpi/testing/testdata/table_entry file to sonic-pins
kishanps Nov 20, 2025
d9f97b9
[PDPI] Move from `third_party/pins_infra/p4_pdpi` to `third_party/pin…
kishanps Jan 27, 2025
b0f8558
Cleanup TODOs and update documentation.
kishanps Feb 15, 2025
e48be7e
[P4 Infra] Add missing license headers for files.
kishanps Dec 1, 2025
8fd550f
[PDPI] Update read request functions to request various metadata by d…
kishanps May 13, 2025
d0e4507
Add DeleteIrEntities and DeletePiEntities to P4RuntimeSessionExtras.
kishanps Jun 5, 2025
4ee59a3
Migrate p4_infra/p4_pdpi/string_encodings to p4_infra/string_encodings.
kishanps Dec 5, 2025
9986597
[P4 Infra] Move `p4_infra/p4_pdpi/netaddr` to `p4_infra/netaddr`. No …
kishanps May 28, 2025
75a0123
[P4 Infra] Move `p4_infra/p4_pdpi/packetlib` to `p4_infra/packetlib`.…
kishanps Jun 6, 2025
bf455e6
Add new ACL ingress entry to drop packets on matching MACs.
kishanps Jun 9, 2025
9ba18ef
[P4 Infra] Move files from `p4_infra/p4_pdpi/utils` to `p4_infra/p4_p…
kishanps Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion alpine_switch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
#include <cstdint>
#include <memory>
#include <string>

#include "absl/log/log.h"
#include "absl/status/statusor.h"
#include "grpc/grpc.h"
#include "grpcpp/support/channel_arguments.h"
#include "lib/basic_switch.h"
#include "p4/v1/p4runtime.grpc.pb.h"
#include "p4_pdpi/p4_runtime_session.h"
#include "p4_infra/p4_pdpi/p4_runtime_session.h"

namespace pins_test {
template <class CreateStubPolicy>
class AlpineSwitch : public BasicSwitch<CreateStubPolicy> {
Expand Down
114 changes: 60 additions & 54 deletions dvaas/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
# limitations under the License.

load("@com_google_googleapis_imports//:imports.bzl", "cc_proto_library")
load("//p4_pdpi/testing:diff_test.bzl", "cmd_diff_test")
load("//p4_infra/p4_pdpi/testing:diff_test.bzl", "cmd_diff_test")

package(
default_testonly = True,
default_visibility = ["//visibility:public"],
licenses = ["notice"],

)

cc_library(
Expand All @@ -45,13 +46,13 @@ cc_library(
"//lib/gnmi:gnmi_helper",
"//lib/gnmi:openconfig_cc_proto",
"//lib/p4rt:p4rt_port",
"//p4_pdpi:ir",
"//p4_pdpi:ir_cc_proto",
"//p4_pdpi:p4_runtime_session",
"//p4_pdpi:p4_runtime_session_extras",
"//p4_pdpi:sequencing",
"//p4_pdpi/packetlib:packetlib_cc_proto",
"//p4_pdpi/string_encodings:hex_string",
"//p4_infra/p4_pdpi:ir",
"//p4_infra/p4_pdpi:ir_cc_proto",
"//p4_infra/p4_pdpi:p4_runtime_session",
"//p4_infra/p4_pdpi:p4_runtime_session_extras",
"//p4_infra/p4_pdpi:sequencing",
"//p4_infra/packetlib:packetlib_cc_proto",
"//p4_infra/string_encodings:hex_string",
"//p4_symbolic/packet_synthesizer:coverage_goal_cc_proto",
"//p4_symbolic/packet_synthesizer:packet_synthesizer_cc_proto",
"//sai_p4/instantiations/google:p4_versions",
Expand Down Expand Up @@ -91,7 +92,11 @@ cc_library(
":test_vector_cc_proto",
"//gutil/gutil:proto",
"//gutil/gutil:overload",
"//p4_pdpi/packetlib:packetlib_cc_proto",
"//gutil/gutil:status",
"//p4_infra/netaddr:ipv4_address",
"//p4_infra/netaddr:ipv6_address",
"//p4_infra/netaddr:mac_address",
"//p4_infra/packetlib:packetlib_cc_proto",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
Expand All @@ -114,12 +119,11 @@ cc_test(
deps = [
":dvaas_detective",
":dvaas_detective_cc_proto",
":test_vector_cc_proto",
"//gutil/gutil:proto",
"//gutil/gutil:testing",
":test_vector_cc_proto",
"//gutil/gutil:status_matchers",
"//p4_pdpi/internal:ordered_map",
"//p4_pdpi/packetlib:packetlib_cc_proto",
"//p4_infra/packetlib:packetlib_cc_proto",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/status",
"@com_google_googletest//:gtest_main",
Expand Down Expand Up @@ -209,12 +213,12 @@ cc_library(
":test_vector_cc_proto",
"//gutil/gutil:status",
"//lib/p4rt:p4rt_port",
"//p4_pdpi:ir",
"//p4_pdpi:ir_cc_proto",
"//p4_pdpi:p4_runtime_session",
"//p4_pdpi/packetlib",
"//p4_pdpi/packetlib:packetlib_cc_proto",
"//p4_pdpi/utils:ir",
"//p4_infra/p4_pdpi:ir",
"//p4_infra/p4_pdpi:ir_cc_proto",
"//p4_infra/p4_pdpi:ir_utils",
"//p4_infra/p4_pdpi:p4_runtime_session",
"//p4_infra/packetlib",
"//p4_infra/packetlib:packetlib_cc_proto",
"//tests/forwarding:util",
"@com_github_google_glog//:glog",
"@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
Expand All @@ -235,9 +239,8 @@ cc_library(
"//gutil/gutil:proto",
"//gutil/gutil:proto_ordering",
"//gutil/gutil:status_matchers",
"//p4_pdpi:ir_cc_proto",
"//p4_pdpi/packetlib:packetlib_cc_proto",
"@com_github_google_glog//:glog",
"//p4_infra/p4_pdpi:ir_cc_proto",
"//p4_infra/packetlib:packetlib_cc_proto",
"@com_google_absl//absl/base:nullability",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/log",
Expand Down Expand Up @@ -266,10 +269,11 @@ cc_library(
":validation_result",
"//gutil/gutil:proto",
"//gutil/gutil:test_artifact_writer",
"//p4_pdpi:ir",
"//p4_pdpi:ir_cc_proto",
"//p4_pdpi:p4_runtime_session",
"//p4_pdpi:p4_runtime_session_extras",
"//lib/p4rt:p4rt_port",
"//p4_infra/p4_pdpi:ir",
"//p4_infra/p4_pdpi:ir_cc_proto",
"//p4_infra/p4_pdpi:p4_runtime_session",
"//p4_infra/p4_pdpi:p4_runtime_session_extras",
"//sai_p4/instantiations/google/test_tools:test_entries",
"//tests/lib:switch_test_setup_helpers",
"@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
Expand All @@ -291,9 +295,10 @@ cc_library(
"//lib/gnmi:gnmi_helper",
"//lib/gnmi:openconfig_cc_proto",
"//lib/p4rt:p4rt_port",
"//p4_pdpi:ir",
"//p4_pdpi:ir_cc_proto",
"//p4_pdpi:p4_runtime_session",
"//p4_infra/p4_pdpi:ir",
"//p4_infra/p4_pdpi:ir_cc_proto",
"//p4_infra/p4_pdpi:p4_runtime_session",
"//p4_infra/p4_pdpi:p4_runtime_session_extras",
"//tests/lib:switch_test_setup_helpers",
"//thinkit:mirror_testbed",
"//thinkit:mirror_testbed_fixture",
Expand All @@ -310,7 +315,7 @@ proto_library(
name = "packet_trace_proto",
testonly = False,
srcs = ["packet_trace.proto"],
deps = ["//p4_pdpi:ir_proto"],
deps = ["//p4_infra/p4_pdpi:ir_proto"],
)

cc_proto_library(
Expand All @@ -324,8 +329,8 @@ proto_library(
srcs = ["test_vector.proto"],
deps = [
":packet_trace_proto",
"//p4_pdpi:ir_proto",
"//p4_pdpi/packetlib:packetlib_proto",
"//p4_infra/p4_pdpi:ir_proto",
"//p4_infra/packetlib:packetlib_proto",
],
)

Expand All @@ -343,11 +348,11 @@ cc_library(
":test_vector_cc_proto",
"//gutil/gutil:proto",
"//gutil/gutil:status",
"//p4_pdpi:ir_cc_proto",
"//p4_pdpi/packetlib",
"//p4_pdpi/packetlib:bit_widths",
"//p4_pdpi/packetlib:packetlib_cc_proto",
"//p4_pdpi/string_encodings:hex_string",
"//p4_infra/p4_pdpi:ir_cc_proto",
"//p4_infra/packetlib",
"//p4_infra/packetlib:bit_widths",
"//p4_infra/packetlib:packetlib_cc_proto",
"//p4_infra/string_encodings:hex_string",
"@com_google_absl//absl/container:btree",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
Expand All @@ -365,9 +370,9 @@ cc_test(
"//gutil/gutil:proto_matchers",
"//gutil/gutil:status_matchers",
"//gutil/gutil:testing",
"//p4_pdpi/packetlib",
"//p4_pdpi/packetlib:bit_widths",
"//p4_pdpi/packetlib:packetlib_cc_proto",
"//p4_infra/packetlib",
"//p4_infra/packetlib:bit_widths",
"//p4_infra/packetlib:packetlib_cc_proto",
"@com_google_absl//absl/status",
"@com_google_googletest//:gtest_main",
],
Expand All @@ -387,7 +392,7 @@ cc_library(
cc_library(
name = "switch_api",
hdrs = ["switch_api.h"],
deps = ["//p4_pdpi:p4_runtime_session"],
deps = ["//p4_infra/p4_pdpi:p4_runtime_session"],
)

cc_library(
Expand Down Expand Up @@ -436,8 +441,8 @@ cc_library(
":test_vector_cc_proto",
"//gutil/gutil:proto",
"//gutil/gutil:status",
"//p4_pdpi:ir",
"//p4_pdpi/packetlib",
"//p4_infra/p4_pdpi:ir",
"//p4_infra/packetlib",
"@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
Expand All @@ -463,10 +468,10 @@ cc_library(
"//gutil/gutil:proto",
"//gutil/gutil:test_artifact_writer",
"//lib/p4rt:p4rt_port",
"//p4_pdpi:ir",
"//p4_pdpi:ir_cc_proto",
"//p4_pdpi:p4_runtime_session",
"//p4_pdpi:p4_runtime_session_extras",
"//p4_infra/p4_pdpi:ir",
"//p4_infra/p4_pdpi:ir_cc_proto",
"//p4_infra/p4_pdpi:p4_runtime_session",
"//p4_infra/p4_pdpi:p4_runtime_session_extras",
"//p4_symbolic/packet_synthesizer:packet_synthesizer_cc_proto",
"//tests/forwarding:util",
"//thinkit:mirror_testbed",
Expand All @@ -492,7 +497,8 @@ cc_library(
":test_vector",
":test_vector_cc_proto",
"//gutil/gutil:proto",
"//p4_pdpi:ir_cc_proto",
"//p4_infra/p4_pdpi:ir_cc_proto",
"//p4_infra/packetlib:packetlib_cc_proto",
"@com_github_p4lang_p4runtime//:p4info_cc_proto",
"@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
"@com_google_absl//absl/container:btree",
Expand All @@ -519,9 +525,9 @@ cc_test(
"//gutil/gutil:proto",
"//gutil/gutil:status_matchers",
"//gutil/gutil:testing",
"//p4_pdpi/packetlib",
"//p4_pdpi/packetlib:packetlib_cc_proto",
"//p4_pdpi/testing:test_p4info_cc",
"//p4_infra/p4_pdpi/testing:test_p4info_cc",
"//p4_infra/packetlib",
"//p4_infra/packetlib:packetlib_cc_proto",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
Expand Down Expand Up @@ -576,9 +582,9 @@ cc_test(
":test_run_validation",
":test_vector_cc_proto",
"//gutil/gutil:testing",
"//p4_pdpi:ir_cc_proto",
"//p4_pdpi/packetlib:packetlib_cc_proto",
"@com_github_google_glog//:glog",
"//p4_infra/p4_pdpi:ir_cc_proto",
"//p4_infra/packetlib:packetlib_cc_proto",
"@com_google_absl//absl/log",
"@com_google_absl//absl/status:statusor",
],
)
Expand All @@ -600,7 +606,7 @@ cc_test(
"//gutil/gutil:proto_matchers",
"//gutil/gutil:status_matchers",
"//gutil/gutil:testing",
"//p4_pdpi/packetlib:packetlib_cc_proto",
"//p4_infra/packetlib:packetlib_cc_proto",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings:string_view",
"@com_google_googletest//:gtest_main",
Expand Down
8 changes: 4 additions & 4 deletions dvaas/arriba_test_vector_validation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
#include "gutil/gutil/test_artifact_writer.h"
#include "lib/p4rt/p4rt_port.h"
#include "p4/v1/p4runtime.pb.h"
#include "p4_pdpi/ir.h"
#include "p4_pdpi/ir.pb.h"
#include "p4_pdpi/p4_runtime_session.h"
#include "p4_pdpi/p4_runtime_session_extras.h"
#include "p4_infra/p4_pdpi/ir.h"
#include "p4_infra/p4_pdpi/ir.pb.h"
#include "p4_infra/p4_pdpi/p4_runtime_session.h"
#include "p4_infra/p4_pdpi/p4_runtime_session_extras.h"
#include "sai_p4/instantiations/google/test_tools/test_entries.h"
#include "tests/lib/switch_test_setup_helpers.h"

Expand Down
2 changes: 1 addition & 1 deletion dvaas/arriba_test_vector_validation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include "dvaas/test_vector.pb.h"
#include "dvaas/validation_result.h"
#include "lib/p4rt/p4rt_port.h"
#include "p4_pdpi/p4_runtime_session.h"
#include "p4_infra/p4_pdpi/p4_runtime_session.h"

namespace dvaas {

Expand Down
20 changes: 10 additions & 10 deletions dvaas/dataplane_validation.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
#include "lib/gnmi/openconfig.pb.h"
#include "lib/p4rt/p4rt_port.h"
#include "p4/v1/p4runtime.pb.h"
#include "p4_pdpi/ir.h"
#include "p4_pdpi/ir.pb.h"
#include "p4_pdpi/p4_runtime_session.h"
#include "p4_pdpi/p4_runtime_session_extras.h"
#include "p4_pdpi/packetlib/packetlib.pb.h"
#include "p4_pdpi/sequencing.h"
#include "p4_pdpi/string_encodings/hex_string.h"
#include "p4_infra/p4_pdpi/ir.h"
#include "p4_infra/p4_pdpi/ir.pb.h"
#include "p4_infra/p4_pdpi/p4_runtime_session.h"
#include "p4_infra/p4_pdpi/p4_runtime_session_extras.h"
#include "p4_infra/p4_pdpi/sequencing.h"
#include "p4_infra/packetlib/packetlib.pb.h"
#include "p4_infra/string_encodings/hex_string.h"
#include "p4_symbolic/packet_synthesizer/packet_synthesizer.pb.h"
#include "proto/gnmi/gnmi.pb.h"
#include "sai_p4/instantiations/google/versions.h"
Expand Down Expand Up @@ -470,9 +470,9 @@ absl::StatusOr<std::string> GetBmv2PacketHex(
constexpr auto kSubmitToIngressSaiP4PacketOutHeader =
std::bitset<16>(0b0000'0000'0100'0000);
return absl::StrCat(
absl::StripPrefix(
pdpi::BitsetToHexString(kSubmitToIngressSaiP4PacketOutHeader),
"0x"),
absl::StripPrefix(string_encodings::BitsetToHexString(
kSubmitToIngressSaiP4PacketOutHeader),
"0x"),
absl::StripPrefix(switch_input.packet().hex(), "0x"));
}
case SwitchInput::PACKET_OUT: {
Expand Down
4 changes: 2 additions & 2 deletions dvaas/dataplane_validation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ limitations under the License.
#include "dvaas/validation_result.h"
#include "gutil/gutil/test_artifact_writer.h"
#include "lib/p4rt/p4rt_port.h"
#include "p4_pdpi/ir.pb.h"
#include "p4_pdpi/packetlib/packetlib.pb.h"
#include "p4_infra/p4_pdpi/ir.pb.h"
#include "p4_infra/packetlib/packetlib.pb.h"
#include "p4_symbolic/packet_synthesizer/coverage_goal.pb.h"
#include "p4_symbolic/packet_synthesizer/packet_synthesizer.pb.h"
#include "proto/gnmi/gnmi.grpc.pb.h"
Expand Down
7 changes: 6 additions & 1 deletion dvaas/dvaas_detective.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@
#include "gutil/gutil/overload.h"
#include "gutil/gutil/proto.h"
#include "gutil/gutil/status.h"
#include "p4_pdpi/packetlib/packetlib.pb.h"
#include "p4_infra/netaddr/ipv4_address.h"
#include "p4_infra/netaddr/ipv6_address.h"
#include "p4_infra/netaddr/mac_address.h"
#include "p4_infra/string_encodings/hex_string.h"
#include "p4_infra/packetlib/packetlib.pb.h"
#include "yggdrasil_decision_forests/dataset/data_spec.h"
#include "yggdrasil_decision_forests/dataset/data_spec.pb.h"
#include "yggdrasil_decision_forests/model/decision_tree/decision_tree.h"
#include "yggdrasil_decision_forests/model/decision_tree/decision_tree.pb.h"
Expand Down
3 changes: 1 addition & 2 deletions dvaas/dvaas_detective_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
#include "gutil/gutil/proto.h"
#include "gutil/gutil/status_matchers.h"
#include "gutil/gutil/testing.h"
#include "p4_pdpi/internal/ordered_map.h"
#include "p4_pdpi/packetlib/packetlib.pb.h"
#include "p4_infra/packetlib/packetlib.pb.h"
#include "yggdrasil_decision_forests/dataset/data_spec.pb.h"
#include "yggdrasil_decision_forests/model/decision_tree/decision_tree.h"
#include "yggdrasil_decision_forests/model/random_forest/random_forest.h"
Expand Down
10 changes: 7 additions & 3 deletions dvaas/mirror_testbed_config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,13 @@
#include "glog/logging.h"
#include "gutil/gutil/status.h"
#include "lib/gnmi/gnmi_helper.h"
#include "p4_pdpi/ir.h"
#include "p4_pdpi/ir.pb.h"
#include "p4_pdpi/p4_runtime_session.h"
#include "lib/p4rt/p4rt_port.h"
#include "p4/config/v1/p4info.pb.h"
#include "p4_infra/p4_pdpi/ir.h"
#include "p4_infra/p4_pdpi/ir.pb.h"
#include "p4_infra/p4_pdpi/p4_runtime_session.h"
#include "p4_infra/p4_pdpi/p4_runtime_session_extras.h"
#include "proto/gnmi/gnmi.grpc.pb.h"
#include "tests/lib/switch_test_setup_helpers.h"
#include "thinkit/mirror_testbed.h"

Expand Down
2 changes: 1 addition & 1 deletion dvaas/mirror_testbed_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "dvaas/switch_api.h"
#include "lib/gnmi/openconfig.pb.h"
#include "lib/p4rt/p4rt_port.h"
#include "p4_pdpi/p4_runtime_session.h"
#include "p4_infra/p4_pdpi/p4_runtime_session.h"
#include "thinkit/mirror_testbed.h"
#include "thinkit/mirror_testbed_fixture.h"

Expand Down
Loading