From e0e0cbc795983da3988f24b7ac96f453519b6b3c Mon Sep 17 00:00:00 2001
From: Menghan Li <menghanl@google.com>
Date: Mon, 3 Feb 2020 15:39:32 -0800
Subject: [PATCH] xds: move "_experimental" to suffix for all balancers (#3356)

---
 xds/internal/balancer/cdsbalancer/cdsbalancer.go      | 4 ++--
 xds/internal/balancer/cdsbalancer/cdsbalancer_test.go | 2 +-
 xds/internal/balancer/edsbalancer/eds.go              | 2 +-
 xds/internal/balancer/edsbalancer/xds_old.go          | 2 +-
 xds/internal/resolver/xds_resolver.go                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer.go b/xds/internal/balancer/cdsbalancer/cdsbalancer.go
index 0d49b381..8d5c3c32 100644
--- 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
index 6fc0bcaa..b03a067b 100644
--- 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
index 2199e038..7c6dda27 100644
--- 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
index 64bb8b40..6729e680 100644
--- 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
index d961918e..f116eff9 100644
--- 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"
         }
       }