diff --git a/xds/src/main/java/io/grpc/xds/PriorityLoadBalancerProvider.java b/xds/src/main/java/io/grpc/xds/PriorityLoadBalancerProvider.java index 6e178c62c1..df35361bed 100644 --- a/xds/src/main/java/io/grpc/xds/PriorityLoadBalancerProvider.java +++ b/xds/src/main/java/io/grpc/xds/PriorityLoadBalancerProvider.java @@ -47,7 +47,7 @@ public final class PriorityLoadBalancerProvider extends LoadBalancerProvider { @Override public String getPolicyName() { - return "priority_experimental"; + return XdsLbPolicies.PRIORITY_POLICY_NAME; } @Override diff --git a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java index 1fe2d720b9..ff9e4a10eb 100644 --- a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java +++ b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java @@ -281,7 +281,7 @@ final class XdsNameResolver extends NameResolver { Map rawServiceConfig = ImmutableMap.of( "loadBalancingConfig", ImmutableList.of(ImmutableMap.of( - "cluster_manager_experimental", + XdsLbPolicies.CLUSTER_MANAGER_POLICY_NAME, ImmutableMap.of("childPolicy", childPolicy.buildOrThrow())))); if (logger.isLoggable(XdsLogLevel.INFO)) { @@ -1014,13 +1014,15 @@ final class XdsNameResolver extends NameResolver { private Map toLbPolicy() { if (traditionalCluster != null) { - return ImmutableMap.of("cds_experimental", ImmutableMap.of("cluster", traditionalCluster)); + return ImmutableMap.of( + XdsLbPolicies.CDS_POLICY_NAME, + ImmutableMap.of("cluster", traditionalCluster)); } else { ImmutableMap rlsConfig = new ImmutableMap.Builder() .put("routeLookupConfig", rlsPluginConfig.config()) .put( "childPolicy", - ImmutableList.of(ImmutableMap.of("cds_experimental", ImmutableMap.of()))) + ImmutableList.of(ImmutableMap.of(XdsLbPolicies.CDS_POLICY_NAME, ImmutableMap.of()))) .put("childPolicyConfigTargetFieldName", "cluster") .buildOrThrow(); return ImmutableMap.of("rls_experimental", rlsConfig);