diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java index c98091b8a4..f7501654d0 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerExperimentLiveTest.java @@ -36,7 +36,7 @@ import com.google.common.io.Closeables; public class SoftLayerExperimentLiveTest extends BaseComputeServiceContextLiveTest { public SoftLayerExperimentLiveTest() { - provider = "glesys"; + provider = "softlayer"; } @Test diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java index 181e380ea7..4d7b9aa477 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/compute/SoftLayerTemplateBuilderLiveTest.java @@ -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 getIso3166Codes() { - return ImmutableSet. of("SG", "NL", "US-CA", "US-TX", "US-VA", "US-WA", "US-TX"); + return ImmutableSet. of("SG", "US-CA", "US-TX", "US-VA", "US-WA"); } + } \ No newline at end of file diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerClientLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerClientLiveTest.java index f8c6eab88b..8732b7a540 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerClientLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/BaseSoftLayerClientLiveTest.java @@ -33,6 +33,10 @@ import org.testng.annotations.Test; @Test(groups = "live") public class BaseSoftLayerClientLiveTest extends BaseComputeServiceContextLiveTest { + public BaseSoftLayerClientLiveTest() { + this.provider = "softlayer"; + } + protected RestContext socontext; @BeforeGroups(groups = { "integration", "live" })