diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java index 7804bb84ae..6da73f8e65 100644 --- a/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java +++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java @@ -67,7 +67,7 @@ public class SoftLayerProviderMetadata extends BaseProviderMetadata { .apiMetadata(new SoftLayerApiMetadata()) .homepage(URI.create("http://www.softlayer.com")) .console(URI.create("https://manage.softlayer.com")) - .iso3166Codes("SG", "US-CA", "US-TX", "US-VA", "US-WA", "NL", "HK", "NSFTW-IL", "AU", "CA-ON", "GB") // NSFTW-IL is a weird isoCode returned by Softlayer + .iso3166Codes("SG", "US-CA", "US-TX", "US-VA", "US-WA", "NL", "HK", "NSFTW-IL", "AU", "CA-ON", "GB", "FR", "IT", "DE", "JP", "MX", "CA-ON", "CA-QC") .endpoint("https://api.softlayer.com/rest") .defaultProperties(SoftLayerProviderMetadata.defaultProperties()); } 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 78a7b5c233..2c07903845 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 @@ -44,7 +44,7 @@ public class SoftLayerTemplateBuilderLiveTest extends BaseTemplateBuilderLiveTes @Test public void testDefaultTemplateBuilder() throws IOException { Template defaultTemplate = view.getComputeService().templateBuilder().build(); - assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "12.04"); + assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "14.04"); assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true); assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU); assertEquals(getCores(defaultTemplate.getHardware()), 1.0d); diff --git a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java index 923af2de2a..0cf933878b 100644 --- a/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java +++ b/providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java @@ -16,18 +16,18 @@ */ package org.jclouds.softlayer.features; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.ImmutableSet.Builder; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; +import java.util.Set; + import org.jclouds.softlayer.domain.Address; import org.jclouds.softlayer.domain.Datacenter; import org.jclouds.softlayer.domain.Region; import org.testng.annotations.Test; -import java.util.Set; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.ImmutableSet.Builder; /** * Tests behavior of {@code DatacenterApi} @@ -51,19 +51,28 @@ public class DatacenterApiLiveTest extends BaseSoftLayerApiLiveTest { public void testListDatacentersContent() { Builder builder = ImmutableSet.builder(); builder.add(Datacenter.builder().id(265592).name("ams01").longName("Amsterdam 1").build()); - builder.add(Datacenter.builder().id(358698).name("wdc03").longName("Ashburn, VA 3").build()); + builder.add(Datacenter.builder().id(814994).name("ams03").longName("Amsterdam 3").build()); builder.add(Datacenter.builder().id(3).name("dal01").longName("Dallas").build()); builder.add(Datacenter.builder().id(154770).name("dal02").longName("Dallas 2").build()); builder.add(Datacenter.builder().id(167092).name("dal04").longName("Dallas 4").build()); builder.add(Datacenter.builder().id(138124).name("dal05").longName("Dallas 5").build()); builder.add(Datacenter.builder().id(154820).name("dal06").longName("Dallas 6").build()); builder.add(Datacenter.builder().id(142776).name("dal07").longName("Dallas 7").build()); + builder.add(Datacenter.builder().id(449494).name("dal09").longName("Dallas 9").build()); + builder.add(Datacenter.builder().id(449506).name("fra02").longName("Frankfurt 2").build()); builder.add(Datacenter.builder().id(352494).name("hkg02").longName("Hong Kong 2").build()); builder.add(Datacenter.builder().id(142775).name("hou02").longName("Houston 2").build()); builder.add(Datacenter.builder().id(358694).name("lon02").longName("London 2").build()); - builder.add(Datacenter.builder().id(18171).name("sea01").longName("Seattle").build()); + builder.add(Datacenter.builder().id(449596).name("mel01").longName("Melbourne 1").build()); + builder.add(Datacenter.builder().id(449600).name("mex01").longName("Mexico 1").build()); + builder.add(Datacenter.builder().id(815394).name("mil01").longName("Milan 1").build()); + builder.add(Datacenter.builder().id(449610).name("mon01").longName("Montreal 1").build()); + builder.add(Datacenter.builder().id(449500).name("par01").longName("Paris 1").build()); builder.add(Datacenter.builder().id(168642).name("sjc01").longName("San Jose 1").build()); + builder.add(Datacenter.builder().id(18171).name("sea01").longName("Seattle").build()); builder.add(Datacenter.builder().id(224092).name("sng01").longName("Singapore 1").build()); + builder.add(Datacenter.builder().id(449612).name("syd01").longName("Sydney 1").build()); + builder.add(Datacenter.builder().id(449604).name("tok02").longName("Tokio 2").build()); builder.add(Datacenter.builder().id(448994).name("tor01").longName("Toronto 1").build()); builder.add(Datacenter.builder().id(37473).name("wdc01").longName("Washington, DC 1").build());