mirror of https://github.com/apache/jclouds.git
vcloud test stabilization
This commit is contained in:
parent
016b0c6eb5
commit
2ce0825e62
|
@ -46,6 +46,8 @@ public class VCloudComputeServiceLiveTest extends BaseComputeServiceLiveTest {
|
|||
|
||||
public VCloudComputeServiceLiveTest() {
|
||||
provider = "vcloud";
|
||||
// vcloud requires instantiate before deploy, which takes longer than 30 seconds
|
||||
nonBlockDurationSeconds = 300;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -18,16 +18,8 @@
|
|||
*/
|
||||
package org.jclouds.bluelock.vcloud.zone01.compute;
|
||||
|
||||
import static org.jclouds.compute.util.ComputeServiceUtils.getCores;
|
||||
import static org.testng.Assert.assertEquals;
|
||||
|
||||
import org.jclouds.compute.domain.ExecResponse;
|
||||
import org.jclouds.compute.domain.Image;
|
||||
import org.jclouds.compute.domain.NodeMetadata;
|
||||
import org.jclouds.compute.domain.OsFamily;
|
||||
import org.jclouds.compute.domain.Template;
|
||||
import org.jclouds.compute.domain.TemplateBuilder;
|
||||
import org.jclouds.compute.predicates.OperatingSystemPredicates;
|
||||
import org.jclouds.vcloud.compute.VCloudComputeServiceLiveTest;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
|
@ -40,34 +32,12 @@ import org.testng.annotations.Test;
|
|||
public class BluelockVCloudZone01ComputeServiceLiveTest extends VCloudComputeServiceLiveTest {
|
||||
public BluelockVCloudZone01ComputeServiceLiveTest() {
|
||||
provider = "bluelock-vcloud-zone01";
|
||||
// vcloud requires instantiate before deploy, which takes longer than 30 seconds
|
||||
nonBlockDurationSeconds = 300;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setServiceDefaults() {
|
||||
group = "director";
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testTemplateBuilder() {
|
||||
Template defaultTemplate = client.templateBuilder().build();
|
||||
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
|
||||
assert OperatingSystemPredicates.supportsApt().apply(defaultTemplate.getImage().getOperatingSystem());
|
||||
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
|
||||
assertEquals(defaultTemplate.getImage().getOperatingSystem().getDescription(), "Ubuntu Linux (64-bit)");
|
||||
assert defaultTemplate.getLocation().getId() != null : defaultTemplate.getLocation();
|
||||
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
|
||||
System.out.println(defaultTemplate.getHardware());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Template buildTemplate(TemplateBuilder templateBuilder) {
|
||||
Template template = super.buildTemplate(templateBuilder);
|
||||
Image image = template.getImage();
|
||||
assert image.getDefaultCredentials().credential != null : image;
|
||||
return template;
|
||||
}
|
||||
|
||||
protected void checkResponseEqualsHostname(ExecResponse execResponse, NodeMetadata node1) {
|
||||
// hostname is not completely predictable based on node metadata
|
||||
|
|
Loading…
Reference in New Issue