Fixed test

Author: TetyanaYahodska

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

@@ -16,6 +16,7 @@
 
 package compute;
 
+import static compute.disks.RegionalDelete.deleteRegionalDisk;
 import static compute.disks.consistencygroup.DeleteDiskConsistencyGroup.deleteDiskConsistencyGroup;
 
 import com.google.cloud.compute.v1.DeleteStoragePoolRequest;
@@ -286,6 +287,22 @@ && isCreatedBeforeThresholdTime(resourcePolicy.getCreationTimestamp())) {
     }
   }
 
+  // Delete disks which starts with the given prefixToDelete and
+  // has creation timestamp >24 hours.
+  public static void cleanUpExistingRegionalDisks(
+          String prefixToDelete, String projectId, String region)
+          throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    try (RegionDisksClient disksClient = RegionDisksClient.create()) {
+      for (Disk disk : disksClient.list(projectId, region).iterateAll()) {
+        if (disk.getName().contains(prefixToDelete)
+                && disk.getRegion().equals(region)
+                && isCreatedBeforeThresholdTime(disk.getCreationTimestamp())) {
+          deleteRegionalDisk(projectId, region, disk.getName());
+        }
+      }
+    }
+  }
+
   public static boolean containPrefixToDeleteAndZone(
       Object resource, String prefixToDelete, String zone) {
     boolean containPrefixAndZone = false;

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

@@ -39,6 +39,7 @@
 public class ConsistencyGroupIT {
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String REGION = "us-central1";
+  private static final String REGION_SECONDARY = "northamerica-northeast1";
   private static final String CONSISTENCY_GROUP_NAME =
       "test-consistency-group-" + UUID.randomUUID();
 
@@ -53,6 +54,10 @@ public static void setUp() throws Exception {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
 
+    // Clean up existing stale resources.
+    Util.cleanUpExistingRegionalDisks("test-disk-for-consistency-", PROJECT_ID, REGION);
+    Util.cleanUpExistingRegionalDisks(
+            "gcloud-test-disk-secondary-regional-", PROJECT_ID, REGION_SECONDARY);
     Util.cleanUpExistingConsistencyGroup("test-consistency-group-", PROJECT_ID, REGION);
   }