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

fixes to some softlayer tests

This commit is contained in:
Adrian Cole 2012-09-10 08:04:42 -07:00
parent b558015515
commit 499e47c5b4
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java
View File

@ -36,7 +36,7 @@ import com.google.common.io.Closeables;
public class SoftLayerExperimentLiveTest extends BaseComputeServiceContextLiveTest {
public SoftLayerExperimentLiveTest() {
provider = "glesys";
provider = "softlayer";
}
@Test

7
providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java
View File

@ -63,7 +63,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes
// For each os-type both 32- and 64-bit are supported.
switch (input.family) {
case UBUNTU:
return input.version.equals("") || input.version.equals("10.04") || input.version.equals("8");
return input.version.equals("") || input.version.equals("10.04") || input.version.equals("12.04") || input.version.equals("8");
case DEBIAN:
return input.version.equals("") || input.version.matches("[56].0");
case FEDORA:
@ -85,7 +85,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes
@Test
public void testDefaultTemplateBuilder() throws IOException {
Template defaultTemplate = view.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "12.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);
@ -212,6 +212,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes
@Override
protected Set<String> getIso3166Codes() {
return ImmutableSet.<String> of("SG", "NL", "US-CA", "US-TX", "US-VA", "US-WA", "US-TX");
return ImmutableSet.<String> of("SG", "US-CA", "US-TX", "US-VA", "US-WA");
}
}

4
providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerClientLiveTest.java
View File

@ -33,6 +33,10 @@ import org.testng.annotations.Test;
@Test(groups = "live")
public class BaseSoftLayerClientLiveTest extends BaseComputeServiceContextLiveTest {
public BaseSoftLayerClientLiveTest() {
this.provider = "softlayer";
}
protected RestContext<SoftLayerClient, SoftLayerAsyncClient> socontext;
@BeforeGroups(groups = { "integration", "live" })