Repository: jclouds Updated Branches: refs/heads/1.9.x 559f7adb6 -> 938860511
Fix for Go2Cloud provider endpoint See JCLOUDS-1004 - Update the Go2Cloud endpoint https://issues.apache.org/jira/browse/JCLOUDS-1004 Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/93886051 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/93886051 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/93886051 Branch: refs/heads/1.9.x Commit: 93886051109b61429081f3267d3a35843ab970dd Parents: 559f7ad Author: Stuart Hendren <[email protected]> Authored: Tue Sep 22 11:38:31 2015 +0100 Committer: Ignasi Barrera <[email protected]> Committed: Wed Sep 23 11:03:16 2015 +0200 ---------------------------------------------------------------------- providers/go2cloud-jhb1/pom.xml | 2 +- .../go2cloud/Go2CloudJohannesburg1ProviderMetadata.java | 9 +++------ .../Go2CloudJohannesburg1TemplateBuilderLiveTest.java | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/93886051/providers/go2cloud-jhb1/pom.xml ---------------------------------------------------------------------- diff --git a/providers/go2cloud-jhb1/pom.xml b/providers/go2cloud-jhb1/pom.xml index e132ff6..c1f033e 100644 --- a/providers/go2cloud-jhb1/pom.xml +++ b/providers/go2cloud-jhb1/pom.xml @@ -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> http://git-wip-us.apache.org/repos/asf/jclouds/blob/93886051/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java b/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java index 80df182..8bfd0f1 100644 --- a/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java +++ b/providers/go2cloud-jhb1/src/main/java/org/jclouds/go2cloud/Go2CloudJohannesburg1ProviderMetadata.java @@ -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; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/93886051/providers/go2cloud-jhb1/src/test/java/org/jclouds/go2cloud/compute/Go2CloudJohannesburg1TemplateBuilderLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/go2cloud-jhb1/src/test/java/org/jclouds/go2cloud/compute/Go2CloudJohannesburg1TemplateBuilderLiveTest.java b/providers/go2cloud-jhb1/src/test/java/org/jclouds/go2cloud/compute/Go2CloudJohannesburg1TemplateBuilderLiveTest.java index 949453c..2062941 100644 --- a/providers/go2cloud-jhb1/src/test/java/org/jclouds/go2cloud/compute/Go2CloudJohannesburg1TemplateBuilderLiveTest.java +++ b/providers/go2cloud-jhb1/src/test/java/org/jclouds/go2cloud/compute/Go2CloudJohannesburg1TemplateBuilderLiveTest.java @@ -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);
