Skip to content

Add detachDisk test to ITComputeTest.java #4420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
andreamlin wants to merge 7 commits into from
Closed

Add detachDisk test to ITComputeTest.java #4420

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
34e7bcb
add ITComputeTest test for resource name working
andreamlin Jan 29, 2019
f77e003
add resource name fix
andreamlin Jan 31, 2019
b0b0f90
starting work on ITCompute test for inserting and getting
andreamlin Jan 31, 2019
2958a26
add detachDisk test
andreamlin Jan 31, 2019
eb5116d
add required dep versions
andreamlin Jan 31, 2019
f162854
formatting
andreamlin Jan 31, 2019
1c9f988
merge in master
andreamlin Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
206 changes: 200 additions & 6 deletions ...ents/google-cloud-compute/src/test/java/com/google/cloud/compute/v1/it/ITComputeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,49 @@

import com.google.api.gax.core.FixedCredentialsProvider;
import com.google.api.gax.paging.Page;
import com.google.api.gax.rpc.ApiException;
import com.google.api.gax.rpc.NotFoundException;
import com.google.api.gax.rpc.PermissionDeniedException;
import com.google.auth.Credentials;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.cloud.ServiceOptions;
import com.google.cloud.compute.v1.AttachedDisk;
import com.google.cloud.compute.v1.AttachedDiskInitializeParams;
import com.google.cloud.compute.v1.Disk;
import com.google.cloud.compute.v1.DiskClient;
import com.google.cloud.compute.v1.DiskSettings;
import com.google.cloud.compute.v1.DiskType;
import com.google.cloud.compute.v1.DiskTypeClient;
import com.google.cloud.compute.v1.DiskTypeClient.AggregatedListDiskTypesPagedResponse;
import com.google.cloud.compute.v1.DiskTypeSettings;
import com.google.cloud.compute.v1.DiskTypesScopedList;
import com.google.cloud.compute.v1.ImageClient;
import com.google.cloud.compute.v1.ImageSettings;
import com.google.cloud.compute.v1.Instance;
import com.google.cloud.compute.v1.InstanceClient;
import com.google.cloud.compute.v1.InstanceSettings;
import com.google.cloud.compute.v1.ListDiskTypesHttpRequest;
import com.google.cloud.compute.v1.NetworkInterface;
import com.google.cloud.compute.v1.Operation;
import com.google.cloud.compute.v1.ProjectGlobalImageName;
import com.google.cloud.compute.v1.ProjectName;
import com.google.cloud.compute.v1.ProjectRegionDiskTypeName;
import com.google.cloud.compute.v1.ProjectRegionSubnetworkName;
import com.google.cloud.compute.v1.ProjectZoneDiskName;
import com.google.cloud.compute.v1.ProjectZoneDiskTypeName;
import com.google.cloud.compute.v1.ProjectZoneInstanceName;
import com.google.cloud.compute.v1.ProjectZoneMachineTypeName;
import com.google.cloud.compute.v1.ProjectZoneName;
import com.google.cloud.compute.v1.Subnetwork;
import com.google.cloud.compute.v1.SubnetworkClient;
import com.google.cloud.compute.v1.SubnetworkSettings;
import com.google.cloud.compute.v1.SubnetworksScopedList;
import com.google.common.collect.Lists;
import java.io.IOException;
import java.util.Arrays;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Rule;
Expand All @@ -45,31 +70,200 @@

