Fixed tests

Author: TetyanaYahodska

compute/cloud-client/src/main/java/compute/reservation/ConsumeSpecificSharedReservation.java

@@ -20,7 +20,6 @@
 
 import static com.google.cloud.compute.v1.ReservationAffinity.ConsumeReservationType.SPECIFIC_RESERVATION;
 
-import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.compute.v1.AllocationSpecificSKUAllocationReservedInstanceProperties;
 import com.google.cloud.compute.v1.AllocationSpecificSKUReservation;
 import com.google.cloud.compute.v1.AttachedDisk;
@@ -169,11 +168,9 @@ public static void createInstance(String projectId, String zone, String instance
           .setInstanceResource(instanceResource)
           .build();
 
-      OperationFuture<Operation, Operation> operation = instancesClient.insertAsync(
-          insertInstanceRequest);
-
       // Wait for the operation to complete.
-      Operation response = operation.get(3, TimeUnit.MINUTES);
+      Operation response = instancesClient.insertAsync(
+          insertInstanceRequest).get(3, TimeUnit.MINUTES);
 
       if (response.hasError()) {
         System.out.println("Instance creation failed ! ! " + response);

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

@@ -90,14 +90,11 @@ public static void cleanUpExistingRegionalInstanceTemplates(
 
       for (InstanceTemplate instanceTemplate :
           instanceTemplatesClient.list(request).iterateAll()) {
-        if (!instanceTemplate.hasCreationTimestamp() || !instanceTemplate.hasId()) {
-          continue;
-        }
         if (containPrefixToDeleteAndZone(instanceTemplate, prefixToDelete, zone)
             && isCreatedBeforeThresholdTime(instanceTemplate.getCreationTimestamp())
             && instanceTemplate.isInitialized()) {
           DeleteRegionalInstanceTemplate.deleteRegionalInstanceTemplate(
-              projectId, zone, instanceTemplate.getName());
+              projectId, region, instanceTemplate.getName());
         }
       }
     }
@@ -196,9 +193,6 @@ public static void cleanUpExistingReservations(
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     try (ReservationsClient reservationsClient = ReservationsClient.create()) {
       for (Reservation reservation : reservationsClient.list(projectId, zone).iterateAll()) {
-        if (!reservationsClient.list(projectId, zone).iterateAll().iterator().hasNext()) {
-          break;
-        }
         if (containPrefixToDeleteAndZone(reservation, prefixToDelete, zone)
             && isCreatedBeforeThresholdTime(reservation.getCreationTimestamp())) {
           DeleteReservation.deleteReservation(projectId, zone, reservation.getName());
@@ -233,7 +227,7 @@ public static boolean containPrefixToDeleteAndZone(
             && ((StoragePool) resource).getZone().contains(zone);
       }
     } catch (NullPointerException e) {
-      System.err.println("Resource not found, skipping deletion:");
+      System.out.println("Resource not found, skipping deletion:");
     }
     return containPrefixAndZone;
   }
@@ -249,7 +243,7 @@ public static boolean containPrefixToDelete(
         containPrefixToDelete = ((Snapshot) resource).getName().contains(prefixToDelete);
       }
     } catch (NullPointerException e) {
-      System.err.println("Resource not found, skipping deletion:");
+      System.out.println("Resource not found, skipping deletion:");
     }
     return containPrefixToDelete;
   }

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

@@ -0,0 +1,98 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package compute.reservation;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+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;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.junit.Assert;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+@Timeout(value = 25, unit = TimeUnit.MINUTES)
+public class CrudOperationReservationIT {
+
+  private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
+  private static final String ZONE = "us-central1-a";
+  private static String RESERVATION_NAME;
+  private static final int NUMBER_OF_VMS = 3;
+
+  // Check if the required environment variables are set.
+  public static void requireEnvVar(String envVarName) {
+    assertWithMessage(String.format("Missing environment variable '%s' ", envVarName))
+        .that(System.getenv(envVarName)).isNotEmpty();
+  }
+
+  @BeforeAll
+  public static void setUp()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
+    requireEnvVar("GOOGLE_CLOUD_PROJECT");
+
+    // Cleanup existing stale resources.
+    Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
+
+    RESERVATION_NAME = "test-reservation-" + UUID.randomUUID();
+    CreateReservation.createReservation(
+        PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);
+  }
+
+  @AfterAll
+  public static void cleanup()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    // Delete the reservation created for testing.
+    DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME);
+
+    // Test that reservations are deleted
+    Assertions.assertThrows(
+        NotFoundException.class,
+        () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME, ZONE));
+  }
+
+  @Test
+  public void testGetReservation()
+      throws IOException {
+    Reservation reservation = GetReservation.getReservation(
+        PROJECT_ID, RESERVATION_NAME, ZONE);
+    assertNotNull(reservation);
+    assertThat(reservation.getName()).isEqualTo(RESERVATION_NAME);
+  }
+
+  @Test
+  public void testListReservation() throws IOException {
+    List<Reservation> reservations =
+        ListReservations.listReservations(PROJECT_ID, ZONE);
+    assertThat(reservations).isNotNull();
+    Assert.assertTrue(reservations.get(0).getName().contains("test-"));
+  }
+}

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

