Created ConsumeReservationIT cals, fixed ReservationIT

Author: TetyanaYahodska

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

@@ -0,0 +1,89 @@
+/*
+ * 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.cloud.compute.v1.ReservationAffinity.ConsumeReservationType.NO_RESERVATION;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import com.google.cloud.compute.v1.Instance;
+import com.google.cloud.compute.v1.InstancesClient;
+import compute.DeleteInstance;
+import compute.Util;
+import java.io.IOException;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+public class ConsumeReservationIT {
+
+  private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
+  private static final String ZONE = "us-west1-a";
+  private static InstancesClient instancesClient;
+  static String javaVersion = System.getProperty("java.version").substring(0, 2);
+  private static final String INSTANCE_NOT_CONSUME_RESERVATION_NAME =
+      "test-instance-not-consume-"  + javaVersion  + "-"
+          + UUID.randomUUID().toString().substring(0, 8);
+  private static final String MACHINE_TYPE = "n2-standard-32";
+
+  // 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");
+
+    // Initialize the clients once for all tests
+    instancesClient = InstancesClient.create();
+
+    // Cleanup existing stale resources.
+    Util.cleanUpExistingInstances("test-instance-not-consume-"  + javaVersion, PROJECT_ID, ZONE);
+  }
+
+  @AfterAll
+  public static void cleanup()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    // Delete the instance created for testing.
+    DeleteInstance.deleteInstance(PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
+
+    // Close the client after all tests
+    instancesClient.close();
+  }
+
+  @Test
+  public void testCreateInstanceNotConsumeReservation()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+
+    CreateInstanceNotConsumeReservation.createInstanceNotConsumeReservation(
+        PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME, MACHINE_TYPE);
+
+    // Verify that the instance was created with the correct consumeReservationType
+    Instance instance = instancesClient.get(
+        PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
+
+    Assertions.assertEquals(NO_RESERVATION.toString(),
+        instance.getReservationAffinity().getConsumeReservationType());
+  }
+}

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

@@ -16,18 +16,14 @@
 
 package compute.reservation;
 
-import static com.google.cloud.compute.v1.ReservationAffinity.ConsumeReservationType.NO_RESERVATION;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import com.google.api.gax.rpc.NotFoundException;
-import com.google.cloud.compute.v1.Instance;
-import com.google.cloud.compute.v1.InstancesClient;
 import com.google.cloud.compute.v1.Reservation;
 import com.google.cloud.compute.v1.ReservationsClient;
 import compute.CreateInstanceTemplate;
 import compute.CreateRegionalInstanceTemplate;
-import compute.DeleteInstance;
 import compute.DeleteInstanceTemplate;
 import compute.DeleteRegionalInstanceTemplate;
 import compute.Util;
@@ -55,7 +51,6 @@ public class ReservationIT {
   private static final String ZONE = "us-west1-a";
   private static final String REGION = ZONE.substring(0, ZONE.lastIndexOf('-'));
   private static ReservationsClient reservationsClient;
-  private static InstancesClient instancesClient;
   private static String RESERVATION_NAME_GLOBAL;
   private static String RESERVATION_NAME_REGIONAL;
   private static String GLOBAL_INSTANCE_TEMPLATE_URI;
@@ -66,11 +61,7 @@ public class ReservationIT {
   private static final String REGIONAL_INSTANCE_TEMPLATE_NAME =
       "test-regional-inst-temp-" + javaVersion  + "-"
           + UUID.randomUUID().toString().substring(0, 8);
-  private static final String INSTANCE_NOT_CONSUME_RESERVATION_NAME =
-      "test-instance-not-consume-"  + javaVersion  + "-"
-          + UUID.randomUUID().toString().substring(0, 8);
   private static final int NUMBER_OF_VMS = 3;
-  private static final String MACHINE_TYPE = "n2-standard-32";
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
@@ -89,7 +80,6 @@ public static void setUp()
 
     // Cleanup existing stale resources.
     Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-" + javaVersion, PROJECT_ID);
-    Util.cleanUpExistingInstanceTemplates("test-instance-not-consume-" + javaVersion, PROJECT_ID);
     Util.cleanUpExistingRegionalInstanceTemplates(
         "test-regional-inst-temp-" + javaVersion, PROJECT_ID, ZONE);
     Util.cleanUpExistingReservations(
@@ -109,16 +99,6 @@ public static void setUp()
         String.format("projects/%s/regions/%s/instanceTemplates/%s",
             PROJECT_ID, REGION, REGIONAL_INSTANCE_TEMPLATE_NAME);
 
-    // Initialize the clients once for all tests
-    reservationsClient = ReservationsClient.create();
-    instancesClient = InstancesClient.create();
-
-    // Cleanup existing stale resources.
-    Util.cleanUpExistingInstances("test-instance-", PROJECT_ID, ZONE);
-    Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-", PROJECT_ID);
-    Util.cleanUpExistingRegionalInstanceTemplates("test-regional-inst-temp-", PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations("test-reserv-", PROJECT_ID, ZONE);
-
     // Create instance template with GLOBAL location.
     CreateInstanceTemplate.createInstanceTemplate(PROJECT_ID, GLOBAL_INSTANCE_TEMPLATE_NAME);
     assertThat(stdOut.toString())
@@ -152,9 +132,6 @@ public static void cleanup()
         .contains("Instance template deletion operation status for "
             + REGIONAL_INSTANCE_TEMPLATE_NAME);
 
-    // Delete the instance created for testing.
-    DeleteInstance.deleteInstance(PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
-
     // Delete all reservations created for testing.
     DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME_GLOBAL);
     DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME_REGIONAL);
@@ -167,9 +144,7 @@ public static void cleanup()
         NotFoundException.class,
         () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME_REGIONAL, ZONE));
 
-    // Close the client after all tests
     reservationsClient.close();
-    instancesClient.close();
 
     stdOut.close();
     System.setOut(out);
@@ -201,19 +176,4 @@ public void testCreateReservationWithRegionInstanceTemplate()
     Assert.assertTrue(reservation.getZone().contains(ZONE));
     Assert.assertEquals(RESERVATION_NAME_REGIONAL, reservation.getName());
   }
-
-  @Test
-  public void testCreateInstanceNotConsumeReservation()
-      throws IOException, ExecutionException, InterruptedException, TimeoutException {
-
-    CreateInstanceNotConsumeReservation.createInstanceNotConsumeReservation(
-        PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME, MACHINE_TYPE);
-
-    // Verify that the instance was created with the correct consumeReservationType
-    Instance instance = instancesClient.get(
-        PROJECT_ID, ZONE, INSTANCE_NOT_CONSUME_RESERVATION_NAME);
-
-    Assert.assertEquals(NO_RESERVATION.toString(),
-        instance.getReservationAffinity().getConsumeReservationType());
-  }
 }