Merge pull request #23759 from markdroth/xds_client_move

Move XdsClient code out of client_channel tree.
4 years ago · bd74690388
parent 75a3e1bb45 d926e1ca47
commit bd74690388
36 changed files with 222 additions and 226 deletions
--- a/40
+++ b/40
@ -1289,9 +1289,9 @@ grpc_cc_library(
 grpc_cc_library(
    name = "grpc_xds_api_header",
    hdrs = [
-        "src/core/ext/filters/client_channel/xds/xds_api.h",
-        "src/core/ext/filters/client_channel/xds/xds_bootstrap.h",
-        "src/core/ext/filters/client_channel/xds/xds_client_stats.h",
+        "src/core/ext/xds/xds_api.h",
+        "src/core/ext/xds/xds_bootstrap.h",
+        "src/core/ext/xds/xds_client_stats.h",
    ],
    external_deps = [
        "upb_lib",
@ -1306,16 +1306,16 @@ grpc_cc_library(
 grpc_cc_library(
    name = "grpc_xds_client",
    srcs = [
-        "src/core/ext/filters/client_channel/xds/xds_api.cc",
-        "src/core/ext/filters/client_channel/xds/xds_bootstrap.cc",
-        "src/core/ext/filters/client_channel/xds/xds_channel.cc",
-        "src/core/ext/filters/client_channel/xds/xds_client.cc",
-        "src/core/ext/filters/client_channel/xds/xds_client_stats.cc",
+        "src/core/ext/xds/xds_api.cc",
+        "src/core/ext/xds/xds_bootstrap.cc",
+        "src/core/ext/xds/xds_channel.cc",
+        "src/core/ext/xds/xds_client.cc",
+        "src/core/ext/xds/xds_client_stats.cc",
    ],
    hdrs = [
-        "src/core/ext/filters/client_channel/xds/xds_channel.h",
-        "src/core/ext/filters/client_channel/xds/xds_channel_args.h",
-        "src/core/ext/filters/client_channel/xds/xds_client.h",
+        "src/core/ext/xds/xds_channel.h",
+        "src/core/ext/xds/xds_channel_args.h",
+        "src/core/ext/xds/xds_client.h",
    ],
    language = "c++",
    deps = [
@ -1329,16 +1329,16 @@ grpc_cc_library(
 grpc_cc_library(
    name = "grpc_xds_client_secure",
    srcs = [
-        "src/core/ext/filters/client_channel/xds/xds_api.cc",
-        "src/core/ext/filters/client_channel/xds/xds_bootstrap.cc",
-        "src/core/ext/filters/client_channel/xds/xds_channel_secure.cc",
-        "src/core/ext/filters/client_channel/xds/xds_client.cc",
-        "src/core/ext/filters/client_channel/xds/xds_client_stats.cc",
+        "src/core/ext/xds/xds_api.cc",
+        "src/core/ext/xds/xds_bootstrap.cc",
+        "src/core/ext/xds/xds_channel_secure.cc",
+        "src/core/ext/xds/xds_client.cc",
+        "src/core/ext/xds/xds_client_stats.cc",
    ],
    hdrs = [
-        "src/core/ext/filters/client_channel/xds/xds_channel.h",
-        "src/core/ext/filters/client_channel/xds/xds_channel_args.h",
-        "src/core/ext/filters/client_channel/xds/xds_client.h",
+        "src/core/ext/xds/xds_channel.h",
+        "src/core/ext/xds/xds_channel_args.h",
+        "src/core/ext/xds/xds_client.h",
    ],
    language = "c++",
    deps = [
@ -1810,7 +1810,7 @@ grpc_cc_library(
    ],
    hdrs = [
        "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h",
-        "src/core/ext/filters/client_channel/xds/xds_channel_args.h",
+        "src/core/ext/xds/xds_channel_args.h",
        "src/core/lib/security/context/security_context.h",
        "src/core/lib/security/credentials/alts/alts_credentials.h",
        "src/core/lib/security/credentials/composite/composite_credentials.h",
--- a/BUILD.gn
+++ b/BUILD.gn
@ -305,17 +305,6 @@ config("grpc_config") {
        "src/core/ext/filters/client_channel/subchannel_interface.h",
        "src/core/ext/filters/client_channel/subchannel_pool_interface.cc",
        "src/core/ext/filters/client_channel/subchannel_pool_interface.h",
-        "src/core/ext/filters/client_channel/xds/xds_api.cc",
-        "src/core/ext/filters/client_channel/xds/xds_api.h",
-        "src/core/ext/filters/client_channel/xds/xds_bootstrap.cc",
-        "src/core/ext/filters/client_channel/xds/xds_bootstrap.h",
-        "src/core/ext/filters/client_channel/xds/xds_channel.h",
-        "src/core/ext/filters/client_channel/xds/xds_channel_args.h",
-        "src/core/ext/filters/client_channel/xds/xds_channel_secure.cc",
-        "src/core/ext/filters/client_channel/xds/xds_client.cc",
-        "src/core/ext/filters/client_channel/xds/xds_client.h",
-        "src/core/ext/filters/client_channel/xds/xds_client_stats.cc",
-        "src/core/ext/filters/client_channel/xds/xds_client_stats.h",
        "src/core/ext/filters/client_idle/client_idle_filter.cc",
        "src/core/ext/filters/deadline/deadline_filter.cc",
        "src/core/ext/filters/deadline/deadline_filter.h",
@ -555,6 +544,17 @@ config("grpc_config") {
        "src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h",
        "src/core/ext/upb-generated/validate/validate.upb.c",
        "src/core/ext/upb-generated/validate/validate.upb.h",
+        "src/core/ext/xds/xds_api.cc",
+        "src/core/ext/xds/xds_api.h",
+        "src/core/ext/xds/xds_bootstrap.cc",
+        "src/core/ext/xds/xds_bootstrap.h",
+        "src/core/ext/xds/xds_channel.h",
+        "src/core/ext/xds/xds_channel_args.h",
+        "src/core/ext/xds/xds_channel_secure.cc",
+        "src/core/ext/xds/xds_client.cc",
+        "src/core/ext/xds/xds_client.h",
+        "src/core/ext/xds/xds_client_stats.cc",
+        "src/core/ext/xds/xds_client_stats.h",
        "src/core/lib/avl/avl.cc",
        "src/core/lib/avl/avl.h",
        "src/core/lib/backoff/backoff.cc",
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1449,11 +1449,6 @@ add_library(grpc
  src/core/ext/filters/client_channel/service_config_parser.cc
  src/core/ext/filters/client_channel/subchannel.cc
  src/core/ext/filters/client_channel/subchannel_pool_interface.cc
-  src/core/ext/filters/client_channel/xds/xds_api.cc
-  src/core/ext/filters/client_channel/xds/xds_bootstrap.cc
-  src/core/ext/filters/client_channel/xds/xds_channel_secure.cc
-  src/core/ext/filters/client_channel/xds/xds_client.cc
-  src/core/ext/filters/client_channel/xds/xds_client_stats.cc
  src/core/ext/filters/client_idle/client_idle_filter.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/ext/filters/http/client/http_client_filter.cc
@ -1579,6 +1574,11 @@ add_library(grpc
  src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
  src/core/ext/upb-generated/validate/validate.upb.c
+  src/core/ext/xds/xds_api.cc
+  src/core/ext/xds/xds_bootstrap.cc
+  src/core/ext/xds/xds_channel_secure.cc
+  src/core/ext/xds/xds_client.cc
+  src/core/ext/xds/xds_client_stats.cc
  src/core/lib/avl/avl.cc
  src/core/lib/backoff/backoff.cc
  src/core/lib/channel/channel_args.cc
@ -2133,11 +2133,6 @@ add_library(grpc_unsecure
  src/core/ext/filters/client_channel/service_config_parser.cc
  src/core/ext/filters/client_channel/subchannel.cc
  src/core/ext/filters/client_channel/subchannel_pool_interface.cc
-  src/core/ext/filters/client_channel/xds/xds_api.cc
-  src/core/ext/filters/client_channel/xds/xds_bootstrap.cc
-  src/core/ext/filters/client_channel/xds/xds_channel.cc
-  src/core/ext/filters/client_channel/xds/xds_client.cc
-  src/core/ext/filters/client_channel/xds/xds_client_stats.cc
  src/core/ext/filters/client_idle/client_idle_filter.cc
  src/core/ext/filters/deadline/deadline_filter.cc
  src/core/ext/filters/http/client/http_client_filter.cc
@ -2258,6 +2253,11 @@ add_library(grpc_unsecure
  src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
  src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
  src/core/ext/upb-generated/validate/validate.upb.c
+  src/core/ext/xds/xds_api.cc
+  src/core/ext/xds/xds_bootstrap.cc
+  src/core/ext/xds/xds_channel.cc
+  src/core/ext/xds/xds_client.cc
+  src/core/ext/xds/xds_client_stats.cc
  src/core/lib/avl/avl.cc
  src/core/lib/backoff/backoff.cc
  src/core/lib/channel/channel_args.cc
--- a/22
+++ b/22
@ -3694,11 +3694,6 @@ LIBGRPC_SRC = \
    src/core/ext/filters/client_channel/service_config_parser.cc \
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
-    src/core/ext/filters/client_channel/xds/xds_api.cc \
-    src/core/ext/filters/client_channel/xds/xds_bootstrap.cc \
-    src/core/ext/filters/client_channel/xds/xds_channel_secure.cc \
-    src/core/ext/filters/client_channel/xds/xds_client.cc \
-    src/core/ext/filters/client_channel/xds/xds_client_stats.cc \
    src/core/ext/filters/client_idle/client_idle_filter.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/filters/http/client/http_client_filter.cc \
@ -3824,6 +3819,11 @@ LIBGRPC_SRC = \
    src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
    src/core/ext/upb-generated/validate/validate.upb.c \
+    src/core/ext/xds/xds_api.cc \
+    src/core/ext/xds/xds_bootstrap.cc \
+    src/core/ext/xds/xds_channel_secure.cc \
+    src/core/ext/xds/xds_client.cc \
+    src/core/ext/xds/xds_client_stats.cc \
    src/core/lib/avl/avl.cc \
    src/core/lib/backoff/backoff.cc \
    src/core/lib/channel/channel_args.cc \
@ -4346,11 +4346,6 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/filters/client_channel/service_config_parser.cc \
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
-    src/core/ext/filters/client_channel/xds/xds_api.cc \
-    src/core/ext/filters/client_channel/xds/xds_bootstrap.cc \
-    src/core/ext/filters/client_channel/xds/xds_channel.cc \
-    src/core/ext/filters/client_channel/xds/xds_client.cc \
-    src/core/ext/filters/client_channel/xds/xds_client_stats.cc \
    src/core/ext/filters/client_idle/client_idle_filter.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/filters/http/client/http_client_filter.cc \
@ -4471,6 +4466,11 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
    src/core/ext/upb-generated/validate/validate.upb.c \
+    src/core/ext/xds/xds_api.cc \
+    src/core/ext/xds/xds_bootstrap.cc \
+    src/core/ext/xds/xds_channel.cc \
+    src/core/ext/xds/xds_client.cc \
+    src/core/ext/xds/xds_client_stats.cc \
    src/core/lib/avl/avl.cc \
    src/core/lib/backoff/backoff.cc \
    src/core/lib/channel/channel_args.cc \
@ -20162,12 +20162,12 @@ ifneq ($(OPENSSL_DEP),)
 # installing headers to their final destination on the drive. We need this
 # otherwise parallel compilation will fail if a source is compiled first.
 src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc: $(OPENSSL_DEP)
-src/core/ext/filters/client_channel/xds/xds_channel_secure.cc: $(OPENSSL_DEP)
 src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc: $(OPENSSL_DEP)
 src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc: $(OPENSSL_DEP)
 src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c: $(OPENSSL_DEP)
 src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c: $(OPENSSL_DEP)
 src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c: $(OPENSSL_DEP)
+src/core/ext/xds/xds_channel_secure.cc: $(OPENSSL_DEP)
 src/core/lib/http/httpcli_security_connector.cc: $(OPENSSL_DEP)
 src/core/lib/security/context/security_context.cc: $(OPENSSL_DEP)
 src/core/lib/security/credentials/alts/alts_credentials.cc: $(OPENSSL_DEP)
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@ -419,12 +419,6 @@ libs:
  - src/core/ext/filters/client_channel/subchannel.h
  - src/core/ext/filters/client_channel/subchannel_interface.h
  - src/core/ext/filters/client_channel/subchannel_pool_interface.h
-  - src/core/ext/filters/client_channel/xds/xds_api.h
-  - src/core/ext/filters/client_channel/xds/xds_bootstrap.h
-  - src/core/ext/filters/client_channel/xds/xds_channel.h
-  - src/core/ext/filters/client_channel/xds/xds_channel_args.h
-  - src/core/ext/filters/client_channel/xds/xds_client.h
-  - src/core/ext/filters/client_channel/xds/xds_client_stats.h
  - src/core/ext/filters/deadline/deadline_filter.h
  - src/core/ext/filters/http/client/http_client_filter.h
  - src/core/ext/filters/http/client_authority_filter.h
@ -539,6 +533,12 @@ libs:
  - src/core/ext/upb-generated/udpa/annotations/versioning.upb.h
  - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h
  - src/core/ext/upb-generated/validate/validate.upb.h
+  - src/core/ext/xds/xds_api.h
+  - src/core/ext/xds/xds_bootstrap.h
+  - src/core/ext/xds/xds_channel.h
+  - src/core/ext/xds/xds_channel_args.h
+  - src/core/ext/xds/xds_client.h
+  - src/core/ext/xds/xds_client_stats.h
  - src/core/lib/avl/avl.h
  - src/core/lib/backoff/backoff.h
  - src/core/lib/channel/channel_args.h
@ -804,11 +804,6 @@ libs:
  - src/core/ext/filters/client_channel/service_config_parser.cc
  - src/core/ext/filters/client_channel/subchannel.cc
  - src/core/ext/filters/client_channel/subchannel_pool_interface.cc
-  - src/core/ext/filters/client_channel/xds/xds_api.cc
-  - src/core/ext/filters/client_channel/xds/xds_bootstrap.cc
-  - src/core/ext/filters/client_channel/xds/xds_channel_secure.cc
-  - src/core/ext/filters/client_channel/xds/xds_client.cc
-  - src/core/ext/filters/client_channel/xds/xds_client_stats.cc
  - src/core/ext/filters/client_idle/client_idle_filter.cc
  - src/core/ext/filters/deadline/deadline_filter.cc
  - src/core/ext/filters/http/client/http_client_filter.cc
@ -934,6 +929,11 @@ libs:
  - src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
  - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
  - src/core/ext/upb-generated/validate/validate.upb.c
+  - src/core/ext/xds/xds_api.cc
+  - src/core/ext/xds/xds_bootstrap.cc
+  - src/core/ext/xds/xds_channel_secure.cc
+  - src/core/ext/xds/xds_client.cc
+  - src/core/ext/xds/xds_client_stats.cc
  - src/core/lib/avl/avl.cc
  - src/core/lib/backoff/backoff.cc
  - src/core/lib/channel/channel_args.cc
@ -1356,12 +1356,6 @@ libs:
  - src/core/ext/filters/client_channel/subchannel.h
  - src/core/ext/filters/client_channel/subchannel_interface.h
  - src/core/ext/filters/client_channel/subchannel_pool_interface.h
-  - src/core/ext/filters/client_channel/xds/xds_api.h
-  - src/core/ext/filters/client_channel/xds/xds_bootstrap.h
-  - src/core/ext/filters/client_channel/xds/xds_channel.h
-  - src/core/ext/filters/client_channel/xds/xds_channel_args.h
-  - src/core/ext/filters/client_channel/xds/xds_client.h
-  - src/core/ext/filters/client_channel/xds/xds_client_stats.h
  - src/core/ext/filters/deadline/deadline_filter.h
  - src/core/ext/filters/http/client/http_client_filter.h
  - src/core/ext/filters/http/client_authority_filter.h
@ -1473,6 +1467,12 @@ libs:
  - src/core/ext/upb-generated/udpa/annotations/versioning.upb.h
  - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h
  - src/core/ext/upb-generated/validate/validate.upb.h
+  - src/core/ext/xds/xds_api.h
+  - src/core/ext/xds/xds_bootstrap.h
+  - src/core/ext/xds/xds_channel.h
+  - src/core/ext/xds/xds_channel_args.h
+  - src/core/ext/xds/xds_client.h
+  - src/core/ext/xds/xds_client_stats.h
  - src/core/lib/avl/avl.h
  - src/core/lib/backoff/backoff.h
  - src/core/lib/channel/channel_args.h
@ -1678,11 +1678,6 @@ libs:
  - src/core/ext/filters/client_channel/service_config_parser.cc
  - src/core/ext/filters/client_channel/subchannel.cc
  - src/core/ext/filters/client_channel/subchannel_pool_interface.cc
-  - src/core/ext/filters/client_channel/xds/xds_api.cc
-  - src/core/ext/filters/client_channel/xds/xds_bootstrap.cc
-  - src/core/ext/filters/client_channel/xds/xds_channel.cc
-  - src/core/ext/filters/client_channel/xds/xds_client.cc
-  - src/core/ext/filters/client_channel/xds/xds_client_stats.cc
  - src/core/ext/filters/client_idle/client_idle_filter.cc
  - src/core/ext/filters/deadline/deadline_filter.cc
  - src/core/ext/filters/http/client/http_client_filter.cc
@ -1803,6 +1798,11 @@ libs:
  - src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
  - src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
  - src/core/ext/upb-generated/validate/validate.upb.c
+  - src/core/ext/xds/xds_api.cc
+  - src/core/ext/xds/xds_bootstrap.cc
+  - src/core/ext/xds/xds_channel.cc
+  - src/core/ext/xds/xds_client.cc
+  - src/core/ext/xds/xds_client_stats.cc
  - src/core/lib/avl/avl.cc
  - src/core/lib/backoff/backoff.cc
  - src/core/lib/channel/channel_args.cc
--- a/config.m4
+++ b/config.m4
@ -98,11 +98,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/filters/client_channel/service_config_parser.cc \
    src/core/ext/filters/client_channel/subchannel.cc \
    src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
-    src/core/ext/filters/client_channel/xds/xds_api.cc \
-    src/core/ext/filters/client_channel/xds/xds_bootstrap.cc \
-    src/core/ext/filters/client_channel/xds/xds_channel_secure.cc \
-    src/core/ext/filters/client_channel/xds/xds_client.cc \
-    src/core/ext/filters/client_channel/xds/xds_client_stats.cc \
    src/core/ext/filters/client_idle/client_idle_filter.cc \
    src/core/ext/filters/deadline/deadline_filter.cc \
    src/core/ext/filters/http/client/http_client_filter.cc \
@ -228,6 +223,11 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
    src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
    src/core/ext/upb-generated/validate/validate.upb.c \
+    src/core/ext/xds/xds_api.cc \
+    src/core/ext/xds/xds_bootstrap.cc \
+    src/core/ext/xds/xds_channel_secure.cc \
+    src/core/ext/xds/xds_client.cc \
+    src/core/ext/xds/xds_client_stats.cc \
    src/core/lib/avl/avl.cc \
    src/core/lib/backoff/backoff.cc \
    src/core/lib/channel/channel_args.cc \
@ -899,7 +899,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/fake)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/sockaddr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/resolver/xds)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_channel/xds)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/client_idle)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/deadline)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http)
@ -950,6 +949,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/annotations)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/udpa/data/orca/v1)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/upb-generated/validate)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/xds)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/avl)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/backoff)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel)
--- a/config.w32
+++ b/config.w32
@ -66,11 +66,6 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\filters\\client_channel\\service_config_parser.cc " +
    "src\\core\\ext\\filters\\client_channel\\subchannel.cc " +
    "src\\core\\ext\\filters\\client_channel\\subchannel_pool_interface.cc " +
-    "src\\core\\ext\\filters\\client_channel\\xds\\xds_api.cc " +
-    "src\\core\\ext\\filters\\client_channel\\xds\\xds_bootstrap.cc " +
-    "src\\core\\ext\\filters\\client_channel\\xds\\xds_channel_secure.cc " +
-    "src\\core\\ext\\filters\\client_channel\\xds\\xds_client.cc " +
-    "src\\core\\ext\\filters\\client_channel\\xds\\xds_client_stats.cc " +
    "src\\core\\ext\\filters\\client_idle\\client_idle_filter.cc " +
    "src\\core\\ext\\filters\\deadline\\deadline_filter.cc " +
    "src\\core\\ext\\filters\\http\\client\\http_client_filter.cc " +
@ -196,6 +191,11 @@ if (PHP_GRPC != "no") {
    "src\\core\\ext\\upb-generated\\udpa\\annotations\\versioning.upb.c " +
    "src\\core\\ext\\upb-generated\\udpa\\data\\orca\\v1\\orca_load_report.upb.c " +
    "src\\core\\ext\\upb-generated\\validate\\validate.upb.c " +
+    "src\\core\\ext\\xds\\xds_api.cc " +
+    "src\\core\\ext\\xds\\xds_bootstrap.cc " +
+    "src\\core\\ext\\xds\\xds_channel_secure.cc " +
+    "src\\core\\ext\\xds\\xds_client.cc " +
+    "src\\core\\ext\\xds\\xds_client_stats.cc " +
    "src\\core\\lib\\avl\\avl.cc " +
    "src\\core\\lib\\backoff\\backoff.cc " +
    "src\\core\\lib\\channel\\channel_args.cc " +
@ -900,7 +900,6 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\fake");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\sockaddr");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\resolver\\xds");
-  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_channel\\xds");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\client_idle");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\deadline");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\filters\\http");
@ -991,6 +990,7 @@ if (PHP_GRPC != "no") {
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\data\\orca");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\udpa\\data\\orca\\v1");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\upb-generated\\validate");
+  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\ext\\xds");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\avl");
  FSO.CreateFolder(base_dir+"\\ext\\grpc\\src\\core\\lib\\backoff");
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@ -259,12 +259,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/subchannel.h',
                      'src/core/ext/filters/client_channel/subchannel_interface.h',
                      'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