@@ -19,7 +19,6 @@
 import static com.google.cloud.compute.v1.ReservationAffinity.ConsumeReservationType.SPECIFIC_RESERVATION;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.google.api.gax.rpc.NotFoundException;
 import com.google.cloud.compute.v1.Instance;
@@ -35,7 +34,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
-import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
@@ -59,11 +57,10 @@
 public class ReservationIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
-  private static final String ZONE = "us-central1-a";
+  private static final String ZONE = "asia-south1-a";
   private static final String REGION = ZONE.substring(0, ZONE.lastIndexOf('-'));
   private static ReservationsClient reservationsClient;
   private static InstancesClient instancesClient;
-  private static String RESERVATION_NAME;
   private static String RESERVATION_NAME_GLOBAL;
   private static String RESERVATION_NAME_REGIONAL;
   private static String RESERVATION_SHARED_NAME;
@@ -76,7 +73,6 @@ public class ReservationIT {
   private static final String SPECIFIC_SHARED_INSTANCE_NAME =
       "test-shared-instance-" + UUID.randomUUID();
   private static final int NUMBER_OF_VMS = 3;
-
   private static final String MACHINE_TYPE = "n2-standard-32";
   private static final String MIN_CPU_PLATFORM = "Intel Cascade Lake";
   private ByteArrayOutputStream stdOut;
@@ -106,7 +102,6 @@ public static void setUp()
     reservationsClient = ReservationsClient.create();
     instancesClient = InstancesClient.create();
 
-    RESERVATION_NAME = "test-reserv-" + UUID.randomUUID();
     RESERVATION_NAME_GLOBAL = "test-reserv-global-" + UUID.randomUUID();
     RESERVATION_NAME_REGIONAL = "test-reserv-regional-" + UUID.randomUUID();
     RESERVATION_SHARED_NAME = "test-shared-reserv-" + UUID.randomUUID();
@@ -154,15 +149,11 @@ public static void cleanup()
     DeleteInstance.deleteInstance(PROJECT_ID, ZONE, SPECIFIC_SHARED_INSTANCE_NAME);
 
     // Delete all reservations created for testing.
-    DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME);
     DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME_GLOBAL);
     DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME_REGIONAL);
     DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_SHARED_NAME);
 
     // Test that reservations are deleted
-    Assertions.assertThrows(
-        NotFoundException.class,
-        () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME, ZONE));
     Assertions.assertThrows(
         NotFoundException.class,
         () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME_GLOBAL, ZONE));
@@ -192,35 +183,7 @@ public void afterEach() {
   }
 
   @Test
-  public void firstCreateReservationTest()
-      throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    CreateReservation.createReservation(
-        PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);
-
-    assertThat(stdOut.toString()).contains("Reservation created. Operation Status: DONE");
-  }
-
-  @Test
-  public void secondGetReservationTest()
-      throws IOException {
-    Reservation reservation = GetReservation.getReservation(
-        PROJECT_ID, RESERVATION_NAME, ZONE);
-
-    assertNotNull(reservation);
-    assertThat(reservation.getName()).isEqualTo(RESERVATION_NAME);
-  }
-
-  @Test
-  public void thirdListReservationTest() throws IOException {
-    List<Reservation> reservations =
-        ListReservations.listReservations(PROJECT_ID, ZONE);
-
-    assertThat(reservations).isNotNull();
-    Assert.assertTrue(reservations.get(0).getName().contains("test-"));
-  }
-
-  @Test
-  public void firstCreateReservationWithGlobalInstanceTemplateTest()
+  public void testCreateReservationWithGlobalInstanceTemplate()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     CreateReservationForInstanceTemplate.createReservationForInstanceTemplate(
         PROJECT_ID, RESERVATION_NAME_GLOBAL,
@@ -234,7 +197,7 @@ public void firstCreateReservationWithGlobalInstanceTemplateTest()
   }
 
   @Test
-  public void firstCreateReservationWithRegionInstanceTemplateTest()
+  public void testCreateReservationWithRegionInstanceTemplate()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     CreateReservationForInstanceTemplate.createReservationForInstanceTemplate(
         PROJECT_ID, RESERVATION_NAME_REGIONAL, REGIONAL_INSTANCE_TEMPLATE_URI,