in-progress changes.

Author: kannanjgithub

xds/src/test/java/io/grpc/xds/CdsLoadBalancer2Test.java

@@ -247,12 +247,11 @@ public void discoverTopLevelEdsCluster() {
     assertThat(childBalancer.name).isEqualTo(CLUSTER_RESOLVER_POLICY_NAME);
     ClusterResolverConfig childLbConfig = (ClusterResolverConfig) childBalancer.config;
     assertThat(childLbConfig.discoveryMechanism).isEqualTo(
-        Arrays.asList(
-          DiscoveryMechanism.forEds(
-            CLUSTER, EDS_SERVICE_NAME, lrsServerInfo, 100L, upstreamTlsContext,
-            Collections.emptyMap(), io.grpc.xds.EnvoyServerProtoData.OutlierDetection.create(
-                null, null, null, null, SuccessRateEjection.create(null, null, null, null),
-                FailurePercentageEjection.create(null, null, null, null)))));
+        DiscoveryMechanism.forEds(
+          CLUSTER, EDS_SERVICE_NAME, lrsServerInfo, 100L, upstreamTlsContext,
+          Collections.emptyMap(), io.grpc.xds.EnvoyServerProtoData.OutlierDetection.create(
+              null, null, null, null, SuccessRateEjection.create(null, null, null, null),
+              FailurePercentageEjection.create(null, null, null, null))));
     assertThat(
         GracefulSwitchLoadBalancerAccessor.getChildProvider(childLbConfig.lbConfig).getPolicyName())
         .isEqualTo("wrr_locality_experimental");
@@ -297,10 +296,9 @@ public void discoverTopLevelLogicalDnsCluster() {
     assertThat(childBalancer.name).isEqualTo(CLUSTER_RESOLVER_POLICY_NAME);
     ClusterResolverConfig childLbConfig = (ClusterResolverConfig) childBalancer.config;
     assertThat(childLbConfig.discoveryMechanism).isEqualTo(
-        Arrays.asList(
-          DiscoveryMechanism.forLogicalDns(
-            CLUSTER, "dns.example.com:1111", lrsServerInfo, 100L, upstreamTlsContext,
-            Collections.emptyMap())));
+        DiscoveryMechanism.forLogicalDns(
+          CLUSTER, "dns.example.com:1111", lrsServerInfo, 100L, upstreamTlsContext,
+          Collections.emptyMap()));
     assertThat(
         GracefulSwitchLoadBalancerAccessor.getChildProvider(childLbConfig.lbConfig).getPolicyName())
         .isEqualTo("wrr_locality_experimental");
@@ -333,9 +331,8 @@ public void nonAggregateCluster_resourceUpdate() {
     FakeLoadBalancer childBalancer = Iterables.getOnlyElement(childBalancers);
     ClusterResolverConfig childLbConfig = (ClusterResolverConfig) childBalancer.config;
     assertThat(childLbConfig.discoveryMechanism).isEqualTo(
-        Arrays.asList(
           DiscoveryMechanism.forEds(
-            CLUSTER, EDS_SERVICE_NAME, null, 100L, null, Collections.emptyMap(), null)));
+            CLUSTER, EDS_SERVICE_NAME, null, 100L, null, Collections.emptyMap(), null));
 
     cluster = EDS_CLUSTER.toBuilder()
         .setCircuitBreakers(CircuitBreakers.newBuilder()
@@ -349,9 +346,8 @@ public void nonAggregateCluster_resourceUpdate() {
     childBalancer = Iterables.getOnlyElement(childBalancers);
     childLbConfig = (ClusterResolverConfig) childBalancer.config;
     assertThat(childLbConfig.discoveryMechanism).isEqualTo(
-        Arrays.asList(
           DiscoveryMechanism.forEds(
-            CLUSTER, EDS_SERVICE_NAME, null, 200L, null, Collections.emptyMap(), null)));
+            CLUSTER, EDS_SERVICE_NAME, null, 200L, null, Collections.emptyMap(), null));
   }
 
   @Test