-                      'src/core/ext/filters/client_channel/xds/xds_api.h',
-                      'src/core/ext/filters/client_channel/xds/xds_bootstrap.h',
-                      'src/core/ext/filters/client_channel/xds/xds_channel.h',
-                      'src/core/ext/filters/client_channel/xds/xds_channel_args.h',
-                      'src/core/ext/filters/client_channel/xds/xds_client.h',
-                      'src/core/ext/filters/client_channel/xds/xds_client_stats.h',
                      'src/core/ext/filters/deadline/deadline_filter.h',
                      'src/core/ext/filters/http/client/http_client_filter.h',
                      'src/core/ext/filters/http/client_authority_filter.h',
@ -379,6 +373,12 @@ Pod::Spec.new do |s|
                      'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
                      'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
                      'src/core/ext/upb-generated/validate/validate.upb.h',
+                      'src/core/ext/xds/xds_api.h',
+                      'src/core/ext/xds/xds_bootstrap.h',
+                      'src/core/ext/xds/xds_channel.h',
+                      'src/core/ext/xds/xds_channel_args.h',
+                      'src/core/ext/xds/xds_client.h',
+                      'src/core/ext/xds/xds_client_stats.h',
                      'src/core/lib/avl/avl.h',
                      'src/core/lib/backoff/backoff.h',
                      'src/core/lib/channel/channel_args.h',
