Skip to content

Commit f4663a5

Browse files
Cleanup reservations
1 parent e106811 commit f4663a5

File tree

1 file changed

+17
-3
lines changed

1 file changed

+17
-3
lines changed

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

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020
import static com.google.common.truth.Truth.assertWithMessage;
21+
import static compute.Util.isCreatedBeforeThresholdTime;
2122

2223
import com.google.api.gax.rpc.NotFoundException;
2324
import com.google.cloud.compute.v1.Reservation;
@@ -82,9 +83,10 @@ public static void setUp()
8283
Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-" + javaVersion, PROJECT_ID);
8384
Util.cleanUpExistingRegionalInstanceTemplates(
8485
"test-regional-inst-temp-" + javaVersion, PROJECT_ID, ZONE);
85-
Util.cleanUpExistingReservations(
86-
"test-reserv-global-" + javaVersion, PROJECT_ID, ZONE);
87-
Util.cleanUpExistingReservations("test-reserv-regional-" + javaVersion, PROJECT_ID, ZONE);
86+
cleanUpExistingReservations(PROJECT_ID, ZONE);
87+
//Util.cleanUpExistingReservations(
88+
// "test-reserv-global-" + javaVersion, PROJECT_ID, ZONE);
89+
//Util.cleanUpExistingReservations("test-reserv-regional-" + javaVersion, PROJECT_ID, ZONE);
8890

8991
// Initialize the client once for all tests
9092
reservationsClient = ReservationsClient.create();
@@ -177,4 +179,16 @@ public void testCreateReservationWithRegionInstanceTemplate()
177179
Assert.assertTrue(reservation.getZone().contains(ZONE));
178180
Assert.assertEquals(RESERVATION_NAME_REGIONAL, reservation.getName());
179181
}
182+
183+
public static void cleanUpExistingReservations(
184+
String projectId, String zone)
185+
throws IOException, ExecutionException, InterruptedException, TimeoutException {
186+
try (ReservationsClient reservationsClient = ReservationsClient.create()) {
187+
for (Reservation reservation : reservationsClient.list(projectId, zone).iterateAll()) {
188+
if (isCreatedBeforeThresholdTime(reservation.getCreationTimestamp())) {
189+
DeleteReservation.deleteReservation(projectId, zone, reservation.getName());
190+
}
191+
}
192+
}
193+
}
180194
}

0 commit comments

Comments
 (0)