|
55 | 55 | import io.grpc.Status.Code; |
56 | 56 | import io.grpc.SynchronizationContext; |
57 | 57 | import io.grpc.internal.FakeClock; |
58 | | -import io.grpc.internal.InternalAttributes; |
| 58 | +import io.grpc.internal.XdsCommonAttributes; |
59 | 59 | import io.grpc.internal.ObjectPool; |
60 | 60 | import io.grpc.internal.PickFirstLoadBalancerProvider; |
61 | 61 | import io.grpc.internal.PickSubchannelArgsImpl; |
@@ -812,10 +812,10 @@ public void endpointAddressesAttachedWithClusterName() { |
812 | 812 | new FixedResultPicker(PickResult.withSubchannel(subchannel))); |
813 | 813 | } |
814 | 814 | }); |
815 | | - assertThat(subchannel.getAttributes().get(InternalAttributes.ATTR_ADDRESS_NAME)).isEqualTo( |
| 815 | + assertThat(subchannel.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME)).isEqualTo( |
816 | 816 | "authority-host-name"); |
817 | 817 | for (EquivalentAddressGroup eag : subchannel.getAllAddresses()) { |
818 | | - assertThat(eag.getAttributes().get(InternalAttributes.ATTR_ADDRESS_NAME)) |
| 818 | + assertThat(eag.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME)) |
819 | 819 | .isEqualTo("authority-host-name"); |
820 | 820 | } |
821 | 821 |
|
@@ -864,9 +864,9 @@ public void endpointAddressesAttachedWithClusterName() { |
864 | 864 | } |
865 | 865 | }); |
866 | 866 | // Sub Channel wrapper args won't have the address name although addresses will. |
867 | | - assertThat(subchannel.getAttributes().get(InternalAttributes.ATTR_ADDRESS_NAME)).isNull(); |
| 867 | + assertThat(subchannel.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME)).isNull(); |
868 | 868 | for (EquivalentAddressGroup eag : subchannel.getAllAddresses()) { |
869 | | - assertThat(eag.getAttributes().get(InternalAttributes.ATTR_ADDRESS_NAME)) |
| 869 | + assertThat(eag.getAttributes().get(XdsCommonAttributes.ATTR_ADDRESS_NAME)) |
870 | 870 | .isEqualTo("authority-host-name"); |
871 | 871 | } |
872 | 872 |
|
@@ -1021,7 +1021,7 @@ public String toString() { |
1021 | 1021 | // Unique but arbitrary string |
1022 | 1022 | .set(EquivalentAddressGroup.ATTR_LOCALITY_NAME, locality.toString()); |
1023 | 1023 | if (authorityHostname != null) { |
1024 | | - attributes.set(InternalAttributes.ATTR_ADDRESS_NAME, authorityHostname); |
| 1024 | + attributes.set(XdsCommonAttributes.ATTR_ADDRESS_NAME, authorityHostname); |
1025 | 1025 | } |
1026 | 1026 | EquivalentAddressGroup eag = new EquivalentAddressGroup(new FakeSocketAddress(name), |
1027 | 1027 | attributes.build()); |
|
0 commit comments