Skip to content

Commit 8f5fefc

Browse files
Fixed naming
1 parent 4d7c2a6 commit 8f5fefc

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static void createReservation(
9090

9191
// Wait for the create reservation operation to complete.
9292
Operation response =
93-
reservationsClient.insertAsync(projectId, zone, reservation).get(4, TimeUnit.MINUTES);
93+
reservationsClient.insertAsync(projectId, zone, reservation).get(3, TimeUnit.MINUTES);
9494
System.out.println(response.getStatus());
9595
if (response.hasError()) {
9696
System.out.println("Reservation creation failed!" + response);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class ReservationIT {
6666
private static String RESERVATION_NAME;
6767
private static String RESERVATION_NAME_GLOBAL;
6868
private static String RESERVATION_NAME_REGIONAL;
69-
private static String SHARED_RESERVATION_NAME;
69+
private static String RESERVATION_SHARED_NAME;
7070
private static String GLOBAL_INSTANCE_TEMPLATE_URI;
7171
private static String REGIONAL_INSTANCE_TEMPLATE_URI;
7272
private static final String GLOBAL_INSTANCE_TEMPLATE_NAME =
@@ -109,7 +109,7 @@ public static void setUp()
109109
RESERVATION_NAME = "test-reserv-" + UUID.randomUUID();
110110
RESERVATION_NAME_GLOBAL = "test-reserv-global-" + UUID.randomUUID();
111111
RESERVATION_NAME_REGIONAL = "test-reserv-regional-" + UUID.randomUUID();
112-
SHARED_RESERVATION_NAME = "test-shared-reserv-" + UUID.randomUUID();
112+
RESERVATION_SHARED_NAME = "test-shared-reserv-" + UUID.randomUUID();
113113

114114
GLOBAL_INSTANCE_TEMPLATE_URI = String.format("projects/%s/global/instanceTemplates/%s",
115115
PROJECT_ID, GLOBAL_INSTANCE_TEMPLATE_NAME);
@@ -157,7 +157,7 @@ public static void cleanup()
157157
DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME);
158158
DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME_GLOBAL);
159159
DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_NAME_REGIONAL);
160-
DeleteReservation.deleteReservation(PROJECT_ID, ZONE, SHARED_RESERVATION_NAME);
160+
DeleteReservation.deleteReservation(PROJECT_ID, ZONE, RESERVATION_SHARED_NAME);
161161

162162
// Test that reservations are deleted
163163
Assertions.assertThrows(
@@ -251,21 +251,21 @@ public void firstCreateReservationWithRegionInstanceTemplateTest()
251251
public void testConsumeSpecificSharedReservation()
252252
throws IOException, ExecutionException, InterruptedException, TimeoutException {
253253
ConsumeSpecificSharedReservation.createReservation(PROJECT_ID,
254-
SHARED_RESERVATION_NAME, NUMBER_OF_VMS, ZONE,
254+
RESERVATION_SHARED_NAME, NUMBER_OF_VMS, ZONE,
255255
MACHINE_TYPE, MIN_CPU_PLATFORM, true);
256256

257-
Assert.assertEquals(SHARED_RESERVATION_NAME,
258-
reservationsClient.get(PROJECT_ID, ZONE, SHARED_RESERVATION_NAME).getName());
257+
Assert.assertEquals(RESERVATION_SHARED_NAME,
258+
reservationsClient.get(PROJECT_ID, ZONE, RESERVATION_SHARED_NAME).getName());
259259

260260
ConsumeSpecificSharedReservation.createInstance(
261261
PROJECT_ID, ZONE, SPECIFIC_SHARED_INSTANCE_NAME, MACHINE_TYPE,
262-
MIN_CPU_PLATFORM, SHARED_RESERVATION_NAME);
262+
MIN_CPU_PLATFORM, RESERVATION_SHARED_NAME);
263263

264264
// Verify that the instance was created with the correct reservation and consumeReservationType
265265
Instance instance = instancesClient.get(PROJECT_ID, ZONE, SPECIFIC_SHARED_INSTANCE_NAME);
266266

267267
Assert.assertTrue(instance.getReservationAffinity()
268-
.getValuesList().get(0).contains(SHARED_RESERVATION_NAME));
268+
.getValuesList().get(0).contains(RESERVATION_SHARED_NAME));
269269
Assert.assertEquals(SPECIFIC_RESERVATION.toString(),
270270
instance.getReservationAffinity().getConsumeReservationType());
271271
}

0 commit comments

Comments
 (0)