Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up volume tests

This commit is contained in:
Andrew Donald Kennedy 2011-11-21 17:44:09 +00:00
parent 192956705b
commit 4095ebd4ab
1 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeClientLiveTest.java
View File

@ -18,31 +18,39 @@
*/ */
package org.jclouds.cloudstack.features; package org.jclouds.cloudstack.features;
import static com.google.common.collect.Iterables.find; import static com.google.common.collect.Iterables.*;
import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.*;
import static org.testng.AssertJUnit.assertNotSame;
import java.util.Set; import java.util.Set;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import org.jclouds.cloudstack.domain.AsyncCreateResponse; import org.jclouds.cloudstack.domain.AsyncCreateResponse;
import org.jclouds.cloudstack.domain.Snapshot;
import org.jclouds.cloudstack.domain.Volume; import org.jclouds.cloudstack.domain.Volume;
import org.jclouds.cloudstack.domain.Zone;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
/** /**
* Tests behavior of {@code SSHKeyPairClient} * Tests behavior of {@code VolumeClient}
* *
* @author Vijay Kiran * @author Vijay Kiran
*/ */
@Test(groups = "live", singleThreaded = true, testName = "VolumeClientLiveTest") @Test(groups = "live", singleThreaded = true, testName = "VolumeClientLiveTest")
public class VolumeClientLiveTest extends BaseCloudStackClientLiveTest { public class VolumeClientLiveTest extends BaseCloudStackClientLiveTest {
protected String prefix = System.getProperty("user.name"); protected String prefix = System.getProperty("user.name");
private long zoneId; private long zoneId;
private long diskOfferingId;
private long snapshotId; @BeforeMethod(groups = "live")
private Volume volume; public void setZoneId() {
Set<Zone> zones = client.getZoneClient().listZones();
assertNotNull(zones);
assertFalse(zones.isEmpty());
zoneId = Iterables.get(zones, 0).getId();
}
public void testListVolumes() { public void testListVolumes() {
final Set<Volume> volumes = client.getVolumeClient().listVolumes(); final Set<Volume> volumes = client.getVolumeClient().listVolumes();
@ -52,68 +60,66 @@ public class VolumeClientLiveTest extends BaseCloudStackClientLiveTest {
} }
public void testCreateVolumeFromDiskofferingInZoneAndDeleteVolume() { public void testCreateVolumeFromDiskofferingInZoneAndDeleteVolume() {
// Pick some disk offering
long diskOfferingId = Iterables.get(client.getOfferingClient().listDiskOfferings(), 0).getId();
zoneId = Iterables.getFirst(client.getZoneClient().listZones(), null).getId(); Volume volume = null;
//Pick some disk offering
diskOfferingId = Iterables.getFirst(client.getOfferingClient().listDiskOfferings(), null).getId();
while (volume == null) { while (volume == null) {
try { try {
AsyncCreateResponse job = client.getVolumeClient().createVolumeFromDiskOfferingInZone(prefix + "-jclouds-volume", AsyncCreateResponse job = client.getVolumeClient().createVolumeFromDiskOfferingInZone(prefix + "-jclouds-volume",
diskOfferingId, zoneId); diskOfferingId, zoneId);
assert jobComplete.apply(job.getJobId()); assertTrue(jobComplete.apply(job.getJobId()));
volume = findVolumeWithId(job.getId()); volume = findVolumeWithId(job.getId());
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
//TODO volume creation failed - retry? // TODO volume creation failed - retry?
} }
} }
checkVolume(volume); checkVolume(volume);
//Delete the volume
// Delete the volume
client.getVolumeClient().deleteVolume(volume.getId()); client.getVolumeClient().deleteVolume(volume.getId());
} }
public void testCreateVolumeFromDiskofferingInZoneAndAttachVolumeToVirtualMachineAndDetachAndDelete() { public void testCreateVolumeFromDiskofferingInZoneAndAttachVolumeToVirtualMachineAndDetachAndDelete() {
// Pick some disk offering
long diskOfferingId = Iterables.get(client.getOfferingClient().listDiskOfferings(), 0).getId();
zoneId = Iterables.getFirst(client.getZoneClient().listZones(), null).getId(); Volume volume = null;
//Pick some disk offering
diskOfferingId = Iterables.getFirst(client.getOfferingClient().listDiskOfferings(), null).getId();
while (volume == null) { while (volume == null) {
try { try {
AsyncCreateResponse job = client.getVolumeClient().createVolumeFromDiskOfferingInZone(prefix + "-jclouds-volume", AsyncCreateResponse job = client.getVolumeClient().createVolumeFromDiskOfferingInZone(prefix + "-jclouds-volume",
diskOfferingId, zoneId); diskOfferingId, zoneId);
assert jobComplete.apply(job.getJobId()); assertTrue(jobComplete.apply(job.getJobId()));
volume = findVolumeWithId(job.getId()); volume = findVolumeWithId(job.getId());
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
//TODO volume creation failed - retry? // TODO volume creation failed - retry?
} }
} }
checkVolume(volume); checkVolume(volume);
long virtualMachineId = Iterables.getFirst(client.getVirtualMachineClient().listVirtualMachines(), null).getId(); long virtualMachineId = Iterables.get(client.getVirtualMachineClient().listVirtualMachines(), 0).getId();
//Attach Volume
// Attach Volume
Volume attachedVolume = null; Volume attachedVolume = null;
while (attachedVolume == null) { while (attachedVolume == null) {
try { try {
AsyncCreateResponse job = client.getVolumeClient().attachVolume(volume.getId(), virtualMachineId); AsyncCreateResponse job = client.getVolumeClient().attachVolume(volume.getId(), virtualMachineId);
assert jobComplete.apply(job.getJobId()); assertTrue(jobComplete.apply(job.getJobId()));
attachedVolume = findVolumeWithId(volume.getId()); attachedVolume = findVolumeWithId(volume.getId());
assert attachedVolume.getVirtualMachineId() == virtualMachineId; assertEquals(virtualMachineId, attachedVolume.getVirtualMachineId());
assert attachedVolume.getAttached() != null; assertNotNull(attachedVolume.getAttached());
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
//TODO volume creation failed - retry? // TODO volume creation failed - retry?
} }
} }
//Detach Volume // Detach Volume
Volume detachedVolume = null; Volume detachedVolume = null;
while (detachedVolume == null) { while (detachedVolume == null) {
try { try {
AsyncCreateResponse job = client.getVolumeClient().detachVolume(volume.getId()); AsyncCreateResponse job = client.getVolumeClient().detachVolume(volume.getId());
assert jobComplete.apply(job.getJobId()); assertTrue(jobComplete.apply(job.getJobId()));
detachedVolume = findVolumeWithId(volume.getId()); detachedVolume = findVolumeWithId(volume.getId());
checkVolume(detachedVolume); checkVolume(detachedVolume);
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
@ -121,34 +127,33 @@ public class VolumeClientLiveTest extends BaseCloudStackClientLiveTest {
} }
} }
//Cleanup // Cleanup
client.getVolumeClient().deleteVolume(volume.getId()); client.getVolumeClient().deleteVolume(volume.getId());
} }
/* /*
TODO Uncomment this test after SnapshotClient has test coverage. // TODO Uncomment this test after SnapshotClient has test coverage.
public void testCreateVolumeFromSnapshotInZoneAndDeleteVolume() { public void testCreateVolumeFromSnapshotInZoneAndDeleteVolume() {
Set<Snapshot> snapshots = client.getSnapshotClient().listSnapshots();
zoneId = Iterables.getFirst(client.getZoneClient().listZones(), null).getId();
final Set<Snapshot> snapshots = client.getSnapshotClient().listSnapshots();
assertNotNull(snapshots); assertNotNull(snapshots);
assertNotSame(0, snapshots.size() ); assertFalse(snapshots.isEmpty());
snapshotId = Iterables.getFirst(snapshots, null).getId(); long snapshotId = Iterables.get(snapshots, 0).getId();
Volume volume = null;
while (volume == null) { while (volume == null) {
try { try {
AsyncCreateResponse job = client.getVolumeClient().createVolumeFromSnapshotInZone(prefix + "-jclouds-volume", AsyncCreateResponse job = client.getVolumeClient().createVolumeFromSnapshotInZone(prefix + "-jclouds-volume",
snapshotId, zoneId); snapshotId, zoneId);
assert jobComplete.apply(job.getJobId()); assertTrue(jobComplete.apply(job.getJobId()));
volume = findVolumeWithId(job.getId()); volume = findVolumeWithId(job.getId());
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
//TODO volume creation failed - retry? // TODO volume creation failed - retry?
} }
} }
checkVolume(volume); checkVolume(volume);
//Delete the volume
// Delete the volume
client.getVolumeClient().deleteVolume(volume.getId()); client.getVolumeClient().deleteVolume(volume.getId());
} }
*/ */
@ -161,13 +166,10 @@ public class VolumeClientLiveTest extends BaseCloudStackClientLiveTest {
private Volume findVolumeWithId(final long id) { private Volume findVolumeWithId(final long id) {
return find(client.getVolumeClient().listVolumes(), new Predicate<Volume>() { return find(client.getVolumeClient().listVolumes(), new Predicate<Volume>() {
@Override @Override
public boolean apply(Volume arg0) { public boolean apply(Volume arg0) {
return arg0.getId() == id; return arg0.getId() == id;
} }
}); });
} }
} }