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

Fix for Go2Cloud provider endpoint 

See JCLOUDS-1004 - Update the Go2Cloud endpoint

https://issues.apache.org/jira/browse/JCLOUDS-1004
This commit is contained in:
Stuart Hendren 2015-09-22 11:38:31 +01:00 committed by Ignasi Barrera
parent ed425c202a
commit 26df7e3c9e
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
providers/go2cloud-jhb1/pom.xml
View File

@ -32,7 +32,7 @@
<packaging>bundle</packaging>
<properties>
<test.go2cloud-jhb1.endpoint>http://api.jhb1.go2cloud.co.za</test.go2cloud-jhb1.endpoint>
<test.go2cloud-jhb1.endpoint>http://api-jhb1.go2cloud.co.za</test.go2cloud-jhb1.endpoint>
<test.go2cloud-jhb1.api-version>2.0</test.go2cloud-jhb1.api-version>
<test.go2cloud-jhb1.build-version />
<test.go2cloud-jhb1.identity>FIXME_IDENTITY</test.go2cloud-jhb1.identity>

9
providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java
View File

@ -53,9 +53,7 @@ public class Go2CloudJohannesburg1ProviderMetadata extends BaseProviderMetadata
return properties;
}
public static class Builder
extends
BaseProviderMetadata.Builder {
public static class Builder extends BaseProviderMetadata.Builder {
protected Builder() {
id("go2cloud-jhb1")
@ -64,7 +62,7 @@ public class Go2CloudJohannesburg1ProviderMetadata extends BaseProviderMetadata
.homepage(URI.create("https://jhb1.go2cloud.co.za"))
.console(URI.create("https://jhb1.go2cloud.co.za/accounts"))
.iso3166Codes("ZA-GP")
.endpoint("https://api.jhb1.go2cloud.co.za")
.endpoint("https://api-jhb1.go2cloud.co.za")
.defaultProperties(Go2CloudJohannesburg1ProviderMetadata.defaultProperties());
}
@ -74,8 +72,7 @@ public class Go2CloudJohannesburg1ProviderMetadata extends BaseProviderMetadata
}
@Override
public Builder fromProviderMetadata(
ProviderMetadata in) {
public Builder fromProviderMetadata(ProviderMetadata in) {
super.fromProviderMetadata(in);
return this;
}

2
providers/go2cloud-jhb1/src/test/java/org/jclouds/go2cloud/compute/Go2CloudJohannesburg1TemplateBuilderLiveTest.java
View File

@ -40,7 +40,7 @@ public class Go2CloudJohannesburg1TemplateBuilderLiveTest extends BaseTemplateBu
public void testDefaultTemplateBuilder() throws IOException {
Template defaultTemplate = this.view.getComputeService().templateBuilder().build();
assertEquals(defaultTemplate.getImage().getOperatingSystem().is64Bit(), true);
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "10.10");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getVersion(), "12.04");
assertEquals(defaultTemplate.getImage().getOperatingSystem().getFamily(), OsFamily.UBUNTU);
assertEquals(defaultTemplate.getLocation().getId(), "go2cloud-jhb1");
assertEquals(getCores(defaultTemplate.getHardware()), 1.0d);