Fixed test

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;
@@ -266,6 +270,21 @@ public static void deleteStoragePool(String project, String zone, String storage
     }
   }
 
+  // Delete storagePools 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 (containPrefixToDeleteAndZone(resourcePolicy, prefixToDelete, region)
+                && isCreatedBeforeThresholdTime(resourcePolicy.getCreationTimestamp())) {
+          deleteDiskConsistencyGroup(projectId, region, resourcePolicy.getName());
+        }
+      }
+    }
+  }
+
   public static boolean containPrefixToDeleteAndZone(
       Object resource, String prefixToDelete, String zone) {
     boolean containPrefixAndZone = false;
@@ -291,6 +310,11 @@ public static boolean containPrefixToDeleteAndZone(
         containPrefixAndZone = ((StoragePool) resource).getName().contains(prefixToDelete)
             && ((StoragePool) resource).getZone().contains(zone);
       }
+      if (resource instanceof ResourcePolicy) {
+        containPrefixAndZone = ((ResourcePolicy) resource).getName().contains(prefixToDelete)
+                && ((ResourcePolicy) resource).getRegion()
+                .contains(zone.substring(0, zone.lastIndexOf('-')));
+      }
     } catch (NullPointerException e) {
       System.out.println("Resource not found, skipping deletion:");
     }

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

@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertEquals;
 
 import com.google.cloud.compute.v1.Operation;
+import compute.Util;
 import compute.disks.consistencygroup.CreateDiskConsistencyGroup;
 import compute.disks.consistencygroup.DeleteDiskConsistencyGroup;
 import java.io.IOException;
@@ -51,6 +52,7 @@ public static void requireEnvVar(String envVarName) {
   public static void setUp() throws Exception {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
+    Util.cleanUpExistingConsistencyGroup("test-consistency-group-", PROJECT_ID, REGION);
   }
 
   @AfterAll

compute/cloud-client/src/test/java/compute/reservation/CrudOperationsReservationIT.java

@@ -59,6 +59,9 @@ public static void setUp()
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
 
     Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, "us-central1-a");
+    Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, "asia-south1-a");
+
     CreateReservation.createReservation(PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);
   }