add test case without code change

lujiajing1126 · lujiajing1126 · commit ef37158f078e · 2024-06-04T19:13:38.000+08:00
Signed-off-by: Megrez Lu &lt;lujiajing1126@gmail.com&gt;
diff --git a/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplTestBase.java b/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplTestBase.java
@@ -2614,6 +2614,58 @@ public void cdsResourceDeleted() {
     verifySubscribedResourcesMetadataSizes(0, 1, 0, 0);
   }
 
+  @Test
+  public void cdsResourcesDelete_edsUnsubscribed() {
+    Assume.assumeFalse(ignoreResourceDeletion());
+
+    List<String> subscribedResourceNames = ImmutableList.of("A");
+    xdsClient.watchXdsResource(XdsClusterResource.getInstance(), "A", cdsResourceWatcher);
+    xdsClient.watchXdsResource(XdsEndpointResource.getInstance(), "A.1", edsResourceWatcher);
+    DiscoveryRpcCall call = resourceDiscoveryCalls.poll();
+    assertThat(call).isNotNull();
+    verifyResourceMetadataRequested(CDS, "A");
+    verifyResourceMetadataRequested(EDS, "A.1");
+    verifySubscribedResourcesMetadataSizes(0, 1, 0, 1);
+
+    // CDS -> {A}, version 1
+    ImmutableMap<String, Any> resourcesV1 = ImmutableMap.of(
+            "A", Any.pack(mf.buildEdsCluster("A", "A.1", "round_robin", null, null, false, null,
+                    "envoy.transport_sockets.tls", null, null
+            )));
+    call.sendResponse(CDS, resourcesV1.values().asList(), VERSION_1, "0000");
+    // {A, B} -> ACK, version 1
+    verifyResourceMetadataAcked(CDS, "A", resourcesV1.get("A"), VERSION_1, TIME_INCREMENT);
+    call.verifyRequest(CDS, subscribedResourceNames, VERSION_1, "0000", NODE);
+
+    // EDS -> {A.1}, version 1
+    List<Message> dropOverloads = ImmutableList.of();
+    List<Message> endpointsV1 = ImmutableList.of(lbEndpointHealthy);
+    ImmutableMap<String, Any> resourcesV11 = ImmutableMap.of(
+            "A.1", Any.pack(mf.buildClusterLoadAssignment("A.1", endpointsV1, dropOverloads)));
+    call.sendResponse(EDS, resourcesV11.values().asList(), VERSION_1, "0000");
+    // {A.1} -> ACK, version 1
+    verifyResourceMetadataAcked(EDS, "A.1", resourcesV11.get("A.1"), VERSION_1, TIME_INCREMENT * 2);
+    verify(cdsResourceWatcher, times(1)).onChanged(any());
+
+    // Empty CDS response deletes the cluster.
+    call.sendResponse(CDS, Collections.<Any>emptyList(), VERSION_2, "0001");
+    call.verifyRequest(CDS, "A", VERSION_2, "0001", NODE);
+    verify(cdsResourceWatcher).onResourceDoesNotExist("A");
+    verifyResourceMetadataDoesNotExist(CDS, "A");
+    verifySubscribedResourcesMetadataSizes(0, 1, 0, 1);
+    // Empty CDS leads to EDS resource "A.1" unsubscribed.
+    xdsClient.cancelXdsResourceWatch(XdsEndpointResource.getInstance(), "A.1", edsResourceWatcher);
+    verifySubscribedResourcesMetadataSizes(0, 1, 0, 0);
+
+    // Send any EDS will not trigger any ACK/NACK response
+    Any updatedClusterLoadAssignment = Any.pack(mf.buildClusterLoadAssignment("A.1",
+            ImmutableList.of(mf.buildLocalityLbEndpoints("region2", "zone2", "subzone2",
+                    mf.buildLbEndpoint("172.44.2.2", 8000, "unknown", 3), 2, 0)),
+            ImmutableList.<Message>of()));
+    call.sendResponse(EDS, updatedClusterLoadAssignment, VERSION_2, "0001");
+    call.verifyNoMoreRequest();
+  }
+
   /**
    * When ignore_resource_deletion server feature is on, xDS client should keep the deleted cluster
    * on empty response, and resume the normal work when CDS contains the cluster again.