@ -749,12 +749,6 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/client_channel/subchannel.h',
                              'src/core/ext/filters/client_channel/subchannel_interface.h',
                              'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
-                              'src/core/ext/filters/client_channel/xds/xds_api.h',
-                              'src/core/ext/filters/client_channel/xds/xds_bootstrap.h',
-                              'src/core/ext/filters/client_channel/xds/xds_channel.h',
-                              'src/core/ext/filters/client_channel/xds/xds_channel_args.h',
-                              'src/core/ext/filters/client_channel/xds/xds_client.h',
-                              'src/core/ext/filters/client_channel/xds/xds_client_stats.h',
                              'src/core/ext/filters/deadline/deadline_filter.h',
                              'src/core/ext/filters/http/client/http_client_filter.h',
                              'src/core/ext/filters/http/client_authority_filter.h',
@ -869,6 +863,12 @@ Pod::Spec.new do |s|
                              'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
                              'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
                              'src/core/ext/upb-generated/validate/validate.upb.h',
+                              'src/core/ext/xds/xds_api.h',
+                              'src/core/ext/xds/xds_bootstrap.h',
+                              'src/core/ext/xds/xds_channel.h',
+                              'src/core/ext/xds/xds_channel_args.h',
+                              'src/core/ext/xds/xds_client.h',
+                              'src/core/ext/xds/xds_client_stats.h',
                              'src/core/lib/avl/avl.h',
                              'src/core/lib/backoff/backoff.h',
                              'src/core/lib/channel/channel_args.h',
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -290,17 +290,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/subchannel_interface.h',
                      'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
                      'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
