You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by jd...@apache.org on 2014/08/13 19:04:07 UTC
[3/4] Prefer Regions to Zones
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
index f394f6a..d0f64a2 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiLiveTest.java
@@ -46,8 +46,8 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
private final Map<String, List<String>> messageIds = Maps.newHashMap();
public void createQueues() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
boolean success = queueApi.create("jclouds-test");
assertTrue(success);
@@ -56,8 +56,8 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "createQueues" })
public void streamZeroPagesOfMessages() throws Exception {
- for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ for (String regionId : regions) {
+ MessageApi messageApi = api.getMessageApi(regionId, CLIENT_ID, "jclouds-test");
MessageStream messageStream = messageApi.stream(echo(true));
@@ -68,8 +68,8 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "streamZeroPagesOfMessages" })
public void createMessage() throws Exception {
- for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ for (String regionId : regions) {
+ MessageApi messageApi = api.getMessageApi(regionId, CLIENT_ID, "jclouds-test");
String json1 = "{\"event\":{\"name\":\"Edmonton Java User Group\",\"attendees\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage message1 = CreateMessage.builder().ttl(120).body(json1).build();
@@ -84,8 +84,8 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "createMessage" })
public void streamOnePageOfMessages() throws Exception {
- for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ for (String regionId : regions) {
+ MessageApi messageApi = api.getMessageApi(regionId, CLIENT_ID, "jclouds-test");
MessageStream messageStream = messageApi.stream(echo(true));
@@ -101,8 +101,8 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "streamOnePageOfMessages" })
public void createMessages() throws Exception {
- for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ for (String regionId : regions) {
+ MessageApi messageApi = api.getMessageApi(regionId, CLIENT_ID, "jclouds-test");
String json1 = "{\"event\":{\"name\":\"Austin Java User Group\",\"attendees\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage message1 = CreateMessage.builder().ttl(120).body(json1).build();
@@ -121,9 +121,9 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "createMessages" })
public void streamManyPagesOfMessages() throws Exception {
- for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
- messageIds.put(zoneId, new ArrayList<String>());
+ for (String regionId : regions) {
+ MessageApi messageApi = api.getMessageApi(regionId, CLIENT_ID, "jclouds-test");
+ messageIds.put(regionId, new ArrayList<String>());
MessageStream messageStream = messageApi.stream(echo(true).limit(2));
@@ -131,7 +131,7 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
assertEquals(Iterables.size(messageStream), 2);
for (Message message : messageStream) {
- messageIds.get(zoneId).add(message.getId());
+ messageIds.get(regionId).add(message.getId());
}
messageStream = messageApi.stream(messageStream.nextStreamOptions());
@@ -143,10 +143,10 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "streamManyPagesOfMessages" })
public void listMessagesByIds() throws Exception {
- for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ for (String regionId : regions) {
+ MessageApi messageApi = api.getMessageApi(regionId, CLIENT_ID, "jclouds-test");
- List<Message> messages = messageApi.list(messageIds.get(zoneId));
+ List<Message> messages = messageApi.list(messageIds.get(regionId));
assertEquals(messages.size(), 4);
@@ -159,10 +159,10 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listMessagesByIds" })
public void getMessage() throws Exception {
- for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ for (String regionId : regions) {
+ MessageApi messageApi = api.getMessageApi(regionId, CLIENT_ID, "jclouds-test");
- Message message = messageApi.get(getLast(messageIds.get(zoneId)));
+ Message message = messageApi.get(getLast(messageIds.get(regionId)));
assertNotNull(message.getId());
assertNotNull(message.getBody());
@@ -171,10 +171,10 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "getMessage" })
public void deleteMessagesByClaimId() throws Exception {
- for (String zoneId : zones) {
+ for (String regionId : regions) {
UUID clientId = UUID.fromString("3381af92-2b9e-11e3-b191-71861300734c");
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
- ClaimApi claimApi = api.getClaimApiForZoneAndClientAndQueue(zoneId, clientId, "jclouds-test");
+ MessageApi messageApi = api.getMessageApi(regionId, CLIENT_ID, "jclouds-test");
+ ClaimApi claimApi = api.getClaimApi(regionId, clientId, "jclouds-test");
Message message = getOnlyElement(claimApi.claim(300, 100, 1));
boolean success = messageApi.deleteByClaim(message.getId(), message.getClaimId().get());
@@ -185,10 +185,10 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "deleteMessagesByClaimId" })
public void deleteMessages() throws Exception {
- for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test");
+ for (String regionId : regions) {
+ MessageApi messageApi = api.getMessageApi(regionId, CLIENT_ID, "jclouds-test");
- boolean success = messageApi.delete(messageIds.get(zoneId));
+ boolean success = messageApi.delete(messageIds.get(regionId));
assertTrue(success);
}
@@ -196,8 +196,8 @@ public class MessageApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "deleteMessages" })
public void delete() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
boolean success = queueApi.delete("jclouds-test");
assertTrue(success);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
index fefa889..5173eb4 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/MessageApiMockTest.java
@@ -48,7 +48,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApi("DFW", CLIENT_ID, "jclouds-test");
String json1 = "{\"event\":{\"name\":\"Edmonton Java User Group\",\"attendees\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage createMessage1 = CreateMessage.builder().ttl(120).body(json1).build();
@@ -76,7 +76,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApi("DFW", CLIENT_ID, "jclouds-test");
String json1 = "{\"event\":{\"name\":\"Austin Java User Group\",\"attendees\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage createMessage1 = CreateMessage.builder().ttl(120).body(json1).build();
@@ -110,7 +110,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApi("DFW", CLIENT_ID, "jclouds-test");
MessageStream messageStream = messageApi.stream();
@@ -134,7 +134,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApi("DFW", CLIENT_ID, "jclouds-test");
MessageStream messageStream = messageApi.stream();
@@ -166,7 +166,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApi("DFW", CLIENT_ID, "jclouds-test");
MessageStream messageStream = messageApi.stream(limit(2));
@@ -197,7 +197,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApi("DFW", CLIENT_ID, "jclouds-test");
List<String> ids = ImmutableList.of("52928896b04a584f24883227", "52928896b04a584f24883228", "52928896b04a584f24883229");
List<Message> messages = messageApi.list(ids);
@@ -227,7 +227,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApi("DFW", CLIENT_ID, "jclouds-test");
Message message = messageApi.get("5292b30cef913e6d026f4dec");
@@ -252,7 +252,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApi("DFW", CLIENT_ID, "jclouds-test");
List<String> ids = ImmutableList.of("52936b8a3ac24e6ef4c067dd", "5292b30cef913e6d026f4dec");
boolean success = messageApi.delete(ids);
@@ -275,7 +275,7 @@ public class MessageApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue("DFW", CLIENT_ID, "jclouds-test");
+ MessageApi messageApi = api.getMessageApi("DFW", CLIENT_ID, "jclouds-test");
boolean success = messageApi.deleteByClaim("52936b8a3ac24e6ef4c067dd", "5292b30cef913e6d026f4dec");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
index f10310b..36a1d40 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiLiveTest.java
@@ -40,8 +40,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
private static final UUID CLIENT_ID = UUID.fromString("3381af92-2b9e-11e3-b191-71861300734c");
public void listZeroPagesOfQueues() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
assertTrue(queues.isEmpty());
@@ -50,8 +50,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listZeroPagesOfQueues" })
public void create() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
for (int i = 0; i < 6; i++) {
boolean success = queueApi.create("jclouds-test-" + i);
@@ -63,8 +63,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "create" })
public void listOnePageOfQueues() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
assertEquals(queues.size(), 6);
@@ -78,8 +78,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listOnePageOfQueues" })
public void createMore() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
for (int i = 6; i < 12; i++) {
boolean success = queueApi.create("jclouds-test-" + i);
@@ -91,8 +91,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "createMore" })
public void listManyPagesOfQueues() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
assertEquals(queues.size(), 12);
@@ -106,8 +106,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listManyPagesOfQueues" })
public void listManyPagesOfQueuesManually() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
Queues queues = queueApi.list(limit(6));
@@ -126,8 +126,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listManyPagesOfQueuesManually" })
public void exists() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
boolean success = queueApi.exists("jclouds-test-1");
assertTrue(success);
@@ -136,8 +136,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "exists" })
public void setMetadata() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
Map<String, String> metadata = ImmutableMap.of("key1", "value1");
boolean success = queueApi.setMetadata("jclouds-test-1", metadata);
@@ -147,8 +147,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "setMetadata" })
public void listManyPagesOfQueuesWithDetails() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
List<Queue> queues = queueApi.list(true).concat().toList();
assertEquals(queues.size(), 12);
@@ -169,8 +169,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "listManyPagesOfQueuesWithDetails" })
public void getMetadata() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
Map<String, String> metadata = queueApi.getMetadata("jclouds-test-1");
assertEquals(metadata.get("key1"), "value1");
@@ -179,8 +179,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "getMetadata" })
public void getStatsWithoutTotal() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
QueueStats stats = queueApi.getStats("jclouds-test-1");
assertEquals(stats.getMessagesStats().getClaimed(), 0);
@@ -193,8 +193,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "getStatsWithoutTotal" })
public void getStatsWithTotal() throws Exception {
- for (String zoneId : zones) {
- MessageApi messageApi = api.getMessageApiForZoneAndClientAndQueue(zoneId, CLIENT_ID, "jclouds-test-1");
+ for (String regionId : regions) {
+ MessageApi messageApi = api.getMessageApi(regionId, CLIENT_ID, "jclouds-test-1");
String json1 = "{\"event\":{\"type\":\"hockey\",\"players\":[\"bob\",\"jim\",\"sally\"]}}";
CreateMessage message1 = CreateMessage.builder().ttl(120).body(json1).build();
@@ -202,7 +202,7 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
messageApi.create(message);
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
QueueStats stats = queueApi.getStats("jclouds-test-1");
assertEquals(stats.getMessagesStats().getClaimed(), 0);
@@ -217,8 +217,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "getStatsWithTotal" })
public void delete() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
for (int i = 0; i < 12; i++) {
boolean success = queueApi.delete("jclouds-test-" + i);
@@ -230,8 +230,8 @@ public class QueueApiLiveTest extends BaseMarconiApiLiveTest {
@Test(dependsOnMethods = { "delete" })
public void doesNotExist() throws Exception {
- for (String zoneId : zones) {
- QueueApi queueApi = api.getQueueApiForZoneAndClient(zoneId, CLIENT_ID);
+ for (String regionId : regions) {
+ QueueApi queueApi = api.getQueueApi(regionId, CLIENT_ID);
boolean success = queueApi.exists("jclouds-test-1");
assertFalse(success);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
index d632f2b..e84b534 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/features/QueueApiMockTest.java
@@ -52,7 +52,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
boolean success = queueApi.create("jclouds-test");
assertTrue(success);
@@ -73,7 +73,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
boolean success = queueApi.delete("jclouds-test");
assertTrue(success);
@@ -94,7 +94,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
boolean success = queueApi.exists("jclouds-test");
assertTrue(success);
@@ -115,7 +115,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
boolean success = queueApi.exists("jclouds-blerg");
assertFalse(success);
@@ -136,7 +136,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
@@ -159,7 +159,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
@@ -184,7 +184,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
FluentIterable<Queue> queues = queueApi.list(false).concat();
@@ -202,7 +202,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
Queues queues = queueApi.list(ListQueuesOptions.NONE);
@@ -222,7 +222,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
List<Queue> queues = queueApi.list(false).concat().toList();
@@ -253,7 +253,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
Queues queues = queueApi.list(limit(6));
@@ -286,7 +286,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
Map<String, String> metadata = ImmutableMap.of("key1", "value1");
boolean success = queueApi.setMetadata("jclouds-test", metadata);
@@ -310,7 +310,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
Map<String, String> metadata = queueApi.getMetadata("jclouds-test");
assertEquals(metadata.get("key1"), "value1");
@@ -331,7 +331,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
QueueStats stats = queueApi.getStats("jclouds-test");
assertEquals(stats.getMessagesStats().getClaimed(), 0);
@@ -356,7 +356,7 @@ public class QueueApiMockTest extends BaseOpenStackMockTest<MarconiApi> {
try {
MarconiApi api = api(server.getUrl("/").toString(), "openstack-marconi");
- QueueApi queueApi = api.getQueueApiForZoneAndClient("DFW", CLIENT_ID);
+ QueueApi queueApi = api.getQueueApi("DFW", CLIENT_ID);
QueueStats stats = queueApi.getStats("jclouds-test");
assertEquals(stats.getMessagesStats().getClaimed(), 0);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/internal/BaseMarconiApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/internal/BaseMarconiApiLiveTest.java b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/internal/BaseMarconiApiLiveTest.java
index 522229e..11b7001 100644
--- a/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/internal/BaseMarconiApiLiveTest.java
+++ b/openstack-marconi/src/test/java/org/jclouds/openstack/marconi/v1/internal/BaseMarconiApiLiveTest.java
@@ -27,21 +27,21 @@ import java.util.Set;
public class BaseMarconiApiLiveTest extends BaseApiLiveTest<MarconiApi> {
- protected Set<String> zones = Sets.newHashSet();
+ protected Set<String> regions = Sets.newHashSet();
public BaseMarconiApiLiveTest() {
provider = "openstack-marconi";
}
@BeforeClass
- public void setupZones() {
- String key = "test." + provider + ".zone";
+ public void setupRegions() {
+ String key = "test." + provider + ".region";
if (System.getProperties().containsKey(key)) {
- zones.add(System.getProperty(key));
+ regions.add(System.getProperty(key));
}
else {
- zones = api.getConfiguredZones();
+ regions = api.getConfiguredRegions();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java
index b682d74..77d4d97 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApi.java
@@ -70,7 +70,20 @@ public interface NeutronApi extends Closeable {
/**
* Provides synchronous access to Router features.
+ *
+ * <h3>NOTE</h3>
+ * This API is an extension that may or may not be present in your OpenStack cloud. Use the Optional return type
+ * to determine if it is present.
*/
@Delegate
+ Optional<? extends RouterApi> getRouterApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+
+ /**
+ * Provides synchronous access to Router features.
+ * @deprecated Please use {@link #getRouterApi(String)} as this method will be removed in jclouds 3.0.
+ */
+ @Deprecated
+ @Delegate
Optional<? extends RouterApi> getRouterExtensionApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
index f5fb592..27b2205 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
@@ -16,8 +16,19 @@
*/
package org.jclouds.openstack.neutron.v2.extensions;
-import com.google.common.annotations.Beta;
-import org.jclouds.Fallbacks;
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.MediaType;
+
+import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
+import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
import org.jclouds.collect.PagedIterable;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
@@ -38,15 +49,7 @@ import org.jclouds.rest.annotations.SelectJson;
import org.jclouds.rest.annotations.Transform;
import org.jclouds.rest.annotations.WrapWith;
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.MediaType;
+import com.google.common.annotations.Beta;
/**
* Provides synchronous access to Router operations on the OpenStack Neutron API.
@@ -73,7 +76,7 @@ public interface RouterApi {
@GET
@Transform(RouterToPagedIterable.class)
@ResponseParser(ParseRouters.class)
- @Fallback(Fallbacks.EmptyPagedIterableOnNotFoundOr404.class)
+ @Fallback(EmptyPagedIterableOnNotFoundOr404.class)
PagedIterable<Router> list();
/**
@@ -95,7 +98,7 @@ public interface RouterApi {
@GET
@Path("/{id}")
@SelectJson("router")
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
+ @Fallback(NullOnNotFoundOr404.class)
@Nullable
Router get(@PathParam("id") String id);
@@ -121,7 +124,7 @@ public interface RouterApi {
@PUT
@Path("/{id}")
@SelectJson("router")
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
+ @Fallback(NullOnNotFoundOr404.class)
@Nullable
Router update(@PathParam("id") String id, @WrapWith("router") Router.UpdateOptions router);
@@ -134,7 +137,7 @@ public interface RouterApi {
@Named("router:delete")
@DELETE
@Path("/{id}")
- @Fallback(Fallbacks.FalseOnNotFoundOr404.class)
+ @Fallback(FalseOnNotFoundOr404.class)
boolean delete(@PathParam("id") String id);
/**
@@ -148,7 +151,7 @@ public interface RouterApi {
@PUT
@Path("/{id}/add_router_interface")
@MapBinder(EmptyOptions.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
+ @Fallback(NullOnNotFoundOr404.class)
@Nullable
RouterInterface addInterfaceForSubnet(@PathParam("id") String routerId, @PayloadParam("subnet_id") String subnetId);
@@ -163,7 +166,7 @@ public interface RouterApi {
@PUT
@Path("/{id}/add_router_interface")
@MapBinder(EmptyOptions.class)
- @Fallback(Fallbacks.NullOnNotFoundOr404.class)
+ @Fallback(NullOnNotFoundOr404.class)
@Nullable
RouterInterface addInterfaceForPort(@PathParam("id") String routerId, @PayloadParam("port_id") String portId);
@@ -177,7 +180,7 @@ public interface RouterApi {
@PUT
@Path("/{id}/remove_router_interface")
@MapBinder(EmptyOptions.class)
- @Fallback(Fallbacks.FalseOnNotFoundOr404.class)
+ @Fallback(FalseOnNotFoundOr404.class)
boolean removeInterfaceForSubnet(@PathParam("id") String routerId, @PayloadParam("subnet_id") String subnetId);
/**
@@ -190,6 +193,6 @@ public interface RouterApi {
@PUT
@Path("/{id}/remove_router_interface")
@MapBinder(EmptyOptions.class)
- @Fallback(Fallbacks.FalseOnNotFoundOr404.class)
+ @Fallback(FalseOnNotFoundOr404.class)
boolean removeInterfaceForPort(@PathParam("id") String routerId, @PayloadParam("port_id") String portId);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java
index 55515df..d2fc042 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApi.java
@@ -17,10 +17,13 @@
package org.jclouds.openstack.neutron.v2_0;
-import com.google.common.base.Optional;
-import com.google.inject.Provides;
+import java.io.Closeable;
+import java.util.Set;
+
import org.jclouds.javax.annotation.Nullable;
+import org.jclouds.location.Region;
import org.jclouds.location.Zone;
+import org.jclouds.location.functions.RegionToEndpoint;
import org.jclouds.location.functions.ZoneToEndpoint;
import org.jclouds.openstack.neutron.v2_0.extensions.RouterApi;
import org.jclouds.openstack.neutron.v2_0.features.NetworkApi;
@@ -30,53 +33,104 @@ import org.jclouds.openstack.v2_0.features.ExtensionApi;
import org.jclouds.rest.annotations.Delegate;
import org.jclouds.rest.annotations.EndpointParam;
-import java.io.Closeable;
-import java.util.Set;
+import com.google.common.base.Optional;
+import com.google.inject.Provides;
/**
* Provides synchronous access to Neutron.
* <p/>
*
- * @see <a href="http://docs.openstack.org/api/openstack-network/2.0/content/">api doc</a>
- * @deprecated Use v2 instead of v2_0
+ * @deprecated Please use {@link org.jclouds.openstack.neutron.v2.NeutronApi} as this
+ * interface will be removed in jclouds 3.0.
*/
@Deprecated
public interface NeutronApi extends Closeable {
+
+ /**
+ * @return the Region codes configured
+ */
+ @Provides
+ @Region
+ Set<String> getConfiguredRegions();
+
+ /**
+ * Provides synchronous access to Extension features.
+ */
+ @Delegate
+ ExtensionApi getExtensionApi(
+ @EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+
+ /**
+ * Provides synchronous access to Network features.
+ */
+ @Delegate
+ NetworkApi getNetworkApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+
+ /**
+ * Provides synchronous access to Subnet features
+ */
+ @Delegate
+ SubnetApi getSubnetApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+
+ /**
+ * Provides synchronous access to Port features.
+ */
+ @Delegate
+ PortApi getPortApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+
+ /**
+ * Provides synchronous access to Router features.
+ */
+ @Delegate
+ Optional<? extends RouterApi> getRouterApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+
/**
* @return the Zone codes configured
+ * @deprecated Please use {@link #getConfiguredRegions()} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Provides
@Zone
Set<String> getConfiguredZones();
/**
* Provides synchronous access to Extension features.
+ * @deprecated Please use {@link #getExtensionApi(String)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
ExtensionApi getExtensionApiForZone(
@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
/**
* Provides synchronous access to Network features.
+ * @deprecated Please use {@link #getNetworkApi(String)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
NetworkApi getNetworkApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
/**
- * Provides synchronous access to Subnet features
+ * Provides synchronous access to Subnet features.
+ * @deprecated Please use {@link #getSubnetApi(String)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
SubnetApi getSubnetApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
/**
* Provides synchronous access to Port features.
+ * @deprecated Please use {@link #getPortApi(String)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
PortApi getPortApiForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
/**
* Provides synchronous access to Router features.
+ * @deprecated Please use {@link #getRouterApi(String)} as this method will be removed in jclouds 3.0.
*/
+ @Deprecated
@Delegate
Optional<? extends RouterApi> getRouterExtensionForZone(@EndpointParam(parser = ZoneToEndpoint.class) @Nullable String zone);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
index 1c09c11..6327f1e 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/NeutronApiMetadata.java
@@ -17,8 +17,12 @@
package org.jclouds.openstack.neutron.v2_0;
-import com.google.common.collect.ImmutableSet;
-import com.google.inject.Module;
+import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
+import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
+
+import java.net.URI;
+import java.util.Properties;
+
import org.jclouds.apis.ApiMetadata;
import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
@@ -28,11 +32,8 @@ import org.jclouds.openstack.neutron.v2_0.config.NeutronHttpApiModule;
import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
-import java.net.URI;
-import java.util.Properties;
-
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
+import com.google.common.collect.ImmutableSet;
+import com.google.inject.Module;
/**
* Implementation of {@link org.jclouds.apis.ApiMetadata} for Neutron 2.0 API
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/config/NeutronHttpApiModule.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/config/NeutronHttpApiModule.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/config/NeutronHttpApiModule.java
index 521453a..fe3d74c 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/config/NeutronHttpApiModule.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/config/NeutronHttpApiModule.java
@@ -16,12 +16,11 @@
*/
package org.jclouds.openstack.neutron.v2_0.config;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.CacheLoader;
-import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.Multimap;
-import com.google.inject.Provides;
+import java.net.URI;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import javax.inject.Provider;
+import javax.inject.Singleton;
import org.jclouds.http.HttpErrorHandler;
import org.jclouds.http.annotation.ClientError;
import org.jclouds.http.annotation.Redirection;
@@ -35,27 +34,26 @@ import org.jclouds.openstack.v2_0.functions.PresentWhenExtensionAnnotationNamesp
import org.jclouds.rest.ConfiguresHttpApi;
import org.jclouds.rest.config.HttpApiModule;
import org.jclouds.rest.functions.ImplicitOptionalConverter;
-
-import javax.inject.Provider;
-import javax.inject.Singleton;
-import java.net.URI;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.Multimap;
+import com.google.inject.Provides;
/**
* Configures the Neutron connection.
*/
-@Deprecated
@ConfiguresHttpApi
public class NeutronHttpApiModule extends HttpApiModule<NeutronApi> {
-
+
@Override
protected void configure() {
bind(DateAdapter.class).to(Iso8601DateAdapter.class);
bind(ImplicitOptionalConverter.class).to(PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet.class);
super.configure();
}
-
+
@Provides
@Singleton
public Multimap<URI, URI> aliases() {
@@ -74,7 +72,7 @@ public class NeutronHttpApiModule extends HttpApiModule<NeutronApi> {
}
});
}
-
+
@Override
protected void bindErrorHandlers() {
bind(HttpErrorHandler.class).annotatedWith(Redirection.class).to(NeutronErrorHandler.class);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java
index b740271..3e8e5a2 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApi.java
@@ -17,9 +17,20 @@
package org.jclouds.openstack.neutron.v2_0.extensions;
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.MediaType;
+
import org.jclouds.Fallbacks;
import org.jclouds.collect.PagedIterable;
import org.jclouds.javax.annotation.Nullable;
+import org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404;
import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
import org.jclouds.openstack.neutron.v2_0.domain.ReferenceWithName;
import org.jclouds.openstack.neutron.v2_0.domain.Router;
@@ -39,27 +50,14 @@ import org.jclouds.rest.annotations.ResponseParser;
import org.jclouds.rest.annotations.SelectJson;
import org.jclouds.rest.annotations.Transform;
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.MediaType;
-
-import static org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404;
-
/**
* Provides synchronous access to Router operations on the OpenStack Neutron API.
* <p/>
* A logical entity for forwarding packets across internal subnets and NATting them on external
* networks through an appropriate external gateway.
*
- * @see <a href=
- * "http://docs.openstack.org/api/openstack-network/2.0/content/router_ext.html">api doc</a>
- * @deprecated Use v2 instead of v2_0
+ * @deprecated Please use {@link org.jclouds.openstack.neutron.v2.extensions.RouterApi} as this
+ * interface will be removed in jclouds 3.0.
*/
@Deprecated
@Path("/v2.0/routers")
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java
index d0a43d4..ffc3df2 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworkDetails.java
@@ -38,6 +38,9 @@ import java.beans.ConstructorProperties;
import static com.google.common.base.Preconditions.checkNotNull;
+/**
+ * @author Nick Livens
+ */
@Beta
@Singleton
public class ParseNetworkDetails extends ParseJson<Networks> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java
index 9a22848..35d0f1c 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseNetworks.java
@@ -38,6 +38,9 @@ import java.beans.ConstructorProperties;
import static com.google.common.base.Preconditions.checkNotNull;
+/**
+ * @author Nick Livens
+ */
@Beta
@Singleton
public class ParseNetworks extends ParseJson<Networks> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java
index 3a0359b..e0c53ed 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePortDetails.java
@@ -39,6 +39,9 @@ import java.beans.ConstructorProperties;
import static com.google.common.base.Preconditions.checkNotNull;
+/**
+ * @author Nick Livens
+ */
@Beta
@Singleton
public class ParsePortDetails extends ParseJson<Ports> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java
index 73ae114..9295df9 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParsePorts.java
@@ -38,6 +38,9 @@ import java.beans.ConstructorProperties;
import static com.google.common.base.Preconditions.checkNotNull;
+/**
+ * @author Nick Livens
+ */
@Beta
@Singleton
public class ParsePorts extends ParseJson<Ports> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java
index 88fbf2e..be8e227 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouterDetails.java
@@ -39,6 +39,9 @@ import java.beans.ConstructorProperties;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker;
+/**
+ * @author Nick Livens
+ */
@Beta
@Singleton
public class ParseRouterDetails extends ParseJson<Routers> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java
index a9842ab..f1e70b1 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseRouters.java
@@ -39,6 +39,9 @@ import java.beans.ConstructorProperties;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.openstack.v2_0.options.PaginationOptions.Builder.marker;
+/**
+ * @author Nick Livens
+ */
@Beta
@Singleton
public class ParseRouters extends ParseJson<Routers> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java
index 0f63aec..4ef5928 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnetDetails.java
@@ -38,6 +38,9 @@ import java.beans.ConstructorProperties;
import static com.google.common.base.Preconditions.checkNotNull;
+/**
+ * @author Nick Livens
+ */
@Beta
@Singleton
public class ParseSubnetDetails extends ParseJson<Subnets> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java
index 4191d8b..ba7b731 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/functions/ParseSubnets.java
@@ -38,6 +38,9 @@ import java.beans.ConstructorProperties;
import static com.google.common.base.Preconditions.checkNotNull;
+/**
+ * @author Nick Livens
+ */
@Beta
@Singleton
public class ParseSubnets extends ParseJson<Subnets> {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java
index 222ca1a..8583428 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiExpectTest.java
@@ -42,6 +42,8 @@ import static org.testng.Assert.assertTrue;
/**
* Tests parsing and Guice wiring of RouterApi
+ *
+ * @author Nick Livens
*/
@Test(groups = "unit", testName = "RouterApiExpectTest")
public class RouterApiExpectTest extends BaseNeutronApiExpectTest {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java
index d38b805..bc4f69a 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/extensions/RouterApiLiveTest.java
@@ -42,6 +42,8 @@ import static org.testng.Assert.assertTrue;
/**
* Tests parsing and Guice wiring of RouterApi
+ *
+ * @author Nick Livens
*/
@Test(groups = "live", testName = "RouterApiLiveTest")
public class RouterApiLiveTest extends BaseNeutronApiLiveTest {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java
index 40d676d..3e16b52 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiExpectTest.java
@@ -42,6 +42,8 @@ import static org.testng.Assert.assertTrue;
/**
* Tests parsing and Guice wiring of NetworkApi
+ *
+ * @author Nick Livens
*/
@Test(groups = "unit", testName = "NetworkApiExpectTest")
public class NetworkApiExpectTest extends BaseNeutronApiExpectTest {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
index e123c2e..6950a89 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/NetworkApiLiveTest.java
@@ -38,6 +38,8 @@ import static org.testng.Assert.assertTrue;
/**
* Tests parsing and Guice wiring of NetworkApi
+ *
+ * @author Nick Livens
*/
@Test(groups = "live", testName = "NetworkApiLiveTest")
public class NetworkApiLiveTest extends BaseNeutronApiLiveTest {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java
index 2231e81..47a7af3 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiExpectTest.java
@@ -41,6 +41,8 @@ import static org.testng.Assert.assertTrue;
/**
* Tests parsing and Guice wiring of PortApi
+ *
+ * @author Nick Livens
*/
@Test(groups = "unit", testName = "PortApiExpectTest")
public class PortApiExpectTest extends BaseNeutronApiExpectTest {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
index 6a5d4a6..1a368b3 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/PortApiLiveTest.java
@@ -43,6 +43,8 @@ import com.google.common.collect.Sets;
/**
* Tests PortApi in combination with the Network & SubnetApi
+ *
+ * @author Nick Livens
*/
@Test(groups = "live", testName = "PortApiLiveTest")
public class PortApiLiveTest extends BaseNeutronApiLiveTest {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
index 0cab1dd..581e6a1 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiExpectTest.java
@@ -40,6 +40,8 @@ import static org.testng.Assert.assertTrue;
/**
* Tests parsing and Guice wiring of SubnetApi
+ *
+ * @author Nick Livens
*/
@Test(groups = "unit", testName = "SubnetApiExpectTest")
public class SubnetApiExpectTest extends BaseNeutronApiExpectTest {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
index 3bde9a1..bd3574f 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2_0/features/SubnetApiLiveTest.java
@@ -43,6 +43,8 @@ import com.google.common.collect.Sets;
/**
* Tests subnet api in combination with the network api
+ *
+ * @author Nick Livens
*/
@Test(groups = "live", testName = "SubnetApiLiveTest")
public class SubnetApiLiveTest extends BaseNeutronApiLiveTest {
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
index 6d8b2a7..2b2cb6b 100644
--- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
+++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/SwiftApi.java
@@ -41,10 +41,7 @@ import com.google.inject.Provides;
* <p/>
* OpenStack Object Storage is an object-based storage system that stores content and metadata
* as objects. You create, modify, and get objects and metadata using this API.
- * <p/>
- * This API is new to jclouds and hence is in Beta. That means we need people to use it and give us feedback. Based
- * on that feedback, minor changes to the interfaces may happen. This code will replace
- * {@code org.jclouds.openstack.swift.SwiftClient} in jclouds 2.0 and it is recommended you adopt it sooner than later.
+ * <p/>8
*/
@Beta
public interface SwiftApi extends Closeable {
@@ -54,73 +51,57 @@ public interface SwiftApi extends Closeable {
Set<String> getConfiguredRegions();
@Delegate
- AccountApi getAccountApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+ AccountApi getAccountApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
@Delegate
- BulkApi getBulkApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+ BulkApi getBulkApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
@Delegate
- ContainerApi getContainerApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+ ContainerApi getContainerApi(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
@Delegate
@Path("/{containerName}")
- ObjectApi getObjectApiForRegionAndContainer(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ObjectApi getObjectApiForContainer(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@PathParam("containerName") String containerName);
@Delegate
@Path("/{containerName}")
- StaticLargeObjectApi getStaticLargeObjectApiForRegionAndContainer(
+ StaticLargeObjectApi getStaticLargeObjectApiForContainer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@PathParam("containerName") String containerName);
/**
- * @deprecated Please use {@link #getConfiguredRegions()} as this method will be removed in jclouds 1.8.
- */
- @Deprecated
- @Provides
- @Region
- Set<String> configuredRegions();
-
- /**
- * @deprecated Please use {@link #getAccountApiForRegion(String)} as this method will be removed in jclouds 1.8.
+ * @deprecated Please use {@link #getAccountApi(String)} as this method will be removed in jclouds 2.0.
*/
- @Deprecated
@Delegate
- AccountApi accountApiInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+ AccountApi getAccountApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
/**
- * @deprecated Please use {@link #getBulkApiForRegion(String)} as this method will be removed in jclouds 1.8.
+ * @deprecated Please use {@link #getBulkApi(String)} as this method will be removed in jclouds 2.0.
*/
- @Deprecated
@Delegate
- BulkApi bulkApiInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+ BulkApi getBulkApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
/**
- * @deprecated Please use {@link #getContainerApiForRegion(String)} as this method will be removed in
- * jclouds 1.8.
+ * @deprecated Please use {@link #getContainerApi(String)} as this method will be removed in jclouds 2.0.
*/
- @Deprecated
@Delegate
- ContainerApi containerApiInRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
+ ContainerApi getContainerApiForRegion(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region);
/**
- * @deprecated Please use {@link #getObjectApiForRegionAndContainer(String, String)} as this method will be
- * removed in jclouds 1.8.
+ * @deprecated Please use {@link #getObjectApiForContainer(String)} as this method will be removed in jclouds 2.0.
*/
- @Deprecated
@Delegate
@Path("/{containerName}")
- ObjectApi objectApiInRegionForContainer(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
+ ObjectApi getObjectApiForRegionAndContainer(@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@PathParam("containerName") String containerName);
/**
- * @deprecated Please use {@link #getStaticLargeObjectApiForRegionAndContainer(String, String)} as this method
- * will be removed in jclouds 1.8.
+ * @deprecated Please use {@link #getStaticLargeObjectApiForContainer(String)} as this method will be removed in jclouds 2.0.
*/
- @Deprecated
@Delegate
@Path("/{containerName}")
- StaticLargeObjectApi staticLargeObjectApiInRegionForContainer(
+ StaticLargeObjectApi getStaticLargeObjectApiForRegionAndContainer(
@EndpointParam(parser = RegionToEndpoint.class) @Nullable String region,
@PathParam("containerName") String containerName);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java
index 903d5ec..f5de499 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java
@@ -41,7 +41,7 @@ public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi>
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- String signature = TemporaryUrlSigner.checkApiEvery(api.getAccountApiForRegion("DFW"), 10000)
+ String signature = TemporaryUrlSigner.checkApiEvery(api.getAccountApi("DFW"), 10000)
.sign("GET", "/v1/AUTH_account/container/object", 1323479485l);
assertEquals(signature, "d9fc2067e52b06598421664cf6610bfc8fc431f6");
@@ -63,7 +63,7 @@ public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi>
try {
SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift");
- TemporaryUrlSigner.checkApiEvery(api.accountApiInRegion("DFW"), 10000)
+ TemporaryUrlSigner.checkApiEvery(api.getAccountApi("DFW"), 10000)
.sign("GET", "/v1/AUTH_account/container/object", 1323479485l);
} finally {
assertEquals(server.getRequestCount(), 2);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
index c62d238..7e54f4c 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiLiveTest.java
@@ -35,8 +35,8 @@ import com.google.common.collect.ImmutableMap;
public class AccountApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
public void testGet() throws Exception {
- for (String regionId : regions) {
- AccountApi accountApi = api.getAccountApiForRegion(regionId);
+ for (String region : regions) {
+ AccountApi accountApi = api.getAccountApi(region);
Account account = accountApi.get();
assertNotNull(account);
@@ -47,8 +47,8 @@ public class AccountApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
}
public void testUpdateMetadata() throws Exception {
- for (String regionId : regions) {
- AccountApi accountApi = api.getAccountApiForRegion(regionId);
+ for (String region : regions) {
+ AccountApi accountApi = api.getAccountApi(region);
Map<String, String> meta = ImmutableMap.of("MyAdd1", "foo", "MyAdd2", "bar");
@@ -59,8 +59,8 @@ public class AccountApiLiveTest extends BaseSwiftApiLiveTest<SwiftApi> {
}
public void testDeleteMetadata() throws Exception {
- for (String regionId : regions) {
- AccountApi accountApi = api.getAccountApiForRegion(regionId);
+ for (String region : regions) {
+ AccountApi accountApi = api.getAccountApi(region);
Map<String, String> meta = ImmutableMap.of("MyDelete1", "foo", "MyDelete2", "bar");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java
index 24c0fcd..d65638c 100644
--- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java
+++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftApiLiveTest.java
@@ -43,7 +43,7 @@ import com.google.common.util.concurrent.Uninterruptibles;
public abstract class BaseSwiftApiLiveTest<A extends SwiftApi> extends BaseApiLiveTest<A> {
protected Set<String> regions;
-
+
protected BaseSwiftApiLiveTest() {
provider = "openstack-swift";
}
@@ -70,8 +70,8 @@ public abstract class BaseSwiftApiLiveTest<A extends SwiftApi> extends BaseApiLi
protected void deleteAllObjectsInContainer(String regionId, final String containerName) {
Uninterruptibles.sleepUninterruptibly(10, TimeUnit.SECONDS);
-
- ObjectList objects = api.getObjectApiForRegionAndContainer(regionId, containerName).list(new ListContainerOptions());
+
+ ObjectList objects = api.getObjectApiForContainer(regionId, containerName).list(new ListContainerOptions());
if (objects == null) {
return;
}
@@ -81,7 +81,7 @@ public abstract class BaseSwiftApiLiveTest<A extends SwiftApi> extends BaseApiLi
}
});
if (!pathsToDelete.isEmpty()) {
- BulkDeleteResponse response = api.getBulkApiForRegion(regionId).bulkDelete(pathsToDelete);
+ BulkDeleteResponse response = api.getBulkApi(regionId).bulkDelete(pathsToDelete);
checkState(response.getErrors().isEmpty(), "Errors deleting paths %s: %s", pathsToDelete, response);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-autoscale-uk/src/main/java/org/jclouds/rackspace/autoscale/uk/AutoscaleUKProviderMetadata.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale-uk/src/main/java/org/jclouds/rackspace/autoscale/uk/AutoscaleUKProviderMetadata.java b/rackspace-autoscale-uk/src/main/java/org/jclouds/rackspace/autoscale/uk/AutoscaleUKProviderMetadata.java
index 710edfe..7f72b5c 100644
--- a/rackspace-autoscale-uk/src/main/java/org/jclouds/rackspace/autoscale/uk/AutoscaleUKProviderMetadata.java
+++ b/rackspace-autoscale-uk/src/main/java/org/jclouds/rackspace/autoscale/uk/AutoscaleUKProviderMetadata.java
@@ -17,15 +17,15 @@
package org.jclouds.rackspace.autoscale.uk;
import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES;
+import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION;
+import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
+import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.autoscale.v1.AutoscaleApiMetadata;
@@ -64,10 +64,10 @@ public class AutoscaleUKProviderMetadata extends BaseProviderMetadata {
public static Properties defaultProperties() {
Properties properties = new Properties();
properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
- properties.setProperty(SERVICE_TYPE, ServiceType.AUTO_SCALE);
+ properties.setProperty(SERVICE_TYPE, ServiceType.AUTO_SCALE);
- properties.setProperty(PROPERTY_ZONES, "LON");
- properties.setProperty(PROPERTY_ZONE + ".LON." + ISO3166_CODES, "GB-SLG");
+ properties.setProperty(PROPERTY_REGIONS, "LON");
+ properties.setProperty(PROPERTY_REGION + ".LON." + ISO3166_CODES, "GB-SLG");
return properties;
}
@@ -86,7 +86,7 @@ public class AutoscaleUKProviderMetadata extends BaseProviderMetadata {
.defaultModules(ImmutableSet.<Class<? extends Module>>builder()
.add(CloudIdentityAuthenticationApiModule.class)
.add(CloudIdentityAuthenticationModule.class)
- .add(ZoneModule.class)
+ .add(RegionModule.class)
.add(AutoscaleParserModule.class)
.add(AutoscaleHttpApiModule.class)
.build())
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-autoscale-uk/src/test/java/org/jclouds/rackspace/autoscale/uk/AutoscaleUKProviderMetadataExpectTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale-uk/src/test/java/org/jclouds/rackspace/autoscale/uk/AutoscaleUKProviderMetadataExpectTest.java b/rackspace-autoscale-uk/src/test/java/org/jclouds/rackspace/autoscale/uk/AutoscaleUKProviderMetadataExpectTest.java
index 6bbeba2..64420de 100644
--- a/rackspace-autoscale-uk/src/test/java/org/jclouds/rackspace/autoscale/uk/AutoscaleUKProviderMetadataExpectTest.java
+++ b/rackspace-autoscale-uk/src/test/java/org/jclouds/rackspace/autoscale/uk/AutoscaleUKProviderMetadataExpectTest.java
@@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableSet;
/**
* This test ensures that the wiring in {@link AutoscaleUKProviderMetadata} is correct.
- *
+ *
*/
@Test(groups = "unit", testName = "AutoscaleUKProviderMetadataExpectTest")
public class AutoscaleUKProviderMetadataExpectTest extends BaseAutoscaleApiExpectTest {
@@ -39,7 +39,7 @@ public class AutoscaleUKProviderMetadataExpectTest extends BaseAutoscaleApiExpec
this.credential = "myApiKey";
}
- public void testCanGetConfiguredZones() {
+ public void testCanGetConfiguredRegions() {
HttpRequest authenticate = HttpRequest.builder().method("POST")
.endpoint("https://lon.identity.api.rackspacecloud.com/v2.0/tokens")
@@ -55,7 +55,7 @@ public class AutoscaleUKProviderMetadataExpectTest extends BaseAutoscaleApiExpec
AutoscaleApi whenNovaRegionExists = requestSendsResponse(authenticate, authenticationResponse);
- assertEquals(whenNovaRegionExists.getConfiguredZones(), ImmutableSet.of("LON"));
+ assertEquals(whenNovaRegionExists.getConfiguredRegions(), ImmutableSet.of("LON"));
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/AutoscaleUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/AutoscaleUSProviderMetadata.java b/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/AutoscaleUSProviderMetadata.java
index 5d5b1d5..ce1fde1 100644
--- a/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/AutoscaleUSProviderMetadata.java
+++ b/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/AutoscaleUSProviderMetadata.java
@@ -17,15 +17,15 @@
package org.jclouds.rackspace.autoscale.us;
import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES;
+import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION;
+import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
+import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.autoscale.v1.AutoscaleApiMetadata;
@@ -64,14 +64,14 @@ public class AutoscaleUSProviderMetadata extends BaseProviderMetadata {
public static Properties defaultProperties() {
Properties properties = new Properties();
properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
- properties.setProperty(SERVICE_TYPE, ServiceType.AUTO_SCALE);
+ properties.setProperty(SERVICE_TYPE, ServiceType.AUTO_SCALE);
- properties.setProperty(PROPERTY_ZONES, "ORD,DFW,IAD,SYD,HKG");
- properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL");
- properties.setProperty(PROPERTY_ZONE + ".DFW." + ISO3166_CODES, "US-TX");
- properties.setProperty(PROPERTY_ZONE + ".IAD." + ISO3166_CODES, "US-VA");
- properties.setProperty(PROPERTY_ZONE + ".SYD." + ISO3166_CODES, "AU-NSW");
- properties.setProperty(PROPERTY_ZONE + ".HKG." + ISO3166_CODES, "HK");
+ properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,IAD,SYD,HKG");
+ properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL");
+ properties.setProperty(PROPERTY_REGION + ".DFW." + ISO3166_CODES, "US-TX");
+ properties.setProperty(PROPERTY_REGION + ".IAD." + ISO3166_CODES, "US-VA");
+ properties.setProperty(PROPERTY_REGION + ".SYD." + ISO3166_CODES, "AU-NSW");
+ properties.setProperty(PROPERTY_REGION + ".HKG." + ISO3166_CODES, "HK");
return properties;
}
@@ -91,7 +91,7 @@ public class AutoscaleUSProviderMetadata extends BaseProviderMetadata {
.defaultModules(ImmutableSet.<Class<? extends Module>>builder()
.add(CloudIdentityAuthenticationApiModule.class)
.add(CloudIdentityAuthenticationModule.class)
- .add(ZoneModule.class)
+ .add(RegionModule.class)
.add(AutoscaleParserModule.class)
.add(AutoscaleHttpApiModule.class)
.build())
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java b/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
index 6d2b0d5..adc4ee8 100644
--- a/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
+++ b/rackspace-autoscale-us/src/main/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadata.java
@@ -17,15 +17,15 @@
package org.jclouds.rackspace.autoscale.us.v1;
import static org.jclouds.location.reference.LocationConstants.ISO3166_CODES;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONE;
-import static org.jclouds.location.reference.LocationConstants.PROPERTY_ZONES;
+import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGION;
+import static org.jclouds.location.reference.LocationConstants.PROPERTY_REGIONS;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
import java.net.URI;
import java.util.Properties;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.ZoneModule;
+import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
import org.jclouds.providers.ProviderMetadata;
import org.jclouds.providers.internal.BaseProviderMetadata;
import org.jclouds.rackspace.autoscale.v1.AutoscaleApiMetadata;
@@ -70,12 +70,12 @@ public class AutoscaleUSProviderMetadata extends BaseProviderMetadata {
properties.setProperty(CREDENTIAL_TYPE, CloudIdentityCredentialTypes.API_KEY_CREDENTIALS);
properties.setProperty(SERVICE_TYPE, ServiceType.AUTO_SCALE);
- properties.setProperty(PROPERTY_ZONES, "ORD,DFW,IAD,SYD,HKG");
- properties.setProperty(PROPERTY_ZONE + ".ORD." + ISO3166_CODES, "US-IL");
- properties.setProperty(PROPERTY_ZONE + ".DFW." + ISO3166_CODES, "US-TX");
- properties.setProperty(PROPERTY_ZONE + ".IAD." + ISO3166_CODES, "US-VA");
- properties.setProperty(PROPERTY_ZONE + ".SYD." + ISO3166_CODES, "AU-NSW");
- properties.setProperty(PROPERTY_ZONE + ".HKG." + ISO3166_CODES, "HK");
+ properties.setProperty(PROPERTY_REGIONS, "ORD,DFW,IAD,SYD,HKG");
+ properties.setProperty(PROPERTY_REGION + ".ORD." + ISO3166_CODES, "US-IL");
+ properties.setProperty(PROPERTY_REGION + ".DFW." + ISO3166_CODES, "US-TX");
+ properties.setProperty(PROPERTY_REGION + ".IAD." + ISO3166_CODES, "US-VA");
+ properties.setProperty(PROPERTY_REGION + ".SYD." + ISO3166_CODES, "AU-NSW");
+ properties.setProperty(PROPERTY_REGION + ".HKG." + ISO3166_CODES, "HK");
return properties;
}
@@ -95,7 +95,7 @@ public class AutoscaleUSProviderMetadata extends BaseProviderMetadata {
.defaultModules(ImmutableSet.<Class<? extends Module>>builder()
.add(CloudIdentityAuthenticationApiModule.class)
.add(CloudIdentityAuthenticationModule.class)
- .add(ZoneModule.class)
+ .add(RegionModule.class)
.add(AutoscaleParserModule.class)
.add(AutoscaleHttpApiModule.class)
.build())
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/1c3ea466/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadataExpectTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadataExpectTest.java b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadataExpectTest.java
index 8dab4c2..41feb1d 100644
--- a/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadataExpectTest.java
+++ b/rackspace-autoscale-us/src/test/java/org/jclouds/rackspace/autoscale/us/v1/AutoscaleUSProviderMetadataExpectTest.java
@@ -53,10 +53,9 @@ public class AutoscaleUSProviderMetadataExpectTest extends BaseAutoscaleApiExpec
.payload(payloadFromResourceWithContentType("/access_rax_us.json", "application/json"))
.build();
- AutoscaleApi whenNovaRegionExists = requestSendsResponse(authenticate, authenticationResponse);
-
- assertEquals(whenNovaRegionExists.getConfiguredZones(), ImmutableSet.of("DFW", "ORD", "IAD"));
+ AutoscaleApi whenAutoscaleRegionExists = requestSendsResponse(authenticate, authenticationResponse);
+ assertEquals(whenAutoscaleRegionExists.getConfiguredRegions(), ImmutableSet.of("DFW", "ORD", "IAD"));
}
}