grpc 1.63.0 → 1.64.0.pre1

data/src/core/{ext/xds → xds/grpc}/xds_cluster_specifier_plugin.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 
 #include <map>
 #include <memory>
@@ -27,9 +25,11 @@
 #include "upb/mem/arena.h"
 #include "upb/reflection/def.h"
 
-#include "src/core/ext/xds/xds_common_types.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"
+#include "src/core/xds/grpc/xds_common_types.h"
 
 namespace grpc_core {
 
@@ -94,4 +94,4 @@ class XdsClusterSpecifierPluginRegistry final {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H

data/src/core/{ext/xds → xds/grpc}/xds_common_types.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_common_types.h"
+#include "src/core/xds/grpc/xds_common_types.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -44,11 +42,12 @@
 #include "xds/type/v3/typed_struct.upb.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/upb_utils.h"
-#include "src/core/ext/xds/xds_bootstrap_grpc.h"
-#include "src/core/ext/xds/xds_client.h"
 #include "src/core/lib/json/json_reader.h"
+#include "src/core/xds/grpc/upb_utils.h"
+#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
+#include "src/core/xds/xds_client/xds_client.h"
 
 namespace grpc_core {
 

data/src/core/{ext/xds → xds/grpc}/xds_common_types.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_COMMON_TYPES_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_COMMON_TYPES_H
 
 #include <string>
 #include <vector>
@@ -29,11 +27,13 @@
 #include "google/protobuf/any.upb.h"
 #include "google/protobuf/duration.upb.h"
 
-#include "src/core/ext/xds/xds_resource_type.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/matchers/matchers.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {
 
@@ -105,4 +105,4 @@ absl::optional<XdsExtension> ExtractXdsExtension(
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_COMMON_TYPES_H

data/src/core/{ext/xds → xds/grpc}/xds_endpoint.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_endpoint.h"
+#include "src/core/xds/grpc/xds_endpoint.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -27,6 +25,7 @@
 #include <set>
 #include <vector>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -42,10 +41,8 @@
 #include "upb/text/encode.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/upb_utils.h"
-#include "src/core/ext/xds/xds_health_status.h"
-#include "src/core/ext/xds/xds_resource_type.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/channel/channel_args.h"
@@ -54,6 +51,9 @@
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/iomgr/resolved_address.h"
+#include "src/core/xds/grpc/upb_utils.h"
+#include "src/core/xds/grpc/xds_health_status.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
 
 // IWYU pragma: no_include "absl/meta/type_traits.h"
 
@@ -408,7 +408,7 @@ absl::StatusOr<std::shared_ptr<const XdsEndpointResource>> EdsResourceParse(
       ValidationErrors::ScopedField field(&errors, absl::StrCat("[", i, "]"));
       auto parsed_locality = LocalityParse(endpoints[i], &address_set, &errors);
       if (parsed_locality.has_value()) {
-        GPR_ASSERT(parsed_locality->locality.lb_weight != 0);
+        CHECK_NE(parsed_locality->locality.lb_weight, 0u);
         // Make sure prorities is big enough. Note that they might not
         // arrive in priority order.
         if (eds_resource->priorities.size() < parsed_locality->priority + 1) {

data/src/core/{ext/xds → xds/grpc}/xds_endpoint.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_ENDPOINT_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_ENDPOINT_H
 
 #include <stdint.h>
 
@@ -33,14 +31,16 @@
 #include "envoy/config/endpoint/v3/endpoint.upbdefs.h"
 #include "upb/reflection/def.h"
 
-#include "src/core/ext/xds/xds_client.h"
-#include "src/core/ext/xds/xds_client_stats.h"
-#include "src/core/ext/xds/xds_resource_type.h"
-#include "src/core/ext/xds/xds_resource_type_impl.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/ref_counted.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/xds/xds_client/xds_client.h"
+#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
+#include "src/core/xds/xds_client/xds_resource_type_impl.h"
 
 namespace grpc_core {
 
@@ -147,4 +147,4 @@ class XdsEndpointResourceType final
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_ENDPOINT_H

data/src/core/{ext/xds → xds/grpc}/xds_health_status.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_health_status.h"
+#include "src/core/xds/grpc/xds_health_status.h"
 
 #include <string>
 
@@ -24,6 +22,8 @@
 #include "absl/strings/str_join.h"
 #include "envoy/config/core/v3/health_check.upb.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 absl::optional<XdsHealthStatus> XdsHealthStatus::FromUpb(uint32_t status) {

data/src/core/{ext/xds → xds/grpc}/xds_health_status.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HEALTH_STATUS_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_HEALTH_STATUS_H
 
 #include <stdint.h>
 
@@ -25,6 +23,8 @@
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/resolver/endpoint_addresses.h"
 
 // Channel arg key for xDS health status.
@@ -88,4 +88,4 @@ class XdsHealthStatusSet final {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_HEALTH_STATUS_H

data/src/core/{ext/xds → xds/grpc}/xds_http_fault_filter.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_http_fault_filter.h"
+#include "src/core/xds/grpc/xds_http_fault_filter.h"
 
 #include <stdint.h>
 
@@ -35,11 +33,10 @@
 
 #include <grpc/status.h>
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/filters/fault_injection/fault_injection_filter.h"
 #include "src/core/ext/filters/fault_injection/fault_injection_service_config_parser.h"
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_http_filters.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/status_util.h"
 #include "src/core/lib/gprpp/time.h"
@@ -47,6 +44,8 @@
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_writer.h"
 #include "src/core/lib/transport/status_conversion.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
 
 namespace grpc_core {
 

data/src/core/{ext/xds → xds/grpc}/xds_http_fault_filter.h

@@ -14,22 +14,22 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "upb/reflection/def.h"
 
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_http_filters.h"
-#include "src/core/ext/xds/xds_resource_type.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/gprpp/validation_errors.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {
 
@@ -55,4 +55,4 @@ class XdsHttpFaultFilter final : public XdsHttpFilterImpl {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FAULT_FILTER_H

data/src/core/{ext/xds → xds/grpc}/xds_http_filters.cc

@@ -14,23 +14,23 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_http_filters.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
+#include "absl/log/check.h"
 #include "absl/types/variant.h"
 #include "envoy/extensions/filters/http/router/v3/router.upb.h"
 #include "envoy/extensions/filters/http/router/v3/router.upbdefs.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/xds_http_fault_filter.h"
-#include "src/core/ext/xds/xds_http_rbac_filter.h"
-#include "src/core/ext/xds/xds_http_stateful_session_filter.h"
+#include "src/core/xds/grpc/xds_http_fault_filter.h"
+#include "src/core/xds/grpc/xds_http_rbac_filter.h"
+#include "src/core/xds/grpc/xds_http_stateful_session_filter.h"
 
 namespace grpc_core {
 
@@ -92,11 +92,10 @@ XdsHttpFilterRegistry::XdsHttpFilterRegistry(bool register_builtins) {
 
 void XdsHttpFilterRegistry::RegisterFilter(
     std::unique_ptr<XdsHttpFilterImpl> filter) {
-  GPR_ASSERT(
-      registry_map_.emplace(filter->ConfigProtoName(), filter.get()).second);
+  CHECK(registry_map_.emplace(filter->ConfigProtoName(), filter.get()).second);
   auto override_proto_name = filter->OverrideConfigProtoName();
   if (!override_proto_name.empty()) {
-    GPR_ASSERT(registry_map_.emplace(override_proto_name, filter.get()).second);
+    CHECK(registry_map_.emplace(override_proto_name, filter.get()).second);
   }
   owning_list_.push_back(std::move(filter));
 }

data/src/core/{ext/xds → xds/grpc}/xds_http_filters.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FILTERS_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FILTERS_H
 
 #include <map>
 #include <memory>
@@ -32,13 +30,15 @@
 #include "absl/types/optional.h"
 #include "upb/reflection/def.h"
 
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_resource_type.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_writer.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {
 
@@ -179,4 +179,4 @@ class XdsHttpFilterRegistry final {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FILTERS_H

data/src/core/{ext/xds → xds/grpc}/xds_http_rbac_filter.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_http_rbac_filter.h"
+#include "src/core/xds/grpc/xds_http_rbac_filter.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -43,18 +41,19 @@
 #include "upb/message/map.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/filters/rbac/rbac_filter.h"
 #include "src/core/ext/filters/rbac/rbac_service_config_parser.h"
-#include "src/core/ext/xds/upb_utils.h"
-#include "src/core/ext/xds/xds_audit_logger_registry.h"
-#include "src/core/ext/xds/xds_bootstrap_grpc.h"
-#include "src/core/ext/xds/xds_client.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/env.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_writer.h"
+#include "src/core/xds/grpc/upb_utils.h"
+#include "src/core/xds/grpc/xds_audit_logger_registry.h"
+#include "src/core/xds/grpc/xds_bootstrap_grpc.h"
+#include "src/core/xds/xds_client/xds_client.h"
 
 namespace grpc_core {
 

data/src/core/{ext/xds → xds/grpc}/xds_http_rbac_filter.h

@@ -14,22 +14,22 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "upb/reflection/def.h"
 
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_http_filters.h"
-#include "src/core/ext/xds/xds_resource_type.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/gprpp/validation_errors.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {
 
@@ -55,4 +55,4 @@ class XdsHttpRbacFilter final : public XdsHttpFilterImpl {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_RBAC_FILTER_H

data/src/core/{ext/xds → xds/grpc}/xds_http_stateful_session_filter.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_http_stateful_session_filter.h"
+#include "src/core/xds/grpc/xds_http_stateful_session_filter.h"
 
 #include <string>
 #include <utility>
@@ -32,17 +30,18 @@
 #include "envoy/type/http/v3/cookie.upb.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/ext/filters/stateful_session/stateful_session_filter.h"
 #include "src/core/ext/filters/stateful_session/stateful_session_service_config_parser.h"
-#include "src/core/ext/xds/upb_utils.h"
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_http_filters.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/json/json_writer.h"
+#include "src/core/xds/grpc/upb_utils.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
 
 namespace grpc_core {
 

data/src/core/{ext/xds → xds/grpc}/xds_http_stateful_session_filter.h

@@ -14,22 +14,22 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "upb/reflection/def.h"
 
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_http_filters.h"
-#include "src/core/ext/xds/xds_resource_type.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/gprpp/validation_errors.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/grpc/xds_http_filters.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {
 
@@ -55,4 +55,4 @@ class XdsHttpStatefulSessionFilter final : public XdsHttpFilterImpl {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_STATEFUL_SESSION_FILTER_H

data/src/core/{ext/xds → xds/grpc}/xds_lb_policy_registry.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_lb_policy_registry.h"
+#include "src/core/xds/grpc/xds_lb_policy_registry.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -35,12 +33,13 @@
 #include "google/protobuf/wrappers.upb.h"
 
 #include <grpc/support/json.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/xds_common_types.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/xds/grpc/xds_common_types.h"
 
 namespace grpc_core {
 

data/src/core/{ext/xds → xds/grpc}/xds_lb_policy_registry.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H
+#define GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H
 
 #include <map>
 #include <memory>
@@ -25,9 +23,11 @@
 #include "absl/strings/string_view.h"
 #include "envoy/config/cluster/v3/cluster.upb.h"
 
-#include "src/core/ext/xds/xds_resource_type.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/json/json.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {
 
@@ -68,4 +68,4 @@ class XdsLbPolicyRegistry final {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
+#endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_LB_POLICY_REGISTRY_H

data/src/core/{ext/xds → xds/grpc}/xds_listener.cc

@@ -14,15 +14,14 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_listener.h"
+#include "src/core/xds/grpc/xds_listener.h"
 
 #include <stdint.h>
 
 #include <set>
 #include <utility>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -46,10 +45,8 @@
 #include "upb/text/encode.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/upb_utils.h"
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_resource_type.h"
 #include "src/core/lib/address_utils/parse_address.h"
 #include "src/core/lib/address_utils/sockaddr_utils.h"
 #include "src/core/lib/debug/trace.h"
@@ -58,6 +55,9 @@
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/iomgr/sockaddr.h"
 #include "src/core/lib/matchers/matchers.h"
+#include "src/core/xds/grpc/upb_utils.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {
 
@@ -874,8 +874,8 @@ void AddFilterChainDataForSourceType(
     const FilterChain& filter_chain,
     InternalFilterChainMap::DestinationIp* destination_ip,
     ValidationErrors* errors) {
-  GPR_ASSERT(static_cast<unsigned int>(
-                 filter_chain.filter_chain_match.source_type) < 3);
+  CHECK(static_cast<unsigned int>(filter_chain.filter_chain_match.source_type) <
+        3u);
   AddFilterChainDataForSourceIpRange(
       filter_chain,
       &destination_ip->source_types_array[static_cast<int>(