Skip to content

xds: rename experimental_cds policy name to cds_experimental #6587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 8, 2020
Merged

xds: rename experimental_cds policy name to cds_experimental #6587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion xds/src/main/java/io/grpc/xds/CdsLoadBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import javax.annotation.Nullable;

/**
* Load balancer for experimental_cds LB policy.
* Load balancer for cds_experimental LB policy.
*/
public final class CdsLoadBalancer extends LoadBalancer {
private final ChannelLogger channelLogger;
Expand Down
4 changes: 2 additions & 2 deletions xds/src/main/java/io/grpc/xds/CdsLoadBalancerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@
/**
* The provider for the "cds" balancing policy. This class should not be directly referenced in
* code. The policy should be accessed through {@link io.grpc.LoadBalancerRegistry#getProvider}
* with the name "cds" (currently "experimental_cds").
* with the name "cds" (currently "cds_experimental").
*/
@Internal
public class CdsLoadBalancerProvider extends LoadBalancerProvider {

static final String CDS_POLICY_NAME = "experimental_cds";
static final String CDS_POLICY_NAME = "cds_experimental";
private static final String CLUSTER_KEY = "cluster";

@Override
Expand Down
2 changes: 1 addition & 1 deletion xds/src/main/java/io/grpc/xds/XdsNameResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public void onConfigChanged(ConfigUpdate update) {
String serviceConfig = "{\n"
+ " \"loadBalancingConfig\": [\n"
+ " {\n"
+ " \"experimental_cds\": {\n"
+ " \"cds_experimental\": {\n"
+ " \"cluster\": \"" + update.getClusterName() + "\"\n"
+ " }\n"
+ " }\n"
Expand Down
16 changes: 8 additions & 8 deletions xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ public void resolve_foundResource() {
List<Map<String, ?>> rawLbConfigs =
(List<Map<String, ?>>) serviceConfig.get("loadBalancingConfig");
Map<String, ?> lbConfig = Iterables.getOnlyElement(rawLbConfigs);
assertThat(lbConfig.keySet()).containsExactly("experimental_cds");
assertThat(lbConfig.keySet()).containsExactly("cds_experimental");
@SuppressWarnings("unchecked")
Map<String, ?> rawConfigValues = (Map<String, ?>) lbConfig.get("experimental_cds");
Map<String, ?> rawConfigValues = (Map<String, ?>) lbConfig.get("cds_experimental");
assertThat(rawConfigValues).containsExactly("cluster", clusterName);
}

Expand Down Expand Up @@ -308,8 +308,8 @@ public void resolve_resourceUpdated() {
List<Map<String, ?>> rawLbConfigs =
(List<Map<String, ?>>) serviceConfig.get("loadBalancingConfig");
Map<String, ?> lbConfig = Iterables.getOnlyElement(rawLbConfigs);
assertThat(lbConfig.keySet()).containsExactly("experimental_cds");
Map<String, ?> rawConfigValues = (Map<String, ?>) lbConfig.get("experimental_cds");
assertThat(lbConfig.keySet()).containsExactly("cds_experimental");
Map<String, ?> rawConfigValues = (Map<String, ?>) lbConfig.get("cds_experimental");
assertThat(rawConfigValues).containsExactly("cluster", "cluster-foo.googleapis.com");

// Simulate receiving another LDS response that tells client to do RDS.
Expand All @@ -331,8 +331,8 @@ public void resolve_resourceUpdated() {
serviceConfig = result.getAttributes().get(GrpcAttributes.NAME_RESOLVER_SERVICE_CONFIG);
rawLbConfigs = (List<Map<String, ?>>) serviceConfig.get("loadBalancingConfig");
lbConfig = Iterables.getOnlyElement(rawLbConfigs);
assertThat(lbConfig.keySet()).containsExactly("experimental_cds");
rawConfigValues = (Map<String, ?>) lbConfig.get("experimental_cds");
assertThat(lbConfig.keySet()).containsExactly("cds_experimental");
rawConfigValues = (Map<String, ?>) lbConfig.get("cds_experimental");
assertThat(rawConfigValues).containsExactly("cluster", "cluster-blade.googleapis.com");
}

Expand Down Expand Up @@ -367,9 +367,9 @@ public void resolve_resourceNewlyAdded() {
List<Map<String, ?>> rawLbConfigs =
(List<Map<String, ?>>) serviceConfig.get("loadBalancingConfig");
Map<String, ?> lbConfig = Iterables.getOnlyElement(rawLbConfigs);
assertThat(lbConfig.keySet()).containsExactly("experimental_cds");
assertThat(lbConfig.keySet()).containsExactly("cds_experimental");
@SuppressWarnings("unchecked")
Map<String, ?> rawConfigValues = (Map<String, ?>) lbConfig.get("experimental_cds");
Map<String, ?> rawConfigValues = (Map<String, ?>) lbConfig.get("cds_experimental");
assertThat(rawConfigValues).containsExactly("cluster", "cluster-foo.googleapis.com");
}

Expand Down