mirror of https://github.com/grpc/grpc-java.git
Revert indendation changes done by IDE in unchanged lines.
This commit is contained in:
parent
7abbc4a977
commit
7c16de891e
|
@ -419,47 +419,47 @@ public class CdsLoadBalancer2Test {
|
||||||
controlPlaneService.setXdsConfig(ADS_TYPE_URL_CDS, ImmutableMap.of(
|
controlPlaneService.setXdsConfig(ADS_TYPE_URL_CDS, ImmutableMap.of(
|
||||||
// CLUSTER (aggr.) -> [cluster1 (aggr.), cluster2 (logical DNS), cluster3 (EDS)]
|
// CLUSTER (aggr.) -> [cluster1 (aggr.), cluster2 (logical DNS), cluster3 (EDS)]
|
||||||
CLUSTER, Cluster.newBuilder()
|
CLUSTER, Cluster.newBuilder()
|
||||||
.setName(CLUSTER)
|
.setName(CLUSTER)
|
||||||
.setClusterType(Cluster.CustomClusterType.newBuilder()
|
.setClusterType(Cluster.CustomClusterType.newBuilder()
|
||||||
.setName("envoy.clusters.aggregate")
|
.setName("envoy.clusters.aggregate")
|
||||||
.setTypedConfig(Any.pack(ClusterConfig.newBuilder()
|
.setTypedConfig(Any.pack(ClusterConfig.newBuilder()
|
||||||
.addClusters(cluster1)
|
.addClusters(cluster1)
|
||||||
.addClusters(cluster2)
|
.addClusters(cluster2)
|
||||||
.addClusters(cluster3)
|
.addClusters(cluster3)
|
||||||
.build())))
|
.build())))
|
||||||
.setLbPolicy(Cluster.LbPolicy.RING_HASH)
|
.setLbPolicy(Cluster.LbPolicy.RING_HASH)
|
||||||
.build(),
|
.build(),
|
||||||
// cluster1 (aggr.) -> [cluster3 (EDS), cluster4 (EDS)]
|
// cluster1 (aggr.) -> [cluster3 (EDS), cluster4 (EDS)]
|
||||||
cluster1, Cluster.newBuilder()
|
cluster1, Cluster.newBuilder()
|
||||||
.setName(cluster1)
|
.setName(cluster1)
|
||||||
.setClusterType(Cluster.CustomClusterType.newBuilder()
|
.setClusterType(Cluster.CustomClusterType.newBuilder()
|
||||||
.setName("envoy.clusters.aggregate")
|
.setName("envoy.clusters.aggregate")
|
||||||
.setTypedConfig(Any.pack(ClusterConfig.newBuilder()
|
.setTypedConfig(Any.pack(ClusterConfig.newBuilder()
|
||||||
.addClusters(cluster3)
|
.addClusters(cluster3)
|
||||||
.addClusters(cluster4)
|
.addClusters(cluster4)
|
||||||
.build())))
|
.build())))
|
||||||
.build(),
|
.build(),
|
||||||
cluster2, Cluster.newBuilder()
|
cluster2, Cluster.newBuilder()
|
||||||
.setName(cluster2)
|
.setName(cluster2)
|
||||||
.setType(Cluster.DiscoveryType.LOGICAL_DNS)
|
.setType(Cluster.DiscoveryType.LOGICAL_DNS)
|
||||||
.setLoadAssignment(ClusterLoadAssignment.newBuilder()
|
.setLoadAssignment(ClusterLoadAssignment.newBuilder()
|
||||||
.addEndpoints(LocalityLbEndpoints.newBuilder()
|
.addEndpoints(LocalityLbEndpoints.newBuilder()
|
||||||
.addLbEndpoints(LbEndpoint.newBuilder()
|
.addLbEndpoints(LbEndpoint.newBuilder()
|
||||||
.setEndpoint(Endpoint.newBuilder()
|
.setEndpoint(Endpoint.newBuilder()
|
||||||
.setAddress(Address.newBuilder()
|
.setAddress(Address.newBuilder()
|
||||||
.setSocketAddress(SocketAddress.newBuilder()
|
.setSocketAddress(SocketAddress.newBuilder()
|
||||||
.setAddress("dns.example.com")
|
.setAddress("dns.example.com")
|
||||||
.setPortValue(1111)))))))
|
.setPortValue(1111)))))))
|
||||||
.build(),
|
.build(),
|
||||||
cluster3, EDS_CLUSTER.toBuilder()
|
cluster3, EDS_CLUSTER.toBuilder()
|
||||||
.setName(cluster3)
|
.setName(cluster3)
|
||||||
.setCircuitBreakers(CircuitBreakers.newBuilder()
|
.setCircuitBreakers(CircuitBreakers.newBuilder()
|
||||||
.addThresholds(CircuitBreakers.Thresholds.newBuilder()
|
.addThresholds(CircuitBreakers.Thresholds.newBuilder()
|
||||||
.setPriority(RoutingPriority.DEFAULT)
|
.setPriority(RoutingPriority.DEFAULT)
|
||||||
.setMaxRequests(UInt32Value.newBuilder().setValue(100))))
|
.setMaxRequests(UInt32Value.newBuilder().setValue(100))))
|
||||||
.build(),
|
.build(),
|
||||||
cluster4, EDS_CLUSTER.toBuilder().setName(cluster4).build()));
|
cluster4, EDS_CLUSTER.toBuilder().setName(cluster4).build()));
|
||||||
startXdsDepManager();
|
startXdsDepManager();
|
||||||
|
|
||||||
verify(helper, never()).updateBalancingState(eq(ConnectivityState.TRANSIENT_FAILURE), any());
|
verify(helper, never()).updateBalancingState(eq(ConnectivityState.TRANSIENT_FAILURE), any());
|
||||||
assertThat(childBalancers).hasSize(1);
|
assertThat(childBalancers).hasSize(1);
|
||||||
|
|
Loading…
Reference in New Issue