From 8fb6591850df9816ec92f16c66f5946fd0c48b9f Mon Sep 17 00:00:00 2001
From: sanjaypujare <sanjaypujare@users.noreply.github.com>
Date: Mon, 22 Jun 2020 14:33:41 -0700
Subject: [PATCH] xds: disable processing of UpstreamTlsContext until we are
 ready to test the feature (#7148)

---
 xds/src/main/java/io/grpc/xds/CdsLoadBalancer.java     | 4 +++-
 xds/src/test/java/io/grpc/xds/CdsLoadBalancerTest.java | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/xds/src/main/java/io/grpc/xds/CdsLoadBalancer.java b/xds/src/main/java/io/grpc/xds/CdsLoadBalancer.java
index 79e7c43350..c4a45f45a0 100644
--- a/xds/src/main/java/io/grpc/xds/CdsLoadBalancer.java
+++ b/xds/src/main/java/io/grpc/xds/CdsLoadBalancer.java
@@ -290,7 +290,9 @@ public final class CdsLoadBalancer extends LoadBalancer {
               /* edsServiceName = */ newUpdate.getEdsServiceName(),
               /* lrsServerName = */ newUpdate.getLrsServerName(),
               new PolicySelection(lbProvider, ImmutableMap.<String, Object>of(), lbConfig));
-      updateSslContextProvider(newUpdate.getUpstreamTlsContext());
+      if (false) {
+        updateSslContextProvider(newUpdate.getUpstreamTlsContext());
+      }
       if (edsBalancer == null) {
         edsBalancer = lbRegistry.getProvider(EDS_POLICY_NAME).newLoadBalancer(helper);
       }
diff --git a/xds/src/test/java/io/grpc/xds/CdsLoadBalancerTest.java b/xds/src/test/java/io/grpc/xds/CdsLoadBalancerTest.java
index a391cf4e8b..32319b17cf 100644
--- a/xds/src/test/java/io/grpc/xds/CdsLoadBalancerTest.java
+++ b/xds/src/test/java/io/grpc/xds/CdsLoadBalancerTest.java
@@ -76,6 +76,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -338,6 +339,7 @@ public class CdsLoadBalancerTest {
     assertThat(xdsClientPool.xdsClient).isNull();
   }
 
+  @Ignore
   @Test
   public void handleCdsConfigUpdate_withUpstreamTlsContext()  {
     assertThat(xdsClient).isNull();