@@ -364,9 +360,8 @@ public void nonAggregateCluster_resourceRevoked() {
     FakeLoadBalancer childBalancer = Iterables.getOnlyElement(childBalancers);
     ClusterResolverConfig childLbConfig = (ClusterResolverConfig) childBalancer.config;
     assertThat(childLbConfig.discoveryMechanism).isEqualTo(
-        Arrays.asList(
           DiscoveryMechanism.forEds(
-            CLUSTER, EDS_SERVICE_NAME, null, null, null, Collections.emptyMap(), null)));
+            CLUSTER, EDS_SERVICE_NAME, null, null, null, Collections.emptyMap(), null));
 
     controlPlaneService.setXdsConfig(ADS_TYPE_URL_CDS, ImmutableMap.of());
 
@@ -396,9 +391,8 @@ public void dynamicCluster() {
     FakeLoadBalancer childBalancer = Iterables.getOnlyElement(childBalancers);
     ClusterResolverConfig childLbConfig = (ClusterResolverConfig) childBalancer.config;
     assertThat(childLbConfig.discoveryMechanism).isEqualTo(
-        Arrays.asList(
           DiscoveryMechanism.forEds(
-            clusterName, EDS_SERVICE_NAME, null, null, null, Collections.emptyMap(), null)));
+            clusterName, EDS_SERVICE_NAME, null, null, null, Collections.emptyMap(), null));
 
     assertThat(this.lastXdsConfig.getClusters()).containsKey(clusterName);
     shutdownLoadBalancer();

xds/src/test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java

@@ -679,7 +679,7 @@ public void onlyEdsClusters_resourceNeverExist_returnErrorPicker() {
   }
 
   @Test
-  public void edsCluster_allResourcesRevoked_shutDownChildLbPolicy() {
+  public void edsCluster_resourcesRevoked_shutDownChildLbPolicy() {
     ClusterResolverConfig config = new ClusterResolverConfig(
             edsDiscoveryMechanism1, roundRobin, false);
     deliverLbConfig(config);
@@ -699,11 +699,11 @@ public void edsCluster_allResourcesRevoked_shutDownChildLbPolicy() {
     assertThat(((PriorityLbConfig) childBalancer.config).priorities).hasSize(1);
     assertAddressesEqual(Arrays.asList(endpoint1), childBalancer.addresses);
 
-    xdsClient.deliverResourceNotFound(EDS_SERVICE_NAME2);
+    xdsClient.deliverResourceNotFound(EDS_SERVICE_NAME1);
     verify(helper).updateBalancingState(
             eq(ConnectivityState.TRANSIENT_FAILURE), pickerCaptor.capture());
     Status expectedError = Status.UNAVAILABLE.withDescription(
-            "No usable endpoint from cluster(s): " + Arrays.asList(CLUSTER1, CLUSTER2));
+            "No usable endpoint from cluster(s): " + Arrays.asList(CLUSTER1));
     assertPicker(pickerCaptor.getValue(), expectedError, null);
   }
 
@@ -986,8 +986,8 @@ public void resolutionErrorAfterChildLbCreated_propagateError() {
 
     xdsClient.deliverError(Status.RESOURCE_EXHAUSTED.withDescription("out of memory"));
     assertThat(childBalancer.upstreamError).isNotNull();  // last cluster's (DNS) error propagated
-    assertThat(childBalancer.upstreamError.getCode()).isEqualTo(Code.UNKNOWN);
-    assertThat(childBalancer.upstreamError.getDescription()).isEqualTo("I am lost");
+    assertThat(childBalancer.upstreamError.getCode()).isEqualTo(Code.UNAVAILABLE);
+    assertThat(childBalancer.upstreamError.getDescription()).isEqualTo("Unable to load EDS backend-service-foo.googleapis.com. xDS server returned: RESOURCE_EXHAUSTED: out of memory");
     assertThat(childBalancer.shutdown).isFalse();
     verify(helper, never()).updateBalancingState(
             eq(ConnectivityState.TRANSIENT_FAILURE), any(SubchannelPicker.class));