xds/googlec2p: use xdstp names for LDS (grpc#6949)

apolcyn · Jan 31, 2024 · 3aafa84 · 3aafa84
1 parent 02858ee
commit 3aafa84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go
@@ -120,7 +120,8 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
 		ClientDefaultListenerResourceNameTemplate: "%s",
 		Authorities: map[string]*bootstrap.Authority{
 			c2pAuthority: {
-				XDSServer: serverConfig,
+				XDSServer:                          serverConfig,
+				ClientListenerResourceNameTemplate: "xdstp://traffic-director-c2p.xds.googleapis.com/envoy.config.listener.v3.Listener/%s",
 			},
 		},
 		NodeProto: newNode(<-zoneCh, <-ipv6CapableCh),

diff --git a/xds/googledirectpath/googlec2p_test.go b/xds/googledirectpath/googlec2p_test.go
@@ -223,7 +223,8 @@ func TestBuildXDS(t *testing.T) {
 				ClientDefaultListenerResourceNameTemplate: "%s",
 				Authorities: map[string]*bootstrap.Authority{
 					"traffic-director-c2p.xds.googleapis.com": {
-						XDSServer: wantServerConfig,
+						XDSServer:                          wantServerConfig,
+						ClientListenerResourceNameTemplate: "xdstp://traffic-director-c2p.xds.googleapis.com/envoy.config.listener.v3.Listener/%s",
 					},
 				},
 				NodeProto: wantNode,