-                      'src/core/ext/filters/client_channel/xds/xds_api.cc',
-                      'src/core/ext/filters/client_channel/xds/xds_api.h',
-                      'src/core/ext/filters/client_channel/xds/xds_bootstrap.cc',
-                      'src/core/ext/filters/client_channel/xds/xds_bootstrap.h',
-                      'src/core/ext/filters/client_channel/xds/xds_channel.h',
-                      'src/core/ext/filters/client_channel/xds/xds_channel_args.h',
-                      'src/core/ext/filters/client_channel/xds/xds_channel_secure.cc',
-                      'src/core/ext/filters/client_channel/xds/xds_client.cc',
-                      'src/core/ext/filters/client_channel/xds/xds_client.h',
-                      'src/core/ext/filters/client_channel/xds/xds_client_stats.cc',
-                      'src/core/ext/filters/client_channel/xds/xds_client_stats.h',
                      'src/core/ext/filters/client_idle/client_idle_filter.cc',
                      'src/core/ext/filters/deadline/deadline_filter.cc',
                      'src/core/ext/filters/deadline/deadline_filter.h',
@ -540,6 +529,17 @@ Pod::Spec.new do |s|
                      'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
                      'src/core/ext/upb-generated/validate/validate.upb.c',
                      'src/core/ext/upb-generated/validate/validate.upb.h',
+                      'src/core/ext/xds/xds_api.cc',
+                      'src/core/ext/xds/xds_api.h',
+                      'src/core/ext/xds/xds_bootstrap.cc',
+                      'src/core/ext/xds/xds_bootstrap.h',
+                      'src/core/ext/xds/xds_channel.h',
+                      'src/core/ext/xds/xds_channel_args.h',
+                      'src/core/ext/xds/xds_channel_secure.cc',
+                      'src/core/ext/xds/xds_client.cc',
+                      'src/core/ext/xds/xds_client.h',
+                      'src/core/ext/xds/xds_client_stats.cc',
+                      'src/core/ext/xds/xds_client_stats.h',
                      'src/core/lib/avl/avl.cc',
                      'src/core/lib/avl/avl.h',
                      'src/core/lib/backoff/backoff.cc',
