Added clean up methods for reservations

Author: TetyanaYahodska

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

@@ -29,6 +29,7 @@
 import com.google.cloud.compute.v1.Reservation;
 import com.google.cloud.compute.v1.ReservationsClient;
 import compute.DeleteInstance;
+import compute.Util;
 import java.io.IOException;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -90,6 +91,10 @@ public static void cleanup()
     Assertions.assertThrows(
         NotFoundException.class,
         () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME, ZONE));
+
+    // Clean up stale resources
+    Util.cleanUpExistingInstances("test-instance-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
   }
 
   @Test

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

@@ -71,10 +71,6 @@ public static void setUp()
     instanceForReservation = "test-instance-for-reserv-" + javaVersion + "-"
         + UUID.randomUUID().toString().substring(0, 8);
 
-    // Cleanup existing stale resources.
-    Util.cleanUpExistingInstances("test-instance-for-reserv-"  + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations("test-reservation-from-vm-"  + javaVersion, PROJECT_ID, ZONE);
-
     CreateInstance.createInstance(PROJECT_ID, ZONE, instanceForReservation);
   }
 
@@ -84,6 +80,10 @@ public static void cleanup()
     // Delete resources created for testing.
     DeleteInstance.deleteInstance(PROJECT_ID, ZONE, instanceForReservation);
 
+    // Clean up stale resources
+    Util.cleanUpExistingReservations("test-reservation-from-vm-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingInstances("test-instance-for-reserv-", PROJECT_ID, ZONE);
+
     reservationsClient.close();
     instancesClient.close();
   }

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

@@ -22,6 +22,7 @@
 
 import com.google.api.gax.rpc.NotFoundException;
 import com.google.cloud.compute.v1.Reservation;
+import compute.Util;
 import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
@@ -69,6 +70,9 @@ public static void cleanup()
     Assertions.assertThrows(
         NotFoundException.class,
         () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME, ZONE));
+
+    // Clean up stale resources
+    Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
   }
 
   @Test

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

@@ -36,6 +36,7 @@
 import compute.CreateRegionalInstanceTemplate;
 import compute.DeleteInstanceTemplate;
 import compute.DeleteRegionalInstanceTemplate;
+import compute.Util;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -145,6 +146,13 @@ public static void cleanup()
         NotFoundException.class,
         () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME_REGIONAL, ZONE));
 
+    // Clean up stale resources
+    Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-", PROJECT_ID);
+    Util.cleanUpExistingInstanceTemplates("test-shared-inst-temp-", PROJECT_ID);
+    Util.cleanUpExistingRegionalInstanceTemplates(
+        "test-regional-inst-temp-", PROJECT_ID, ZONE);
+
     stdOut.close();
     System.setOut(out);
   }

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

@@ -23,6 +23,7 @@
 import com.google.cloud.compute.v1.InstanceTemplate;
 import compute.DeleteInstance;
 import compute.DeleteInstanceTemplate;
+import compute.Util;
 import java.io.IOException;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -71,6 +72,11 @@ public static void cleanup()
     DeleteInstance.deleteInstance(PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
     DeleteInstanceTemplate.deleteInstanceTemplate(
         PROJECT_ID, TEMPLATE_NOT_CONSUME_RESERVATION_NAME);
+
+    // Clean up stale resources
+    Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingInstances("test-instance-not-consume-", PROJECT_ID, ZONE);
+    Util.cleanUpExistingInstanceTemplates("test-template-not-consume-", PROJECT_ID);
   }
 
   @Test