grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: add server name in EDS request resource_names field

This commit is contained in:
ZHANG Dapeng 2019-09-25 12:48:03 -07:00 committed by GitHub
parent e281c75b2a
commit 694de41107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xds/src/main/java/io/grpc/xds/XdsComms.java
View File

@ -344,14 +344,12 @@ final class XdsComms {
DiscoveryRequest.newBuilder() DiscoveryRequest.newBuilder()
.setNode(Node.newBuilder() .setNode(Node.newBuilder()
.setMetadata(Struct.newBuilder() .setMetadata(Struct.newBuilder()
.putFields(
TRAFFICDIRECTOR_GRPC_HOSTNAME,
Value.newBuilder().setStringValue(helper.getAuthority())
.build())
.putFields( .putFields(
"endpoints_required", "endpoints_required",
Value.newBuilder().setBoolValue(true).build()))) Value.newBuilder().setBoolValue(true).build())))
.setTypeUrl(EDS_TYPE_URL).build(); .setTypeUrl(EDS_TYPE_URL)
// In the future, the right resource name can be obtained from CDS response.
.addResourceNames(helper.getAuthority()).build();
helper.getChannelLogger().log(ChannelLogLevel.DEBUG, "Sending EDS request {0}", edsRequest); helper.getChannelLogger().log(ChannelLogLevel.DEBUG, "Sending EDS request {0}", edsRequest);
xdsRequestWriter.onNext(edsRequest); xdsRequestWriter.onNext(edsRequest);
} }

1
xds/src/test/java/io/grpc/xds/XdsCommsTest.java
View File

@ -223,6 +223,7 @@ public class XdsCommsTest {
assertThat( assertThat(
request.getNode().getMetadata().getFieldsOrThrow("endpoints_required").getBoolValue()) request.getNode().getMetadata().getFieldsOrThrow("endpoints_required").getBoolValue())
.isTrue(); .isTrue();
assertThat(request.getResourceNamesList()).hasSize(1);
Locality localityProto1 = Locality.newBuilder() Locality localityProto1 = Locality.newBuilder()
.setRegion("region1").setZone("zone1").setSubZone("subzone1").build(); .setRegion("region1").setZone("zone1").setSubZone("subzone1").build();