From 01ef97802f2013f249ba96993d1d3fadc8c071f5 Mon Sep 17 00:00:00 2001 From: Menghan Li Date: Fri, 4 Jun 2021 14:34:09 -0700 Subject: [PATCH] [xds_client_in_attributes] fix --- xds/internal/balancer/clusterimpl/balancer_test.go | 14 +++++++------- xds/internal/balancer/clusterimpl/clusterimpl.go | 6 +++--- xds/internal/balancer/edsbalancer/xds_lrs_test.go | 2 +- xds/internal/balancer/lrs/balancer_test.go | 2 +- xds/internal/xdsclient/attributes.go | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xds/internal/balancer/clusterimpl/balancer_test.go b/xds/internal/balancer/clusterimpl/balancer_test.go index eaaa73dabf1b..ab3613bec31d 100644 --- a/xds/internal/balancer/clusterimpl/balancer_test.go +++ b/xds/internal/balancer/clusterimpl/balancer_test.go @@ -87,7 +87,7 @@ func TestDropByCategory(t *testing.T) { dropDenominator = 2 ) if err := b.UpdateClientConnState(balancer.ClientConnState{ - ResolverState: client.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), + ResolverState: xdsclient.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), BalancerConfig: &LBConfig{ Cluster: testClusterName, EDSServiceName: testServiceName, @@ -172,7 +172,7 @@ func TestDropByCategory(t *testing.T) { dropDenominator2 = 4 ) if err := b.UpdateClientConnState(balancer.ClientConnState{ - ResolverState: client.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), + ResolverState: xdsclient.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), BalancerConfig: &LBConfig{ Cluster: testClusterName, EDSServiceName: testServiceName, @@ -235,7 +235,7 @@ func TestDropCircuitBreaking(t *testing.T) { var maxRequest uint32 = 50 if err := b.UpdateClientConnState(balancer.ClientConnState{ - ResolverState: client.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), + ResolverState: xdsclient.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), BalancerConfig: &LBConfig{ Cluster: testClusterName, EDSServiceName: testServiceName, @@ -342,7 +342,7 @@ func TestPickerUpdateAfterClose(t *testing.T) { var maxRequest uint32 = 50 if err := b.UpdateClientConnState(balancer.ClientConnState{ - ResolverState: client.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), + ResolverState: xdsclient.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), BalancerConfig: &LBConfig{ Cluster: testClusterName, EDSServiceName: testServiceName, @@ -383,7 +383,7 @@ func TestClusterNameInAddressAttributes(t *testing.T) { defer b.Close() if err := b.UpdateClientConnState(balancer.ClientConnState{ - ResolverState: client.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), + ResolverState: xdsclient.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), BalancerConfig: &LBConfig{ Cluster: testClusterName, EDSServiceName: testServiceName, @@ -432,7 +432,7 @@ func TestClusterNameInAddressAttributes(t *testing.T) { const testClusterName2 = "test-cluster-2" var addr2 = resolver.Address{Addr: "2.2.2.2"} if err := b.UpdateClientConnState(balancer.ClientConnState{ - ResolverState: client.SetClient(resolver.State{Addresses: []resolver.Address{addr2}}, xdsC), + ResolverState: xdsclient.SetClient(resolver.State{Addresses: []resolver.Address{addr2}}, xdsC), BalancerConfig: &LBConfig{ Cluster: testClusterName2, EDSServiceName: testServiceName, @@ -468,7 +468,7 @@ func TestReResolution(t *testing.T) { defer b.Close() if err := b.UpdateClientConnState(balancer.ClientConnState{ - ResolverState: client.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), + ResolverState: xdsclient.SetClient(resolver.State{Addresses: testBackendAddrs}, xdsC), BalancerConfig: &LBConfig{ Cluster: testClusterName, EDSServiceName: testServiceName, diff --git a/xds/internal/balancer/clusterimpl/clusterimpl.go b/xds/internal/balancer/clusterimpl/clusterimpl.go index b338eed8121c..29b35999ba97 100644 --- a/xds/internal/balancer/clusterimpl/clusterimpl.go +++ b/xds/internal/balancer/clusterimpl/clusterimpl.go @@ -93,9 +93,9 @@ type clusterImplBalancer struct { closed *grpcsync.Event done *grpcsync.Event - bOpts balancer.BuildOptions - logger *grpclog.PrefixLogger - xdsC xdsclient.Interface + bOpts balancer.BuildOptions + logger *grpclog.PrefixLogger + xdsClient xdsclient.Interface config *LBConfig childLB balancer.Balancer diff --git a/xds/internal/balancer/edsbalancer/xds_lrs_test.go b/xds/internal/balancer/edsbalancer/xds_lrs_test.go index 86e36fceaedf..3dcbf5e259c7 100644 --- a/xds/internal/balancer/edsbalancer/xds_lrs_test.go +++ b/xds/internal/balancer/edsbalancer/xds_lrs_test.go @@ -26,8 +26,8 @@ import ( "google.golang.org/grpc/balancer" "google.golang.org/grpc/resolver" - xdsclient "google.golang.org/grpc/xds/internal/client" "google.golang.org/grpc/xds/internal/testutils/fakeclient" + "google.golang.org/grpc/xds/internal/xdsclient" ) // TestXDSLoadReporting verifies that the edsBalancer starts the loadReport diff --git a/xds/internal/balancer/lrs/balancer_test.go b/xds/internal/balancer/lrs/balancer_test.go index 5308d96cc734..c0ec9cc41dd3 100644 --- a/xds/internal/balancer/lrs/balancer_test.go +++ b/xds/internal/balancer/lrs/balancer_test.go @@ -33,9 +33,9 @@ import ( internalserviceconfig "google.golang.org/grpc/internal/serviceconfig" "google.golang.org/grpc/resolver" xdsinternal "google.golang.org/grpc/xds/internal" - xdsclient "google.golang.org/grpc/xds/internal/client" "google.golang.org/grpc/xds/internal/testutils" "google.golang.org/grpc/xds/internal/testutils/fakeclient" + "google.golang.org/grpc/xds/internal/xdsclient" ) const defaultTestTimeout = 1 * time.Second diff --git a/xds/internal/xdsclient/attributes.go b/xds/internal/xdsclient/attributes.go index 1ccd95c73a80..5025aee6c761 100644 --- a/xds/internal/xdsclient/attributes.go +++ b/xds/internal/xdsclient/attributes.go @@ -19,8 +19,8 @@ package xdsclient import ( "google.golang.org/grpc/resolver" - "google.golang.org/grpc/xds/internal/client/bootstrap" - "google.golang.org/grpc/xds/internal/client/load" + "google.golang.org/grpc/xds/internal/xdsclient/bootstrap" + "google.golang.org/grpc/xds/internal/xdsclient/load" ) type clientKeyType string