Skip to content

Commit 4ee59a3

Browse files
kishanpsSRAVANI KANASANI
kishanps
authored and
SRAVANI KANASANI
committed
Migrate p4_infra/p4_pdpi/string_encodings to p4_infra/string_encodings.
Signed-off-by: SRAVANI KANASANI <kanasanis@google.com>
1 parent d0e4507 commit 4ee59a3

Some content is hidden

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

72 files changed

+540
-446
lines changed

‎dvaas/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package(
1919
default_testonly = True,
2020
default_visibility = ["//visibility:public"],
2121
licenses = ["notice"],
22+
2223
)
2324

2425
cc_library(
@@ -51,7 +52,7 @@ cc_library(
5152
"//p4_infra/p4_pdpi:p4_runtime_session_extras",
5253
"//p4_infra/p4_pdpi:sequencing",
5354
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
54-
"//p4_infra/p4_pdpi/string_encodings:hex_string",
55+
"//p4_infra/string_encodings:hex_string",
5556
"//p4_symbolic/packet_synthesizer:coverage_goal_cc_proto",
5657
"//p4_symbolic/packet_synthesizer:packet_synthesizer_cc_proto",
5758
"//sai_p4/instantiations/google:p4_versions",
@@ -96,7 +97,6 @@ cc_library(
9697
"//p4_infra/p4_pdpi/netaddr:ipv6_address",
9798
"//p4_infra/p4_pdpi/netaddr:mac_address",
9899
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
99-
"//p4_infra/p4_pdpi/string_encodings:hex_string",
100100
"@com_google_absl//absl/container:flat_hash_map",
101101
"@com_google_absl//absl/status",
102102
"@com_google_absl//absl/status:statusor",
@@ -352,7 +352,7 @@ cc_library(
352352
"//p4_infra/p4_pdpi/packetlib",
353353
"//p4_infra/p4_pdpi/packetlib:bit_widths",
354354
"//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
355-
"//p4_infra/p4_pdpi/string_encodings:hex_string",
355+
"//p4_infra/string_encodings:hex_string",
356356
"@com_google_absl//absl/container:btree",
357357
"@com_google_absl//absl/status",
358358
"@com_google_absl//absl/status:statusor",

‎dvaas/dataplane_validation.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
#include "p4_infra/p4_pdpi/p4_runtime_session_extras.h"
6161
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
6262
#include "p4_infra/p4_pdpi/sequencing.h"
63-
#include "p4_infra/p4_pdpi/string_encodings/hex_string.h"
63+
#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"
6666
#include "sai_p4/instantiations/google/versions.h"
@@ -470,9 +470,9 @@ absl::StatusOr<std::string> GetBmv2PacketHex(
470470
constexpr auto kSubmitToIngressSaiP4PacketOutHeader =
471471
std::bitset<16>(0b0000'0000'0100'0000);
472472
return absl::StrCat(
473-
absl::StripPrefix(
474-
pdpi::BitsetToHexString(kSubmitToIngressSaiP4PacketOutHeader),
475-
"0x"),
473+
absl::StripPrefix(string_encodings::BitsetToHexString(
474+
kSubmitToIngressSaiP4PacketOutHeader),
475+
"0x"),
476476
absl::StripPrefix(switch_input.packet().hex(), "0x"));
477477
}
478478
case SwitchInput::PACKET_OUT: {

‎dvaas/dvaas_detective.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include "p4_infra/p4_pdpi/netaddr/ipv6_address.h"
4141
#include "p4_infra/p4_pdpi/netaddr/mac_address.h"
4242
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
43-
#include "p4_infra/p4_pdpi/string_encodings/hex_string.h"
43+
#include "p4_infra/string_encodings/hex_string.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/test_vector.cc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "p4_infra/p4_pdpi/packetlib/bit_widths.h"
2929
#include "p4_infra/p4_pdpi/packetlib/packetlib.h"
3030
#include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
31-
#include "p4_infra/p4_pdpi/string_encodings/hex_string.h"
31+
#include "p4_infra/string_encodings/hex_string.h"
3232
#include "re2/re2.h"
3333

3434
namespace dvaas {
@@ -82,8 +82,9 @@ absl::StatusOr<int> ExtractIdFromTaggedPacket(absl::string_view raw_packet) {
8282

8383
absl::StatusOr<int> ExtractIdFromTaggedPacketInHex(
8484
absl::string_view packet_hex) {
85-
ASSIGN_OR_RETURN(std::string raw_packet,
86-
pdpi::HexStringToByteString(absl::StrCat("0x", packet_hex)));
85+
ASSIGN_OR_RETURN(
86+
std::string raw_packet,
87+
string_encodings::HexStringToByteString(absl::StrCat("0x", packet_hex)));
8788
return dvaas::ExtractIdFromTaggedPacket(raw_packet);
8889
}
8990

‎lib/p4rt/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ cc_library(
7777
hdrs = ["p4rt_port.h"],
7878
deps = [
7979
"//gutil/gutil:status",
80-
"//p4_infra/p4_pdpi/string_encodings:byte_string",
81-
"//p4_infra/p4_pdpi/string_encodings:decimal_string",
82-
"//p4_infra/p4_pdpi/string_encodings:hex_string",
80+
"//p4_infra/string_encodings:byte_string",
81+
"//p4_infra/string_encodings:decimal_string",
82+
"//p4_infra/string_encodings:hex_string",
8383
"@com_google_absl//absl/numeric:bits",
8484
"@com_google_absl//absl/status",
8585
"@com_google_absl//absl/status:statusor",

‎lib/p4rt/p4rt_port.cc‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@
2626
#include "absl/strings/string_view.h"
2727
#include "absl/types/span.h"
2828
#include "gutil/gutil/status.h"
29-
#include "p4_infra/p4_pdpi/string_encodings/byte_string.h"
30-
#include "p4_infra/p4_pdpi/string_encodings/decimal_string.h"
31-
#include "p4_infra/p4_pdpi/string_encodings/hex_string.h"
29+
#include "p4_infra/string_encodings/byte_string.h"
30+
#include "p4_infra/string_encodings/decimal_string.h"
31+
#include "p4_infra/string_encodings/hex_string.h"
3232

3333
namespace pins_test {
3434

3535
absl::StatusOr<P4rtPortId> P4rtPortId::MakeFromP4rtEncoding(
3636
absl::string_view p4rt_port_id) {
3737
ASSIGN_OR_RETURN(uint32_t p4rt_port_id_int,
38-
pdpi::DecimalStringToUint32(p4rt_port_id));
38+
string_encodings::DecimalStringToUint32(p4rt_port_id));
3939
return P4rtPortId(p4rt_port_id_int);
4040
}
4141

@@ -65,7 +65,7 @@ std::vector<P4rtPortId> P4rtPortId::MakeVectorFromOpenConfigEncodings(
6565
absl::StatusOr<P4rtPortId> P4rtPortId::MakeFromHexstringEncoding(
6666
absl::string_view hexstring_encoding) {
6767
ASSIGN_OR_RETURN(uint32_t p4rt_port_id_int,
68-
pdpi::HexStringToUint32(hexstring_encoding));
68+
string_encodings::HexStringToUint32(hexstring_encoding));
6969
return P4rtPortId(p4rt_port_id_int);
7070
}
7171

@@ -84,7 +84,8 @@ absl::StatusOr<std::string> P4rtPortId::GetBmv2P4rtEncoding() const {
8484
"but the present P4RT port ID "
8585
<< p4rt_port_id_ << " has " << width << " bits.";
8686
}
87-
return pdpi::BitsetToP4RuntimeByteString<kBmv2PortBitWidth>(p4rt_port_id_);
87+
return string_encodings::BitsetToP4RuntimeByteString<kBmv2PortBitWidth>(
88+
p4rt_port_id_);
8889
}
8990

9091
bool P4rtPortId::operator==(const P4rtPortId& other) const {

‎p4_fuzzer/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ cc_library(
152152
"//p4_infra/p4_pdpi:references",
153153
"//p4_infra/p4_pdpi/internal:ordered_map",
154154
"//p4_infra/p4_pdpi/netaddr:ipv6_address",
155-
"//p4_infra/p4_pdpi/string_encodings:byte_string",
155+
"//p4_infra/string_encodings:byte_string",
156156
"//p4_infra/p4_pdpi/utils:ir",
157157
"@com_github_google_glog//:glog",
158158
"@com_github_p4lang_p4_constraints//p4_constraints:ast",

‎p4_fuzzer/fuzz_util.cc‎

Lines changed: 3 additions & 2 deletions
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/netaddr/ipv6_address.h"
6060
#include "p4_infra/p4_pdpi/references.h"
61-
#include "p4_infra/p4_pdpi/string_encodings/byte_string.h"
6261
#include "p4_infra/p4_pdpi/utils/ir.h"
62+
#include "p4_infra/string_encodings/byte_string.h"
6363

6464
namespace p4_fuzzer {
6565

@@ -708,7 +708,8 @@ absl::StatusOr<Replica> FuzzReplica(absl::BitGen* gen,
708708
if (auto it = reference_map.find(instance_param); it != reference_map.end()) {
709709
ASSIGN_OR_RETURN(
710710
auto instance,
711-
pdpi::ByteStringToBitset<kReplicaInstanceBitwidth>(it->second));
711+
string_encodings::ByteStringToBitset<kReplicaInstanceBitwidth>(
712+
it->second));
712713
replica.set_instance(instance.to_ullong());
713714
} else {
714715
replica.set_instance(FuzzUint64(gen, kReplicaInstanceBitwidth));

‎p4_infra/p4_pdpi/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ cc_library(
3232
"//gutil/gutil:collections",
3333
"//gutil/gutil:proto",
3434
"//gutil/gutil:status",
35-
"//p4_infra/p4_pdpi/string_encodings:byte_string",
35+
"//p4_infra/string_encodings:byte_string",
3636
"@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
3737
"@com_google_absl//absl/container:btree",
3838
"@com_google_absl//absl/container:flat_hash_map",
@@ -209,7 +209,7 @@ cc_library(
209209
"//gutil/gutil:proto",
210210
"//gutil/gutil:status",
211211
"//p4_infra/p4_pdpi/internal:ordered_map",
212-
"//p4_infra/p4_pdpi/string_encodings:hex_string",
212+
"//p4_infra/string_encodings:hex_string",
213213
"//p4_infra/p4_pdpi/utils:ir",
214214
"@com_github_grpc_grpc//:grpc++",
215215
"@com_github_p4lang_p4runtime//:p4info_cc_proto",

‎p4_infra/p4_pdpi/netaddr/BUILD.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ cc_library(
88
hdrs = ["network_address.h"],
99
deps = [
1010
"//gutil/gutil:status",
11-
"//p4_infra/p4_pdpi/string_encodings:byte_string",
12-
"//p4_infra/p4_pdpi/string_encodings:hex_string",
11+
"//p4_infra/string_encodings:byte_string",
12+
"//p4_infra/string_encodings:hex_string",
1313
"@com_google_absl//absl/status:statusor",
1414
"@com_google_absl//absl/strings",
1515
],
@@ -36,7 +36,7 @@ cc_test(
3636
":network_address",
3737
"//gutil/gutil:status",
3838
"//gutil/gutil:status_matchers",
39-
"//p4_infra/p4_pdpi/string_encodings:safe",
39+
"//p4_infra/string_encodings:safe",
4040
"@com_google_absl//absl/container:flat_hash_map",
4141
"@com_google_absl//absl/strings",
4242
"@com_google_googletest//:gtest_main",
@@ -50,7 +50,7 @@ cc_library(
5050
deps = [
5151
":network_address",
5252
"//gutil/gutil:status",
53-
"//p4_infra/p4_pdpi/string_encodings:hex_string",
53+
"//p4_infra/string_encodings:hex_string",
5454
"@com_google_absl//absl/log",
5555
"@com_google_absl//absl/numeric:int128",
5656
"@com_google_absl//absl/status",
@@ -67,7 +67,7 @@ cc_test(
6767
":network_address",
6868
"//gutil/gutil:status",
6969
"//gutil/gutil:status_matchers",
70-
"//p4_infra/p4_pdpi/string_encodings:safe",
70+
"//p4_infra/string_encodings:safe",
7171
"@com_google_absl//absl/numeric:int128",
7272
"@com_google_absl//absl/strings",
7373
"@com_google_googletest//:gtest_main",
@@ -96,7 +96,7 @@ cc_test(
9696
":network_address",
9797
"//gutil/gutil:status",
9898
"//gutil/gutil:status_matchers",
99-
"//p4_infra/p4_pdpi/string_encodings:safe",
99+
"//p4_infra/string_encodings:safe",
100100
"@com_google_absl//absl/strings",
101101
"@com_google_googletest//:gtest_main",
102102
],

0 commit comments

Comments
 (0)