diff --git a/balancer/xds/xds.go b/balancer/xds/xds.go index 5cc19824..f08b4002 100644 --- a/balancer/xds/xds.go +++ b/balancer/xds/xds.go @@ -42,7 +42,7 @@ import ( const ( defaultTimeout = 10 * time.Second - xdsName = "xds" + xdsName = "xds_experimental" ) var ( diff --git a/balancer/xds/xds_lrs_test.go b/balancer/xds/xds_lrs_test.go index 7dc3f164..9b5ff691 100644 --- a/balancer/xds/xds_lrs_test.go +++ b/balancer/xds/xds_lrs_test.go @@ -95,7 +95,7 @@ func (s) TestXdsLoadReporting(t *testing.T) { newEDSBalancer = originalNewEDSBalancer }() - builder := balancer.Get("xds") + builder := balancer.Get(xdsName) cc := newTestClientConn() lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) if !ok { diff --git a/balancer/xds/xds_test.go b/balancer/xds/xds_test.go index 4b08f05e..bbc1835a 100644 --- a/balancer/xds/xds_test.go +++ b/balancer/xds/xds_test.go @@ -239,7 +239,7 @@ func (s) TestXdsBalanceHandleResolvedAddrs(t *testing.T) { startupTimeout = 500 * time.Millisecond defer func() { startupTimeout = defaultTimeout }() - builder := balancer.Get("xds") + builder := balancer.Get(xdsName) cc := newTestClientConn() lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) if !ok { @@ -273,7 +273,7 @@ func (s) TestXdsBalanceHandleBalancerConfigBalancerNameUpdate(t *testing.T) { newEDSBalancer = originalNewEDSBalancer }() - builder := balancer.Get("xds") + builder := balancer.Get(xdsName) cc := newTestClientConn() lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) if !ok { @@ -348,7 +348,7 @@ func (s) TestXdsBalanceHandleBalancerConfigChildPolicyUpdate(t *testing.T) { newEDSBalancer = originalNewEDSBalancer }() - builder := balancer.Get("xds") + builder := balancer.Get(xdsName) cc := newTestClientConn() lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) if !ok { @@ -438,7 +438,7 @@ func (s) TestXdsBalanceHandleBalancerConfigFallBackUpdate(t *testing.T) { newEDSBalancer = originalNewEDSBalancer }() - builder := balancer.Get("xds") + builder := balancer.Get(xdsName) cc := newTestClientConn() lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) if !ok { @@ -513,7 +513,7 @@ func (s) TestXdsBalancerHandlerSubConnStateChange(t *testing.T) { newEDSBalancer = originalNewEDSBalancer }() - builder := balancer.Get("xds") + builder := balancer.Get(xdsName) cc := newTestClientConn() lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) if !ok { @@ -591,7 +591,7 @@ func (s) TestXdsBalancerFallBackSignalFromEdsBalancer(t *testing.T) { newEDSBalancer = originalNewEDSBalancer }() - builder := balancer.Get("xds") + builder := balancer.Get(xdsName) cc := newTestClientConn() lb, ok := builder.Build(cc, balancer.BuildOptions{Target: resolver.Target{Endpoint: testServiceName}}).(*xdsBalancer) if !ok {