Created ConsumeReservationIT class

TetyanaYahodska · TetyanaYahodska · commit 9f12638e5211 · 2024-10-19T19:09:59.000+02:00
diff --git a/compute/cloud-client/src/main/java/compute/reservation/ConsumeSpecificSharedReservation.java b/compute/cloud-client/src/main/java/compute/reservation/ConsumeSpecificSharedReservation.java
@@ -174,8 +174,7 @@ public static void createInstance(String projectId, String zone, String instance
 
       if (response.hasError()) {
         System.out.println("Instance creation failed ! ! " + response);
-        return;
-      }
+     }
       System.out.println("Operation Status: " + response.getStatus());
     }
   }
diff --git a/compute/cloud-client/src/test/java/compute/reservation/ConsumeReservationIT.java b/compute/cloud-client/src/test/java/compute/reservation/ConsumeReservationIT.java
@@ -0,0 +1,119 @@
+/*
+ * 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.SPECIFIC_RESERVATION;
+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.ReservationsClient;
+import compute.DeleteInstance;
+import compute.Util;
+import java.io.IOException;
+import java.util.UUID;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+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;
+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 ConsumeReservationIT {
+
+  private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
+  private static final String ZONE = "europe-southwest1-a";
+  static String javaVersion = System.getProperty("java.version").substring(0, 2);
+  private static ReservationsClient reservationsClient;
+  private static InstancesClient instancesClient;
+  private static final String RESERVATION_SHARED_NAME = "test-reservation-shared-" + javaVersion
+      + "-" + UUID.randomUUID().toString().substring(0, 8);
+  private static final String SPECIFIC_SHARED_INSTANCE_NAME =
+      "test-shared-instance-" + javaVersion  + "-"
+          + UUID.randomUUID().toString().substring(0, 8);
+  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";
+
+  // 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.cleanUpExistingInstances("test-shared-instance-" + javaVersion, PROJECT_ID, ZONE);
+    Util.cleanUpExistingReservations("test-shared-instance-" + javaVersion, PROJECT_ID, ZONE);
+
+    // Initialize the clients once for all tests
+    reservationsClient = ReservationsClient.create();
+    instancesClient = InstancesClient.create();
+  }
+
+  @AfterAll
+  public static void cleanup()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    // Delete resources created for testing.
+    DeleteInstance.deleteInstance(PROJECT_ID, ZONE, SPECIFIC_SHARED_INSTANCE_NAME);
+    DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_SHARED_NAME);
+
+    // Test that reservations are deleted
+    Assertions.assertThrows(
+        NotFoundException.class,
+        () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_SHARED_NAME, ZONE));
+
+    // Close clients after all tests
+    reservationsClient.close();
+    instancesClient.close();
+  }
+
+  @Test
+  public void testConsumeSpecificSharedReservation()
+      throws IOException, ExecutionException, InterruptedException, TimeoutException {
+    ConsumeSpecificSharedReservation.createReservation(PROJECT_ID,
+        RESERVATION_SHARED_NAME, NUMBER_OF_VMS, ZONE,
+        MACHINE_TYPE, MIN_CPU_PLATFORM, true);
+
+    Assertions.assertEquals(RESERVATION_SHARED_NAME,
+        reservationsClient.get(PROJECT_ID, ZONE, RESERVATION_SHARED_NAME).getName());
+
+    ConsumeSpecificSharedReservation.createInstance(
+        PROJECT_ID, ZONE, SPECIFIC_SHARED_INSTANCE_NAME, MACHINE_TYPE,
+        MIN_CPU_PLATFORM, RESERVATION_SHARED_NAME);
+
+    // Verify that the instance was created with the correct reservation and consumeReservationType
+    Instance instance = instancesClient.get(PROJECT_ID, ZONE, SPECIFIC_SHARED_INSTANCE_NAME);
+
+    Assertions.assertTrue(instance.getReservationAffinity()
+        .getValuesList().get(0).contains(RESERVATION_SHARED_NAME));
+    Assertions.assertEquals(SPECIFIC_RESERVATION.toString(),
+        instance.getReservationAffinity().getConsumeReservationType());
+  }
+}
diff --git a/compute/cloud-client/src/test/java/compute/reservation/CrudOperationsReservationIT.java b/compute/cloud-client/src/test/java/compute/reservation/CrudOperationsReservationIT.java
@@ -40,19 +40,12 @@
 import org.junit.jupiter.api.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
-<<<<<<<< HEAD:compute/cloud-client/src/test/java/compute/reservation/CrudOperationReservationIT.java
-
-@RunWith(JUnit4.class)
-@Timeout(value = 25, unit = TimeUnit.MINUTES)
-public class CrudOperationReservationIT {
-========
 import org.junit.runners.MethodSorters;
 
 @RunWith(JUnit4.class)
 @Timeout(value = 25, unit = TimeUnit.MINUTES)
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class CrudOperationsReservationIT {
->>>>>>>> main:compute/cloud-client/src/test/java/compute/reservation/CrudOperationsReservationIT.java
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String ZONE = "us-west1-a";
@@ -71,21 +64,12 @@ public static void setUp()
       throws IOException, ExecutionException, InterruptedException, TimeoutException {
     requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS");
     requireEnvVar("GOOGLE_CLOUD_PROJECT");
-<<<<<<<< HEAD:compute/cloud-client/src/test/java/compute/reservation/CrudOperationReservationIT.java
-    RESERVATION_NAME = "test-reservation-" + UUID.randomUUID();
 
-    // Cleanup existing stale resources.
-    Util.cleanUpExistingReservations("test-reservation-", PROJECT_ID, ZONE);
-
-    CreateReservation.createReservation(
-        PROJECT_ID, RESERVATION_NAME, NUMBER_OF_VMS, ZONE);
-========
     RESERVATION_NAME = "test-reservation-" + javaVersion + "-"
         + UUID.randomUUID().toString().substring(0, 8);
 
     // Cleanup existing stale resources.
     Util.cleanUpExistingReservations("test-reservation-"  + javaVersion, PROJECT_ID, ZONE);
->>>>>>>> main:compute/cloud-client/src/test/java/compute/reservation/CrudOperationsReservationIT.java
   }
 
   @AfterAll
diff --git a/compute/cloud-client/src/test/java/compute/reservation/ReservationIT.java b/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.SPECIFIC_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,10 +51,8 @@ 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 RESERVATION_SHARED_NAME;
   private static String GLOBAL_INSTANCE_TEMPLATE_URI;
   private static String REGIONAL_INSTANCE_TEMPLATE_URI;
   static String javaVersion = System.getProperty("java.version").substring(0, 2);
@@ -67,12 +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 SPECIFIC_SHARED_INSTANCE_NAME =
-      "test-shared-instance-" + javaVersion  + "-"
-          + UUID.randomUUID().toString().substring(0, 8);
   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";
 
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
@@ -90,24 +79,17 @@ public static void setUp()
     System.setOut(new PrintStream(stdOut));
 
     // Cleanup existing stale resources.
-    Util.cleanUpExistingInstances("test-shared-instance", PROJECT_ID, ZONE);
     Util.cleanUpExistingInstanceTemplates("test-global-inst-temp-" + javaVersion, PROJECT_ID);
     Util.cleanUpExistingRegionalInstanceTemplates(
         "test-regional-inst-temp-" + javaVersion, PROJECT_ID, ZONE);
     Util.cleanUpExistingReservations(
         "test-reservation-global-" + javaVersion, PROJECT_ID, ZONE);
     Util.cleanUpExistingReservations("test-reservation-regional-" + javaVersion, PROJECT_ID, ZONE);
-    Util.cleanUpExistingReservations("test-reserv-", PROJECT_ID, ZONE);
-
-    // Initialize the clients once for all tests
-    reservationsClient = ReservationsClient.create();
-    instancesClient = InstancesClient.create();
 
     RESERVATION_NAME_GLOBAL = "test-reservation-global-" + javaVersion  + "-"
         + UUID.randomUUID().toString().substring(0, 8);
     RESERVATION_NAME_REGIONAL = "test-reservation-regional-" + javaVersion  + "-"
         + UUID.randomUUID().toString().substring(0, 8);
-    RESERVATION_SHARED_NAME = "test-reserv-shared-" + UUID.randomUUID();
     GLOBAL_INSTANCE_TEMPLATE_URI = String.format("projects/%s/global/instanceTemplates/%s",
         PROJECT_ID, GLOBAL_INSTANCE_TEMPLATE_NAME);
     REGIONAL_INSTANCE_TEMPLATE_URI =
@@ -123,6 +105,9 @@ public static void setUp()
         PROJECT_ID, REGION, REGIONAL_INSTANCE_TEMPLATE_NAME);
     assertThat(stdOut.toString()).contains("Instance Template Operation Status: DONE");
 
+    // Initialize the client once for all tests
+    reservationsClient = ReservationsClient.create();
+
     stdOut.close();
     System.setOut(out);
   }
@@ -147,13 +132,9 @@ public static void cleanup()
         .contains("Instance template deletion operation status for "
             + REGIONAL_INSTANCE_TEMPLATE_NAME);
 
-    // Delete instance created for consume shared reservation.
-    DeleteInstance.deleteInstance(PROJECT_ID, ZONE, SPECIFIC_SHARED_INSTANCE_NAME);
-
     // Delete all reservations created for testing.
     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(
@@ -163,10 +144,6 @@ public static void cleanup()
         NotFoundException.class,
         () -> GetReservation.getReservation(PROJECT_ID, RESERVATION_NAME_REGIONAL, ZONE));
 
-    // Close clients after all tests
-    reservationsClient.close();
-    instancesClient.close();
-
     stdOut.close();
     System.setOut(out);
   }
@@ -198,27 +175,4 @@ public void testCreateReservationWithRegionInstanceTemplate()
     Assert.assertTrue(reservation.getZone().contains(ZONE));
     Assert.assertEquals(RESERVATION_NAME_REGIONAL, reservation.getName());
   }
-
-  @Test
-  public void testConsumeSpecificSharedReservation()
-      throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    ConsumeSpecificSharedReservation.createReservation(PROJECT_ID,
-        RESERVATION_SHARED_NAME, NUMBER_OF_VMS, ZONE,
-        MACHINE_TYPE, MIN_CPU_PLATFORM, true);
-
-    Assert.assertEquals(RESERVATION_SHARED_NAME,
-        reservationsClient.get(PROJECT_ID, ZONE, RESERVATION_SHARED_NAME).getName());
-
-    ConsumeSpecificSharedReservation.createInstance(
-        PROJECT_ID, ZONE, SPECIFIC_SHARED_INSTANCE_NAME, MACHINE_TYPE,
-        MIN_CPU_PLATFORM, RESERVATION_SHARED_NAME);
-
-    // Verify that the instance was created with the correct reservation and consumeReservationType
-    Instance instance = instancesClient.get(PROJECT_ID, ZONE, SPECIFIC_SHARED_INSTANCE_NAME);
-
-    Assert.assertTrue(instance.getReservationAffinity()
-        .getValuesList().get(0).contains(RESERVATION_SHARED_NAME));
-    Assert.assertEquals(SPECIFIC_RESERVATION.toString(),
-        instance.getReservationAffinity().getConsumeReservationType());
-  }
 }

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,7 @@ public static void createInstance(String projectId, String zone, String instance`
`174`	`174`
`175`	`175`	`if (response.hasError()) {`
`176`	`176`	`System.out.println("Instance creation failed ! ! " + response);`
`177`		`- return;`
`178`		`- }`
	`177`	`+ }`
`179`	`178`	`System.out.println("Operation Status: " + response.getStatus());`
`180`	`179`	`}`
`181`	`180`	`}`