You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/08 07:02:58 UTC
git commit: bug fix keystone role api + bug fix host aggregates
Repository: jclouds
Updated Branches:
refs/heads/master e6bf0cc9a -> c9d5d2a20
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/c9d5d2a2
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/c9d5d2a2
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/c9d5d2a2
Branch: refs/heads/master
Commit: c9d5d2a200fb37875931451281ae1d32d593dc17
Parents: e6bf0cc
Author: istolber <in...@alcatel-lucent.com>
Authored: Wed Oct 8 07:17:39 2014 +0300
Committer: Adrian Cole <ad...@gmail.com>
Committed: Tue Oct 7 21:44:38 2014 -0700
----------------------------------------------------------------------
.../openstack/keystone/v2_0/extensions/RoleAdminApi.java | 3 +++
.../jclouds/openstack/nova/v2_0/domain/HostAggregate.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/c9d5d2a2/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/c9d5d2a2/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 d5e75a3..c6f3457 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
@@ -169,13 +169,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.hosts = hosts == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(hosts);
- this.state = checkNotNull(state, "state");
+ this.availabilityZone = availabilityZone;
+ this.hosts = hosts == null ? ImmutableSet.<String>of() : ImmutableSet.copyOf(hosts);
+ this.state = state;
this.created = checkNotNull(created, "created");
this.updated = Optional.fromNullable(updated);
this.metadata = metadata == null ? ImmutableMap.<String, String>of() : ImmutableMap.copyOf(metadata);