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

[SoftLayer] fix SoftLayerTemplateBuilderLiveTest 

add more iso3166Codes
fix DatacenterApiLiveTest
This commit is contained in:
Andrea Turli 2015-06-03 22:34:09 +02:00
parent a0ada77eec
commit 16cf5909dd
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/softlayer/src/main/java/org/jclouds/softlayer/SoftLayerProviderMetadata.java
View File

@ -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());
}

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

@ -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);

27
providers/softlayer/src/test/java/org/jclouds/softlayer/features/DatacenterApiLiveTest.java
View File

@ -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<Datacenter> 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());