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/11/20 22:47:16 UTC
git commit: JCLOUDS-384 This makes autoscale and trove be consistent
with other jclouds APIs by renaming get*ApiFor* calls.
Updated Branches:
refs/heads/master c0d9b1c89 -> 70e9ce8c1
JCLOUDS-384 This makes autoscale and trove be consistent with other jclouds APIs by renaming get*ApiFor* calls.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/70e9ce8c
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/70e9ce8c
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/70e9ce8c
Branch: refs/heads/master
Commit: 70e9ce8c1c5d2c0438a6d063316989859265dd34
Parents: c0d9b1c
Author: Zack Shoylev <za...@rackspace.com>
Authored: Wed Nov 20 13:01:24 2013 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Wed Nov 20 15:36:15 2013 -0600
----------------------------------------------------------------------
.../jclouds/openstack/trove/v1/TroveApi.java | 18 +--
.../v1/features/DatabaseApiExpectTest.java | 112 +++++++++----------
.../trove/v1/features/DatabaseApiLiveTest.java | 12 +-
.../trove/v1/features/UserApiExpectTest.java | 44 ++++----
.../trove/v1/features/UserApiLiveTest.java | 14 +--
.../rackspace/autoscale/v1/AutoscaleApi.java | 10 +-
.../v1/features/ScalingPolicyApiExpectTest.java | 26 ++---
.../v1/features/ScalingPolicyApiLiveTest.java | 14 +--
.../v1/features/WebhookApiExpectTest.java | 20 ++--
.../v1/features/WebhookApiLiveTest.java | 20 ++--
10 files changed, 145 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/70e9ce8c/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java b/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java
index cd193b9..798ebd3 100644
--- a/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java
+++ b/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/TroveApi.java
@@ -48,37 +48,37 @@ public interface TroveApi extends Closeable{
@Provides
@Zone
Set<String> getConfiguredZones();
-
+
/**
* Provides access to Flavor features.
*/
@Delegate
FlavorApi getFlavorApiForZone(
@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
-
+
/**
* Provides access to Instance features.
*/
@Delegate
InstanceApi getInstanceApiForZone(
@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
-
+
/**
* Provides access to User features.
*/
@Delegate
@Path("/instances/{instanceId}")
- UserApi getUserApiForInstanceInZone(@PathParam("instanceId") String instanceId,
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
-
+ UserApi getUserApiForZoneAndInstance(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone,
+ @PathParam("instanceId") String instanceId);
+
/**
* Provides access to Database features.
*/
@Delegate
@Path("/instances/{instanceId}")
- DatabaseApi getDatabaseApiForInstanceInZone(@PathParam("instanceId") String instanceId,
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
-
+ DatabaseApi getDatabaseApiForZoneAndInstance(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone,
+ @PathParam("instanceId") String instanceId);
+
/**
* Provides the Tenant.
*/
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/70e9ce8c/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiExpectTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiExpectTest.java
index 0bdd724..804d77d 100644
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiExpectTest.java
+++ b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiExpectTest.java
@@ -45,13 +45,13 @@ public class DatabaseApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint)
.method("POST")
- .payload(payloadFromResourceWithContentType("/database_create_simple_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(202).build() // response
- ).getDatabaseApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.create("testingdb");
- assertTrue(result);
+ .payload(payloadFromResourceWithContentType("/database_create_simple_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(202).build() // response
+ ).getDatabaseApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
+
+ boolean result = api.create("testingdb");
+ assertTrue(result);
}
public void testCreateDatabaseSimpleFail() {
@@ -61,13 +61,13 @@ public class DatabaseApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint)
.method("POST")
- .payload(payloadFromResourceWithContentType("/database_create_simple_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(404).build() // response
- ).getDatabaseApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.create("testingdb");
- assertFalse(result);
+ .payload(payloadFromResourceWithContentType("/database_create_simple_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(404).build() // response
+ ).getDatabaseApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
+
+ boolean result = api.create("testingdb");
+ assertFalse(result);
}
public void testCreateDatabase() {
@@ -77,13 +77,13 @@ public class DatabaseApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint)
.method("POST")
- .payload(payloadFromResourceWithContentType("/database_create_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(202).build() // response
- ).getDatabaseApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.create("testingdb", "utf8", "utf8_general_ci");
- assertTrue(result);
+ .payload(payloadFromResourceWithContentType("/database_create_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(202).build() // response
+ ).getDatabaseApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
+
+ boolean result = api.create("testingdb", "utf8", "utf8_general_ci");
+ assertTrue(result);
}
public void testCreateDatabaseFail() {
@@ -93,13 +93,13 @@ public class DatabaseApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint)
.method("POST")
- .payload(payloadFromResourceWithContentType("/database_create_request.json", MediaType.APPLICATION_JSON))
- .build(),
- HttpResponse.builder().statusCode(404).build() // response
- ).getDatabaseApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.create("testingdb", "utf8", "utf8_general_ci");
- assertFalse(result);
+ .payload(payloadFromResourceWithContentType("/database_create_request.json", MediaType.APPLICATION_JSON))
+ .build(),
+ HttpResponse.builder().statusCode(404).build() // response
+ ).getDatabaseApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
+
+ boolean result = api.create("testingdb", "utf8", "utf8_general_ci");
+ assertFalse(result);
}
public void testDeleteDatabase() {
@@ -108,13 +108,13 @@ public class DatabaseApiExpectTest extends BaseTroveApiExpectTest {
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint)
- .method("DELETE")
- .build(),
- HttpResponse.builder().statusCode(202).build() // response
- ).getDatabaseApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.delete("db1");
- assertTrue(result);
+ .method("DELETE")
+ .build(),
+ HttpResponse.builder().statusCode(202).build() // response
+ ).getDatabaseApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
+
+ boolean result = api.delete("db1");
+ assertTrue(result);
}
public void testDeleteDatabaseFail() {
@@ -123,26 +123,26 @@ public class DatabaseApiExpectTest extends BaseTroveApiExpectTest {
keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint)
- .method("DELETE")
- .build(),
- HttpResponse.builder().statusCode(404).build() // response
- ).getDatabaseApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- boolean result = api.delete("db1");
- assertFalse(result);
+ .method("DELETE")
+ .build(),
+ HttpResponse.builder().statusCode(404).build() // response
+ ).getDatabaseApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
+
+ boolean result = api.delete("db1");
+ assertFalse(result);
}
public void testListDatabases() {
URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/databases");
DatabaseApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/database_list.json")).build()
- ).getDatabaseApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- List<String> databases = api.list().toList();
- assertEquals(databases.size(), 5);
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint).build(),
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/database_list.json")).build()
+ ).getDatabaseApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
+
+ List<String> databases = api.list().toList();
+ assertEquals(databases.size(), 5);
assertEquals(databases.iterator().next(), "anotherdb");
}
@@ -150,12 +150,12 @@ public class DatabaseApiExpectTest extends BaseTroveApiExpectTest {
URI endpoint = URI.create("http://172.16.0.1:8776/v1/3456/instances/instanceId-1234-5678/databases");
DatabaseApi api = requestsSendResponses(
keystoneAuthWithUsernameAndPasswordAndTenantName,
- responseWithKeystoneAccess,
- authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(404).payload(payloadFromResource("/database_list.json")).build()
- ).getDatabaseApiForInstanceInZone("instanceId-1234-5678","RegionOne");
-
- Set<String> databases = api.list().toSet();
- assertTrue(databases.isEmpty());
+ responseWithKeystoneAccess,
+ authenticatedGET().endpoint(endpoint).build(),
+ HttpResponse.builder().statusCode(404).payload(payloadFromResource("/database_list.json")).build()
+ ).getDatabaseApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
+
+ Set<String> databases = api.list().toSet();
+ assertTrue(databases.isEmpty());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/70e9ce8c/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiLiveTest.java b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiLiveTest.java
index 09d7829..c60ee7c 100644
--- a/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiLiveTest.java
+++ b/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/DatabaseApiLiveTest.java
@@ -55,9 +55,9 @@ public class DatabaseApiLiveTest extends BaseTroveApiLiveTest {
instanceList.add(first);
instanceList.add(second);
instancesToDelete.put(zone, instanceList);
-
- DatabaseApi databaseApiFirst = api.getDatabaseApiForInstanceInZone(first.getId(), zone);
- DatabaseApi databaseApiSecond = api.getDatabaseApiForInstanceInZone(second.getId(), zone);
+
+ DatabaseApi databaseApiFirst = api.getDatabaseApiForZoneAndInstance(zone, first.getId());
+ DatabaseApi databaseApiSecond = api.getDatabaseApiForZoneAndInstance(zone, second.getId());
databaseApiFirst.create("livetest_db1");
databaseApiFirst.create("livetest_db2");
databaseApiSecond.create("livetest_db3");
@@ -83,7 +83,7 @@ public class DatabaseApiLiveTest extends BaseTroveApiLiveTest {
InstanceApi instanceApi = api.getInstanceApiForZone(zone);
assertTrue(instanceApi.list().size() >= 2);
for(Instance instance : instancesToDelete.get(zone)) {
- DatabaseApi databaseApi = api.getDatabaseApiForInstanceInZone(instance.getId(), zone);
+ DatabaseApi databaseApi = api.getDatabaseApiForZoneAndInstance(zone, instance.getId());
if(!instance.getName().contains("database_testing"))continue;
assertTrue(databaseApi.list().size() >=1);
for(String database : databaseApi.list()){
@@ -92,14 +92,14 @@ public class DatabaseApiLiveTest extends BaseTroveApiLiveTest {
}
}
}
-
+
@Test
public void testDeleteDatabases() {
for (String zone : api.getConfiguredZones()) {
InstanceApi instanceApi = api.getInstanceApiForZone(zone);
assertTrue(instanceApi.list().size() >= 2);
for(Instance instance : instancesToDelete.get(zone)) {
- DatabaseApi databaseApi = api.getDatabaseApiForInstanceInZone(instance.getId(), zone);
+ DatabaseApi databaseApi = api.getDatabaseApiForZoneAndInstance(zone, instance.getId());
if(!instance.getName().contains("database_testing"))continue;
assertTrue(databaseApi.list().size() >=1);
for(String database : databaseApi.list()){
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/70e9ce8c/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 163dabe..b1f9208 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
@@ -55,7 +55,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.payload(payloadFromResourceWithContentType("/user_create_simple_request.json", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
boolean result = api.create("dbuser1", "password", "databaseA");
assertTrue(result);
@@ -71,7 +71,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.payload(payloadFromResourceWithContentType("/user_create_simple_request.json", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
boolean result = api.create("dbuser1", "password", "databaseA");
assertFalse(result);
@@ -87,7 +87,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.payload(payloadFromResourceWithContentType("/user_create_with_host_simple_request.json", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
boolean result = api.create("dbuser1", "password", "192.168.64.64", "databaseA");
assertTrue(result);
@@ -103,7 +103,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.payload(payloadFromResourceWithContentType("/user_create_with_host_simple_request.json", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
boolean result = api.create("dbuser1", "password", "192.168.64.64", "databaseA");
assertFalse(result);
@@ -119,7 +119,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.payload(payloadFromResourceWithContentType("/user_create_request.json", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
Set<String> databases1 = Sets.newHashSet();
databases1.add( "databaseA" );
@@ -151,7 +151,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.payload(payloadFromResourceWithContentType("/user_create_request.json", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
Set<String> databases1 = Sets.newHashSet();
databases1.add( "databaseA" );
@@ -183,7 +183,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.payload(payloadFromResourceWithContentType("/user_grant_simple_request.json", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
boolean result = api.grant("dbuser1", "databaseZ");
assertTrue(result);
@@ -199,7 +199,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.payload(payloadFromResourceWithContentType("/user_grant_simple_request.json", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
boolean result = api.grant("dbuser1", "databaseZ");
assertFalse(result);
@@ -215,7 +215,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.payload(payloadFromResourceWithContentType("/user_grant_request.json", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
List<String> databases = Lists.newArrayList();
databases.add( "databaseC" );
@@ -235,7 +235,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.payload(payloadFromResourceWithContentType("/user_grant_request.json", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
List<String> databases = Lists.newArrayList();
databases.add( "databaseC" );
@@ -254,7 +254,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.method("DELETE")
.build(),
HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
Set<String> databases = Sets.newHashSet();
databases.add( "database" );
@@ -272,7 +272,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.method("DELETE")
.build(),
HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
Set<String> databases = Sets.newHashSet();
databases.add( "database" );
@@ -290,7 +290,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.method("DELETE")
.build(),
HttpResponse.builder().statusCode(202).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
Set<String> databases = Sets.newHashSet();
databases.add( "database" );
@@ -308,7 +308,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
.method("DELETE")
.build(),
HttpResponse.builder().statusCode(404).build() // response
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
Set<String> databases = Sets.newHashSet();
databases.add( "database" );
@@ -324,7 +324,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/trove_user_list.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
Set<User> users = api.list().toSet();
assertEquals(users.size(), 4);
@@ -339,7 +339,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/trove_user_list.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
Set<User> users = api.list().toSet();
assertTrue(users.isEmpty());
@@ -352,7 +352,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/user_list_access.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
List<String> databases = api.getDatabaseList("dbuser1").toList();
assertEquals(databases.size(), 2);
@@ -366,7 +366,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_list_access.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
Set<String> databases = api.getDatabaseList("dbuser1").toSet();
assertTrue(databases.isEmpty());
@@ -379,7 +379,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/user_get.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
User user = api.get("exampleuser");
assertEquals(user.getName(), "exampleuser");
@@ -395,7 +395,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_get.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
User user = api.get("exampleuser");
assertNull(user);
@@ -408,7 +408,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/user_get_withhost.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).getUserApiForZoneAndInstance("RegionOne", "instanceId-1234-5678");
User user = api.get("example.user", "192.168.64.64");
assertEquals(user.getName(), "example.user");
@@ -425,7 +425,7 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/user_get_withhost.json")).build()
- ).getUserApiForInstanceInZone("instanceId-1234-5678","RegionOne");
+ ).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/70e9ce8c/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
index 0ad444b..cd4a468 100644
--- 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
@@ -84,8 +84,8 @@ public class UserApiLiveTest extends BaseTroveApiLiveTest {
.databases(ImmutableSet.of(
"u3db1",
"u3db2")).build();
- UserApi userApiFirst = api.getUserApiForInstanceInZone(first.getId(), zone);
- UserApi userApiSecond = api.getUserApiForInstanceInZone(second.getId(), zone);
+ 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));
}
@@ -116,7 +116,7 @@ public class UserApiLiveTest extends BaseTroveApiLiveTest {
InstanceApi instanceApi = api.getInstanceApiForZone(zone);
assertTrue(instanceApi.list().size() >= 2);
for(Instance instance : instancesToDelete.get(zone)) {
- UserApi userApi = api.getUserApiForInstanceInZone(instance.getId(), 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()){
@@ -132,7 +132,7 @@ public class UserApiLiveTest extends BaseTroveApiLiveTest {
InstanceApi instanceApi = api.getInstanceApiForZone(zone);
assertTrue(instanceApi.list().size() >= 2);
for(Instance instance : instancesToDelete.get(zone)) {
- UserApi userApi = api.getUserApiForInstanceInZone(instance.getId(), 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()){
@@ -153,7 +153,7 @@ public class UserApiLiveTest extends BaseTroveApiLiveTest {
InstanceApi instanceApi = api.getInstanceApiForZone(zone);
assertTrue(instanceApi.list().size() >= 2 );
for(Instance instance : instancesToDelete.get(zone)) {
- UserApi userApi = api.getUserApiForInstanceInZone(instance.getId(), 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()){
@@ -169,7 +169,7 @@ public class UserApiLiveTest extends BaseTroveApiLiveTest {
InstanceApi instanceApi = api.getInstanceApiForZone(zone);
assertTrue(instanceApi.list().size() >= 2);
for(Instance instance : instancesToDelete.get(zone)) {
- UserApi userApi = api.getUserApiForInstanceInZone(instance.getId(), 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()){
@@ -200,7 +200,7 @@ public class UserApiLiveTest extends BaseTroveApiLiveTest {
public void testGetUserWhenNotFound() {
for (String zone : api.getConfiguredZones()) {
String instanceId = instancesToDelete.get(zone).iterator().next().getId();
- UserApi userApi = api.getUserApiForInstanceInZone(instanceId, zone);
+ UserApi userApi = api.getUserApiForZoneAndInstance(zone, instanceId);
assertNull(userApi.get("9999"));
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/70e9ce8c/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java
index 50c4cc6..58ab926 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/AutoscaleApi.java
@@ -63,17 +63,17 @@ public interface AutoscaleApi extends Closeable{
*/
@Delegate
@Path("/groups/{groupId}")
- PolicyApi getPolicyApiForGroupInZone(@PathParam("groupId") String groupId,
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
+ PolicyApi getPolicyApiForZoneAndGroup(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone,
+ @PathParam("groupId") String groupId);
/**
* Provides access to webhook management features.
*/
@Delegate
@Path("/groups/{groupId}/policies/{policyId}")
- WebhookApi getWebhookApiForGroupAndPolicyInZone(@PathParam("groupId") String groupId,
- @PathParam("policyId") String policyId,
- @EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
+ WebhookApi getWebhookApiForZoneAndGroupAndPolicy(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone,
+ @PathParam("groupId") String groupId,
+ @PathParam("policyId") String policyId);
/**
* Provides the Tenant.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/70e9ce8c/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiExpectTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiExpectTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiExpectTest.java
index 8bb310c..a30c4a7 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiExpectTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiExpectTest.java
@@ -3,7 +3,7 @@
* 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 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
@@ -53,7 +53,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_policy_create_request.json", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_policy_create_response.json")).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
@@ -84,7 +84,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_policy_create_request.json", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_policy_create_response.json")).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
@@ -109,7 +109,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("GET").endpoint(endpoint).build(),
HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_policy_list_response.json")).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.list();
@@ -129,7 +129,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("GET").endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_policy_list_response.json")).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.list();
@@ -143,7 +143,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("GET").endpoint(endpoint).build(),
HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_policy_get_response.json")).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
ScalingPolicyResponse scalingPolicyResponse = api.get("policyId");
@@ -162,7 +162,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("GET").endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_policy_get_response.json")).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
ScalingPolicyResponse scalingPolicyResponse = api.get("policyId");
@@ -176,7 +176,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("PUT").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_policy_update_request.json", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(201).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
ScalingPolicy scalingPolicy = ScalingPolicy.builder()
.cooldown(6)
@@ -197,7 +197,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("PUT").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_policy_update_request.json", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(404).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
ScalingPolicy scalingPolicy = ScalingPolicy.builder()
.cooldown(6)
@@ -218,7 +218,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("DELETE").endpoint(endpoint).build(),
HttpResponse.builder().statusCode(201).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
boolean result = api.delete("policyId");
assertTrue(result);
@@ -231,7 +231,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("DELETE").endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
boolean result = api.delete("policyId");
assertFalse(result);
@@ -244,7 +244,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("POST").endpoint(endpoint).build(),
HttpResponse.builder().statusCode(201).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
boolean result = api.execute("policyId");
assertTrue(result);
@@ -257,7 +257,7 @@ public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("POST").endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getPolicyApiForGroupInZone("groupId1", "DFW");
+ ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
boolean result = api.execute("policyId");
assertFalse(result);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/70e9ce8c/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
index 4fa7465..124b9ba 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
@@ -149,7 +149,7 @@ public class ScalingPolicyApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testCreatePolicy() {
for (String zone : api.getConfiguredZones()) {
- PolicyApi policyApi = api.getPolicyApiForGroupInZone(created.get(zone).get(0).getId(), zone);
+ PolicyApi policyApi = api.getPolicyApiForZoneAndGroup(zone, created.get(zone).get(0).getId());
List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
@@ -173,7 +173,7 @@ public class ScalingPolicyApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testListPolicy() {
for (String zone : api.getConfiguredZones()) {
- PolicyApi policyApi = api.getPolicyApiForGroupInZone(created.get(zone).get(0).getId(), zone);
+ PolicyApi policyApi = api.getPolicyApiForZoneAndGroup(zone, created.get(zone).get(0).getId());
FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = policyApi.list();
assertNotNull(scalingPolicyResponse.iterator().next().getId());
@@ -184,7 +184,7 @@ public class ScalingPolicyApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testGetPolicy() {
for (String zone : api.getConfiguredZones()) {
- PolicyApi policyApi = api.getPolicyApiForGroupInZone(created.get(zone).get(0).getId(), zone);
+ PolicyApi policyApi = api.getPolicyApiForZoneAndGroup(zone, created.get(zone).get(0).getId());
assertNotNull(policyApi);
ScalingPolicyResponse listResponse = policyApi.list().iterator().next();
@@ -203,7 +203,7 @@ public class ScalingPolicyApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testUpdatePolicy() {
for (String zone : api.getConfiguredZones()) {
- PolicyApi policyApi = api.getPolicyApiForGroupInZone(created.get(zone).get(0).getId(), zone);
+ PolicyApi policyApi = api.getPolicyApiForZoneAndGroup(zone, created.get(zone).get(0).getId());
List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
@@ -247,7 +247,7 @@ public class ScalingPolicyApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testDeletePolicy() {
for (String zone : api.getConfiguredZones()) {
- PolicyApi policyApi = api.getPolicyApiForGroupInZone(created.get(zone).get(0).getId(), zone);
+ PolicyApi policyApi = api.getPolicyApiForZoneAndGroup(zone, created.get(zone).get(0).getId());
List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
@@ -273,7 +273,7 @@ public class ScalingPolicyApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testExecutePolicy() {
for (String zone : api.getConfiguredZones()) {
- PolicyApi policyApi = api.getPolicyApiForGroupInZone(created.get(zone).get(0).getId(), zone);
+ PolicyApi policyApi = api.getPolicyApiForZoneAndGroup(zone, created.get(zone).get(0).getId());
List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
@@ -301,7 +301,7 @@ public class ScalingPolicyApiLiveTest extends BaseAutoscaleApiLiveTest {
for (String zone : api.getConfiguredZones()) {
GroupApi groupApi = api.getGroupApiForZone(zone);
for (Group group : created.get(zone)) {
- PolicyApi policyApi = api.getPolicyApiForGroupInZone(group.getId(), zone);
+ PolicyApi policyApi = api.getPolicyApiForZoneAndGroup(zone, group.getId());
if(policyApi == null)continue;
for(ScalingPolicyResponse sgr : policyApi.list()) {
if(!policyApi.delete(sgr.getId())) {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/70e9ce8c/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiExpectTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiExpectTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiExpectTest.java
index 41555db..bfd7d7a 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiExpectTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiExpectTest.java
@@ -50,7 +50,7 @@ public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhook_create_request.json", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_webhook_create_response.json")).build()
- ).getWebhookApiForGroupAndPolicyInZone("1234567890", "321456", "DFW");
+ ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
FluentIterable<WebhookResponse> webhooks = api.create("PagerDuty", ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook"));
assertEquals(webhooks.first().get().getName(), "PagerDuty");
@@ -64,7 +64,7 @@ public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhook_create_request.json", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_webhook_create_response.json")).build()
- ).getWebhookApiForGroupAndPolicyInZone("1234567890", "321456", "DFW");
+ ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
FluentIterable<WebhookResponse> webhooks = api.create("PagerDuty", ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook"));
assertTrue(webhooks.isEmpty());
@@ -77,7 +77,7 @@ public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhooks_create_request.json", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_webhooks_create_response.json")).build()
- ).getWebhookApiForGroupAndPolicyInZone("1234567890", "321456", "DFW");
+ ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
FluentIterable<WebhookResponse> webhooks = api.create(ImmutableList.of(
Webhook.builder().name("PagerDuty").metadata(ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook")).build(),
@@ -95,7 +95,7 @@ public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhooks_create_request.json", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_webhooks_create_response.json")).build()
- ).getWebhookApiForGroupAndPolicyInZone("1234567890", "321456", "DFW");
+ ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
FluentIterable<WebhookResponse> webhooks = api.create(ImmutableList.of(
Webhook.builder().name("PagerDuty").metadata(ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook")).build(),
@@ -111,7 +111,7 @@ public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("GET").endpoint(endpoint).build(),
HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_webhook_list_response.json")).build()
- ).getWebhookApiForGroupAndPolicyInZone("1234567890", "321456", "DFW");
+ ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
FluentIterable<WebhookResponse> webhooks = api.list();
assertEquals(webhooks.size(), 2);
@@ -126,7 +126,7 @@ public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("GET").endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_webhook_list_response.json")).build()
- ).getWebhookApiForGroupAndPolicyInZone("1234567890", "321456", "DFW");
+ ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
FluentIterable<WebhookResponse> webhooks = api.list();
assertEquals(webhooks.size(), 0);
@@ -139,7 +139,7 @@ public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("PUT").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhook_update_request.json", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(201).build()
- ).getWebhookApiForGroupAndPolicyInZone("1234567890", "321456", "DFW");
+ ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
boolean success = api.update("5555", "alice", ImmutableMap.<String, Object>of("notes", "this is for Alice"));
assertTrue(success);
@@ -152,7 +152,7 @@ public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().method("PUT").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhook_update_request.json", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(404).build()
- ).getWebhookApiForGroupAndPolicyInZone("1234567890", "321456", "DFW");
+ ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
boolean success = api.update("5555", "alice", ImmutableMap.<String, Object>of("notes", "this is for Alice"));
assertFalse(success);
@@ -165,7 +165,7 @@ public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_webhook_get_response.json")).build()
- ).getWebhookApiForGroupAndPolicyInZone("1234567890", "321456", "DFW");
+ ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
WebhookResponse webhook = api.get("5555");
assertEquals(webhook.getName(), "alice");
@@ -179,7 +179,7 @@ public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
responseWithKeystoneAccess,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_webhook_get_response.json")).build()
- ).getWebhookApiForGroupAndPolicyInZone("1234567890", "321456", "DFW");
+ ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
WebhookResponse webhook = api.get("5555");
assertNull(webhook);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/70e9ce8c/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
index a6bed11..99d1457 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
@@ -105,7 +105,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
Group g = groupApi.create(groupConfiguration, launchConfiguration, scalingPolicies);
createdGroupList.add(g);
- WebhookApi webhookApi = api.getWebhookApiForGroupAndPolicyInZone(g.getId(), g.getScalingPolicies().iterator().next().getId(), zone);
+ WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
assertFalse( webhookApi.create("test_webhook", ImmutableMap.<String, Object>of()).isEmpty() );
assertNotNull(g);
@@ -160,7 +160,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testCreateWebhook() {
for (String zone : api.getConfiguredZones()) {
Group g = created.get(zone).get(0);
- WebhookApi webhookApi = api.getWebhookApiForGroupAndPolicyInZone(g.getId(), g.getScalingPolicies().iterator().next().getId(), zone);
+ WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
WebhookResponse webhook = webhookApi.create("test1", ImmutableMap.<String, Object>of("notes", "test metadata")).first().get();
assertEquals(webhook.getName(), "test1");
@@ -172,7 +172,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testCreateWebhooks() {
for (String zone : api.getConfiguredZones()) {
Group g = created.get(zone).get(0);
- WebhookApi webhookApi = api.getWebhookApiForGroupAndPolicyInZone(g.getId(), g.getScalingPolicies().iterator().next().getId(), zone);
+ WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
FluentIterable<WebhookResponse> webhookList = webhookApi.create(
ImmutableList.of(
Webhook.builder().name("test5").metadata(null).build(),
@@ -190,7 +190,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testUpdateWebhook() {
for (String zone : api.getConfiguredZones()) {
Group g = created.get(zone).get(0);
- WebhookApi webhookApi = api.getWebhookApiForGroupAndPolicyInZone(g.getId(), g.getScalingPolicies().iterator().next().getId(), zone);
+ WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
String webhookId = webhookApi.list().first().get().getId();
assertTrue( webhookApi.update(webhookId, "updated_name", ImmutableMap.<String, Object>of()) );
@@ -204,7 +204,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testGetWebhook() {
for (String zone : api.getConfiguredZones()) {
Group g = created.get(zone).get(0);
- WebhookApi webhookApi = api.getWebhookApiForGroupAndPolicyInZone(g.getId(), g.getScalingPolicies().iterator().next().getId(), zone);
+ WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
WebhookResponse webhookList = webhookApi.list().first().get();
WebhookResponse webhookGet = webhookApi.get(webhookList.getId());
assertNotNull(webhookList);
@@ -217,7 +217,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testListWebhook() {
for (String zone : api.getConfiguredZones()) {
Group g = created.get(zone).get(0);
- WebhookApi webhookApi = api.getWebhookApiForGroupAndPolicyInZone(g.getId(), g.getScalingPolicies().iterator().next().getId(), zone);
+ WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
assertFalse( webhookApi.list().isEmpty() );
}
}
@@ -226,7 +226,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testDeleteWebhook() {
for (String zone : api.getConfiguredZones()) {
Group g = created.get(zone).get(0);
- WebhookApi webhookApi = api.getWebhookApiForGroupAndPolicyInZone(g.getId(), g.getScalingPolicies().iterator().next().getId(), zone);
+ WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
WebhookResponse webhook = webhookApi.create("test1", ImmutableMap.<String, Object>of("notes", "test metadata")).first().get();
assertEquals(webhook.getName(), "test1");
@@ -241,7 +241,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testExecuteWebhook() throws IOException {
for (String zone : api.getConfiguredZones()) {
Group g = created.get(zone).get(0);
- WebhookApi webhookApi = api.getWebhookApiForGroupAndPolicyInZone(g.getId(), g.getScalingPolicies().iterator().next().getId(), zone);
+ WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
WebhookResponse webhook = webhookApi.create("test_execute", ImmutableMap.<String, Object>of("notes", "test metadata")).first().get();
assertTrue( AutoscaleUtils.execute(webhook.getAnonymousExecutionURI().get()) , " for " + webhook + " in " + zone);
@@ -252,7 +252,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
public void testExecuteWebhookFail() throws IOException, URISyntaxException {
for (String zone : api.getConfiguredZones()) {
Group g = created.get(zone).get(0);
- WebhookApi webhookApi = api.getWebhookApiForGroupAndPolicyInZone(g.getId(), g.getScalingPolicies().iterator().next().getId(), zone);
+ WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
WebhookResponse webhook = webhookApi.create("test_execute_fail", ImmutableMap.<String, Object>of("notes", "test metadata")).first().get();
URI uri = new URI(webhook.getAnonymousExecutionURI().toString() + "123");
@@ -266,7 +266,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
for (String zone : api.getConfiguredZones()) {
GroupApi groupApi = api.getGroupApiForZone(zone);
for (Group group : created.get(zone)) {
- PolicyApi policyApi = api.getPolicyApiForGroupInZone(group.getId(), zone);
+ PolicyApi policyApi = api.getPolicyApiForZoneAndGroup(zone, group.getId());
if(policyApi == null)continue;
for(ScalingPolicyResponse sgr : policyApi.list()) {
if(!policyApi.delete(sgr.getId())) {