public class ITComputeTest {

private static final String ZONE = "us-central1-a";
private static final String ZONE = "us-west1-a";
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to move REGION near here?

private static final String DISK_TYPE = "local-ssd";
private static final String DEFAULT_PROJECT = ServiceOptions.getDefaultProjectId();
private static final String UUID_INSTANCE = UUID.randomUUID().toString().replaceAll("-", "");
private static final String INSTANCE_NAME_FORMAT =
String.format("test-api-instance-%s", UUID_INSTANCE);
private static final String REGION = "us-west1";

private static final ProjectZoneName PROJECT_ZONE_NAME =
ProjectZoneName.of(DEFAULT_PROJECT, ZONE);
private static final ProjectZoneMachineTypeName MACHINE_TYPE_NAME =
ProjectZoneMachineTypeName.of(
String.format("custom-%s-%s", 4, 4 * 1024), DEFAULT_PROJECT, ZONE);

// Google-managed image. See https://cloud.google.com/compute/docs/images.
private static final ProjectGlobalImageName IMAGE_NAME =
ProjectGlobalImageName.of("cos-69-10895-138-0", "cos-cloud");
private static final ProjectZoneInstanceName INSTANCE_NAME =
ProjectZoneInstanceName.of(
String.format(INSTANCE_NAME_FORMAT, UUID_INSTANCE), DEFAULT_PROJECT, ZONE);

private static final ProjectZoneDiskTypeName diskTypeName =
ProjectZoneDiskTypeName.of("pd-standard", DEFAULT_PROJECT, ZONE);
private static final ProjectZoneDiskName DISK_NAME =
ProjectZoneDiskName.of(
String.format("test-api-device-name-%s", UUID_INSTANCE), DEFAULT_PROJECT, ZONE);

private static DiskTypeClient diskTypeClient;
private static DiskTypeSettings diskTypeSettings;
private static InstanceClient instanceClient;
private static DiskClient diskClient;
private static SubnetworkClient subNetworkClient;
private static ImageClient imageClient;

@Rule public Timeout globalTimeout = Timeout.seconds(300);

@BeforeClass
public static void beforeClass() throws IOException {
public static void beforeClass() throws Exception {
Credentials credentials =
GoogleCredentials.getApplicationDefault()
.createScoped(DiskTypeSettings.getDefaultServiceScopes());

diskTypeSettings =
DiskTypeSettings diskTypeSettings =
DiskTypeSettings.newBuilder()
.setCredentialsProvider(FixedCredentialsProvider.create(credentials))
.build();
diskTypeClient = DiskTypeClient.create(diskTypeSettings);

InstanceSettings instanceSettings =
InstanceSettings.newBuilder()
.setCredentialsProvider(FixedCredentialsProvider.create(credentials))
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we reuse the FixedCredentialsProvider for all three calls?

.build();
instanceClient = InstanceClient.create(instanceSettings);

DiskSettings diskSettings =
DiskSettings.newBuilder()
.setCredentialsProvider(FixedCredentialsProvider.create(credentials))
.build();
diskClient = DiskClient.create(diskSettings);

SubnetworkSettings subNetworkSettings =
SubnetworkSettings.newBuilder()
.setCredentialsProvider(FixedCredentialsProvider.create(credentials))
.build();
subNetworkClient = SubnetworkClient.create(subNetworkSettings);

ImageSettings imageSettings =
ImageSettings.newBuilder()
.setCredentialsProvider(FixedCredentialsProvider.create(credentials))
.build();
imageClient = ImageClient.create(imageSettings);

// Remove resources that will be created later to avoid quota problems or resource overriding
// errors.
removeResources(Arrays.asList(PermissionDeniedException.class, NotFoundException.class));
}

// Remove resources that are created in this test class to avoid overbilling and 403s.
private static void removeResources(List<Class<? extends ApiException>> exceptionTypes)
throws Exception {
try {
instanceClient.deleteInstance(INSTANCE_NAME);
Thread.sleep(10000);
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thread.sleep(1000) isn't great. Perhaps you can use Operation actualResponse = instanceClient.deleteInstance(INSTANCE_NAME); and poll?

} catch (Exception e) {
if (isNotExceptionType(exceptionTypes, e)) throw e;
}
Thread.sleep(10000);
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you add another sleep?

try {
diskClient.deleteDisk(DISK_NAME);
} catch (Exception e) {
if (isNotExceptionType(exceptionTypes, e)) throw e;
}
try {
instanceClient.deleteInstance(INSTANCE_NAME);
} catch (Exception e) {
if (isNotExceptionType(exceptionTypes, e)) throw e;
}
try {
imageClient.deleteImage(IMAGE_NAME);
} catch (Exception e) {
if (isNotExceptionType(exceptionTypes, e)) throw e;
}
}

private static boolean isNotExceptionType(
List<Class<? extends ApiException>> exceptionTypes, Exception e) {
for (Class<? extends ApiException> type : exceptionTypes) {
if (type.isInstance(e)) {
return false;
}
}
return true;
}

@AfterClass
public static void tearDown() throws Exception {
diskTypeClient.close();
try {
removeResources(Arrays.asList(NotFoundException.class, PermissionDeniedException.class));
} finally {
diskTypeClient.close();
instanceClient.close();
subNetworkClient.close();
diskClient.close();
imageClient.close();
}
}

@Test
public void testDetachDisk() throws Exception {
long startAt = System.currentTimeMillis();
System.out.println("Clients created in " + (System.currentTimeMillis() - startAt) + "ms.");
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this print statement still belong here?


// Fetch a subnetwork, assuming there is one. Projects start with a default network.
Iterable<SubnetworksScopedList> subnetworks =
subNetworkClient.aggregatedListSubnetworks(DEFAULT_PROJECT).iterateAll();
// TODO(andrealin): Implement futures for Compute methods.
Thread.sleep(10000);
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why the sleep? 10 seconds is a lot of time to for a test.

Subnetwork subnetwork = subnetworks.iterator().next().getSubnetworksList().get(0);

NetworkInterface networkInterface =
NetworkInterface.newBuilder()
.setNetwork(subnetwork.getNetwork())
.setSubnetwork(
ProjectRegionSubnetworkName.of(DEFAULT_PROJECT, REGION, subnetwork.getName())
.toString())
.build();
AttachedDisk bootDisk =
AttachedDisk.newBuilder()
.setAutoDelete(true)
.setBoot(true)
.setInitializeParams(
AttachedDiskInitializeParams.newBuilder()
.setSourceImage(IMAGE_NAME.toString())
.setDiskSizeGb(String.valueOf(100))
.build())
.build();

// Insert an instance using the found subnetwork and its corresponding network (may not be the
// inserted network).
Instance instanceResource =
Instance.newBuilder()
.setName(INSTANCE_NAME.getInstance())
.addNetworkInterfaces(networkInterface)
.setMachineType(MACHINE_TYPE_NAME.toString())
.addDisks(bootDisk)
.build();
Operation op1 = instanceClient.insertInstance(PROJECT_ZONE_NAME, instanceResource);
System.out.println(String.format("Instance created: %s", op1.toString()));
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this still belong here? If so, then perhaps a log statement would be better.


// Insert a disk.
Disk disk =
Disk.newBuilder()
.setName(DISK_NAME.getDisk())
.setSizeGb(String.valueOf(7))
.setType(diskTypeName.toString())
.build();
Operation op2 = diskClient.insertDisk(PROJECT_ZONE_NAME, disk);
System.out.println(String.format("Disk created: %s", op2.toString()));
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Log, and sleep?

Thread.sleep(10000);

// Attach the disk to the instance.
AttachedDisk attachedDisk =
AttachedDisk.newBuilder()
.setDeviceName(DISK_NAME.getDisk())
.setAutoDelete(false)
.setMode("READ_WRITE")
.setSource(DISK_NAME.toString())
.build();
Operation op3 = instanceClient.attachDiskInstance(INSTANCE_NAME, false, attachedDisk);
System.out.println(String.format("Disk attached: %s", op3.toString()));
Thread.sleep(10000);
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sleeping again?

System.out.println("----------------------------------------");
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

log statement?


Operation op4 = instanceClient.detachDiskInstance(INSTANCE_NAME, DISK_NAME.getDisk());
System.out.println(String.format("Disk detached: %s", op4.toString()));
Copy link
Contributor

@sduskis sduskis Feb 7, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

log statement.

}

@Test
Expand Down