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

bug fix keystone role api + bug fix host aggregates

This commit is contained in:
istolber 2014-10-08 07:17:39 +03:00 committed by Adrian Cole
parent 7b7b54e0c7
commit 4c0f7e766d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/extensions/RoleAdminApi.java
View File

@ -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 {

6
apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java
View File

@ -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);