grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update default XDS server name in C2P resolver

This commit is contained in:
Alexander Polcyn 2021-08-25 12:57:28 -07:00 committed by Eric Anderson
parent 3cb0696b1f
commit f1b699bbf1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java
View File

@ -184,7 +184,7 @@ final class GoogleCloudToProdNameResolver extends NameResolver {
ImmutableMap.of("TRAFFICDIRECTOR_DIRECTPATH_C2P_IPV6_CAPABLE", true));
}
ImmutableMap.Builder<String, Object> 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;
}

2
xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java
View File

@ -189,7 +189,7 @@ public class GoogleCloudToProdNameResolverTest {
Map<String, ?> server = Iterables.getOnlyElement(
(List<Map<String, ?>>) 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"));
}