|
82 | 82 | import io.grpc.inprocess.InProcessServerBuilder; |
83 | 83 | import io.grpc.internal.FakeClock; |
84 | 84 | import io.grpc.internal.GrpcUtil; |
85 | | -import io.grpc.xds.internal.XdsInternalAttributes; |
86 | 85 | import io.grpc.testing.GrpcCleanupRule; |
87 | 86 | import io.grpc.util.GracefulSwitchLoadBalancer; |
88 | 87 | import io.grpc.util.GracefulSwitchLoadBalancerAccessor; |
|
103 | 102 | import io.grpc.xds.WrrLocalityLoadBalancer.WrrLocalityConfig; |
104 | 103 | import io.grpc.xds.client.Bootstrapper.ServerInfo; |
105 | 104 | import io.grpc.xds.client.XdsClient; |
| 105 | +import io.grpc.xds.internal.XdsInternalAttributes; |
106 | 106 | import io.grpc.xds.internal.security.CommonTlsContextTestsUtil; |
107 | 107 | import java.net.InetSocketAddress; |
108 | 108 | import java.net.URI; |
@@ -581,7 +581,8 @@ public void onlyEdsClusters_receivedEndpoints() { |
581 | 581 | io.grpc.xds.client.Locality locality2 = io.grpc.xds.client.Locality.create( |
582 | 582 | LOCALITY2.getRegion(), LOCALITY2.getZone(), LOCALITY2.getSubZone()); |
583 | 583 | for (EquivalentAddressGroup eag : childBalancer.addresses) { |
584 | | - io.grpc.xds.client.Locality locality = eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY); |
| 584 | + io.grpc.xds.client.Locality locality = |
| 585 | + eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY); |
585 | 586 | if (locality.equals(locality1)) { |
586 | 587 | assertThat(eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY_WEIGHT)) |
587 | 588 | .isEqualTo(70); |
@@ -814,7 +815,8 @@ public void handleEdsResource_ignoreLocalitiesWithNoHealthyEndpoints() { |
814 | 815 | io.grpc.xds.client.Locality locality2 = io.grpc.xds.client.Locality.create( |
815 | 816 | LOCALITY2.getRegion(), LOCALITY2.getZone(), LOCALITY2.getSubZone()); |
816 | 817 | for (EquivalentAddressGroup eag : childBalancer.addresses) { |
817 | | - assertThat(eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY)).isEqualTo(locality2); |
| 818 | + assertThat(eag.getAttributes().get(io.grpc.xds.XdsAttributes.ATTR_LOCALITY)) |
| 819 | + .isEqualTo(locality2); |
818 | 820 | } |
819 | 821 | } |
820 | 822 |
|
|
0 commit comments