Repository: jclouds Updated Branches: refs/heads/1.9.x c6f47ca90 -> 72889bbf1
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/72889bbf Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/72889bbf Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/72889bbf Branch: refs/heads/1.9.x Commit: 72889bbf1934568ceb7a5f0e32f2837bbc31ca76 Parents: c6f47ca Author: Zack Shoylev <[email protected]> Authored: Wed Nov 18 08:55:20 2015 -0600 Committer: Zack Shoylev <[email protected]> Committed: Mon Nov 23 16:42: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/72889bbf/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/72889bbf/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("[email protected]").enabled(true); + CreateUserOptions createUserOptions = CreateUserOptions.Builder.email("[email protected]").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\":\"[email protected]\",\"enabled\":true}}"); + "{\"user\":{\"name\":\"jqsmith\",\"tenantId\":\"12345\",\"password\":\"jclouds-password\",\"email\":\"[email protected]\",\"enabled\":true}}"); } finally { server.shutdown(); }
