Repository: jclouds Updated Branches: refs/heads/1.8.x 8122f0b38 -> f3b3c4c70
added zone to openstack Host Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/f3b3c4c7 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/f3b3c4c7 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/f3b3c4c7 Branch: refs/heads/1.8.x Commit: f3b3c4c7067f2cdc149fe07fc420af59c5216154 Parents: 8122f0b Author: istolber <[email protected]> Authored: Wed Oct 8 08:46:00 2014 +0300 Committer: Adrian Cole <[email protected]> Committed: Wed Oct 8 08:08:18 2014 -0700 ---------------------------------------------------------------------- .../openstack/nova/v2_0/domain/Host.java | 31 +++++++++++++++----- .../HostAdministrationApiExpectTest.java | 3 +- .../src/test/resources/hosts_list.json | 1 + 3 files changed, 27 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/f3b3c4c7/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java index 72df77d..2c690f4 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java @@ -43,6 +43,7 @@ public class Host { protected String name; protected String service; + protected String zone; /** * @see Host#getName() @@ -60,14 +61,23 @@ public class Host { return self(); } + /** + * @see Host#getZone() + */ + public T zone(String zone) { + this.zone = zone; + return self(); + } + public Host build() { - return new Host(name, service); + return new Host(name, service, zone); } public T fromHost(Host in) { return this .name(in.getName()) - .service(in.getService()); + .service(in.getService()) + .zone(in.getZone()); } } @@ -81,13 +91,15 @@ public class Host { @Named("host_name") private final String name; private final String service; + private final String zone; @ConstructorProperties({ - "host_name", "service" + "host_name", "service", "zone" }) - protected Host(@Nullable String name, @Nullable String service) { + protected Host(@Nullable String name, @Nullable String service, @Nullable String zone) { this.name = name; this.service = service; + this.zone = zone; } @Nullable @@ -100,9 +112,13 @@ public class Host { return this.service; } + @Nullable + public String getZone() { + return this.zone; + } @Override public int hashCode() { - return Objects.hashCode(name, service); + return Objects.hashCode(name, service, zone); } @Override @@ -111,12 +127,13 @@ public class Host { if (obj == null || getClass() != obj.getClass()) return false; Host that = Host.class.cast(obj); return Objects.equal(this.name, that.name) - && Objects.equal(this.service, that.service); + && Objects.equal(this.service, that.service) + && Objects.equal(this.zone, that.zone); } protected ToStringHelper string() { return Objects.toStringHelper(this) - .add("name", name).add("service", service); + .add("name", name).add("service", service).add("zone", zone); } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/f3b3c4c7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java index 3b3f01f..0414bda 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAdministrationApiExpectTest.java @@ -53,12 +53,13 @@ public class HostAdministrationApiExpectTest extends BaseNovaApiExpectTest { .endpoint(endpoint).build(), HttpResponse.builder().statusCode(200).payload(payloadFromResource("/hosts_list.json")).build()).getHostAdministrationExtensionForZone("az-1.region-a.geo-1").get(); - Host expected = Host.builder().name("ubuntu").service("compute").build(); + Host expected = Host.builder().name("ubuntu").service("compute").zone("nova").build(); Set<? extends Host> result = api.list().toSet(); Host host = Iterables.getOnlyElement(result); assertEquals(host.getName(), "ubuntu"); assertEquals(host.getService(), "compute"); + assertEquals(host.getZone(), "nova"); assertEquals(host, expected); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/f3b3c4c7/apis/openstack-nova/src/test/resources/hosts_list.json ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/test/resources/hosts_list.json b/apis/openstack-nova/src/test/resources/hosts_list.json index 6eb1361..ab06b0d 100644 --- a/apis/openstack-nova/src/test/resources/hosts_list.json +++ b/apis/openstack-nova/src/test/resources/hosts_list.json @@ -1,6 +1,7 @@ { "hosts": [ { + "zone": "nova", "host_name": "ubuntu", "service": "compute" }
