added clea up method for Consistency Group

Author: TetyanaYahodska

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

@@ -16,6 +16,8 @@
 
 package compute;
 
+import static compute.disks.consistencygroup.DeleteDiskConsistencyGroup.deleteDiskConsistencyGroup;
+
 import com.google.cloud.compute.v1.DeleteStoragePoolRequest;
 import com.google.cloud.compute.v1.Disk;
 import com.google.cloud.compute.v1.DisksClient;
@@ -30,6 +32,8 @@
 import com.google.cloud.compute.v1.RegionInstanceTemplatesClient;
 import com.google.cloud.compute.v1.Reservation;
 import com.google.cloud.compute.v1.ReservationsClient;
+import com.google.cloud.compute.v1.ResourcePoliciesClient;
+import com.google.cloud.compute.v1.ResourcePolicy;
 import com.google.cloud.compute.v1.Snapshot;
 import com.google.cloud.compute.v1.SnapshotsClient;
 import com.google.cloud.compute.v1.StoragePool;
@@ -52,6 +56,7 @@
 import java.util.concurrent.TimeoutException;
 import java.util.stream.IntStream;
 
+
 public abstract class Util {
   // Cleans existing test resources if any.
   // If the project contains too many instances, use "filter" when listing
@@ -283,6 +288,22 @@ && isCreatedBeforeThresholdTime(disk.getCreationTimestamp())) {
     }
   }
 
+  // Delete ConsistencyGroup which starts with the given prefixToDelete and
+  // has creation timestamp >24 hours.
+  public static void cleanUpExistingConsistencyGroup(
+          String prefixToDelete, String projectId, String region)
+          throws IOException, ExecutionException, InterruptedException {
+    try (ResourcePoliciesClient client = ResourcePoliciesClient.create()) {
+      for (ResourcePolicy resourcePolicy : client.list(projectId, region).iterateAll()) {
+        if (resourcePolicy.getName().contains(prefixToDelete)
+                && resourcePolicy.getRegion().equals(region)
+                && isCreatedBeforeThresholdTime(resourcePolicy.getCreationTimestamp())) {
+          deleteDiskConsistencyGroup(projectId, region, resourcePolicy.getName());
+        }
+      }
+    }
+  }
+
   public static boolean containPrefixToDeleteAndZone(
       Object resource, String prefixToDelete, String zone) {
     boolean containPrefixAndZone = false;

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

@@ -94,6 +94,7 @@ public static void cleanUp()
     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);
   }
 
   @Test