@ -1154,12 +1154,6 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/client_channel/subchannel.h',
                              'src/core/ext/filters/client_channel/subchannel_interface.h',
                              'src/core/ext/filters/client_channel/subchannel_pool_interface.h',
-                              'src/core/ext/filters/client_channel/xds/xds_api.h',
-                              'src/core/ext/filters/client_channel/xds/xds_bootstrap.h',
-                              'src/core/ext/filters/client_channel/xds/xds_channel.h',
-                              'src/core/ext/filters/client_channel/xds/xds_channel_args.h',
-                              'src/core/ext/filters/client_channel/xds/xds_client.h',
-                              'src/core/ext/filters/client_channel/xds/xds_client_stats.h',
                              'src/core/ext/filters/deadline/deadline_filter.h',
                              'src/core/ext/filters/http/client/http_client_filter.h',
                              'src/core/ext/filters/http/client_authority_filter.h',
@ -1274,6 +1268,12 @@ Pod::Spec.new do |s|
                              'src/core/ext/upb-generated/udpa/annotations/versioning.upb.h',
                              'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h',
                              'src/core/ext/upb-generated/validate/validate.upb.h',
+                              'src/core/ext/xds/xds_api.h',
+                              'src/core/ext/xds/xds_bootstrap.h',
+                              'src/core/ext/xds/xds_channel.h',
+                              'src/core/ext/xds/xds_channel_args.h',
+                              'src/core/ext/xds/xds_client.h',
+                              'src/core/ext/xds/xds_client_stats.h',
                              'src/core/lib/avl/avl.h',
                              'src/core/lib/backoff/backoff.h',
                              'src/core/lib/channel/channel_args.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -209,17 +209,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/client_channel/subchannel_interface.h )
  s.files += %w( src/core/ext/filters/client_channel/subchannel_pool_interface.cc )
  s.files += %w( src/core/ext/filters/client_channel/subchannel_pool_interface.h )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_api.cc )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_api.h )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_bootstrap.cc )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_bootstrap.h )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_channel.h )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_channel_args.h )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_channel_secure.cc )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_client.cc )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_client.h )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_client_stats.cc )
-  s.files += %w( src/core/ext/filters/client_channel/xds/xds_client_stats.h )
  s.files += %w( src/core/ext/filters/client_idle/client_idle_filter.cc )
  s.files += %w( src/core/ext/filters/deadline/deadline_filter.cc )
  s.files += %w( src/core/ext/filters/deadline/deadline_filter.h )
@ -459,6 +448,17 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h )
  s.files += %w( src/core/ext/upb-generated/validate/validate.upb.c )
  s.files += %w( src/core/ext/upb-generated/validate/validate.upb.h )
+  s.files += %w( src/core/ext/xds/xds_api.cc )
+  s.files += %w( src/core/ext/xds/xds_api.h )
+  s.files += %w( src/core/ext/xds/xds_bootstrap.cc )
+  s.files += %w( src/core/ext/xds/xds_bootstrap.h )
+  s.files += %w( src/core/ext/xds/xds_channel.h )
+  s.files += %w( src/core/ext/xds/xds_channel_args.h )
+  s.files += %w( src/core/ext/xds/xds_channel_secure.cc )
+  s.files += %w( src/core/ext/xds/xds_client.cc )
+  s.files += %w( src/core/ext/xds/xds_client.h )
+  s.files += %w( src/core/ext/xds/xds_client_stats.cc )
+  s.files += %w( src/core/ext/xds/xds_client_stats.h )
  s.files += %w( src/core/lib/avl/avl.cc )
  s.files += %w( src/core/lib/avl/avl.h )
  s.files += %w( src/core/lib/backoff/backoff.cc )
--- a/grpc.gyp
+++ b/grpc.gyp
@ -498,11 +498,6 @@
        'src/core/ext/filters/client_channel/service_config_parser.cc',
        'src/core/ext/filters/client_channel/subchannel.cc',
        'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
-        'src/core/ext/filters/client_channel/xds/xds_api.cc',
-        'src/core/ext/filters/client_channel/xds/xds_bootstrap.cc',
-        'src/core/ext/filters/client_channel/xds/xds_channel_secure.cc',
-        'src/core/ext/filters/client_channel/xds/xds_client.cc',
-        'src/core/ext/filters/client_channel/xds/xds_client_stats.cc',
        'src/core/ext/filters/client_idle/client_idle_filter.cc',
        'src/core/ext/filters/deadline/deadline_filter.cc',
        'src/core/ext/filters/http/client/http_client_filter.cc',
@ -628,6 +623,11 @@
        'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
        'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
        'src/core/ext/upb-generated/validate/validate.upb.c',
+        'src/core/ext/xds/xds_api.cc',
+        'src/core/ext/xds/xds_bootstrap.cc',
+        'src/core/ext/xds/xds_channel_secure.cc',
+        'src/core/ext/xds/xds_client.cc',
+        'src/core/ext/xds/xds_client_stats.cc',
        'src/core/lib/avl/avl.cc',
        'src/core/lib/backoff/backoff.cc',
        'src/core/lib/channel/channel_args.cc',
@ -1013,11 +1013,6 @@
        'src/core/ext/filters/client_channel/service_config_parser.cc',
        'src/core/ext/filters/client_channel/subchannel.cc',
        'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
-        'src/core/ext/filters/client_channel/xds/xds_api.cc',
-        'src/core/ext/filters/client_channel/xds/xds_bootstrap.cc',
-        'src/core/ext/filters/client_channel/xds/xds_channel.cc',
-        'src/core/ext/filters/client_channel/xds/xds_client.cc',
-        'src/core/ext/filters/client_channel/xds/xds_client_stats.cc',
        'src/core/ext/filters/client_idle/client_idle_filter.cc',
        'src/core/ext/filters/deadline/deadline_filter.cc',
        'src/core/ext/filters/http/client/http_client_filter.cc',
@ -1138,6 +1133,11 @@
        'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
        'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
        'src/core/ext/upb-generated/validate/validate.upb.c',
+        'src/core/ext/xds/xds_api.cc',
+        'src/core/ext/xds/xds_bootstrap.cc',
+        'src/core/ext/xds/xds_channel.cc',
+        'src/core/ext/xds/xds_client.cc',
+        'src/core/ext/xds/xds_client_stats.cc',
        'src/core/lib/avl/avl.cc',
        'src/core/lib/backoff/backoff.cc',
        'src/core/lib/channel/channel_args.cc',
