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 2013/12/13 01:46:49 UTC
[2/4] Remove trove from labs (moved to jclouds).
https://issues.apache.org/jira/browse/JCLOUDS-102
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/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
deleted file mode 100644
index b1f9208..0000000
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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()
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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()
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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()
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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()
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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()
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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()
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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()
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- 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()
- ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
-
- User user = api.get("example.user", "192.168.64.64");
- assertNull(user);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiLiveTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiLiveTest.java
deleted file mode 100644
index cd4a468..0000000
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiLiveTest.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * 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 com.google.common.base.Preconditions.checkArgument;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.jclouds.openstack.trove.v1.domain.Instance;
-import org.jclouds.openstack.trove.v1.domain.User;
-import org.jclouds.openstack.trove.v1.internal.BaseTroveApiLiveTest;
-import org.jclouds.openstack.trove.v1.utils.TroveUtils;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-/**
- * @author Zack Shoylev
- */
-@Test(groups = "live", testName = "UserApiLiveTest")
-public class UserApiLiveTest extends BaseTroveApiLiveTest {
-
- // zone to instance
- private static Map<String,List<Instance>> instancesToDelete = Maps.newHashMap();
- // not deleting users. they will be deleted when instances are deleted
-
- @Override
- @BeforeClass(groups = { "integration", "live" })
- public void setup() {
- super.setup();
- TroveUtils utils= new TroveUtils(api);
- for (String zone : api.getConfiguredZones()) {
- // create instances
- List<Instance> instanceList = Lists.newArrayList();
- Instance first = utils.getWorkingInstance(zone, "first_user_trove_live_testing_" + zone, "1", 1);
- Instance second = utils.getWorkingInstance(zone, "second_user_trove_live_testing_" + zone, "1", 1);
- instanceList.add(first);
- instanceList.add(second);
- instancesToDelete.put(zone, instanceList);
- // create users
- User user1 = User.builder()
- .name("user1")
- .password(UUID.randomUUID().toString())
- .databases(ImmutableSet.of(
- "u1db1",
- "u1db2")).build();
- User user2 = User.builder()
- .name("user2")
- .password(UUID.randomUUID().toString())
- .databases(ImmutableSet.of(
- "u2db1",
- "u2db2")).build();
- User user3 = User.builder()
- .name("user3")
- .password(UUID.randomUUID().toString())
- .host("173.203.44.122")
- .databases(ImmutableSet.of(
- "u3db1",
- "u3db2")).build();
- UserApi userApiFirst = api.getUserApiForZoneAndInstance(zone, first.getId());
- UserApi userApiSecond = api.getUserApiForZoneAndInstance(zone, second.getId());
- userApiFirst.create(ImmutableSet.of(user1, user2));
- userApiSecond.create(ImmutableSet.of(user3));
- }
- }
-
- @Override
- @AfterClass(groups = { "integration", "live" })
- public void tearDown(){
- for (String zone : api.getConfiguredZones()) {
- InstanceApi instanceApi = api.getInstanceApiForZone(zone);
- for(Instance instance : instancesToDelete.get(zone)){
- if( !instanceApi.delete(instance.getId() ) )
- throw new RuntimeException("Could not delete a database instance after tests!");
- }
- }
- super.tearDown();
- }
-
- private void checkUser(User user) {
- assertNotNull(user.getName(), "Name cannot be null for " + user);
- assertNotNull(user.getHost(), "Host cannot be null (should be '%' if default) for " + user);
- checkArgument(!user.getDatabases().isEmpty(), "Number of databases must not be 0");
- }
-
- @Test
- public void testListUsers() {
- for (String zone : api.getConfiguredZones()) {
- InstanceApi instanceApi = api.getInstanceApiForZone(zone);
- assertTrue(instanceApi.list().size() >= 2);
- for(Instance instance : instancesToDelete.get(zone)) {
- UserApi userApi = api.getUserApiForZoneAndInstance(zone, instance.getId());
- if(!instance.getName().contains("user_trove_live_testing"))continue;
- assertTrue(userApi.list().size() >=1);
- for(User user : userApi.list()){
- checkUser(user);
- }
- }
- }
- }
-
- @Test
- public void testGetUser() {
- for (String zone : api.getConfiguredZones()) {
- InstanceApi instanceApi = api.getInstanceApiForZone(zone);
- assertTrue(instanceApi.list().size() >= 2);
- for(Instance instance : instancesToDelete.get(zone)) {
- UserApi userApi = api.getUserApiForZoneAndInstance(zone, instance.getId());
- if(!instance.getName().contains("user_trove_live_testing"))continue;
- assertTrue(userApi.list().size() >=1);
- for(User user : userApi.list()){
- User userFromGet = userApi.get(user.getIdentifier());
- assertEquals(userFromGet.getName(), user.getName());
- assertEquals(userFromGet.getHost(), user.getHost());
- assertEquals(userFromGet.getIdentifier(), user.getIdentifier());
- assertEquals(userFromGet.getDatabases(), user.getDatabases());
- assertEquals(userFromGet, user);
- }
- }
- }
- }
-
- @Test
- public void testGetDatabaseListForUser() {
- for (String zone : api.getConfiguredZones()) {
- InstanceApi instanceApi = api.getInstanceApiForZone(zone);
- assertTrue(instanceApi.list().size() >= 2 );
- for(Instance instance : instancesToDelete.get(zone)) {
- UserApi userApi = api.getUserApiForZoneAndInstance(zone, instance.getId());
- if(!instance.getName().contains("user_trove_live_testing"))continue;
- assertTrue(userApi.list().size() >=1);
- for(User user : userApi.list()){
- assertFalse(userApi.getDatabaseList(user.getIdentifier()).isEmpty());
- }
- }
- }
- }
-
- @Test
- public void testGrantAndRevokeAcccessForUser() {
- for (String zone : api.getConfiguredZones()) {
- InstanceApi instanceApi = api.getInstanceApiForZone(zone);
- assertTrue(instanceApi.list().size() >= 2);
- for(Instance instance : instancesToDelete.get(zone)) {
- UserApi userApi = api.getUserApiForZoneAndInstance(zone, instance.getId());
- if(!instance.getName().contains("user_trove_live_testing"))continue;
- assertTrue(userApi.list().size() >=1);
- for(User user : userApi.list()){
- userApi.grant(user.getIdentifier(), "dbA");
- userApi.grant(user.getIdentifier(), ImmutableList.of(
- "dbB",
- "dbC"));
-
- Set<String> databases = userApi.getDatabaseList(user.getIdentifier()).toSet();
- assertTrue(databases.contains("dbA"));
- assertTrue(databases.contains("dbB"));
- assertTrue(databases.contains("dbC"));
-
- userApi.revoke(user.getIdentifier(), "dbA");
- userApi.revoke(user.getIdentifier(), "dbB");
- userApi.revoke(user.getIdentifier(), "dbC");
-
- databases = userApi.getDatabaseList(user.getIdentifier()).toSet();
- assertFalse(databases.contains("dbA"));
- assertFalse(databases.contains("dbB"));
- assertFalse(databases.contains("dbC"));
- }
- }
- }
- }
-
- @Test
- public void testGetUserWhenNotFound() {
- for (String zone : api.getConfiguredZones()) {
- String instanceId = instancesToDelete.get(zone).iterator().next().getId();
- UserApi userApi = api.getUserApiForZoneAndInstance(zone, instanceId);
- assertNull(userApi.get("9999"));
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveApiExpectTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveApiExpectTest.java
deleted file mode 100644
index b8c4216..0000000
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveApiExpectTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.internal;
-
-import org.jclouds.openstack.trove.v1.TroveApi;
-
-/**
- * Base class for writing Trove Rest Api Expect tests
- *
- * @author Everett Toews
- */
-public class BaseTroveApiExpectTest extends BaseTroveExpectTest<TroveApi> {
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveApiLiveTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveApiLiveTest.java
deleted file mode 100644
index 978f4ce..0000000
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveApiLiveTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.internal;
-
-import java.util.Properties;
-
-import org.jclouds.apis.BaseApiLiveTest;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties;
-import org.jclouds.openstack.trove.v1.TroveApi;
-
-/**
- * Tests behavior of TroveApi
- *
- * @author Zack Shoylev
- */
-public class BaseTroveApiLiveTest extends BaseApiLiveTest<TroveApi> {
-
- public BaseTroveApiLiveTest() {
- provider = "openstack-trove";
- }
-
- @Override
- protected Properties setupProperties() {
- Properties props = super.setupProperties();
- setIfTestSystemPropertyPresent(props, KeystoneProperties.CREDENTIAL_TYPE);
- setIfTestSystemPropertyPresent(props, KeystoneProperties.SERVICE_TYPE);
- return props;
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveExpectTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveExpectTest.java
deleted file mode 100644
index b43db05..0000000
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/internal/BaseTroveExpectTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.internal;
-
-import javax.ws.rs.core.MediaType;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.openstack.keystone.v2_0.internal.KeystoneFixture;
-import org.jclouds.rest.internal.BaseRestApiExpectTest;
-
-/**
- * Base class for writing Nova Expect tests
- *
- * @author Adrian Cole
- */
-public class BaseTroveExpectTest<T> extends BaseRestApiExpectTest<T> {
- protected HttpRequest keystoneAuthWithUsernameAndPassword;
- protected HttpRequest keystoneAuthWithUsernameAndPasswordAndTenantName;
- protected HttpRequest keystoneAuthWithAccessKeyAndSecretKeyAndTenantName;
- protected String authToken;
- protected HttpResponse responseWithKeystoneAccess;
- protected HttpRequest extensionsOfNovaRequest;
- protected HttpResponse extensionsOfNovaResponse;
- protected HttpResponse unmatchedExtensionsOfNovaResponse;
- protected HttpRequest keystoneAuthWithAccessKeyAndSecretKeyAndTenantId;
- protected String identityWithTenantId;
-
- public BaseTroveExpectTest() {
- provider = "openstack-trove";
- keystoneAuthWithUsernameAndPassword = KeystoneFixture.INSTANCE.initialAuthWithUsernameAndPassword(identity,
- credential);
- keystoneAuthWithUsernameAndPasswordAndTenantName = KeystoneFixture.INSTANCE.initialAuthWithUsernameAndPasswordAndTenantName(identity,
- credential);
- keystoneAuthWithAccessKeyAndSecretKeyAndTenantName = KeystoneFixture.INSTANCE.initialAuthWithAccessKeyAndSecretKeyAndTenantName(identity,
- credential);
- keystoneAuthWithAccessKeyAndSecretKeyAndTenantId = KeystoneFixture.INSTANCE.initialAuthWithAccessKeyAndSecretKeyAndTenantId(identity,
- credential);
-
- authToken = KeystoneFixture.INSTANCE.getAuthToken();
- responseWithKeystoneAccess = KeystoneFixture.INSTANCE.responseWithAccess();
- // now, createContext arg will need tenant prefix
- identityWithTenantId = KeystoneFixture.INSTANCE.getTenantId() + ":" + identity;
- identity = KeystoneFixture.INSTANCE.getTenantName() + ":" + identity;
- }
-
- @Override
- protected HttpRequestComparisonType compareHttpRequestAsType(HttpRequest input) {
- return HttpRequestComparisonType.JSON;
- }
-
- protected HttpRequest.Builder<?> authenticatedGET() {
- return HttpRequest.builder()
- .method("GET")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken);
- }
-
- protected HttpRequest.Builder<?> authenticatedPOST() {
- return HttpRequest.builder()
- .method("POST")
- .addHeader("Accept", MediaType.APPLICATION_JSON)
- .addHeader("X-Auth-Token", authToken);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseFlavorListTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseFlavorListTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseFlavorListTest.java
deleted file mode 100644
index 39361cf..0000000
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseFlavorListTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * 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.parse;
-
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.http.Uris;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.openstack.trove.v1.domain.Flavor;
-import org.jclouds.openstack.v2_0.domain.Link;
-import org.jclouds.openstack.v2_0.domain.Link.Relation;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
-/**
- *
- * @author Zack Shoylev
- */
-
-@Test(groups = "unit", testName = "ParseFlavorTest")
-public class ParseFlavorListTest extends BaseSetParserTest<Flavor> {
-
- @Override
- public String resource() {
- return "/flavor_list.json";
- }
-
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- @SelectJson("flavors")
- public Set<Flavor> expected() {
- return ImmutableSet
- .of(Flavor.builder()
- .id(1)
- .name("512MB Instance")
- .ram(512)
- .links(ImmutableList.of(
- Link.create(Relation.SELF, Uris.uriBuilder("https://localhost:8778/v1.0/811050/flavors/1").build() ),
- Link.create(Relation.BOOKMARK, Uris.uriBuilder("https://localhost:8778/flavors/1").build() )
- ))
- .build(),
- Flavor.builder()
- .id(2)
- .name("1GB Instance")
- .ram(1024)
- .links(ImmutableList.of(
- Link.create(Relation.SELF, Uris.uriBuilder("https://localhost:8778/v1.0/811050/flavors/2").build() ),
- Link.create(Relation.BOOKMARK, Uris.uriBuilder("https://localhost:8778/flavors/2").build() )
- ))
- .build(),
- Flavor.builder()
- .id(3)
- .name("2GB Instance")
- .ram(2048)
- .links(ImmutableList.of(
- Link.create(Relation.SELF, Uris.uriBuilder("https://localhost:8778/v1.0/811050/flavors/3").build() ),
- Link.create(Relation.BOOKMARK, Uris.uriBuilder("https://localhost:8778/flavors/3").build() )
- ))
- .build(),
- Flavor.builder()
- .id(4)
- .name("4GB Instance")
- .ram(4096)
- .links(ImmutableList.of(
- Link.create(Relation.SELF, Uris.uriBuilder("https://localhost:8778/v1.0/811050/flavors/4").build() ),
- Link.create(Relation.BOOKMARK, Uris.uriBuilder("https://localhost:8778/flavors/4").build() )
- ))
- .build(),
- Flavor.builder()
- .id(5)
- .name("8GB Instance")
- .ram(8192)
- .links(ImmutableList.of(
- Link.create(Relation.SELF, Uris.uriBuilder("https://localhost:8778/v1.0/811050/flavors/5").build() ),
- Link.create(Relation.BOOKMARK, Uris.uriBuilder("https://localhost:8778/flavors/5").build() )
- ))
- .build(),
- Flavor.builder()
- .id(6)
- .name("16GB Instance")
- .ram(16384)
- .links(ImmutableList.of(
- Link.create(Relation.SELF, Uris.uriBuilder("https://localhost:8778/v1.0/811050/flavors/6").build() ),
- Link.create(Relation.BOOKMARK, Uris.uriBuilder("https://localhost:8778/flavors/6").build() )
- ))
- .build());
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseInstanceListTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseInstanceListTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseInstanceListTest.java
deleted file mode 100644
index 995404e..0000000
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseInstanceListTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.parse;
-
-import java.util.Set;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.http.Uris;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.openstack.trove.v1.domain.Flavor;
-import org.jclouds.openstack.trove.v1.domain.Instance;
-import org.jclouds.openstack.v2_0.domain.Link;
-import org.jclouds.openstack.v2_0.domain.Link.Relation;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-
-/**
- *
- * @author Zack Shoylev
- */
-
-@Test(groups = "unit", testName = "ParseInstanceTest")
-public class ParseInstanceListTest extends BaseSetParserTest<Instance> {
-
- @Override
- public String resource() {
- return "/instance_list.json";
- }
-
- /*
- * The instance needs to be comparable for this test to work
- * */
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- @SelectJson("instances")
- public Set<Instance> expected() {
- return ImmutableSet
- .of(Instance.builder()
- .id("098653ba-218b-47ce-936a-e0b749101f81")
- .name("xml_rack_instance")
- .size(2)
- .flavor(
- Flavor.builder()
- .id(1)
- .links(ImmutableList.of(
- Link.create(Relation.SELF, Uris.uriBuilder("https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1").build() ),
- Link.create(Relation.BOOKMARK, Uris.uriBuilder("https://ord.databases.api.rackspacecloud.com/flavors/1").build())))
- .build()
- )
- .status(Instance.Status.ACTIVE)
- .links(ImmutableList.of(
- Link.create(Relation.SELF, Uris.uriBuilder("https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81").build() ),
- Link.create(Relation.BOOKMARK, Uris.uriBuilder("https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81").build() )
- ))
- .build(),
- Instance.builder()
- .id("44b277eb-39be-4921-be31-3d61b43651d7")
- .name("json_rack_instance")
- .size(2)
- .flavor(
- Flavor.builder()
- .id(1)
- .links(ImmutableList.of(
- Link.create(Relation.SELF, Uris.uriBuilder("https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1").build() ),
- Link.create(Relation.BOOKMARK, Uris.uriBuilder("https://ord.databases.api.rackspacecloud.com/flavors/1").build())))
- .build()
- )
- .status(Instance.Status.ACTIVE)
- .links(ImmutableList.of(
- Link.create(Relation.SELF, Uris.uriBuilder("https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7").build() ),
- Link.create(Relation.BOOKMARK, Uris.uriBuilder("https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7").build() )
- ))
- .build()
- );
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseUserListTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseUserListTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseUserListTest.java
deleted file mode 100644
index e62fbf4..0000000
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/parse/ParseUserListTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.parse;
-
-import java.util.Set;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.core.MediaType;
-import org.jclouds.json.BaseSetParserTest;
-import org.jclouds.openstack.trove.v1.domain.User;
-import org.jclouds.rest.annotations.SelectJson;
-import org.testng.annotations.Test;
-import com.google.common.collect.ImmutableSet;
-
-/**
- *
- * @author Zack Shoylev
- */
-
-@Test(groups = "unit", testName = "ParseUserTest")
-public class ParseUserListTest extends BaseSetParserTest<User> {
-
- @Override
- public String resource() {
- return "/trove_user_list.json";
- }
-
- /*
- * The user needs to be comparable for this test to work
- * */
- @Override
- @Consumes(MediaType.APPLICATION_JSON)
- @SelectJson("users")
- public Set<User> expected() {
- return ImmutableSet
- .of(User.builder()
- .name("dbuser1")
- .host("%")
- .build(),
- User.builder()
- .name("dbuser2")
- .host("%")
- .databases( ImmutableSet.of(
- "databaseB",
- "databaseC") )
- .build(),
- User.builder().name("dbuser3").host("%").build(),
- User.builder().name("demouser").host("%").databases(
- ImmutableSet.of("sampledb"))
- .build()
- );
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/utils/TroveUtilsExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/utils/TroveUtilsExpectTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/utils/TroveUtilsExpectTest.java
deleted file mode 100644
index 2f41d09..0000000
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/utils/TroveUtilsExpectTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.utils;
-
-import static org.testng.Assert.assertEquals;
-
-import java.net.URI;
-import java.util.List;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.openstack.trove.v1.TroveApi;
-import org.jclouds.openstack.trove.v1.domain.Instance;
-import org.jclouds.openstack.trove.v1.internal.BaseTroveApiExpectTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.ImmutableList;
-
-/**
- * Tests TroveUtils
- *
- * @author Zack Shoylev
- */
-@Test(groups = "unit", testName = "InstanceApiExpectTest")
-public class TroveUtilsExpectTest extends BaseTroveApiExpectTest {
-
- public void testHelperCreateInstance() {
- HttpRequest createInstance = authenticatedGET().endpoint(URI.create("http://172.16.0.1:8776/v1/3456/instances"))
- .method("POST")
- .payload(payloadFromResourceWithContentType("/instance_create_request.json", MediaType.APPLICATION_JSON))
- .build();
- HttpResponse createInstanceSuccess = HttpResponse.builder().statusCode(200).payload(payloadFromResource("/instance_create.json")).build();
- HttpResponse createInstanceFail = HttpResponse.builder().statusCode(404).payload(payloadFromResource("/instance_create.json")).build();
- HttpRequest getInstance = authenticatedGET().endpoint(URI.create("http://172.16.0.1:8776/v1/3456/instances/44b277eb-39be-4921-be31-3d61b43651d7")).build();
- HttpResponse badStatus = HttpResponse.builder().statusCode(200).payload(payloadFromResource("/instance_get_bad_instance.json")).build();
- HttpResponse goodStatus = HttpResponse.builder().statusCode(200).payload(payloadFromResource("/instance_get.json")).build();
- HttpResponse deletedStatus = HttpResponse.builder().statusCode(404).payload(payloadFromResource("/instance_get.json")).build();
- HttpRequest deleteInstance = authenticatedGET().endpoint(URI.create("http://172.16.0.1:8776/v1/3456/instances/44b277eb-39be-4921-be31-3d61b43651d7")).method("DELETE").build();
- HttpResponse deleteInstanceResponse = HttpResponse.builder().statusCode(202).build();
-
- List<HttpRequest> requests = ImmutableList.of( keystoneAuthWithUsernameAndPasswordAndTenantName, createInstance, createInstance, createInstance, getInstance, deleteInstance, getInstance, createInstance, createInstance, getInstance);
- List<HttpResponse> responses = ImmutableList.of(responseWithKeystoneAccess, createInstanceFail, createInstanceFail, createInstanceSuccess, badStatus, deleteInstanceResponse, deletedStatus, createInstanceFail, createInstanceSuccess, goodStatus);
-
- TroveApi api = orderedRequestsSendResponses(requests, responses);
-
- TroveUtils utils = new TroveUtils(api);
- Instance instance = utils.getWorkingInstance("RegionOne", "json_rack_instance", "1", 2);
- assertEquals(instance.getSize(),2);
- assertEquals(instance.getName(), "json_rack_instance");
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/access_rax_us.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/access_rax_us.json b/openstack-trove/src/test/resources/access_rax_us.json
deleted file mode 100644
index b90bebc..0000000
--- a/openstack-trove/src/test/resources/access_rax_us.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
- "access": {
- "token": {
- "id": "myToken",
- "expires": "2012-09-30T17:15:32.000-05:00",
- "tenant": {
- "id": "717071",
- "name": "717071"
- }
- },
- "serviceCatalog": [
- {
- "endpoints": [
- {
- "tenantId": "717071",
- "publicURL": "https://dns.api.rackspacecloud.com/v1.0/717071"
- }
- ],
- "name": "cloudDNS",
- "type": "rax:dns"
- },
- {
- "endpoints": [
- {
- "tenantId": "717071",
- "publicURL": "https://monitoring.api.rackspacecloud.com/v1.0/717071"
- }
- ],
- "name": "cloudMonitoring",
- "type": "rax:monitor"
- },
- {
- "endpoints": [
- {
- "region": "DFW",
- "tenantId": "717071",
- "publicURL": "https://dfw.servers.api.rackspacecloud.com/v2/717071",
- "versionInfo": "https://dfw.servers.api.rackspacecloud.com/v2",
- "versionList": "https://dfw.servers.api.rackspacecloud.com/",
- "versionId": "2"
- },
- {
- "region": "ORD",
- "tenantId": "717071",
- "publicURL": "https://ord.servers.api.rackspacecloud.com/v2/717071",
- "versionInfo": "https://ord.servers.api.rackspacecloud.com/v2",
- "versionList": "https://ord.servers.api.rackspacecloud.com/",
- "versionId": "2"
- }
- ],
- "name": "cloudServersOpenStack",
- "type": "compute"
- },
- {
- "endpoints": [
- {
- "region": "ORD",
- "tenantId": "717071",
- "publicURL": "https://ord.loadbalancers.api.rackspacecloud.com/v1.0/717071"
- },
- {
- "region": "DFW",
- "tenantId": "717071",
- "publicURL": "https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/717071"
- }
- ],
- "name": "cloudLoadBalancers",
- "type": "rax:load-balancer"
- },
- {
- "endpoints": [
- {
- "region": "DFW",
- "tenantId": "717071",
- "publicURL": "https://dfw.databases.api.rackspacecloud.com/v1.0/717071"
- },
- {
- "region": "ORD",
- "tenantId": "717071",
- "publicURL": "https://ord.databases.api.rackspacecloud.com/v1.0/717071"
- },
- {
- "region": "SYD",
- "tenantId": "717071",
- "publicURL": "https://syd.databases.api.rackspacecloud.com/v1.0/717071"
- }
- ],
- "name": "cloudDatabases",
- "type": "rax:database"
- },
- {
- "endpoints": [
- {
- "region": "DFW",
- "tenantId": "MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9",
- "publicURL": "https://storage101.dfw1.clouddrive.com/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9",
- "internalURL": "https://snet-storage101.dfw1.clouddrive.com/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9"
- },
- {
- "region": "ORD",
- "tenantId": "MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9",
- "publicURL": "https://storage101.ord1.clouddrive.com/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9",
- "internalURL": "https://snet-storage101.ord1.clouddrive.com/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9"
- }
- ],
- "name": "cloudFiles",
- "type": "object-store"
- },
- {
- "endpoints": [
- {
- "region": "DFW",
- "tenantId": "MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9",
- "publicURL": "https://cdn1.clouddrive.com/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9"
- },
- {
- "region": "ORD",
- "tenantId": "MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9",
- "publicURL": "https://cdn2.clouddrive.com/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9"
- }
- ],
- "name": "cloudFilesCDN",
- "type": "rax:object-cdn"
- },
- {
- "endpoints": [
- {
- "tenantId": "717071",
- "publicURL": "https://servers.api.rackspacecloud.com/v1.0/717071",
- "versionInfo": "https://servers.api.rackspacecloud.com/v1.0",
- "versionList": "https://servers.api.rackspacecloud.com/",
- "versionId": "1.0"
- }
- ],
- "name": "cloudServers",
- "type": "compute"
- },
- {
- "endpoints": [
- {
- "publicURL": "https://ord.blockstorage.api.rackspacecloud.com/v1/717071",
- "tenantId": "717071",
- "region": "ORD"
- },
- {
- "region": "DFW",
- "tenantId": "717071",
- "publicURL": "https://dfw.blockstorage.api.rackspacecloud.com/v1/717071"
- }
- ],
- "name": "cloudBlockStorage",
- "type": "volume"
- }
- ],
- "user": {
- "id": "224085",
- "roles": [
- {
- "id": "3",
- "description": "User Admin Role.",
- "name": "identity:user-admin"
- }
- ],
- "name": "myUsername",
- "RAX-AUTH:defaultRegion": "DFW"
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/database_create_request.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/database_create_request.json b/openstack-trove/src/test/resources/database_create_request.json
deleted file mode 100644
index 7766ac9..0000000
--- a/openstack-trove/src/test/resources/database_create_request.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "databases": [
- {
- "character_set": "utf8",
- "collate": "utf8_general_ci",
- "name": "testingdb"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/database_create_simple_request.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/database_create_simple_request.json b/openstack-trove/src/test/resources/database_create_simple_request.json
deleted file mode 100644
index 02ad014..0000000
--- a/openstack-trove/src/test/resources/database_create_simple_request.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "databases": [
- {
- "name": "testingdb"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/database_list.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/database_list.json b/openstack-trove/src/test/resources/database_list.json
deleted file mode 100644
index aca6447..0000000
--- a/openstack-trove/src/test/resources/database_list.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "databases": [
- {
- "name": "anotherdb"
- },
- {
- "name": "nextround"
- },
- {
- "name": "oneMoreDB"
- },
- {
- "name": "sampledb"
- },
- {
- "name": "testingdb"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/flavor_get.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/flavor_get.json b/openstack-trove/src/test/resources/flavor_get.json
deleted file mode 100644
index ea07770..0000000
--- a/openstack-trove/src/test/resources/flavor_get.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "flavor":{
- "id":1,
- "links":[
- {
- "href":"https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
- "rel":"self"
- },
- {
- "href":"https://ord.databases.api.rackspacecloud.com/flavors/1",
- "rel":"bookmark"
- }
- ],
- "name":"512MB Instance",
- "ram":512
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/flavor_list.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/flavor_list.json b/openstack-trove/src/test/resources/flavor_list.json
deleted file mode 100644
index a9108f2..0000000
--- a/openstack-trove/src/test/resources/flavor_list.json
+++ /dev/null
@@ -1,94 +0,0 @@
-{
- "flavors":[
- {
- "ram":512,
- "id":1,
- "links":[
- {
- "href":"https://localhost:8778/v1.0/811050/flavors/1",
- "rel":"self"
- },
- {
- "href":"https://localhost:8778/flavors/1",
- "rel":"bookmark"
- }
- ],
- "name":"512MB Instance"
- },
- {
- "ram":1024,
- "id":2,
- "links":[
- {
- "href":"https://localhost:8778/v1.0/811050/flavors/2",
- "rel":"self"
- },
- {
- "href":"https://localhost:8778/flavors/2",
- "rel":"bookmark"
- }
- ],
- "name":"1GB Instance"
- },
- {
- "ram":2048,
- "id":3,
- "links":[
- {
- "href":"https://localhost:8778/v1.0/811050/flavors/3",
- "rel":"self"
- },
- {
- "href":"https://localhost:8778/flavors/3",
- "rel":"bookmark"
- }
- ],
- "name":"2GB Instance"
- },
- {
- "ram":4096,
- "id":4,
- "links":[
- {
- "href":"https://localhost:8778/v1.0/811050/flavors/4",
- "rel":"self"
- },
- {
- "href":"https://localhost:8778/flavors/4",
- "rel":"bookmark"
- }
- ],
- "name":"4GB Instance"
- },
- {
- "ram":8192,
- "id":5,
- "links":[
- {
- "href":"https://localhost:8778/v1.0/811050/flavors/5",
- "rel":"self"
- },
- {
- "href":"https://localhost:8778/flavors/5",
- "rel":"bookmark"
- }
- ],
- "name":"8GB Instance"
- },
- {
- "ram":16384,
- "id":6,
- "links":[
- {
- "href":"https://localhost:8778/v1.0/811050/flavors/6",
- "rel":"self"
- },
- {
- "href":"https://localhost:8778/flavors/6",
- "rel":"bookmark"
- }
- ],
- "name":"16GB Instance"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/instance_create.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/instance_create.json b/openstack-trove/src/test/resources/instance_create.json
deleted file mode 100644
index cfb4106..0000000
--- a/openstack-trove/src/test/resources/instance_create.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "instance": {
- "created": "2013-03-18T19:09:17",
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "self"
- },
- {
- "href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "bookmark"
- }
- ],
- "name": "json_rack_instance",
- "status": "BUILD",
- "updated": "2013-03-18T19:09:17",
- "volume": {
- "size": 2
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/instance_create_request.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/instance_create_request.json b/openstack-trove/src/test/resources/instance_create_request.json
deleted file mode 100644
index 607c5a1..0000000
--- a/openstack-trove/src/test/resources/instance_create_request.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "instance":{
- "name":"json_rack_instance",
- "volume":{
- "size":2
- },
- "flavorRef":"1"
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/instance_get.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/instance_get.json b/openstack-trove/src/test/resources/instance_get.json
deleted file mode 100644
index baf8708..0000000
--- a/openstack-trove/src/test/resources/instance_get.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "instance": {
- "created": "2013-03-18T19:09:17",
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "hostname": "e09ad9a3f73309469cf1f43d11e79549caf9acf2.rackspaceclouddb.com",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "self"
- },
- {
- "href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "bookmark"
- }
- ],
- "name": "json_rack_instance",
- "status": "ACTIVE",
- "updated": "2013-03-18T19:09:17",
- "volume": {
- "size": 2,
- "used": 0.16368598397821188
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/instance_get_bad_instance.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/instance_get_bad_instance.json b/openstack-trove/src/test/resources/instance_get_bad_instance.json
deleted file mode 100644
index 99b8688..0000000
--- a/openstack-trove/src/test/resources/instance_get_bad_instance.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "instance": {
- "created": "2013-03-18T19:09:17",
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "hostname": "e09ad9a3f73309469cf1f43d11e79549caf9acf2.rackspaceclouddb.com",
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "self"
- },
- {
- "href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "bookmark"
- }
- ],
- "name": "json_rack_instance",
- "status": "ERROR",
- "updated": "2013-03-18T19:09:17",
- "volume": {
- "size": 2,
- "used": 0.16368598397821188
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/instance_is_rooted.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/instance_is_rooted.json b/openstack-trove/src/test/resources/instance_is_rooted.json
deleted file mode 100644
index f3990b4..0000000
--- a/openstack-trove/src/test/resources/instance_is_rooted.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "rootEnabled": true
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/instance_is_rooted_false.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/instance_is_rooted_false.json b/openstack-trove/src/test/resources/instance_is_rooted_false.json
deleted file mode 100644
index 04e4e6d..0000000
--- a/openstack-trove/src/test/resources/instance_is_rooted_false.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "rootEnabled": false
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/instance_list.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/instance_list.json b/openstack-trove/src/test/resources/instance_list.json
deleted file mode 100644
index c1834a2..0000000
--- a/openstack-trove/src/test/resources/instance_list.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
- "instances": [
- {
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "id": "098653ba-218b-47ce-936a-e0b749101f81",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/098653ba-218b-47ce-936a-e0b749101f81",
- "rel": "self"
- },
- {
- "href": "https://ord.databases.api.rackspacecloud.com/instances/098653ba-218b-47ce-936a-e0b749101f81",
- "rel": "bookmark"
- }
- ],
- "name": "xml_rack_instance",
- "status": "ACTIVE",
- "volume": {
- "size": 2
- }
- },
- {
- "flavor": {
- "id": "1",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/flavors/1",
- "rel": "self"
- },
- {
- "href": "https://ord.databases.api.rackspacecloud.com/flavors/1",
- "rel": "bookmark"
- }
- ]
- },
- "id": "44b277eb-39be-4921-be31-3d61b43651d7",
- "links": [
- {
- "href": "https://ord.databases.api.rackspacecloud.com/v1.0/1234/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "self"
- },
- {
- "href": "https://ord.databases.api.rackspacecloud.com/instances/44b277eb-39be-4921-be31-3d61b43651d7",
- "rel": "bookmark"
- }
- ],
- "name": "json_rack_instance",
- "status": "ACTIVE",
- "volume": {
- "size": 2
- }
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/instance_root.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/instance_root.json b/openstack-trove/src/test/resources/instance_root.json
deleted file mode 100644
index e937b90..0000000
--- a/openstack-trove/src/test/resources/instance_root.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "user": {
- "name": "root",
- "password": "12345"
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/logback-test.xml b/openstack-trove/src/test/resources/logback-test.xml
deleted file mode 100644
index 6559c23..0000000
--- a/openstack-trove/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- 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.
-
--->
-<configuration scan="false">
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-wire.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-blobstore.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <root>
- <level value="warn" />
- </root>
-
- <logger name="org.jclouds">
- <level value="DEBUG" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="jclouds.wire">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
- <logger name="jclouds.headers">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
- <logger name="jclouds.blobstore">
- <level value="DEBUG" />
- <appender-ref ref="BLOBSTOREFILE" />
- </logger>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/logback.xml
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/logback.xml b/openstack-trove/src/test/resources/logback.xml
deleted file mode 100644
index 6559c23..0000000
--- a/openstack-trove/src/test/resources/logback.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- 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.
-
--->
-<configuration scan="false">
- <appender name="FILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="WIREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-wire.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <appender name="BLOBSTOREFILE" class="ch.qos.logback.core.FileAppender">
- <file>target/test-data/jclouds-blobstore.log</file>
-
- <encoder>
- <Pattern>%d %-5p [%c] [%thread] %m%n</Pattern>
- </encoder>
- </appender>
-
- <root>
- <level value="warn" />
- </root>
-
- <logger name="org.jclouds">
- <level value="DEBUG" />
- <appender-ref ref="FILE" />
- </logger>
-
- <logger name="jclouds.wire">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
- <logger name="jclouds.headers">
- <level value="DEBUG" />
- <appender-ref ref="WIREFILE" />
- </logger>
-
- <logger name="jclouds.blobstore">
- <level value="DEBUG" />
- <appender-ref ref="BLOBSTOREFILE" />
- </logger>
-
-</configuration>
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/f65d94a8/openstack-trove/src/test/resources/trove_user_list.json
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/resources/trove_user_list.json b/openstack-trove/src/test/resources/trove_user_list.json
deleted file mode 100644
index 546df43..0000000
--- a/openstack-trove/src/test/resources/trove_user_list.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "users": [
- {
- "databases": [],
- "host": "%",
- "name": "dbuser1"
- },
- {
- "databases": [
- {
- "name": "databaseB"
- },
- {
- "name": "databaseC"
- }
- ],
- "host": "%",
- "name": "dbuser2"
- },
- {
- "databases": [],
- "name": "dbuser3",
- "host": "%"
- },
- {
- "databases": [
- {
- "name": "sampledb"
- }
- ],
- "host": "%",
- "name": "demouser"
- }
- ]
-}