[Comb] Move p4_infra/p4_pdpi/netaddr to p4_infra/netaddr. No semantic changes.

dvaas/BUILD.bazel

@@ -60,7 +60,7 @@ cc_library(
         "//p4_infra/p4_pdpi:p4_runtime_session_extras",
         "//p4_infra/p4_pdpi:sequencing",
         "//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
-        "//p4_infra/p4_pdpi/string_encodings:hex_string",
+        "//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",
@@ -315,7 +315,7 @@ cc_library(
         "//p4_infra/p4_pdpi/packetlib",
         "//p4_infra/p4_pdpi/packetlib:bit_widths",
         "//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
-        "//p4_infra/p4_pdpi/string_encodings:hex_string",
+        "//p4_infra/string_encodings:hex_string",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
@@ -583,10 +583,10 @@ cc_library(
         ":packet_trace_cc_proto",
         ":test_vector_cc_proto",
         "//gutil/gutil:status",
+        "//p4_infra/netaddr:ipv4_address",
+        "//p4_infra/netaddr:ipv6_address",
+        "//p4_infra/netaddr:mac_address",
         "//p4_infra/p4_pdpi:ir_cc_proto",
-        "//p4_infra/p4_pdpi/netaddr:ipv4_address",
-        "//p4_infra/p4_pdpi/netaddr:ipv6_address",
-        "//p4_infra/p4_pdpi/netaddr:mac_address",
         "//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
         "@com_google_absl//absl/algorithm:container",
         "@com_google_absl//absl/log",

dvaas/dataplane_validation.cc

@@ -69,7 +69,7 @@
 #include "p4_infra/p4_pdpi/p4_runtime_session_extras.h"
 #include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
 #include "p4_infra/p4_pdpi/sequencing.h"
-#include "p4_infra/p4_pdpi/string_encodings/hex_string.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"
@@ -550,9 +550,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: {

dvaas/labeler.cc

@@ -13,10 +13,10 @@
 #include "dvaas/packet_trace.pb.h"
 #include "dvaas/test_vector.pb.h"
 #include "gutil/gutil/status.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/p4_pdpi/ir.pb.h"
-#include "p4_infra/p4_pdpi/netaddr/ipv4_address.h"
-#include "p4_infra/p4_pdpi/netaddr/ipv6_address.h"
-#include "p4_infra/p4_pdpi/netaddr/mac_address.h"
 #include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
 #include "re2/re2.h"
 

dvaas/test_vector.cc

@@ -28,7 +28,7 @@
 #include "p4_infra/p4_pdpi/packetlib/bit_widths.h"
 #include "p4_infra/p4_pdpi/packetlib/packetlib.h"
 #include "p4_infra/p4_pdpi/packetlib/packetlib.pb.h"
-#include "p4_infra/p4_pdpi/string_encodings/hex_string.h"
+#include "p4_infra/string_encodings/hex_string.h"
 #include "re2/re2.h"
 
 namespace dvaas {
@@ -82,8 +82,9 @@ absl::StatusOr<int> ExtractIdFromTaggedPacket(absl::string_view raw_packet) {
 
 absl::StatusOr<int> ExtractIdFromTaggedPacketInHex(
     absl::string_view packet_hex) {
-  ASSIGN_OR_RETURN(std::string raw_packet,
-                   pdpi::HexStringToByteString(absl::StrCat("0x", packet_hex)));
+  ASSIGN_OR_RETURN(
+      std::string raw_packet,
+      string_encodings::HexStringToByteString(absl::StrCat("0x", packet_hex)));
   return dvaas::ExtractIdFromTaggedPacket(raw_packet);
 }
 

lib/BUILD.bazel

@@ -65,60 +65,9 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "basic_switch",
-    hdrs = ["basic_switch.h"],
-    deps = [
-        "//p4_infra/p4_pdpi:p4_runtime_session",
-        "//thinkit:switch",
-        "@com_github_gnmi//proto/gnmi:gnmi_cc_grpc_proto",
-        "@com_github_gnoi//cert:cert_cc_grpc_proto",
-        "@com_github_gnoi//diag:diag_cc_grpc_proto",
-        "@com_github_gnoi//factory_reset:factory_reset_cc_grpc_proto",
-        "@com_github_gnoi//os:os_cc_grpc_proto",
-        "@com_github_gnoi//system:system_cc_grpc_proto",
-        "@com_github_grpc_grpc//:grpc++_public_hdrs",
-        "@com_github_grpc_grpc//:grpc_security_base",
-        "@com_github_p4lang_p4runtime//:p4runtime_cc_grpc",
-        "@com_google_absl//absl/status:statusor",
-    ],
-)
-
-cc_library(
-    name = "alpine_switch",
-    hdrs = ["alpine_switch.h"],
-    deps = [
-        ":basic_switch",
-        "//p4_infra/p4_pdpi:p4_runtime_session",
-        "@com_github_grpc_grpc//:grpc++",
-        "@com_github_grpc_grpc//:grpc_security_base",
-        "@com_github_p4lang_p4runtime//:p4runtime_cc_grpc",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/status:statusor",
-    ],
-)
-
-cc_test(
-    name = "basic_switch_test",
-    srcs = ["basic_switch_test.cc"],
-    deps = [
-        ":basic_switch",
-        "//gutil/gutil:status_matchers",
-        "@com_github_gnmi//proto/gnmi:gnmi_cc_grpc_proto",
-        "@com_github_gnoi//cert:cert_cc_grpc_proto",
-        "@com_github_gnoi//diag:diag_cc_grpc_proto",
-        "@com_github_gnoi//factory_reset:factory_reset_cc_grpc_proto",
-        "@com_github_gnoi//os:os_cc_grpc_proto",
-        "@com_github_gnoi//system:system_cc_grpc_proto",
-        "@com_github_grpc_grpc//:grpc++_public_hdrs",
-        "@com_github_p4lang_p4runtime//:p4runtime_cc_grpc",
-        "@com_google_googletest//:gtest_main",
-    ],
-)
-
 cc_library(
     name = "ixia_helper",
-    testonly = 1,
+    testonly = True,
     srcs = ["ixia_helper.cc"],
     hdrs = ["ixia_helper.h"],
     deps = [
@@ -129,23 +78,22 @@ cc_library(
         "//gutil/gutil:status",
         "//lib/gnmi:gnmi_helper",
         "//lib/utils:json_utils",
-        "//p4_infra/p4_pdpi/netaddr:ipv4_address",
-        "//p4_infra/p4_pdpi/netaddr:ipv6_address",
-        "//p4_infra/p4_pdpi/netaddr:mac_address",
+        "//p4_infra/netaddr:ipv4_address",
+        "//p4_infra/netaddr:ipv6_address",
+        "//p4_infra/netaddr:mac_address",
         "//thinkit:generic_testbed",
         "@com_github_gnmi//proto/gnmi:gnmi_cc_grpc_proto",
         "@com_github_nlohmann_json//:nlohmann_json",
         "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/functional:function_ref",
         "@com_google_absl//absl/log",
-	"@com_google_absl//absl/functional:function_ref",
         "@com_google_absl//absl/random",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/time",
         "@com_google_absl//absl/types:span",
-        "@com_google_protobuf//:protobuf",
     ],
 )
 
@@ -182,6 +130,57 @@ cc_proto_library(
     deps = [":ixia_helper_proto"],
 )
 
+cc_library(
+    name = "basic_switch",
+    hdrs = ["basic_switch.h"],
+    deps = [
+        "//p4_infra/p4_pdpi:p4_runtime_session",
+        "//thinkit:switch",
+        "@com_github_gnmi//proto/gnmi:gnmi_cc_grpc_proto",
+        "@com_github_gnoi//cert:cert_cc_grpc_proto",
+        "@com_github_gnoi//diag:diag_cc_grpc_proto",
+        "@com_github_gnoi//factory_reset:factory_reset_cc_grpc_proto",
+        "@com_github_gnoi//os:os_cc_grpc_proto",
+        "@com_github_gnoi//system:system_cc_grpc_proto",
+        "@com_github_grpc_grpc//:grpc++_public_hdrs",
+        "@com_github_grpc_grpc//:grpc_security_base",
+        "@com_github_p4lang_p4runtime//:p4runtime_cc_grpc",
+        "@com_google_absl//absl/status:statusor",
+    ],
+)
+
+cc_library(
+    name = "alpine_switch",
+    hdrs = ["alpine_switch.h"],
+    deps = [
+        ":basic_switch",
+        "//p4_infra/p4_pdpi:p4_runtime_session",
+        "@com_github_grpc_grpc//:grpc++",
+        "@com_github_grpc_grpc//:grpc_security_base",
+        "@com_github_p4lang_p4runtime//:p4runtime_cc_grpc",
+        "@com_google_absl//absl/log",
+        "@com_google_absl//absl/status:statusor",
+    ],
+)
+
+cc_test(
+    name = "basic_switch_test",
+    srcs = ["basic_switch_test.cc"],
+    deps = [
+        ":basic_switch",
+        "//gutil/gutil:status_matchers",
+        "@com_github_gnmi//proto/gnmi:gnmi_cc_grpc_proto",
+        "@com_github_gnoi//cert:cert_cc_grpc_proto",
+        "@com_github_gnoi//diag:diag_cc_grpc_proto",
+        "@com_github_gnoi//factory_reset:factory_reset_cc_grpc_proto",
+        "@com_github_gnoi//os:os_cc_grpc_proto",
+        "@com_github_gnoi//system:system_cc_grpc_proto",
+        "@com_github_grpc_grpc//:grpc++_public_hdrs",
+        "@com_github_p4lang_p4runtime//:p4runtime_cc_grpc",
+        "@com_google_googletest//:gtest_main",
+    ],
+)
+
 cc_library(
     name = "lacp_ixia_helper",
     testonly = True,

lib/ixia_helper.h

@@ -29,9 +29,9 @@
 #include "absl/time/time.h"
 #include "absl/types/span.h"
 #include "lib/ixia_helper.pb.h"
-#include "p4_infra/p4_pdpi/netaddr/ipv4_address.h"
-#include "p4_infra/p4_pdpi/netaddr/ipv6_address.h"
-#include "p4_infra/p4_pdpi/netaddr/mac_address.h"
+#include "p4_infra/netaddr/ipv4_address.h"
+#include "p4_infra/netaddr/ipv6_address.h"
+#include "p4_infra/netaddr/mac_address.h"
 #include "proto/gnmi/gnmi.grpc.pb.h"
 #include "thinkit/generic_testbed.h"
 

lib/p4rt/BUILD.bazel

@@ -77,9 +77,9 @@ cc_library(
     hdrs = ["p4rt_port.h"],
     deps = [
         "//gutil/gutil:status",
-        "//p4_infra/p4_pdpi/string_encodings:byte_string",
-        "//p4_infra/p4_pdpi/string_encodings:decimal_string",
-	"//p4_infra/p4_pdpi/string_encodings:hex_string",
+        "//p4_infra/string_encodings:byte_string",
+        "//p4_infra/string_encodings:decimal_string",
+        "//p4_infra/string_encodings:hex_string",
         "@com_google_absl//absl/numeric:bits",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",

lib/p4rt/p4rt_port.cc

@@ -26,16 +26,16 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/span.h"
 #include "gutil/gutil/status.h"
-#include "p4_infra/p4_pdpi/string_encodings/byte_string.h"
-#include "p4_infra/p4_pdpi/string_encodings/decimal_string.h"
-#include "p4_infra/p4_pdpi/string_encodings/hex_string.h"
+#include "p4_infra/string_encodings/byte_string.h"
+#include "p4_infra/string_encodings/decimal_string.h"
+#include "p4_infra/string_encodings/hex_string.h"
 
 namespace pins_test {
 
 absl::StatusOr<P4rtPortId> P4rtPortId::MakeFromP4rtEncoding(
     absl::string_view p4rt_port_id) {
   ASSIGN_OR_RETURN(uint32_t p4rt_port_id_int,
-                   pdpi::DecimalStringToUint32(p4rt_port_id));
+                   string_encodings::DecimalStringToUint32(p4rt_port_id));
   return P4rtPortId(p4rt_port_id_int);
 }
 
@@ -65,7 +65,7 @@ std::vector<P4rtPortId> P4rtPortId::MakeVectorFromOpenConfigEncodings(
 absl::StatusOr<P4rtPortId> P4rtPortId::MakeFromHexstringEncoding(
     absl::string_view hexstring_encoding) {
   ASSIGN_OR_RETURN(uint32_t p4rt_port_id_int,
-                   pdpi::HexStringToUint32(hexstring_encoding));
+                   string_encodings::HexStringToUint32(hexstring_encoding));
   return P4rtPortId(p4rt_port_id_int);
 }
 
@@ -84,7 +84,8 @@ absl::StatusOr<std::string> P4rtPortId::GetBmv2P4rtEncoding() const {
               "but the present P4RT port ID "
            << p4rt_port_id_ << " has " << width << " bits.";
   }
-  return pdpi::BitsetToP4RuntimeByteString<kBmv2PortBitWidth>(p4rt_port_id_);
+  return string_encodings::BitsetToP4RuntimeByteString<kBmv2PortBitWidth>(
+      p4rt_port_id_);
 }
 
 bool P4rtPortId::operator==(const P4rtPortId& other) const {

p4_fuzzer/BUILD.bazel

@@ -145,15 +145,14 @@ cc_library(
         "//gutil/gutil:proto",
         "//gutil/gutil:status",
         "//lib/p4rt:p4rt_port",
+        "//p4_infra/netaddr:ipv6_address",
         "//p4_infra/p4_pdpi:built_ins",
         "//p4_infra/p4_pdpi:entity_keys",
         "//p4_infra/p4_pdpi:ir_cc_proto",
         "//p4_infra/p4_pdpi:ir_properties",
         "//p4_infra/p4_pdpi:references",
-        "//p4_infra/p4_pdpi/internal:ordered_map",
-        "//p4_infra/p4_pdpi/netaddr:ipv6_address",
-        "//p4_infra/p4_pdpi/string_encodings:byte_string",
         "//p4_infra/p4_pdpi/utils:ir",
+        "//p4_infra/string_encodings:byte_string",
         "@com_github_p4lang_p4_constraints//p4_constraints:ast",
         "@com_github_p4lang_p4_constraints//p4_constraints:ast_cc_proto",
         "@com_github_p4lang_p4_constraints//p4_constraints:constraint_source",
@@ -271,9 +270,9 @@ cc_test(
         "//gutil/gutil:status",
         "//gutil/gutil:status_matchers",
         "//gutil/gutil:testing",
+        "//p4_infra/netaddr:ipv4_address",
         "//p4_infra/p4_pdpi:ir",
         "//p4_infra/p4_pdpi:ir_cc_proto",
-        "//p4_infra/p4_pdpi/netaddr:ipv4_address",
         "//sai_p4/instantiations/google:instantiations",
         "//sai_p4/instantiations/google:sai_p4info_cc",
         "//sai_p4/instantiations/google:sai_pd_cc_proto",

p4_fuzzer/fuzz_util.cc

@@ -51,14 +51,14 @@
 #include "p4_fuzzer/fuzzer_config.h"
 #include "p4_fuzzer/mutation.h"
 #include "p4_fuzzer/switch_state.h"
+#include "p4_infra/netaddr/ipv6_address.h"
 #include "p4_infra/p4_pdpi/built_ins.h"
 #include "p4_infra/p4_pdpi/entity_keys.h"
 #include "p4_infra/p4_pdpi/internal/ordered_map.h"
 #include "p4_infra/p4_pdpi/ir.pb.h"
-#include "p4_infra/p4_pdpi/netaddr/ipv6_address.h"
 #include "p4_infra/p4_pdpi/references.h"
-#include "p4_infra/p4_pdpi/string_encodings/byte_string.h"
 #include "p4_infra/p4_pdpi/utils/ir.h"
+#include "p4_infra/string_encodings/byte_string.h"
 
 namespace p4_fuzzer {
 
@@ -707,7 +707,8 @@ absl::StatusOr<Replica> FuzzReplica(absl::BitGen* gen,
   if (auto it = reference_map.find(instance_param); it != reference_map.end()) {
     ASSIGN_OR_RETURN(
         auto instance,
-        pdpi::ByteStringToBitset<kReplicaInstanceBitwidth>(it->second));
+        string_encodings::ByteStringToBitset<kReplicaInstanceBitwidth>(
+            it->second));
     replica.set_instance(instance.to_ullong());
   } else {
     replica.set_instance(FuzzUint64(gen, kReplicaInstanceBitwidth));

p4_fuzzer/oracle_util_test.cc

@@ -34,9 +34,9 @@
 #include "p4_fuzzer/fuzzer.pb.h"
 #include "p4_fuzzer/switch_state.h"
 #include "p4_fuzzer/test_utils.h"
+#include "p4_infra/netaddr/ipv4_address.h"
 #include "p4_infra/p4_pdpi/ir.h"
 #include "p4_infra/p4_pdpi/ir.pb.h"
-#include "p4_infra/p4_pdpi/netaddr/ipv4_address.h"
 #include "sai_p4/instantiations/google/instantiations.h"
 #include "sai_p4/instantiations/google/sai_p4info.h"
 #include "sai_p4/instantiations/google/sai_pd.pb.h"