Skip to content

Commit 2f8012b

Browse files
rkavitha-hclkishanps
rkavitha-hcl
and
kishanps
authored
Update Module Path: gutil Relocated to Nested Directory (#1500)
Co-authored-by: kishanps <kishanps@google.com>
1 parent f9d7dc1 commit 2f8012b

File tree

470 files changed

+1886
-1862
lines changed

Some content is hidden

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

470 files changed

+1886
-1862
lines changed

‎dvaas/BUILD.bazel‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ cc_library(
3737
":user_provided_packet_test_vector",
3838
":validation_result",
3939
"//dvaas/thinkit_tests:dvaas_regression_cc_proto",
40-
"//gutil:proto",
41-
"//gutil:proto_ordering",
42-
"//gutil:status",
43-
"//gutil:test_artifact_writer",
44-
"//gutil:version",
40+
"//gutil/gutil:proto",
41+
"//gutil/gutil:proto_ordering",
42+
"//gutil/gutil:status",
43+
"//gutil/gutil:test_artifact_writer",
44+
"//gutil/gutil:version",
4545
"//lib/gnmi:gnmi_helper",
4646
"//lib/gnmi:openconfig_cc_proto",
4747
"//lib/p4rt:p4rt_port",
@@ -89,8 +89,8 @@ cc_library(
8989
deps = [
9090
":dvaas_detective_cc_proto",
9191
":test_vector_cc_proto",
92-
"//gutil:overload",
93-
"//gutil:proto",
92+
"//gutil/gutil:proto",
93+
"//gutil/gutil:overload",
9494
"//p4_pdpi/packetlib:packetlib_cc_proto",
9595
"@com_google_absl//absl/container:flat_hash_map",
9696
"@com_google_absl//absl/status",
@@ -114,10 +114,10 @@ cc_test(
114114
deps = [
115115
":dvaas_detective",
116116
":dvaas_detective_cc_proto",
117-
"//gutil:proto",
118-
"//gutil:testing",
117+
"//gutil/gutil:proto",
118+
"//gutil/gutil:testing",
119119
":test_vector_cc_proto",
120-
"//gutil:status_matchers",
120+
"//gutil/gutil:status_matchers",
121121
"//p4_pdpi/internal:ordered_map",
122122
"//p4_pdpi/packetlib:packetlib_cc_proto",
123123
"@com_google_absl//absl/container:flat_hash_map",
@@ -148,10 +148,10 @@ cc_test(
148148
deps = [
149149
":dataplane_validation",
150150
":packet_trace_cc_proto",
151-
"//gutil:proto",
152-
"//gutil:status_matchers",
153-
"//gutil:test_artifact_writer",
154-
"//gutil:testing",
151+
"//gutil/gutil:proto",
152+
"//gutil/gutil:status_matchers",
153+
"//gutil/gutil:test_artifact_writer",
154+
"//gutil/gutil:testing",
155155
"@com_google_absl//absl/container:btree",
156156
"@com_google_absl//absl/log",
157157
"@com_google_absl//absl/status",
@@ -180,7 +180,7 @@ cc_library(
180180
":test_run_validation",
181181
":test_vector_cc_proto",
182182
":test_vector_stats",
183-
"//gutil:status",
183+
"//gutil/gutil:status",
184184
"//p4_symbolic/packet_synthesizer:packet_synthesizer_cc_proto",
185185
"@com_github_google_glog//:glog",
186186
"@com_google_absl//absl/algorithm:container",
@@ -207,7 +207,7 @@ cc_library(
207207
":port_id_map",
208208
":test_vector",
209209
":test_vector_cc_proto",
210-
"//gutil:status",
210+
"//gutil/gutil:status",
211211
"//lib/p4rt:p4rt_port",
212212
"//p4_pdpi:ir",
213213
"//p4_pdpi:ir_cc_proto",
@@ -232,9 +232,9 @@ cc_library(
232232
deps = [
233233
":switch_api",
234234
":test_vector_cc_proto",
235-
"//gutil:proto",
236-
"//gutil:proto_ordering",
237-
"//gutil:status_matchers",
235+
"//gutil/gutil:proto",
236+
"//gutil/gutil:proto_ordering",
237+
"//gutil/gutil:status_matchers",
238238
"//p4_pdpi:ir_cc_proto",
239239
"//p4_pdpi/packetlib:packetlib_cc_proto",
240240
"@com_github_google_glog//:glog",
@@ -264,9 +264,8 @@ cc_library(
264264
":test_vector",
265265
":test_vector_cc_proto",
266266
":validation_result",
267-
"//gutil:proto",
268-
"//gutil:test_artifact_writer",
269-
"//lib/p4rt:p4rt_port",
267+
"//gutil/gutil:proto",
268+
"//gutil/gutil:test_artifact_writer",
270269
"//p4_pdpi:ir",
271270
"//p4_pdpi:ir_cc_proto",
272271
"//p4_pdpi:p4_runtime_session",
@@ -342,8 +341,8 @@ cc_library(
342341
hdrs = ["test_vector.h"],
343342
deps = [
344343
":test_vector_cc_proto",
345-
"//gutil:proto",
346-
"//gutil:status",
344+
"//gutil/gutil:proto",
345+
"//gutil/gutil:status",
347346
"//p4_pdpi:ir_cc_proto",
348347
"//p4_pdpi/packetlib",
349348
"//p4_pdpi/packetlib:bit_widths",
@@ -363,9 +362,9 @@ cc_test(
363362
deps = [
364363
":test_vector",
365364
":test_vector_cc_proto",
366-
"//gutil:proto_matchers",
367-
"//gutil:status_matchers",
368-
"//gutil:testing",
365+
"//gutil/gutil:proto_matchers",
366+
"//gutil/gutil:status_matchers",
367+
"//gutil/gutil:testing",
369368
"//p4_pdpi/packetlib",
370369
"//p4_pdpi/packetlib:bit_widths",
371370
"//p4_pdpi/packetlib:packetlib_cc_proto",
@@ -396,8 +395,8 @@ cc_library(
396395
srcs = ["port_id_map.cc"],
397396
hdrs = ["port_id_map.h"],
398397
deps = [
399-
"//gutil:status",
400-
"//gutil:test_artifact_writer",
398+
"//gutil/gutil:status",
399+
"//gutil/gutil:test_artifact_writer",
401400
"//lib/gnmi:gnmi_helper",
402401
"//lib/p4rt:p4rt_port",
403402
"@com_github_gnmi//proto/gnmi:gnmi_cc_grpc_proto",
@@ -418,7 +417,7 @@ cc_test(
418417
srcs = ["port_id_map_test.cc"],
419418
deps = [
420419
":port_id_map",
421-
"//gutil:status_matchers",
420+
"//gutil/gutil:status_matchers",
422421
"//lib/p4rt:p4rt_port",
423422
"@com_google_absl//absl/container:flat_hash_map",
424423
"@com_google_absl//absl/status",
@@ -435,8 +434,8 @@ cc_library(
435434
deps = [
436435
":test_vector",
437436
":test_vector_cc_proto",
438-
"//gutil:proto",
439-
"//gutil:status",
437+
"//gutil/gutil:proto",
438+
"//gutil/gutil:status",
440439
"//p4_pdpi:ir",
441440
"//p4_pdpi/packetlib",
442441
"@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
@@ -461,8 +460,8 @@ cc_library(
461460
":test_vector",
462461
":test_vector_cc_proto",
463462
":validation_result",
464-
"//gutil:proto",
465-
"//gutil:test_artifact_writer",
463+
"//gutil/gutil:proto",
464+
"//gutil/gutil:test_artifact_writer",
466465
"//lib/p4rt:p4rt_port",
467466
"//p4_pdpi:ir",
468467
"//p4_pdpi:ir_cc_proto",
@@ -492,7 +491,7 @@ cc_library(
492491
":packet_trace_cc_proto",
493492
":test_vector",
494493
":test_vector_cc_proto",
495-
"//gutil:proto",
494+
"//gutil/gutil:proto",
496495
"//p4_pdpi:ir_cc_proto",
497496
"@com_github_p4lang_p4runtime//:p4info_cc_proto",
498497
"@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
@@ -516,11 +515,11 @@ cc_test(
516515
":test_vector",
517516
":test_vector_cc_proto",
518517
":user_provided_packet_test_vector",
519-
"//gutil:collections",
520-
"//gutil:proto",
521-
"//gutil:status_matchers",
522-
"//gutil:testing",
523-
"//p4_pdpi/packetlib",
518+
"//gutil/gutil:collections",
519+
"//gutil/gutil:proto",
520+
"//gutil/gutil:status_matchers",
521+
"//gutil/gutil:testing",
522+
"//p4_pdpi/packetlib",
524523
"//p4_pdpi/packetlib:packetlib_cc_proto",
525524
"//p4_pdpi/testing:test_p4info_cc",
526525
"@com_google_absl//absl/status",
@@ -551,7 +550,7 @@ cc_test(
551550
deps = [
552551
":test_vector_cc_proto",
553552
":test_vector_stats",
554-
"//gutil:testing",
553+
"//gutil/gutil:testing",
555554
"@com_google_googletest//:gtest_main",
556555
],
557556
)
@@ -576,7 +575,7 @@ cc_test(
576575
deps = [
577576
":test_run_validation",
578577
":test_vector_cc_proto",
579-
"//gutil:testing",
578+
"//gutil/gutil:testing",
580579
"//p4_pdpi:ir_cc_proto",
581580
"//p4_pdpi/packetlib:packetlib_cc_proto",
582581
"@com_github_google_glog//:glog",
@@ -598,9 +597,9 @@ cc_test(
598597
":switch_api",
599598
":test_run_validation",
600599
":test_vector_cc_proto",
601-
"//gutil:proto_matchers",
602-
"//gutil:status_matchers",
603-
"//gutil:testing",
600+
"//gutil/gutil:proto_matchers",
601+
"//gutil/gutil:status_matchers",
602+
"//gutil/gutil:testing",
604603
"//p4_pdpi/packetlib:packetlib_cc_proto",
605604
"@com_google_absl//absl/status",
606605
"@com_google_absl//absl/strings:string_view",

‎dvaas/arriba_test_vector_validation.cc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@
2929
#include "dvaas/test_vector.h"
3030
#include "dvaas/test_vector.pb.h"
3131
#include "dvaas/validation_result.h"
32-
#include "glog/logging.h"
33-
#include "gutil/proto.h"
34-
#include "gutil/status.h"
35-
#include "gutil/test_artifact_writer.h"
32+
#include "gutil/gutil/proto.h"
33+
#include "gutil/gutil/status.h"
34+
#include "gutil/gutil/test_artifact_writer.h"
3635
#include "lib/p4rt/p4rt_port.h"
3736
#include "p4/v1/p4runtime.pb.h"
3837
#include "p4_pdpi/ir.h"

‎dvaas/dataplane_validation.cc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@
4545
#include "dvaas/user_provided_packet_test_vector.h"
4646
#include "dvaas/validation_result.h"
4747
#include "glog/logging.h"
48-
#include "gutil/proto.h"
49-
#include "gutil/proto_ordering.h"
50-
#include "gutil/status.h"
51-
#include "gutil/test_artifact_writer.h"
52-
#include "gutil/version.h"
48+
#include "gutil/gutil/proto.h"
49+
#include "gutil/gutil/proto_ordering.h"
50+
#include "gutil/gutil/status.h"
51+
#include "gutil/gutil/test_artifact_writer.h"
52+
#include "gutil/gutil/version.h"
5353
#include "lib/gnmi/gnmi_helper.h"
5454
#include "lib/gnmi/openconfig.pb.h"
5555
#include "lib/p4rt/p4rt_port.h"

‎dvaas/dataplane_validation.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ limitations under the License.
4040
#include "dvaas/test_vector.h"
4141
#include "dvaas/test_vector.pb.h"
4242
#include "dvaas/validation_result.h"
43-
#include "gutil/test_artifact_writer.h"
43+
#include "gutil/gutil/test_artifact_writer.h"
4444
#include "lib/p4rt/p4rt_port.h"
4545
#include "p4_pdpi/ir.pb.h"
4646
#include "p4_pdpi/packetlib/packetlib.pb.h"

‎dvaas/dataplane_validation_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
#include "dvaas/packet_trace.pb.h"
1212
#include "gmock/gmock.h"
1313
#include "gtest/gtest.h"
14-
#include "gutil/proto.h"
15-
#include "gutil/status_matchers.h"
16-
#include "gutil/test_artifact_writer.h"
17-
#include "gutil/testing.h"
14+
#include "gutil/gutil/proto.h"
15+
#include "gutil/gutil/status_matchers.h"
16+
#include "gutil/gutil/test_artifact_writer.h"
17+
#include "gutil/gutil/testing.h"
1818

1919
namespace dvaas {
2020
namespace {

‎dvaas/dvaas_detective.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
#include "absl/types/variant.h"
3434
#include "dvaas/dvaas_detective.pb.h"
3535
#include "dvaas/test_vector.pb.h"
36-
#include "gutil/overload.h"
37-
#include "gutil/proto.h"
38-
#include "gutil/status.h"
36+
#include "gutil/gutil/overload.h"
37+
#include "gutil/gutil/proto.h"
38+
#include "gutil/gutil/status.h"
3939
#include "p4_pdpi/packetlib/packetlib.pb.h"
4040
#include "yggdrasil_decision_forests/dataset/data_spec.pb.h"
4141
#include "yggdrasil_decision_forests/model/decision_tree/decision_tree.h"

‎dvaas/dvaas_detective_test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
#include "dvaas/test_vector.pb.h"
3535
#include "gmock/gmock.h"
3636
#include "gtest/gtest.h"
37-
#include "gutil/proto.h"
38-
#include "gutil/status_matchers.h"
39-
#include "gutil/testing.h"
37+
#include "gutil/gutil/proto.h"
38+
#include "gutil/gutil/status_matchers.h"
39+
#include "gutil/gutil/testing.h"
4040
#include "p4_pdpi/internal/ordered_map.h"
4141
#include "p4_pdpi/packetlib/packetlib.pb.h"
4242
#include "yggdrasil_decision_forests/dataset/data_spec.pb.h"

‎dvaas/mirror_testbed_config.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "absl/status/status.h"
1818
#include "absl/strings/match.h"
1919
#include "glog/logging.h"
20-
#include "gutil/status.h"
20+
#include "gutil/gutil/status.h"
2121
#include "lib/gnmi/gnmi_helper.h"
2222
#include "p4_pdpi/ir.h"
2323
#include "p4_pdpi/ir.pb.h"

‎dvaas/packet_injection.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "dvaas/test_vector.h"
3030
#include "dvaas/test_vector.pb.h"
3131
#include "glog/logging.h"
32-
#include "gutil/status.h"
32+
#include "gutil/gutil/status.h"
3333
#include "lib/p4rt/p4rt_port.h"
3434
#include "p4/v1/p4runtime.pb.h"
3535
#include "p4_pdpi/ir.h"

‎dvaas/port_id_map.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "absl/strings/str_join.h"
2828
#include "absl/strings/string_view.h"
2929
#include "absl/strings/substitute.h"
30-
#include "gutil/status.h"
31-
#include "gutil/test_artifact_writer.h"
30+
#include "gutil/gutil/status.h"
31+
#include "gutil/gutil/test_artifact_writer.h"
3232
#include "lib/gnmi/gnmi_helper.h"
3333
#include "lib/p4rt/p4rt_port.h"
3434
#include "proto/gnmi/gnmi.grpc.pb.h"

0 commit comments

Comments
 (0)