Skip to content

Commit 75a0123

Browse files
kishanpsSRAVANI KANASANI
kishanps
authored and
SRAVANI KANASANI
committed
[P4 Infra] Move p4_infra/p4_pdpi/packetlib to p4_infra/packetlib. No semantic changes.
Signed-off-by: SRAVANI KANASANI <kanasanis@google.com>
1 parent 9986597 commit 75a0123

File tree

92 files changed

+210
-205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+210
-205
lines changed

‎dvaas/BUILD.bazel‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ cc_library(
5151
"//p4_infra/p4_pdpi:p4_runtime_session",
5252
"//p4_infra/p4_pdpi:p4_runtime_session_extras",
5353
"//p4_infra/p4_pdpi:sequencing",
54-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
54+
"//p4_infra/packetlib:packetlib_cc_proto",
5555
"//p4_infra/string_encodings:hex_string",
5656
"//p4_symbolic/packet_synthesizer:coverage_goal_cc_proto",
5757
"//p4_symbolic/packet_synthesizer:packet_synthesizer_cc_proto",
@@ -96,7 +96,7 @@ cc_library(
9696
"//p4_infra/netaddr:ipv4_address",
9797
"//p4_infra/netaddr:ipv6_address",
9898
"//p4_infra/netaddr:mac_address",
99-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
99+
"//p4_infra/packetlib:packetlib_cc_proto",
100100
"@com_google_absl//absl/container:flat_hash_map",
101101
"@com_google_absl//absl/status",
102102
"@com_google_absl//absl/status:statusor",
@@ -123,7 +123,7 @@ cc_test(
123123
"//gutil/gutil:proto",
124124
"//gutil/gutil:testing",
125125
"//gutil/gutil:status_matchers",
126-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
126+
"//p4_infra/packetlib:packetlib_cc_proto",
127127
"@com_google_absl//absl/container:flat_hash_map",
128128
"@com_google_absl//absl/status",
129129
"@com_google_googletest//:gtest_main",
@@ -216,9 +216,9 @@ cc_library(
216216
"//p4_infra/p4_pdpi:ir",
217217
"//p4_infra/p4_pdpi:ir_cc_proto",
218218
"//p4_infra/p4_pdpi:p4_runtime_session",
219-
"//p4_infra/p4_pdpi/packetlib",
220-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
221219
"//p4_infra/p4_pdpi/utils:ir",
220+
"//p4_infra/packetlib",
221+
"//p4_infra/packetlib:packetlib_cc_proto",
222222
"//tests/forwarding:util",
223223
"@com_github_google_glog//:glog",
224224
"@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
@@ -240,7 +240,7 @@ cc_library(
240240
"//gutil/gutil:proto_ordering",
241241
"//gutil/gutil:status_matchers",
242242
"//p4_infra/p4_pdpi:ir_cc_proto",
243-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
243+
"//p4_infra/packetlib:packetlib_cc_proto",
244244
"@com_google_absl//absl/base:nullability",
245245
"@com_google_absl//absl/container:flat_hash_set",
246246
"@com_google_absl//absl/log",
@@ -330,7 +330,7 @@ proto_library(
330330
deps = [
331331
":packet_trace_proto",
332332
"//p4_infra/p4_pdpi:ir_proto",
333-
"//p4_infra/p4_pdpi/packetlib:packetlib_proto",
333+
"//p4_infra/packetlib:packetlib_proto",
334334
],
335335
)
336336

@@ -349,9 +349,9 @@ cc_library(
349349
"//gutil/gutil:proto",
350350
"//gutil/gutil:status",
351351
"//p4_infra/p4_pdpi:ir_cc_proto",
352-
"//p4_infra/p4_pdpi/packetlib",
353-
"//p4_infra/p4_pdpi/packetlib:bit_widths",
354-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
352+
"//p4_infra/packetlib",
353+
"//p4_infra/packetlib:bit_widths",
354+
"//p4_infra/packetlib:packetlib_cc_proto",
355355
"//p4_infra/string_encodings:hex_string",
356356
"@com_google_absl//absl/container:btree",
357357
"@com_google_absl//absl/status",
@@ -370,9 +370,9 @@ cc_test(
370370
"//gutil/gutil:proto_matchers",
371371
"//gutil/gutil:status_matchers",
372372
"//gutil/gutil:testing",
373-
"//p4_infra/p4_pdpi/packetlib",
374-
"//p4_infra/p4_pdpi/packetlib:bit_widths",
375-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
373+
"//p4_infra/packetlib",
374+
"//p4_infra/packetlib:bit_widths",
375+
"//p4_infra/packetlib:packetlib_cc_proto",
376376
"@com_google_absl//absl/status",
377377
"@com_google_googletest//:gtest_main",
378378
],
@@ -442,7 +442,7 @@ cc_library(
442442
"//gutil/gutil:proto",
443443
"//gutil/gutil:status",
444444
"//p4_infra/p4_pdpi:ir",
445-
"//p4_infra/p4_pdpi/packetlib",
445+
"//p4_infra/packetlib",
446446
"@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
447447
"@com_google_absl//absl/status",
448448
"@com_google_absl//absl/status:statusor",
@@ -498,7 +498,7 @@ cc_library(
498498
":test_vector_cc_proto",
499499
"//gutil/gutil:proto",
500500
"//p4_infra/p4_pdpi:ir_cc_proto",
501-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
501+
"//p4_infra/packetlib:packetlib_cc_proto",
502502
"@com_github_p4lang_p4runtime//:p4info_cc_proto",
503503
"@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
504504
"@com_google_absl//absl/container:btree",
@@ -525,9 +525,9 @@ cc_test(
525525
"//gutil/gutil:proto",
526526
"//gutil/gutil:status_matchers",
527527
"//gutil/gutil:testing",
528-
"//p4_infra/p4_pdpi/packetlib",
529-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
530528
"//p4_infra/p4_pdpi/testing:test_p4info_cc",
529+
"//p4_infra/packetlib",
530+
"//p4_infra/packetlib:packetlib_cc_proto",
531531
"@com_google_absl//absl/status",
532532
"@com_google_absl//absl/status:statusor",
533533
"@com_google_absl//absl/strings",
@@ -583,7 +583,7 @@ cc_test(
583583
":test_vector_cc_proto",
584584
"//gutil/gutil:testing",
585585
"//p4_infra/p4_pdpi:ir_cc_proto",
586-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
586+
"//p4_infra/packetlib:packetlib_cc_proto",
587587
"@com_google_absl//absl/log",
588588
"@com_google_absl//absl/status:statusor",
589589
],
@@ -606,7 +606,7 @@ cc_test(
606606
"//gutil/gutil:proto_matchers",
607607
"//gutil/gutil:status_matchers",
608608
"//gutil/gutil:testing",
609-
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
609+
"//p4_infra/packetlib:packetlib_cc_proto",
610610
"@com_google_absl//absl/status",
611611
"@com_google_absl//absl/strings:string_view",
612612
"@com_google_googletest//:gtest_main",

‎dvaas/dataplane_validation.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
#include "p4_infra/p4_pdpi/ir.pb.h"
5959
#include "p4_infra/p4_pdpi/p4_runtime_session.h"
6060
#include "p4_infra/p4_pdpi/p4_runtime_session_extras.h"
61-
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
6261
#include "p4_infra/p4_pdpi/sequencing.h"
62+
#include "p4_infra/packetlib/packetlib.pb.h"
6363
#include "p4_infra/string_encodings/hex_string.h"
6464
#include "p4_symbolic/packet_synthesizer/packet_synthesizer.pb.h"
6565
#include "proto/gnmi/gnmi.pb.h"

‎dvaas/dataplane_validation.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ limitations under the License.
4343
#include "gutil/gutil/test_artifact_writer.h"
4444
#include "lib/p4rt/p4rt_port.h"
4545
#include "p4_infra/p4_pdpi/ir.pb.h"
46-
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
46+
#include "p4_infra/packetlib/packetlib.pb.h"
4747
#include "p4_symbolic/packet_synthesizer/coverage_goal.pb.h"
4848
#include "p4_symbolic/packet_synthesizer/packet_synthesizer.pb.h"
4949
#include "proto/gnmi/gnmi.grpc.pb.h"

‎dvaas/dvaas_detective.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
#include "p4_infra/netaddr/ipv4_address.h"
4040
#include "p4_infra/netaddr/ipv6_address.h"
4141
#include "p4_infra/netaddr/mac_address.h"
42-
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
4342
#include "p4_infra/string_encodings/hex_string.h"
43+
#include "p4_infra/packetlib/packetlib.pb.h"
4444
#include "yggdrasil_decision_forests/dataset/data_spec.h"
4545
#include "yggdrasil_decision_forests/dataset/data_spec.pb.h"
4646
#include "yggdrasil_decision_forests/model/decision_tree/decision_tree.h"

‎dvaas/dvaas_detective_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "gutil/gutil/proto.h"
3838
#include "gutil/gutil/status_matchers.h"
3939
#include "gutil/gutil/testing.h"
40-
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
40+
#include "p4_infra/packetlib/packetlib.pb.h"
4141
#include "yggdrasil_decision_forests/dataset/data_spec.pb.h"
4242
#include "yggdrasil_decision_forests/model/decision_tree/decision_tree.h"
4343
#include "yggdrasil_decision_forests/model/random_forest/random_forest.h"

‎dvaas/packet_injection.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
#include "p4/v1/p4runtime.pb.h"
3535
#include "p4_infra/p4_pdpi/ir.h"
3636
#include "p4_infra/p4_pdpi/p4_runtime_session.h"
37-
#include "p4_infra/p4_pdpi/packetlib/packetlib.h"
38-
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
3937
#include "p4_infra/p4_pdpi/utils/ir.h"
38+
#include "p4_infra/packetlib/packetlib.h"
39+
#include "p4_infra/packetlib/packetlib.pb.h"
4040
#include "tests/forwarding/util.h"
4141

4242
namespace dvaas {

‎dvaas/packet_injection.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "lib/p4rt/p4rt_port.h"
2929
#include "p4_infra/p4_pdpi/ir.pb.h"
3030
#include "p4_infra/p4_pdpi/p4_runtime_session.h"
31-
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
31+
#include "p4_infra/packetlib/packetlib.pb.h"
3232

3333
namespace dvaas {
3434

‎dvaas/test_insights.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include "p4/config/v1/p4info.pb.h"
4040
#include "p4/v1/p4runtime.pb.h"
4141
#include "p4_infra/p4_pdpi/ir.pb.h"
42-
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
42+
#include "p4_infra/packetlib/packetlib.pb.h"
4343

4444
namespace dvaas {
4545

‎dvaas/test_run_validation.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include "gutil/gutil/status.h"
4545
#include "gutil/gutil/status_matchers.h"
4646
#include "p4_infra/p4_pdpi/ir.pb.h"
47-
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
47+
#include "p4_infra/packetlib/packetlib.pb.h"
4848

4949
namespace dvaas {
5050

‎dvaas/test_run_validation.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "dvaas/test_vector.pb.h"
3030
#include "google/protobuf/descriptor.h"
3131
#include "google/protobuf/repeated_ptr_field.h"
32-
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
32+
#include "p4_infra/packetlib/packetlib.pb.h"
3333

3434
namespace dvaas {
3535

0 commit comments

Comments
 (0)