Repository: jclouds Updated Branches: refs/heads/1.8.x 7b7b54e0c -> 4c0f7e766
bug fix keystone role api + bug fix host aggregates Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/4c0f7e76 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/4c0f7e76 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/4c0f7e76 Branch: refs/heads/1.8.x Commit: 4c0f7e766d9b5e59cb00e310d4b6a290fa87e07b Parents: 7b7b54e Author: istolber <[email protected]> Authored: Wed Oct 8 07:17:39 2014 +0300 Committer: Adrian Cole <[email protected]> Committed: Tue Oct 7 22:03:16 2014 -0700 ---------------------------------------------------------------------- .../openstack/keystone/v2_0/extensions/RoleAdminApi.java | 3 +++ .../org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/4c0f7e76/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java index 0a938d2..68bc5c5 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java @@ -31,10 +31,12 @@ import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.javax.annotation.Nullable; import org.jclouds.openstack.keystone.v2_0.domain.Role; +import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest; import org.jclouds.openstack.v2_0.ServiceType; import org.jclouds.openstack.v2_0.services.Extension; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.PayloadParam; +import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.SelectJson; import org.jclouds.rest.annotations.WrapWith; @@ -47,6 +49,7 @@ import com.google.common.collect.FluentIterable; */ @Beta @Extension(of = ServiceType.IDENTITY, namespace = ExtensionNamespaces.OS_KSADM) +@RequestFilters(AuthenticateRequest.class) @Path("OS-KSADM/roles") public interface RoleAdminApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/4c0f7e76/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java index 75d3b70..0a4b3f5 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java @@ -168,13 +168,13 @@ public class HostAggregate { @ConstructorProperties({ "id", "name", "availability_zone", "hosts", "operational_state", "created_at", "updated_at", "metadata" }) - protected HostAggregate(String id, String name, String availabilityZone, @Nullable Set<String> hosts, String state, Date created, + protected HostAggregate(String id, String name, @Nullable String availabilityZone, @Nullable Set<String> hosts, @Nullable String state, Date created, @Nullable Date updated, @Nullable Map<String, String> metadata) { this.id = checkNotNull(id, "id"); this.name = checkNotNull(name, "name"); - this.availabilityZone = checkNotNull(availabilityZone, "availabilityZone"); + this.availabilityZone = availabilityZone; this.hosts = hosts == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(hosts); - this.state = checkNotNull(state, "state"); + this.state = state; this.created = checkNotNull(created, "created"); this.updated = Optional.fromNullable(updated); this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);
