From f1b699bbf1684a6c30e8d0da99e7e93a2dc784fe Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Wed, 25 Aug 2021 12:57:28 -0700 Subject: [PATCH] Update default XDS server name in C2P resolver --- .../main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java | 2 +- .../java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java b/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java index 55ec809772..9abdf12f17 100644 --- a/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java +++ b/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java @@ -184,7 +184,7 @@ final class GoogleCloudToProdNameResolver extends NameResolver { ImmutableMap.of("TRAFFICDIRECTOR_DIRECTPATH_C2P_IPV6_CAPABLE", true)); } ImmutableMap.Builder serverBuilder = ImmutableMap.builder(); - String server_uri = "directpath-trafficdirector.googleapis.com"; + String server_uri = "directpath-pa.googleapis.com"; if (serverUriOverride != null && serverUriOverride.length() > 0) { server_uri = serverUriOverride; } diff --git a/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java b/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java index 07e957b24c..421b2a1dd0 100644 --- a/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java +++ b/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java @@ -189,7 +189,7 @@ public class GoogleCloudToProdNameResolverTest { Map server = Iterables.getOnlyElement( (List>) bootstrap.get("xds_servers")); assertThat(server).containsExactly( - "server_uri", "directpath-trafficdirector.googleapis.com", + "server_uri", "directpath-pa.googleapis.com", "channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")), "server_features", ImmutableList.of("xds_v3")); }