From 05b4a8b8f779518bb0119042c8c5806fa33d2184 Mon Sep 17 00:00:00 2001
From: apolcyn <apolcyn@google.com>
Date: Mon, 5 Feb 2024 14:35:18 -0800
Subject: [PATCH] Revert "xds/googlec2p: use xdstp names for LDS (#6949)"
 (#6964)

---
 xds/googledirectpath/googlec2p.go      | 3 +--
 xds/googledirectpath/googlec2p_test.go | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go
index 19e59536fb64..58c0eba9547d 100644
--- a/xds/googledirectpath/googlec2p.go
+++ b/xds/googledirectpath/googlec2p.go
@@ -120,8 +120,7 @@ func (c2pResolverBuilder) Build(t resolver.Target, cc resolver.ClientConn, opts
 		ClientDefaultListenerResourceNameTemplate: "%s",
 		Authorities: map[string]*bootstrap.Authority{
 			c2pAuthority: {
-				XDSServer:                          serverConfig,
-				ClientListenerResourceNameTemplate: "xdstp://traffic-director-c2p.xds.googleapis.com/envoy.config.listener.v3.Listener/%s",
+				XDSServer: serverConfig,
 			},
 		},
 		NodeProto: newNode(<-zoneCh, <-ipv6CapableCh),
diff --git a/xds/googledirectpath/googlec2p_test.go b/xds/googledirectpath/googlec2p_test.go
index 915a67438441..3d8cca065942 100644
--- a/xds/googledirectpath/googlec2p_test.go
+++ b/xds/googledirectpath/googlec2p_test.go
@@ -223,8 +223,7 @@ func TestBuildXDS(t *testing.T) {
 				ClientDefaultListenerResourceNameTemplate: "%s",
 				Authorities: map[string]*bootstrap.Authority{
 					"traffic-director-c2p.xds.googleapis.com": {
-						XDSServer:                          wantServerConfig,
-						ClientListenerResourceNameTemplate: "xdstp://traffic-director-c2p.xds.googleapis.com/envoy.config.listener.v3.Listener/%s",
+						XDSServer: wantServerConfig,
 					},
 				},
 				NodeProto: wantNode,