You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2013/07/12 23:40:49 UTC
[1/2] git commit: Fixes encoding of "." when listing a single user
Only affects users with restricted hostnames
Updated Branches:
refs/heads/master 7eaf69a59 -> c2524d07a
Fixes encoding of "." when listing a single user
Only affects users with restricted hostnames
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/commit/83513ad4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/tree/83513ad4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/diff/83513ad4
Branch: refs/heads/master
Commit: 83513ad4f22aecf46720d17b5c77bff924b45494
Parents: 7eaf69a
Author: zack-shoylev <za...@rackspace.com>
Authored: Mon Jul 8 16:25:05 2013 -0500
Committer: Ignasi Barrera <ig...@gmail.com>
Committed: Fri Jul 12 23:36:56 2013 +0200
----------------------------------------------------------------------
.../openstack/trove/v1/features/UserApi.java | 3 ++
.../trove/v1/filters/EncodeDotsForUserGet.java | 49 ++++++++++++++++++++
.../trove/v1/features/UserApiExpectTest.java | 12 ++---
.../src/test/resources/user_get_withhost.json | 2 +-
4 files changed, 59 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/83513ad4/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java b/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java
index 59c8e08..3736660 100644
--- a/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java
+++ b/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/features/UserApi.java
@@ -35,6 +35,7 @@ import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
import org.jclouds.openstack.trove.v1.binders.BindCreateUserToJson;
import org.jclouds.openstack.trove.v1.binders.BindGrantUserToJson;
import org.jclouds.openstack.trove.v1.domain.User;
+import org.jclouds.openstack.trove.v1.filters.EncodeDotsForUserGet;
import org.jclouds.openstack.trove.v1.functions.ParseDatabaseListForUser;
import org.jclouds.rest.annotations.Fallback;
import org.jclouds.rest.annotations.MapBinder;
@@ -208,6 +209,7 @@ public interface UserApi {
@Named("user:get/{name}")
@GET
@Path("/users/{name}")
+ @RequestFilters(EncodeDotsForUserGet.class)
@SelectJson("user")
@Consumes(MediaType.APPLICATION_JSON)
@Fallback(NullOnNotFoundOr404.class)
@@ -224,6 +226,7 @@ public interface UserApi {
@Named("user:get/{name}@{hostname}")
@GET
@Path("/users/{name}@{hostname}")
+ @RequestFilters(EncodeDotsForUserGet.class)
@SelectJson("user")
@Consumes(MediaType.APPLICATION_JSON)
@Fallback(NullOnNotFoundOr404.class)
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/83513ad4/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/filters/EncodeDotsForUserGet.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/filters/EncodeDotsForUserGet.java b/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/filters/EncodeDotsForUserGet.java
new file mode 100644
index 0000000..4be330f
--- /dev/null
+++ b/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/filters/EncodeDotsForUserGet.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.openstack.trove.v1.filters;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.inject.Singleton;
+
+import org.jclouds.http.HttpException;
+import org.jclouds.http.HttpRequest;
+import org.jclouds.http.HttpRequestFilter;
+
+/**
+ * Encodes "." as %2e when getting a user with restricted hostname
+ *
+ * @author Zack Shoylev
+ *
+ */
+@Singleton
+public class EncodeDotsForUserGet implements HttpRequestFilter {
+ private final Pattern pattern = Pattern.compile("/[^/]*$"); // From last / to the end of the line
+
+ @Override
+ public HttpRequest filter(HttpRequest request) throws HttpException {
+ String endpoint = request.getEndpoint().toString();
+ Matcher matcher = pattern.matcher(endpoint);
+ if(!matcher.find())
+ return request; // do not modify if not found. This however is not expected to happen.
+ String encodable = matcher.group();
+ String encoded = encodable.replace(".", "%2e");
+ String newEndpoint = matcher.replaceFirst(encoded);
+ return request.toBuilder().endpoint(newEndpoint).build();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/83513ad4/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
index 1bb99ae..a711d11 100644
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
+++ b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
@@ -402,7 +402,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
}
public void testGetUserWithHostname() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/exampleuser%40192.168.64.64");
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/example%2euser%40192%2e168%2e64%2e64");
UserApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess,
@@ -410,16 +410,16 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/user_get_withhost.json")).build()
).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
- User user = api.get("exampleuser", "192.168.64.64");
- assertEquals(user.getName(), "exampleuser");
+ User user = api.get("example.user", "192.168.64.64");
+ assertEquals(user.getName(), "example.user");
assertEquals(user.getHost(), "192.168.64.64");
- assertEquals(user.getIdentifier(), "exampleuser@192.168.64.64");
+ assertEquals(user.getIdentifier(), "example.user@192.168.64.64");
assertEquals(user.getDatabases().size(), 2);
assertEquals(user.getDatabases().iterator().next(), "databaseA");
}
public void testGetUserWithHostnameFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/exampleuser%40192.168.64.64");
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/example%2euser%40192%2e168%2e64%2e64");
UserApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess,
@@ -427,7 +427,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_get_withhost.json")).build()
).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
- User user = api.get("exampleuser", "192.168.64.64");
+ User user = api.get("example.user", "192.168.64.64");
assertNull(user);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/83513ad4/openstack-trove/src/test/resources/user_get_withhost.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/user_get_withhost.json b/openstack-trove/src/test/resources/user_get_withhost.json
index 03274b6..2827568 100644
--- a/openstack-trove/src/test/resources/user_get_withhost.json
+++ b/openstack-trove/src/test/resources/user_get_withhost.json
@@ -1,6 +1,6 @@
{
"user": {
- "name": "exampleuser",
+ "name": "example.user",
"host": "192.168.64.64",
"databases": [
{
[2/2] git commit: Changed to unix file type and removed windows line
terminations
Posted by na...@apache.org.
Changed to unix file type and removed windows line terminations
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/commit/c2524d07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/tree/c2524d07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/diff/c2524d07
Branch: refs/heads/master
Commit: c2524d07afa603e8c095e06f560d5a69a54a2e4a
Parents: 83513ad
Author: Ignasi Barrera <ig...@gmail.com>
Authored: Fri Jul 12 23:37:55 2013 +0200
Committer: Ignasi Barrera <ig...@gmail.com>
Committed: Fri Jul 12 23:37:55 2013 +0200
----------------------------------------------------------------------
.../trove/v1/features/UserApiExpectTest.java | 866 +++++++++----------
1 file changed, 433 insertions(+), 433 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/c2524d07/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
index a711d11..163dabe 100644
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
+++ b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
@@ -1,433 +1,433 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.openstack.trove.v1.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.assertFalse;
-
-import java.net.URI;
-import java.util.List;
-import java.util.Set;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.openstack.trove.v1.domain.User;
-import org.jclouds.openstack.trove.v1.internal.BaseTroveApiExpectTest;
-import org.testng.annotations.Test;
-import org.testng.collections.Lists;
-import org.testng.internal.annotations.Sets;
-
-import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.ImmutableSortedSet.Builder;
-
-/**
- * Tests UserApi Guice wiring and parsing
- *
- * @author Zack Shoylev
- */
-@Test(groups = "unit", testName = "UserApiExpectTest")
-public class UserApiExpectTest extends BaseTroveApiExpectTest {
-
- public void testCreateUserSimple() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("POST")
- .payload(payloadFromResourceWithContentType("/user_create_simple_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.create("dbuser1", "password", "databaseA");
- assertTrue(result);
- }
-
- public void testCreateUserSimpleFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("POST")
- .payload(payloadFromResourceWithContentType("/user_create_simple_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.create("dbuser1", "password", "databaseA");
- assertFalse(result);
- }
-
- public void testCreateUserSimpleWithHost() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("POST")
- .payload(payloadFromResourceWithContentType("/user_create_with_host_simple_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.create("dbuser1", "password", "192.168.64.64", "databaseA");
- assertTrue(result);
- }
-
- public void testCreateUserSimpleWithHostFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("POST")
- .payload(payloadFromResourceWithContentType("/user_create_with_host_simple_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.create("dbuser1", "password", "192.168.64.64", "databaseA");
- assertFalse(result);
- }
-
- public void testCreateUser() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("POST")
- .payload(payloadFromResourceWithContentType("/user_create_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- Set<String> databases1 = Sets.newHashSet();
- databases1.add( "databaseA" );
- Builder<String> databases2builder = ImmutableSortedSet.<String>naturalOrder();
- databases2builder.add( "databaseB" );
- databases2builder.add( "databaseC" );
- Set<String> databases2 = databases2builder.build();
- Set<String> databases3 = Sets.newHashSet();
- databases3.add( "databaseD" );
- User user1 = User.builder().databases( databases1 ).name("dbuser1").password("password").build();
- User user2 = User.builder().databases( databases2 ).name("dbuser2").password("password").build();
- User user3 = User.builder().databases( databases3 ).name("dbuser3").password("password").host("192.168.64.64").build();
- Set<User> users = Sets.newHashSet();
- users.add(user1);
- users.add(user2);
- users.add(user3);
-
- boolean result = api.create(ImmutableSortedSet.<User>naturalOrder().addAll(users).build());
- assertTrue(result);
- }
-
- public void testCreateUserFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("POST")
- .payload(payloadFromResourceWithContentType("/user_create_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- Set<String> databases1 = Sets.newHashSet();
- databases1.add( "databaseA" );
- Builder<String> databases2builder = ImmutableSortedSet.<String>naturalOrder();
- databases2builder.add( "databaseB" );
- databases2builder.add( "databaseC" );
- Set<String> databases2 = databases2builder.build();
- Set<String> databases3 = Sets.newHashSet();
- databases3.add( "databaseD" );
- User user1 = User.builder().databases( databases1 ).name("dbuser1").password("password").build();
- User user2 = User.builder().databases( databases2 ).name("dbuser2").password("password").build();
- User user3 = User.builder().databases( databases3 ).name("dbuser3").password("password").host("192.168.64.64").build();
- Set<User> users = Sets.newHashSet();
- users.add(user1);
- users.add(user2);
- users.add(user3);
-
- boolean result = api.create( ImmutableSortedSet.<User>naturalOrder().addAll(users).build());
- assertFalse(result);
- }
-
- public void testGrantUserSimple() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("PUT")
- .payload(payloadFromResourceWithContentType("/user_grant_simple_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.grant("dbuser1", "databaseZ");
- assertTrue(result);
- }
-
- public void testGrantUserSimpleFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("PUT")
- .payload(payloadFromResourceWithContentType("/user_grant_simple_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.grant("dbuser1", "databaseZ");
- assertFalse(result);
- }
-
- public void testGrantUser() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("PUT")
- .payload(payloadFromResourceWithContentType("/user_grant_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- List<String> databases = Lists.newArrayList();
- databases.add( "databaseC" );
- databases.add( "databaseD" );
-
- boolean result = api.grant("dbuser1", databases);
- assertTrue(result);
- }
-
- public void testGrantUserFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("PUT")
- .payload(payloadFromResourceWithContentType("/user_grant_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- List<String> databases = Lists.newArrayList();
- databases.add( "databaseC" );
- databases.add( "databaseD" );
-
- boolean result = api.grant("dbuser1", databases);
- assertFalse(result);
- }
-
- public void testRevokeUser() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases/databaseA");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("DELETE")
- .build(),
- HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- Set<String> databases = Sets.newHashSet();
- databases.add( "database" );
- databases.add( "database" );
- boolean result = api.revoke("dbuser1", "databaseA");
- assertTrue(result);
- }
-
- public void testRevokeUserFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases/databaseA");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("DELETE")
- .build(),
- HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- Set<String> databases = Sets.newHashSet();
- databases.add( "database" );
- databases.add( "database" );
- boolean result = api.revoke("dbuser1", "databaseA");
- assertFalse(result);
- }
-
- public void testDeleteUser() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("DELETE")
- .build(),
- HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- Set<String> databases = Sets.newHashSet();
- databases.add( "database" );
- databases.add( "database" );
- boolean result = api.delete("dbuser1");
- assertTrue(result);
- }
-
- public void testDeleteUserFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
- .method("DELETE")
- .build(),
- HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- Set<String> databases = Sets.newHashSet();
- databases.add( "database" );
- databases.add( "database" );
- boolean result = api.delete("dbuser1");
- assertFalse(result);
- }
-
- public void testListUsers() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/trove_user_list.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- Set<User> users = api.list().toSet();
- assertEquals(users.size(), 4);
- assertTrue(users.iterator().next().getDatabases().isEmpty());
- assertEquals(users.iterator().next().getName(), "dbuser1");
- }
-
- public void testListUsersFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(404).payload(payloadFromResource("/trove_user_list.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- Set<User> users = api.list().toSet();
- assertTrue(users.isEmpty());
- }
-
- public void testUserGetDatabaseList() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/user_list_access.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- List<String> databases = api.getDatabaseList("dbuser1").toList();
- assertEquals(databases.size(), 2);
- assertEquals(databases.iterator().next(), "databaseA");
- }
-
- public void testUserGetDatabaseListFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_list_access.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- Set<String> databases = api.getDatabaseList("dbuser1").toSet();
- assertTrue(databases.isEmpty());
- }
-
- public void testGetUser() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/exampleuser");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/user_get.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- User user = api.get("exampleuser");
- assertEquals(user.getName(), "exampleuser");
- assertEquals(user.getHost(), "%");
- assertEquals(user.getDatabases().size(), 2);
- assertEquals(user.getDatabases().iterator().next(), "databaseA");
- }
-
- public void testGetUserFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/exampleuser");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_get.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- User user = api.get("exampleuser");
- assertNull(user);
- }
-
- public void testGetUserWithHostname() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/example%2euser%40192%2e168%2e64%2e64");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/user_get_withhost.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- User user = api.get("example.user", "192.168.64.64");
- assertEquals(user.getName(), "example.user");
- assertEquals(user.getHost(), "192.168.64.64");
- assertEquals(user.getIdentifier(), "example.user@192.168.64.64");
- assertEquals(user.getDatabases().size(), 2);
- assertEquals(user.getDatabases().iterator().next(), "databaseA");
- }
-
- public void testGetUserWithHostnameFail() {
- URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/example%2euser%40192%2e168%2e64%2e64");
- UserApi api = requestsSendResponses(
- keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_get_withhost.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- User user = api.get("example.user", "192.168.64.64");
- assertNull(user);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.openstack.trove.v1.features;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertFalse;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Set;
+
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.http.HttpResponse;
+import org.jclouds.openstack.trove.v1.domain.User;
+import org.jclouds.openstack.trove.v1.internal.BaseTroveApiExpectTest;
+import org.testng.annotations.Test;
+import org.testng.collections.Lists;
+import org.testng.internal.annotations.Sets;
+
+import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.collect.ImmutableSortedSet.Builder;
+
+/**
+ * Tests UserApi Guice wiring and parsing
+ *
+ * @author Zack Shoylev
+ */
+@Test(groups = "unit", testName = "UserApiExpectTest")
+public class UserApiExpectTest extends BaseTroveApiExpectTest {
+
+ public void testCreateUserSimple() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("POST")
+ .payload(payloadFromResourceWithContentType("/user_create_simple_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(202).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ boolean result = api.create("dbuser1", "password", "databaseA");
+ assertTrue(result);
+ }
+
+ public void testCreateUserSimpleFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("POST")
+ .payload(payloadFromResourceWithContentType("/user_create_simple_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(404).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ boolean result = api.create("dbuser1", "password", "databaseA");
+ assertFalse(result);
+ }
+
+ public void testCreateUserSimpleWithHost() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("POST")
+ .payload(payloadFromResourceWithContentType("/user_create_with_host_simple_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(202).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ boolean result = api.create("dbuser1", "password", "192.168.64.64", "databaseA");
+ assertTrue(result);
+ }
+
+ public void testCreateUserSimpleWithHostFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("POST")
+ .payload(payloadFromResourceWithContentType("/user_create_with_host_simple_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(404).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ boolean result = api.create("dbuser1", "password", "192.168.64.64", "databaseA");
+ assertFalse(result);
+ }
+
+ public void testCreateUser() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("POST")
+ .payload(payloadFromResourceWithContentType("/user_create_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(202).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ Set<String> databases1 = Sets.newHashSet();
+ databases1.add( "databaseA" );
+ Builder<String> databases2builder = ImmutableSortedSet.<String>naturalOrder();
+ databases2builder.add( "databaseB" );
+ databases2builder.add( "databaseC" );
+ Set<String> databases2 = databases2builder.build();
+ Set<String> databases3 = Sets.newHashSet();
+ databases3.add( "databaseD" );
+ User user1 = User.builder().databases( databases1 ).name("dbuser1").password("password").build();
+ User user2 = User.builder().databases( databases2 ).name("dbuser2").password("password").build();
+ User user3 = User.builder().databases( databases3 ).name("dbuser3").password("password").host("192.168.64.64").build();
+ Set<User> users = Sets.newHashSet();
+ users.add(user1);
+ users.add(user2);
+ users.add(user3);
+
+ boolean result = api.create(ImmutableSortedSet.<User>naturalOrder().addAll(users).build());
+ assertTrue(result);
+ }
+
+ public void testCreateUserFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("POST")
+ .payload(payloadFromResourceWithContentType("/user_create_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(404).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ Set<String> databases1 = Sets.newHashSet();
+ databases1.add( "databaseA" );
+ Builder<String> databases2builder = ImmutableSortedSet.<String>naturalOrder();
+ databases2builder.add( "databaseB" );
+ databases2builder.add( "databaseC" );
+ Set<String> databases2 = databases2builder.build();
+ Set<String> databases3 = Sets.newHashSet();
+ databases3.add( "databaseD" );
+ User user1 = User.builder().databases( databases1 ).name("dbuser1").password("password").build();
+ User user2 = User.builder().databases( databases2 ).name("dbuser2").password("password").build();
+ User user3 = User.builder().databases( databases3 ).name("dbuser3").password("password").host("192.168.64.64").build();
+ Set<User> users = Sets.newHashSet();
+ users.add(user1);
+ users.add(user2);
+ users.add(user3);
+
+ boolean result = api.create( ImmutableSortedSet.<User>naturalOrder().addAll(users).build());
+ assertFalse(result);
+ }
+
+ public void testGrantUserSimple() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("PUT")
+ .payload(payloadFromResourceWithContentType("/user_grant_simple_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(202).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ boolean result = api.grant("dbuser1", "databaseZ");
+ assertTrue(result);
+ }
+
+ public void testGrantUserSimpleFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("PUT")
+ .payload(payloadFromResourceWithContentType("/user_grant_simple_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(404).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ boolean result = api.grant("dbuser1", "databaseZ");
+ assertFalse(result);
+ }
+
+ public void testGrantUser() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("PUT")
+ .payload(payloadFromResourceWithContentType("/user_grant_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(202).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ List<String> databases = Lists.newArrayList();
+ databases.add( "databaseC" );
+ databases.add( "databaseD" );
+
+ boolean result = api.grant("dbuser1", databases);
+ assertTrue(result);
+ }
+
+ public void testGrantUserFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("PUT")
+ .payload(payloadFromResourceWithContentType("/user_grant_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(404).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ List<String> databases = Lists.newArrayList();
+ databases.add( "databaseC" );
+ databases.add( "databaseD" );
+
+ boolean result = api.grant("dbuser1", databases);
+ assertFalse(result);
+ }
+
+ public void testRevokeUser() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases/databaseA");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("DELETE")
+ .build(),
+ HttpResponse.builder().statusCode(202).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ Set<String> databases = Sets.newHashSet();
+ databases.add( "database" );
+ databases.add( "database" );
+ boolean result = api.revoke("dbuser1", "databaseA");
+ assertTrue(result);
+ }
+
+ public void testRevokeUserFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases/databaseA");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("DELETE")
+ .build(),
+ HttpResponse.builder().statusCode(404).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ Set<String> databases = Sets.newHashSet();
+ databases.add( "database" );
+ databases.add( "database" );
+ boolean result = api.revoke("dbuser1", "databaseA");
+ assertFalse(result);
+ }
+
+ public void testDeleteUser() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("DELETE")
+ .build(),
+ HttpResponse.builder().statusCode(202).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ Set<String> databases = Sets.newHashSet();
+ databases.add( "database" );
+ databases.add( "database" );
+ boolean result = api.delete("dbuser1");
+ assertTrue(result);
+ }
+
+ public void testDeleteUserFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint) // bad naming convention, you should not be able to change the method to POST
+ .method("DELETE")
+ .build(),
+ HttpResponse.builder().statusCode(404).build() // response
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ Set<String> databases = Sets.newHashSet();
+ databases.add( "database" );
+ databases.add( "database" );
+ boolean result = api.delete("dbuser1");
+ assertFalse(result);
+ }
+
+ public void testListUsers() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint).build(),
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/trove_user_list.json")).build()
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ Set<User> users = api.list().toSet();
+ assertEquals(users.size(), 4);
+ assertTrue(users.iterator().next().getDatabases().isEmpty());
+ assertEquals(users.iterator().next().getName(), "dbuser1");
+ }
+
+ public void testListUsersFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint).build(),
+ HttpResponse.builder().statusCode(404).payload(payloadFromResource("/trove_user_list.json")).build()
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ Set<User> users = api.list().toSet();
+ assertTrue(users.isEmpty());
+ }
+
+ public void testUserGetDatabaseList() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint).build(),
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/user_list_access.json")).build()
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ List<String> databases = api.getDatabaseList("dbuser1").toList();
+ assertEquals(databases.size(), 2);
+ assertEquals(databases.iterator().next(), "databaseA");
+ }
+
+ public void testUserGetDatabaseListFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/dbuser1/databases");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint).build(),
+ HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_list_access.json")).build()
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ Set<String> databases = api.getDatabaseList("dbuser1").toSet();
+ assertTrue(databases.isEmpty());
+ }
+
+ public void testGetUser() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/exampleuser");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint).build(),
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/user_get.json")).build()
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ User user = api.get("exampleuser");
+ assertEquals(user.getName(), "exampleuser");
+ assertEquals(user.getHost(), "%");
+ assertEquals(user.getDatabases().size(), 2);
+ assertEquals(user.getDatabases().iterator().next(), "databaseA");
+ }
+
+ public void testGetUserFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/exampleuser");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint).build(),
+ HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_get.json")).build()
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ User user = api.get("exampleuser");
+ assertNull(user);
+ }
+
+ public void testGetUserWithHostname() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/example%2euser%40192%2e168%2e64%2e64");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint).build(),
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/user_get_withhost.json")).build()
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ User user = api.get("example.user", "192.168.64.64");
+ assertEquals(user.getName(), "example.user");
+ assertEquals(user.getHost(), "192.168.64.64");
+ assertEquals(user.getIdentifier(), "example.user@192.168.64.64");
+ assertEquals(user.getDatabases().size(), 2);
+ assertEquals(user.getDatabases().iterator().next(), "databaseA");
+ }
+
+ public void testGetUserWithHostnameFail() {
+ URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/users/example%2euser%40192%2e168%2e64%2e64");
+ UserApi api = requestsSendResponses(
+ keystoneAuthWithUsernameAndPasswordAndTenantName,
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint).build(),
+ HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_get_withhost.json")).build()
+ ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+
+ User user = api.get("example.user", "192.168.64.64");
+ assertNull(user);
+ }
+}