xds: move "_experimental" to suffix for all balancers (#3356)

grpc · Feb 3, 2020 · e0e0cbc · e0e0cbc
1 parent 77bc3d3
commit e0e0cbc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer.go b/xds/internal/balancer/cdsbalancer/cdsbalancer.go
@@ -37,8 +37,8 @@ import (
 )
 
 const (
-	cdsName = "experimental_cds"
-	edsName = "experimental_eds"
+	cdsName = "cds_experimental"
+	edsName = "eds_experimental"
 )
 
 var (

diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go
@@ -175,7 +175,7 @@ func cdsCCS(cluster string, xdsClient interface{}) balancer.ClientConnState {
 	const cdsLBConfig = `{
       "loadBalancingConfig":[
         {
-          "experimental_cds":{
+          "cds_experimental":{
             "Cluster": %s
           }
         }

diff --git a/xds/internal/balancer/edsbalancer/eds.go b/xds/internal/balancer/edsbalancer/eds.go
@@ -38,7 +38,7 @@ import (
 
 const (
 	defaultTimeout = 10 * time.Second
-	edsName        = "experimental_eds"
+	edsName        = "eds_experimental"
 )
 
 var (

diff --git a/xds/internal/balancer/edsbalancer/xds_old.go b/xds/internal/balancer/edsbalancer/xds_old.go
@@ -36,7 +36,7 @@ func init() {
 }
 
 // xdsBalancerBuilder register edsBalancerBuilder (now with name
-// "experimental_eds") under the old name "xds_experimental".
+// "eds_experimental") under the old name "xds_experimental".
 type xdsBalancerBuilder struct {
 	edsBalancerBuilder
 }

diff --git a/xds/internal/resolver/xds_resolver.go b/xds/internal/resolver/xds_resolver.go
@@ -155,7 +155,7 @@ type xdsResolver struct {
 const jsonFormatSC = `{
     "loadBalancingConfig":[
       {
-        "experimental_cds":{
+        "cds_experimental":{
           "Cluster": "%s"
         }
       }