Fixed claenup method for Hyperdisk

Author: TetyanaYahodska

compute/cloud-client/src/test/java/compute/Util.java

@@ -223,7 +223,8 @@ public static void cleanUpExistingSnapshots(String prefixToDelete, String projec
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     try (SnapshotsClient snapshotsClient = SnapshotsClient.create()) {
       for (Snapshot snapshot : snapshotsClient.list(projectId).iterateAll()) {
-        if (isCreatedBeforeThresholdTime(snapshot.getCreationTimestamp())) {
+        if (containPrefixToDelete(snapshot, prefixToDelete)
+            && isCreatedBeforeThresholdTime(snapshot.getCreationTimestamp())) {
           DeleteSnapshot.deleteSnapshot(projectId, snapshot.getName());
         }
       }
@@ -237,7 +238,8 @@ public static void cleanUpExistingStoragePool(
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     try (StoragePoolsClient storagePoolsClient = StoragePoolsClient.create()) {
       for (StoragePool storagePool : storagePoolsClient.list(projectId, zone).iterateAll()) {
-        if (isCreatedBeforeThresholdTime(storagePool.getCreationTimestamp())) {
+        if (containPrefixToDelete(storagePool, prefixToDelete)
+            && isCreatedBeforeThresholdTime(storagePool.getCreationTimestamp())) {
           deleteStoragePool(projectId, zone, storagePool.getName());
         }
       }

compute/cloud-client/src/test/java/compute/disks/HyperdisksIT.java

@@ -64,7 +64,10 @@ public static void setUp()
     STORAGE_POOL_NAME = "test-storage-pool-enc-" + UUID.randomUUID();
 
     Util.cleanUpExistingDisks("test-hyperdisk-enc-", PROJECT_ID, ZONE);
-    Util.cleanUpExistingStoragePool("test-storage-pool-enc-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingStoragePool("test-storage-pool-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingStoragePool("test-storage-pool-", PROJECT_ID, "us-central1-a");
+    Util.cleanUpExistingStoragePool("test-storage-pool-", PROJECT_ID, "asia-south1-a");
+
   }
 
   @AfterAll