--- a/package.xml
+++ b/package.xml
@ -189,17 +189,6 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_interface.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_pool_interface.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_pool_interface.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_api.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_api.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_bootstrap.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_bootstrap.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_channel.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_channel_args.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_channel_secure.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_client.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_client.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_client_stats.cc" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/xds/xds_client_stats.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_idle/client_idle_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.cc" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.h" role="src" />
@ -439,6 +428,17 @@
    <file baseinstalldir="/" name="src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upb-generated/validate/validate.upb.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/upb-generated/validate/validate.upb.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_api.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_api.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_bootstrap.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_bootstrap.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_channel.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_channel_args.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_channel_secure.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_client.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_client.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_client_stats.cc" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/xds/xds_client_stats.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/avl/avl.cc" role="src" />
    <file baseinstalldir="/" name="src/core/lib/avl/avl.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/backoff/backoff.cc" role="src" />
--- a/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
@ -24,7 +24,7 @@
 #include "src/core/ext/filters/client_channel/lb_policy_factory.h"
 #include "src/core/ext/filters/client_channel/lb_policy_registry.h"
 #include "src/core/ext/filters/client_channel/service_config.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client.h"
+#include "src/core/ext/xds/xds_client.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/orphanable.h"
--- a/src/core/ext/filters/client_channel/lb_policy/xds/eds.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/eds.cc
@ -32,9 +32,9 @@
 #include "src/core/ext/filters/client_channel/lb_policy_factory.h"
 #include "src/core/ext/filters/client_channel/lb_policy_registry.h"
 #include "src/core/ext/filters/client_channel/server_address.h"
-#include "src/core/ext/filters/client_channel/xds/xds_channel_args.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client_stats.h"
+#include "src/core/ext/xds/xds_channel_args.h"
+#include "src/core/ext/xds/xds_client.h"
+#include "src/core/ext/xds/xds_client_stats.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
--- a/src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc
@ -22,8 +22,8 @@
 #include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h"
 #include "src/core/ext/filters/client_channel/lb_policy_factory.h"
 #include "src/core/ext/filters/client_channel/lb_policy_registry.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client_stats.h"
+#include "src/core/ext/xds/xds_client.h"
+#include "src/core/ext/xds/xds_client_stats.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
--- a/src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
+++ b/src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
@ -35,7 +35,7 @@
 #include "src/core/ext/filters/client_channel/lb_policy/child_policy_handler.h"
 #include "src/core/ext/filters/client_channel/lb_policy_factory.h"
 #include "src/core/ext/filters/client_channel/lb_policy_registry.h"
-#include "src/core/ext/filters/client_channel/xds/xds_api.h"
+#include "src/core/ext/xds/xds_api.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/orphanable.h"
--- a/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
+++ b/src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
@ -20,7 +20,7 @@

 #include "src/core/ext/filters/client_channel/config_selector.h"
 #include "src/core/ext/filters/client_channel/resolver_registry.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client.h"
+#include "src/core/ext/xds/xds_client.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/transport/timeout_encoding.h"

