You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/11/23 23:37:27 UTC
jclouds git commit: Fixes tenantId when using the keystone admin
extension
Repository: jclouds
Updated Branches:
refs/heads/master ab25fc725 -> 02b79106c
Fixes tenantId when using the keystone admin extension
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/02b79106
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/02b79106
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/02b79106
Branch: refs/heads/master
Commit: 02b79106c34895aee914e3daefdaa89a281f568c
Parents: ab25fc7
Author: Zack Shoylev <za...@rackspace.com>
Authored: Wed Nov 18 08:55:20 2015 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Mon Nov 23 16:03:02 2015 -0600
----------------------------------------------------------------------
.../openstack/keystone/v2_0/options/CreateUserOptions.java | 6 +++---
.../keystone/v2_0/extensions/UserAdminApiMockTest.java | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/02b79106/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
index 1e1b843..a9f5887 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
@@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableMap;
public class CreateUserOptions implements MapBinder{
@Inject
private BindToJsonPayload jsonBinder;
-
+
private String tenant;
private String password;
private String email;
@@ -75,7 +75,7 @@ public class CreateUserOptions implements MapBinder{
static class ServerRequest {
final String name;
- String tenant;
+ String tenantId;
String password;
String email;
boolean enabled;
@@ -97,7 +97,7 @@ public class CreateUserOptions implements MapBinder{
if (password != null)
user.password = password;
if (tenant != null)
- user.tenant = tenant;
+ user.tenantId = tenant;
user.enabled = enabled;
return bindToRequest(request, ImmutableMap.of("user", user));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/02b79106/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApiMockTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApiMockTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApiMockTest.java
index 2c8ac30..86798e3 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApiMockTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/keystone/v2_0/extensions/UserAdminApiMockTest.java
@@ -48,7 +48,8 @@ public class UserAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
try {
KeystoneApi keystoneApi = api(server.getUrl("/").toString(), "openstack-keystone");
UserAdminApi userAdminApi = keystoneApi.getUserAdminApi().get();
- CreateUserOptions createUserOptions = CreateUserOptions.Builder.email("john.smith@example.org").enabled(true);
+ CreateUserOptions createUserOptions = CreateUserOptions.Builder.email("john.smith@example.org").enabled(true)
+ .tenant("12345");
User testUser = userAdminApi.create("jqsmith", "jclouds-password", createUserOptions);
assertNotNull(testUser);
@@ -61,7 +62,7 @@ public class UserAdminApiMockTest extends BaseOpenStackMockTest<KeystoneApi> {
assertEquals(createUserRequest.getRequestLine(), "POST /users HTTP/1.1");
assertEquals(
new String(createUserRequest.getBody()),
- "{\"user\":{\"name\":\"jqsmith\",\"password\":\"jclouds-password\",\"email\":\"john.smith@example.org\",\"enabled\":true}}");
+ "{\"user\":{\"name\":\"jqsmith\",\"tenantId\":\"12345\",\"password\":\"jclouds-password\",\"email\":\"john.smith@example.org\",\"enabled\":true}}");
} finally {
server.shutdown();
}