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

Signed-off-by: SRAVANI KANASANI <kanasanis@google.com>

Author: kishanps

dvaas/BUILD.bazel

@@ -93,9 +93,9 @@ cc_library(
         "//gutil/gutil:overload",
         "//gutil/gutil:proto",
         "//gutil/gutil:status",
-        "//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",
         "//p4_infra/p4_pdpi/packetlib:packetlib_cc_proto",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/status",

dvaas/dvaas_detective.cc

@@ -36,12 +36,16 @@
 #include "gutil/gutil/overload.h"
 #include "gutil/gutil/proto.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/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/decision_tree/decision_tree.pb.h"
 #include "yggdrasil_decision_forests/model/random_forest/random_forest.h"
 #include "yggdrasil_decision_forests/utils/distribution.pb.h"
+
 namespace dvaas {
 namespace dvaas_internal {
 namespace ydf = ::yggdrasil_decision_forests;

dvaas/packet_injection.h

@@ -53,7 +53,7 @@ struct TaggedPacketIn {
 using IsExpectedUnsolicitedPacketFunctionType =
     std::function<bool(const packetlib::Packet &packet)>;
 
-// Unsolicited packets that, for the time being, are acceptable in a GPINS
+// Unsolicited packets that, for the time being, are acceptable in a PINS
 // testbeds.
 inline bool
 DefaultIsExpectedUnsolicitedPacket(const packetlib::Packet &packet) {

lib/BUILD.bazel

@@ -78,9 +78,9 @@ 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_google_glog//:glog",

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"
 

p4_fuzzer/BUILD.bazel

@@ -145,13 +145,13 @@ 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/string_encodings:byte_string",
         "//p4_infra/p4_pdpi/utils:ir",
         "@com_github_google_glog//:glog",
@@ -269,9 +269,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

@@ -52,11 +52,11 @@
 #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/utils/ir.h"
 #include "p4_infra/string_encodings/byte_string.h"

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"

p4_infra/p4_pdpi/netaddr/BUILD.bazel p4_infra/netaddr/BUILD.bazelp4_infra/p4_pdpi/netaddr/BUILD.bazel renamed to p4_infra/netaddr/BUILD.bazel

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "p4_infra/p4_pdpi/netaddr/ipv4_address.h"
+#include "p4_infra/netaddr/ipv4_address.h"
 
 #include <bitset>
 #include <cstdint>
@@ -25,7 +25,7 @@
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "gutil/gutil/status.h"
-#include "p4_infra/p4_pdpi/netaddr/network_address.h"
+#include "p4_infra/netaddr/network_address.h"
 
 namespace netaddr {