--- a/src/core/ext/filters/client_channel/server_address.h
+++ b/src/core/ext/filters/client_channel/server_address.h
@ -39,7 +39,7 @@ namespace grpc_core {
 // args when a subchannel is created for this address.
 class ServerAddress {
 public:
-  // Base clas for resolver-supplied attributes.
+  // Base class for resolver-supplied attributes.
  // Unlike channel args, these attributes don't affect subchannel
  // uniqueness or behavior.  They are for use by LB policies only.
  class AttributeInterface {
--- a/src/core/ext/filters/client_channel/xds/xds_api.cc
+++ b/src/core/ext/filters/client_channel/xds/xds_api.cc
@ -35,7 +35,7 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>

-#include "src/core/ext/filters/client_channel/xds/xds_api.h"
+#include "src/core/ext/xds/xds_api.h"
 #include "src/core/lib/gpr/env.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gpr/useful.h"
--- a/src/core/ext/filters/client_channel/xds/xds_api.h
+++ b/src/core/ext/filters/client_channel/xds/xds_api.h
@ -16,8 +16,8 @@
 *
 */

-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_API_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_API_H
+#ifndef GRPC_CORE_EXT_XDS_XDS_API_H
+#define GRPC_CORE_EXT_XDS_XDS_API_H

 #include <grpc/support/port_platform.h>

@ -27,13 +27,13 @@

 #include "absl/container/inlined_vector.h"
 #include "absl/types/optional.h"
+#include "re2/re2.h"

 #include <grpc/slice_buffer.h>

-#include "re2/re2.h"
 #include "src/core/ext/filters/client_channel/server_address.h"
-#include "src/core/ext/filters/client_channel/xds/xds_bootstrap.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client_stats.h"
+#include "src/core/ext/xds/xds_bootstrap.h"
+#include "src/core/ext/xds/xds_client_stats.h"

 namespace grpc_core {

@ -349,4 +349,4 @@ class XdsApi {

 }  // namespace grpc_core

-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_API_H */
+#endif /* GRPC_CORE_EXT_XDS_XDS_API_H */
--- a/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc
+++ b/src/core/ext/filters/client_channel/xds/xds_bootstrap.cc
@ -16,7 +16,7 @@

 #include <grpc/support/port_platform.h>

-#include "src/core/ext/filters/client_channel/xds/xds_bootstrap.h"
+#include "src/core/ext/xds/xds_bootstrap.h"

 #include <vector>

--- a/src/core/ext/filters/client_channel/xds/xds_bootstrap.h
+++ b/src/core/ext/filters/client_channel/xds/xds_bootstrap.h
@ -14,8 +14,8 @@
 // limitations under the License.
 //

-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_BOOTSTRAP_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_BOOTSTRAP_H
+#ifndef GRPC_CORE_EXT_XDS_XDS_BOOTSTRAP_H
+#define GRPC_CORE_EXT_XDS_XDS_BOOTSTRAP_H

 #include <grpc/support/port_platform.h>

@ -90,4 +90,4 @@ class XdsBootstrap {

 }  // namespace grpc_core

-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_BOOTSTRAP_H */
+#endif /* GRPC_CORE_EXT_XDS_XDS_BOOTSTRAP_H */
--- a/src/core/ext/filters/client_channel/xds/xds_channel.cc
+++ b/src/core/ext/filters/client_channel/xds/xds_channel.cc
@ -20,7 +20,7 @@

 #include <grpc/grpc.h>

-#include "src/core/ext/filters/client_channel/xds/xds_channel.h"
+#include "src/core/ext/xds/xds_channel.h"

 namespace grpc_core {

--- a/src/core/ext/filters/client_channel/xds/xds_channel.h
+++ b/src/core/ext/filters/client_channel/xds/xds_channel.h
@ -16,14 +16,14 @@
 *
 */

-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CHANNEL_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CHANNEL_H
+#ifndef GRPC_CORE_EXT_XDS_XDS_CHANNEL_H
+#define GRPC_CORE_EXT_XDS_XDS_CHANNEL_H

 #include <grpc/support/port_platform.h>

 #include <grpc/impl/codegen/grpc_types.h>

-#include "src/core/ext/filters/client_channel/xds/xds_bootstrap.h"
+#include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/lib/iomgr/error.h"

 namespace grpc_core {
@ -42,5 +42,5 @@ grpc_channel* CreateXdsChannel(const XdsBootstrap& bootstrap,

 }  // namespace grpc_core

-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CHANNEL_H \
+#endif /* GRPC_CORE_EXT_XDS_XDS_CHANNEL_H \
        */
--- a/src/core/ext/filters/client_channel/xds/xds_channel_args.h
+++ b/src/core/ext/filters/client_channel/xds/xds_channel_args.h
@ -14,8 +14,8 @@
 // limitations under the License.
 //

-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CHANNEL_ARGS_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CHANNEL_ARGS_H
+#ifndef GRPC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H
+#define GRPC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H

 // Boolean channel arg indicating whether the target is an xds server.
 #define GRPC_ARG_ADDRESS_IS_XDS_SERVER "grpc.address_is_xds_server"
@ -23,4 +23,4 @@
 // Pointer channel arg containing a ref to the XdsClient object.
 #define GRPC_ARG_XDS_CLIENT "grpc.xds_client"

-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CHANNEL_ARGS_H */
+#endif /* GRPC_CORE_EXT_XDS_XDS_CHANNEL_ARGS_H */
--- a/src/core/ext/filters/client_channel/xds/xds_channel_secure.cc
+++ b/src/core/ext/filters/client_channel/xds/xds_channel_secure.cc
@ -18,7 +18,7 @@

 #include <grpc/support/port_platform.h>

-#include "src/core/ext/filters/client_channel/xds/xds_channel.h"
+#include "src/core/ext/xds/xds_channel.h"

 #include <string.h>

@ -28,8 +28,6 @@
 #include <grpc/support/alloc.h>
 #include <grpc/support/string_util.h>

-#include "src/core/ext/filters/client_channel/client_channel.h"
-#include "src/core/ext/filters/client_channel/server_address.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/string.h"
 #include "src/core/lib/iomgr/sockaddr_utils.h"
--- a/src/core/ext/filters/client_channel/xds/xds_client.cc
+++ b/src/core/ext/filters/client_channel/xds/xds_client.cc
@ -33,14 +33,12 @@
 #include <grpc/support/time.h>

 #include "src/core/ext/filters/client_channel/client_channel.h"
-#include "src/core/ext/filters/client_channel/parse_address.h"
-#include "src/core/ext/filters/client_channel/server_address.h"
 #include "src/core/ext/filters/client_channel/service_config.h"
-#include "src/core/ext/filters/client_channel/xds/xds_api.h"
-#include "src/core/ext/filters/client_channel/xds/xds_channel.h"
-#include "src/core/ext/filters/client_channel/xds/xds_channel_args.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client_stats.h"
+#include "src/core/ext/xds/xds_api.h"
+#include "src/core/ext/xds/xds_channel.h"
+#include "src/core/ext/xds/xds_channel_args.h"
+#include "src/core/ext/xds/xds_client.h"
+#include "src/core/ext/xds/xds_client_stats.h"
 #include "src/core/lib/backoff/backoff.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_stack.h"
--- a/src/core/ext/filters/client_channel/xds/xds_client.h
+++ b/src/core/ext/filters/client_channel/xds/xds_client.h
@ -14,8 +14,8 @@
 // limitations under the License.
 //

-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CLIENT_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CLIENT_H
+#ifndef GRPC_CORE_EXT_XDS_XDS_CLIENT_H
+#define GRPC_CORE_EXT_XDS_XDS_CLIENT_H

 #include <grpc/support/port_platform.h>

@ -25,9 +25,9 @@
 #include "absl/types/optional.h"

 #include "src/core/ext/filters/client_channel/service_config.h"
-#include "src/core/ext/filters/client_channel/xds/xds_api.h"
-#include "src/core/ext/filters/client_channel/xds/xds_bootstrap.h"
-#include "src/core/ext/filters/client_channel/xds/xds_client_stats.h"
+#include "src/core/ext/xds/xds_api.h"
+#include "src/core/ext/xds/xds_bootstrap.h"
+#include "src/core/ext/xds/xds_client_stats.h"
 #include "src/core/lib/gprpp/map.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/gprpp/orphanable.h"
@ -306,4 +306,4 @@ class XdsClient : public InternallyRefCounted<XdsClient> {

 }  // namespace grpc_core

-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CLIENT_H */
+#endif /* GRPC_CORE_EXT_XDS_XDS_CLIENT_H */
--- a/src/core/ext/filters/client_channel/xds/xds_client_stats.cc
+++ b/src/core/ext/filters/client_channel/xds/xds_client_stats.cc
@ -18,14 +18,14 @@

 #include <grpc/support/port_platform.h>

-#include "src/core/ext/filters/client_channel/xds/xds_client_stats.h"
+#include "src/core/ext/xds/xds_client_stats.h"

 #include <string.h>

 #include <grpc/support/atm.h>
 #include <grpc/support/string_util.h>

-#include "src/core/ext/filters/client_channel/xds/xds_client.h"
+#include "src/core/ext/xds/xds_client.h"

 namespace grpc_core {

--- a/src/core/ext/filters/client_channel/xds/xds_client_stats.h
+++ b/src/core/ext/filters/client_channel/xds/xds_client_stats.h
@ -16,8 +16,8 @@
 *
 */

-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CLIENT_STATS_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CLIENT_STATS_H
+#ifndef GRPC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
+#define GRPC_CORE_EXT_XDS_XDS_CLIENT_STATS_H

 #include <grpc/support/port_platform.h>

@ -208,4 +208,4 @@ class XdsClusterLocalityStats : public RefCounted<XdsClusterLocalityStats> {

 }  // namespace grpc_core

-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_XDS_XDS_CLIENT_STATS_H */
+#endif /* GRPC_CORE_EXT_XDS_XDS_CLIENT_STATS_H */
--- a/src/core/lib/security/security_connector/fake/fake_security_connector.cc
+++ b/src/core/lib/security/security_connector/fake/fake_security_connector.cc
@ -29,8 +29,8 @@
 #include <grpc/support/string_util.h>

 #include "src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h"
-#include "src/core/ext/filters/client_channel/xds/xds_channel_args.h"
 #include "src/core/ext/transport/chttp2/alpn/alpn.h"
+#include "src/core/ext/xds/xds_channel_args.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/handshaker.h"
 #include "src/core/lib/gpr/string.h"
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -75,11 +75,6 @@ CORE_SOURCE_FILES = [
    'src/core/ext/filters/client_channel/service_config_parser.cc',
    'src/core/ext/filters/client_channel/subchannel.cc',
    'src/core/ext/filters/client_channel/subchannel_pool_interface.cc',
-    'src/core/ext/filters/client_channel/xds/xds_api.cc',
-    'src/core/ext/filters/client_channel/xds/xds_bootstrap.cc',
-    'src/core/ext/filters/client_channel/xds/xds_channel_secure.cc',
-    'src/core/ext/filters/client_channel/xds/xds_client.cc',
-    'src/core/ext/filters/client_channel/xds/xds_client_stats.cc',
    'src/core/ext/filters/client_idle/client_idle_filter.cc',
    'src/core/ext/filters/deadline/deadline_filter.cc',
    'src/core/ext/filters/http/client/http_client_filter.cc',
@ -205,6 +200,11 @@ CORE_SOURCE_FILES = [
    'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
    'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
    'src/core/ext/upb-generated/validate/validate.upb.c',
+    'src/core/ext/xds/xds_api.cc',
+    'src/core/ext/xds/xds_bootstrap.cc',
+    'src/core/ext/xds/xds_channel_secure.cc',
+    'src/core/ext/xds/xds_client.cc',
+    'src/core/ext/xds/xds_client_stats.cc',
    'src/core/lib/avl/avl.cc',
    'src/core/lib/backoff/backoff.cc',
    'src/core/lib/channel/channel_args.cc',
--- a/test/core/client_channel/xds_bootstrap_test.cc
+++ b/test/core/client_channel/xds_bootstrap_test.cc
@ -22,7 +22,7 @@
 #include <grpc/grpc.h>
 #include <grpc/slice.h>

-#include "src/core/ext/filters/client_channel/xds/xds_bootstrap.h"
+#include "src/core/ext/xds/xds_bootstrap.h"
 #include "test/core/util/test_config.h"

 namespace grpc_core {
--- a/test/cpp/end2end/xds_end2end_test.cc
+++ b/test/cpp/end2end/xds_end2end_test.cc
@ -45,7 +45,7 @@
 #include "src/core/ext/filters/client_channel/parse_address.h"
 #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"
 #include "src/core/ext/filters/client_channel/server_address.h"
-#include "src/core/ext/filters/client_channel/xds/xds_api.h"
+#include "src/core/ext/xds/xds_api.h"
 #include "src/core/lib/gpr/env.h"
 #include "src/core/lib/gpr/tmpfile.h"
 #include "src/core/lib/gprpp/map.h"
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -1162,17 +1162,6 @@ src/core/ext/filters/client_channel/subchannel.h \
 src/core/ext/filters/client_channel/subchannel_interface.h \
 src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
 src/core/ext/filters/client_channel/subchannel_pool_interface.h \
-src/core/ext/filters/client_channel/xds/xds_api.cc \
-src/core/ext/filters/client_channel/xds/xds_api.h \
-src/core/ext/filters/client_channel/xds/xds_bootstrap.cc \
-src/core/ext/filters/client_channel/xds/xds_bootstrap.h \
-src/core/ext/filters/client_channel/xds/xds_channel.h \
-src/core/ext/filters/client_channel/xds/xds_channel_args.h \
-src/core/ext/filters/client_channel/xds/xds_channel_secure.cc \
-src/core/ext/filters/client_channel/xds/xds_client.cc \
-src/core/ext/filters/client_channel/xds/xds_client.h \
-src/core/ext/filters/client_channel/xds/xds_client_stats.cc \
-src/core/ext/filters/client_channel/xds/xds_client_stats.h \
 src/core/ext/filters/client_idle/client_idle_filter.cc \
 src/core/ext/filters/deadline/deadline_filter.cc \
 src/core/ext/filters/deadline/deadline_filter.h \
@ -1412,6 +1401,17 @@ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
 src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \
 src/core/ext/upb-generated/validate/validate.upb.c \
 src/core/ext/upb-generated/validate/validate.upb.h \
+src/core/ext/xds/xds_api.cc \
+src/core/ext/xds/xds_api.h \
+src/core/ext/xds/xds_bootstrap.cc \
+src/core/ext/xds/xds_bootstrap.h \
+src/core/ext/xds/xds_channel.h \
+src/core/ext/xds/xds_channel_args.h \
+src/core/ext/xds/xds_channel_secure.cc \
+src/core/ext/xds/xds_client.cc \
+src/core/ext/xds/xds_client.h \
+src/core/ext/xds/xds_client_stats.cc \
+src/core/ext/xds/xds_client_stats.h \
 src/core/lib/avl/avl.cc \
 src/core/lib/avl/avl.h \
 src/core/lib/backoff/backoff.cc \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -973,17 +973,6 @@ src/core/ext/filters/client_channel/subchannel.h \
 src/core/ext/filters/client_channel/subchannel_interface.h \
 src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
 src/core/ext/filters/client_channel/subchannel_pool_interface.h \
-src/core/ext/filters/client_channel/xds/xds_api.cc \
-src/core/ext/filters/client_channel/xds/xds_api.h \
-src/core/ext/filters/client_channel/xds/xds_bootstrap.cc \
-src/core/ext/filters/client_channel/xds/xds_bootstrap.h \
-src/core/ext/filters/client_channel/xds/xds_channel.h \
-src/core/ext/filters/client_channel/xds/xds_channel_args.h \
-src/core/ext/filters/client_channel/xds/xds_channel_secure.cc \
-src/core/ext/filters/client_channel/xds/xds_client.cc \
-src/core/ext/filters/client_channel/xds/xds_client.h \
-src/core/ext/filters/client_channel/xds/xds_client_stats.cc \
-src/core/ext/filters/client_channel/xds/xds_client_stats.h \
 src/core/ext/filters/client_idle/client_idle_filter.cc \
 src/core/ext/filters/deadline/deadline_filter.cc \
 src/core/ext/filters/deadline/deadline_filter.h \
@ -1230,6 +1219,17 @@ src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
 src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h \
 src/core/ext/upb-generated/validate/validate.upb.c \
 src/core/ext/upb-generated/validate/validate.upb.h \
+src/core/ext/xds/xds_api.cc \
+src/core/ext/xds/xds_api.h \
+src/core/ext/xds/xds_bootstrap.cc \
+src/core/ext/xds/xds_bootstrap.h \
+src/core/ext/xds/xds_channel.h \
+src/core/ext/xds/xds_channel_args.h \
+src/core/ext/xds/xds_channel_secure.cc \
+src/core/ext/xds/xds_client.cc \
+src/core/ext/xds/xds_client.h \
+src/core/ext/xds/xds_client_stats.cc \
+src/core/ext/xds/xds_client_stats.h \
 src/core/lib/README.md \
 src/core/lib/avl/avl.cc \
 src/core/lib/avl/avl.h \