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 18:59:45 UTC
[06/12] Prefer Regions to Zones in OpenStack APIs
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java
index 8e192c1..7080c74 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiExpectTest.java
@@ -48,7 +48,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_list.json")).build())
- .getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ .getHostAggregateApi("az-1.region-a.geo-1").get();
HostAggregate result = Iterables.getOnlyElement(api.list());
assertEquals(result, exampleHostAggregate());
@@ -60,7 +60,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_with_host_details.json")).build())
- .getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ .getHostAggregateApi("az-1.region-a.geo-1").get();
assertEquals(api.get("1"), exampleHostAggregateWithHost());
}
@@ -70,7 +70,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(404).build()).getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(404).build()).getHostAggregateApi("az-1.region-a.geo-1").get();
assertNull(api.get("1"));
}
@@ -83,7 +83,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
.payload(payloadFromStringWithContentType("{\"aggregate\":{\"name\":\"ubuntu1\",\"availability_zone\":\"nova\"}}", MediaType.APPLICATION_JSON))
.endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build())
- .getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ .getHostAggregateApi("az-1.region-a.geo-1").get();
assertEquals(api.createInAvailabilityZone("ubuntu1", "nova"), exampleHostAggregate());
}
@@ -93,7 +93,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
- HttpResponse.builder().statusCode(200).build()).getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(200).build()).getHostAggregateApi("az-1.region-a.geo-1").get();
assertTrue(api.delete("1"));
}
@@ -103,7 +103,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
HostAggregateApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
- HttpResponse.builder().statusCode(404).build()).getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(404).build()).getHostAggregateApi("az-1.region-a.geo-1").get();
assertFalse(api.delete("1"));
}
@@ -114,7 +114,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
.payload(payloadFromStringWithContentType("{\"aggregate\":{\"name\":\"newaggregatename\"}}", MediaType.APPLICATION_JSON)).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build()).getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build()).getHostAggregateApi("az-1.region-a.geo-1").get();
assertEquals(api.updateName("1", "newaggregatename"), exampleHostAggregate());
}
@@ -125,7 +125,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
.payload(payloadFromStringWithContentType("{\"aggregate\":{\"availability_zone\":\"zone1\"}}", MediaType.APPLICATION_JSON)).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build()).getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build()).getHostAggregateApi("az-1.region-a.geo-1").get();
assertEquals(api.updateAvailabilityZone("1", "zone1"), exampleHostAggregate());
}
@@ -136,7 +136,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
.payload(payloadFromStringWithContentType("{\"add_host\":{\"host\":\"ubuntu\"}}", MediaType.APPLICATION_JSON)).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build()).getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build()).getHostAggregateApi("az-1.region-a.geo-1").get();
assertEquals(api.addHost("1", "ubuntu"), exampleHostAggregate());
}
@@ -147,7 +147,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
.payload(payloadFromStringWithContentType("{\"remove_host\":{\"host\":\"ubuntu\"}}", MediaType.APPLICATION_JSON)).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build()).getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build()).getHostAggregateApi("az-1.region-a.geo-1").get();
assertEquals(api.removeHost("1", "ubuntu"), exampleHostAggregate());
}
@@ -159,7 +159,7 @@ public class HostAggregateApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("POST")
.payload(payloadFromStringWithContentType("{\"set_metadata\":{\"metadata\":{\"mykey\":\"some value or other\"}}}", MediaType.APPLICATION_JSON)).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build()).getHostAggregateExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/host_aggregate_details.json")).build()).getHostAggregateApi("az-1.region-a.geo-1").get();
assertEquals(api.setMetadata("1", ImmutableMap.of("mykey", "some value or other")), exampleHostAggregate());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiLiveTest.java
index 49940a0..499d916 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/HostAggregateApiLiveTest.java
@@ -49,9 +49,9 @@ public class HostAggregateApiLiveTest extends BaseNovaApiLiveTest {
@Override
public void setup() {
super.setup();
- String zone = Iterables.getLast(api.getConfiguredZones(), "nova");
- apiOption = api.getHostAggregateExtensionForZone(zone);
- hostAdminOption = api.getHostAdministrationExtensionForZone(zone);
+ String region = Iterables.getLast(api.getConfiguredRegions(), "nova");
+ apiOption = api.getHostAggregateApi(region);
+ hostAdminOption = api.getHostAdministrationApi(region);
}
@AfterClass(groups = { "integration", "live" })
@@ -99,7 +99,7 @@ public class HostAggregateApiLiveTest extends BaseNovaApiLiveTest {
)) {
// Apply changes
HostAggregate details = api.setMetadata(testAggregate.getId(), theMetaData);
-
+
// bug in openstack - metadata values are never removed, so we just checking what we've set
for (Map.Entry<String, String> entry : theMetaData.entrySet()) {
assertEquals(details.getMetadata().get(entry.getKey()), entry.getValue());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java
index ea04fbe..ea719e5 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiExpectTest.java
@@ -50,10 +50,10 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
NovaApi apiWhenServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, list, listResponse);
- assertEquals(apiWhenServersExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1", "az-2.region-a.geo-1", "az-3.region-a.geo-1"));
+ assertEquals(apiWhenServersExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1", "az-2.region-a.geo-1", "az-3.region-a.geo-1"));
// NOTE this required a change to the KeyPair domain object toString method
- assertEquals(apiWhenServersExist.getKeyPairExtensionForZone("az-1.region-a.geo-1").get().list().toString(),
+ assertEquals(apiWhenServersExist.getKeyPairApi("az-1.region-a.geo-1").get().list().toString(),
new ParseKeyPairListTest().expected().toString());
}
@@ -70,7 +70,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
NovaApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, list, listResponse);
- assertTrue(apiWhenNoServersExist.getKeyPairExtensionForZone("az-1.region-a.geo-1").get().list().isEmpty());
+ assertTrue(apiWhenNoServersExist.getKeyPairApi("az-1.region-a.geo-1").get().list().isEmpty());
}
@@ -90,7 +90,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
NovaApi apiWhenServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, create, createResponse);
- assertEquals(apiWhenServersExist.getKeyPairExtensionForZone("az-1.region-a.geo-1").get().create("testkeypair")
+ assertEquals(apiWhenServersExist.getKeyPairApi("az-1.region-a.geo-1").get().create("testkeypair")
.toString(), new ParseKeyPairTest().expected().toString());
}
@@ -115,7 +115,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
assertEquals(
apiWhenServersExist
- .getKeyPairExtensionForZone("az-1.region-a.geo-1")
+ .getKeyPairApi("az-1.region-a.geo-1")
.get()
.createWithPublicKey(
"testkeypair",
@@ -136,7 +136,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
NovaApi apiWhenServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, delete, deleteResponse);
- assertTrue(apiWhenServersExist.getKeyPairExtensionForZone("az-1.region-a.geo-1").get().delete("testkeypair"));
+ assertTrue(apiWhenServersExist.getKeyPairApi("az-1.region-a.geo-1").get().delete("testkeypair"));
}
public void testGetKeyPairWhenResponseIs2xx() throws Exception {
@@ -153,7 +153,7 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
NovaApi apiWhenKeyPairExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, get, getResponse);
- assertEquals(apiWhenKeyPairExists.getKeyPairExtensionForZone("az-1.region-a.geo-1").get().get("testkeypair"),
+ assertEquals(apiWhenKeyPairExists.getKeyPairApi("az-1.region-a.geo-1").get().get("testkeypair"),
new ParseKeyPairTest().expected());
}
@@ -170,6 +170,6 @@ public class KeyPairApiExpectTest extends BaseNovaApiExpectTest {
NovaApi apiWhenNoKeyPairExists = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, get, getResponse);
- assertNull(apiWhenNoKeyPairExists.getKeyPairExtensionForZone("az-1.region-a.geo-1").get().get("testkeypair"));
+ assertNull(apiWhenNoKeyPairExists.getKeyPairApi("az-1.region-a.geo-1").get().get("testkeypair"));
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiLiveTest.java
index 4edfed8..506960f 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/KeyPairApiLiveTest.java
@@ -35,16 +35,16 @@ public class KeyPairApiLiveTest extends BaseNovaApiLiveTest {
final String PUBLIC_KEY = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQCrrBREFxz3002l1HuXz0+UOdJQ/mOYD5DiJwwB/TOybwIKQJPOxJWA9gBoo4k9dthTKBTaEYbzrll7iZcp59E80S6mNiAr3mUgi+x5Y8uyXeJ2Ws+h6peVyFVUu9epkwpcTd1GVfdcVWsTajwDz9+lxCDhl0RZKDFoT0scTxbj/w== nova@nv-aw2az2-api0002";
public void testListKeyPairs() throws Exception {
- for (String zoneId : api.getConfiguredZones()) {
- KeyPairApi keyPairApi = api.getKeyPairExtensionForZone(zoneId).get();
+ for (String regionId : api.getConfiguredRegions()) {
+ KeyPairApi keyPairApi = api.getKeyPairApi(regionId).get();
FluentIterable<? extends KeyPair> keyPairsList = keyPairApi.list();
assertNotNull(keyPairsList);
}
}
public void testCreateAndGetAndDeleteKeyPair() throws Exception {
- for (String zoneId : api.getConfiguredZones()) {
- KeyPairApi keyPairApi = api.getKeyPairExtensionForZone(zoneId).get();
+ for (String regionId : api.getConfiguredRegions()) {
+ KeyPairApi keyPairApi = api.getKeyPairApi(regionId).get();
KeyPair createdKeyPair = null;
try {
createdKeyPair = keyPairApi.create(KEYPAIR_NAME);
@@ -63,8 +63,8 @@ public class KeyPairApiLiveTest extends BaseNovaApiLiveTest {
}
public void testCreateAndDeleteKeyPairWithPublicKey() throws Exception {
- for (String zoneId : api.getConfiguredZones()) {
- KeyPairApi keyPairApi = api.getKeyPairExtensionForZone(zoneId).get();
+ for (String regionId : api.getConfiguredRegions()) {
+ KeyPairApi keyPairApi = api.getKeyPairApi(regionId).get();
KeyPair createdKeyPair = null;
try {
createdKeyPair = keyPairApi.createWithPublicKey(KEYPAIR_NAME, PUBLIC_KEY);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java
index fe876aa..0350128 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiExpectTest.java
@@ -42,7 +42,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/quotas.json")).build()).getQuotaExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/quotas.json")).build()).getQuotaApi("az-1.region-a.geo-1").get();
assertEquals(api.getByTenant("demo"), getTestQuotas());
}
@@ -52,7 +52,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(404).build()).getQuotaExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(404).build()).getQuotaApi("az-1.region-a.geo-1").get();
assertNull(api.getByTenant("demo"));
}
@@ -61,7 +61,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(200).payload(payloadFromResource("/quotas.json")).build()).getQuotaExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(200).payload(payloadFromResource("/quotas.json")).build()).getQuotaApi("az-1.region-a.geo-1").get();
assertEquals(api.getDefaultsForTenant("demo"), getTestQuotas());
}
@@ -71,7 +71,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
QuotaApi api = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
- HttpResponse.builder().statusCode(404).build()).getQuotaExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(404).build()).getQuotaApi("az-1.region-a.geo-1").get();
assertNull(api.getDefaultsForTenant("demo"));
}
@@ -85,7 +85,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
.addHeader("Accept", "application/json")
.payload(payloadFromResourceWithContentType("/quotas.json", MediaType.APPLICATION_JSON))
.build(),
- HttpResponse.builder().statusCode(200).build()).getQuotaExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(200).build()).getQuotaApi("az-1.region-a.geo-1").get();
assertTrue(api.updateQuotaOfTenant(getTestQuotas(), "demo"));
}
@@ -100,7 +100,7 @@ public class QuotaApiExpectTest extends BaseNovaApiExpectTest {
.addHeader("Accept", "application/json")
.payload(payloadFromResourceWithContentType("/quotas.json", MediaType.APPLICATION_JSON))
.build(),
- HttpResponse.builder().statusCode(404).build()).getQuotaExtensionForZone("az-1.region-a.geo-1").get();
+ HttpResponse.builder().statusCode(404).build()).getQuotaApi("az-1.region-a.geo-1").get();
api.updateQuotaOfTenant(getTestQuotas(), "demo");
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiLiveTest.java
index d0190dc..9d1ecc9 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/QuotaApiLiveTest.java
@@ -40,8 +40,8 @@ public class QuotaApiLiveTest extends BaseNovaApiLiveTest {
public void setup() {
super.setup();
tenant = identity.split(":")[0];
- String zone = Iterables.getLast(api.getConfiguredZones(), "nova");
- apiOption = api.getQuotaExtensionForZone(zone);
+ String region = Iterables.getLast(api.getConfiguredRegions(), "nova");
+ apiOption = api.getQuotaApi(region);
}
public void testGetQuotasForCurrentTenant() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java
index fe692ba..ae108ac 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiExpectTest.java
@@ -55,9 +55,9 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, list,
listResponse);
- assertEquals(apiWhenSecurityGroupsExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1", "az-2.region-a.geo-1", "az-3.region-a.geo-1"));
+ assertEquals(apiWhenSecurityGroupsExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1", "az-2.region-a.geo-1", "az-3.region-a.geo-1"));
- assertEquals(apiWhenSecurityGroupsExist.getSecurityGroupExtensionForZone("az-1.region-a.geo-1").get()
+ assertEquals(apiWhenSecurityGroupsExist.getSecurityGroupApi("az-1.region-a.geo-1").get()
.list().toString(), new ParseSecurityGroupListTest().expected().toString());
}
@@ -73,7 +73,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, listListSecurityGroups,
listListSecurityGroupsResponse);
- assertTrue(apiWhenNoSecurityGroupsExist.getSecurityGroupExtensionForZone("az-1.region-a.geo-1").get()
+ assertTrue(apiWhenNoSecurityGroupsExist.getSecurityGroupApi("az-1.region-a.geo-1").get()
.list().isEmpty());
}
@@ -91,7 +91,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, getSecurityGroup,
getSecurityGroupResponse);
- assertEquals(apiWhenSecurityGroupsExist.getSecurityGroupExtensionForZone("az-1.region-a.geo-1").get()
+ assertEquals(apiWhenSecurityGroupsExist.getSecurityGroupApi("az-1.region-a.geo-1").get()
.get("0").toString(), new ParseSecurityGroupTest().expected().toString());
}
@@ -107,7 +107,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, getSecurityGroup,
getSecurityGroupResponse);
- assertNull(apiWhenNoSecurityGroupsExist.getSecurityGroupExtensionForZone("az-1.region-a.geo-1").get()
+ assertNull(apiWhenNoSecurityGroupsExist.getSecurityGroupApi("az-1.region-a.geo-1").get()
.get("0"));
}
@@ -129,7 +129,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, create,
createResponse);
- assertEquals(apiWhenSecurityGroupsExist.getSecurityGroupExtensionForZone("az-1.region-a.geo-1").get()
+ assertEquals(apiWhenSecurityGroupsExist.getSecurityGroupApi("az-1.region-a.geo-1").get()
.createWithDescription("jclouds-test", "jclouds-test").toString(),
createExpected().toString());
}
@@ -147,7 +147,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, delete,
deleteResponse);
- assertTrue(apiWhenServersExist.getSecurityGroupExtensionForZone("az-1.region-a.geo-1").get()
+ assertTrue(apiWhenServersExist.getSecurityGroupApi("az-1.region-a.geo-1").get()
.delete("160"));
}
@@ -171,12 +171,12 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createRule,
createRuleResponse);
- assertEquals(apiWhenSecurityGroupsExist.getSecurityGroupExtensionForZone("az-1.region-a.geo-1").get()
+ assertEquals(apiWhenSecurityGroupsExist.getSecurityGroupApi("az-1.region-a.geo-1").get()
.createRuleAllowingCidrBlock("161",
Ingress.builder().ipProtocol(IpProtocol.TCP).fromPort(80).toPort(8080).build(), "0.0.0.0/0")
.toString(), createRuleExpected().toString());
}
-
+
public void testCreateSecurityGroupRuleForSecurityGroupIdWhenResponseIs2xx() throws Exception {
HttpRequest createRule = HttpRequest
.builder()
@@ -196,7 +196,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, createRule,
createRuleResponse);
- assertEquals(apiWhenSecurityGroupsExist.getSecurityGroupExtensionForZone("az-1.region-a.geo-1").get()
+ assertEquals(apiWhenSecurityGroupsExist.getSecurityGroupApi("az-1.region-a.geo-1").get()
.createRuleAllowingSecurityGroupId("161",
Ingress.builder().ipProtocol(IpProtocol.TCP).fromPort(80).toPort(8080).build(), "999")
.toString(), createRuleExpected().toString());
@@ -215,7 +215,7 @@ public class SecurityGroupApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse, deleteRule,
deleteRuleResponse);
- assertTrue(apiWhenSecurityGroupsExist.getSecurityGroupExtensionForZone("az-1.region-a.geo-1").get()
+ assertTrue(apiWhenSecurityGroupsExist.getSecurityGroupApi("az-1.region-a.geo-1").get()
.deleteRule("161"));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiLiveTest.java
index eaf9c0f..c930a17 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SecurityGroupApiLiveTest.java
@@ -38,16 +38,16 @@ public class SecurityGroupApiLiveTest extends BaseNovaApiLiveTest {
public static final String SECURITY_GROUP_NAME = "testsg";
public void list() throws Exception {
- for (String zoneId : api.getConfiguredZones()) {
- SecurityGroupApi securityGroupApi = api.getSecurityGroupExtensionForZone(zoneId).get();
+ for (String regionId : api.getConfiguredRegions()) {
+ SecurityGroupApi securityGroupApi = api.getSecurityGroupApi(regionId).get();
Set<? extends SecurityGroup> securityGroupsList = securityGroupApi.list().toSet();
assertNotNull(securityGroupsList);
}
}
public void createGetAndDeleteSecurityGroup() throws Exception {
- for (String zoneId : api.getConfiguredZones()) {
- SecurityGroupApi securityGroupApi = api.getSecurityGroupExtensionForZone(zoneId).get();
+ for (String regionId : api.getConfiguredRegions()) {
+ SecurityGroupApi securityGroupApi = api.getSecurityGroupApi(regionId).get();
SecurityGroup securityGroup = null;
String id;
try {
@@ -66,8 +66,8 @@ public class SecurityGroupApiLiveTest extends BaseNovaApiLiveTest {
}
public void createAndDeleteSecurityGroupRule() throws Exception {
- for (String zoneId : api.getConfiguredZones()) {
- SecurityGroupApi securityGroupApi = api.getSecurityGroupExtensionForZone(zoneId).get();
+ for (String regionId : api.getConfiguredRegions()) {
+ SecurityGroupApi securityGroupApi = api.getSecurityGroupApi(regionId).get();
SecurityGroup securityGroup = null;
try {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java
index d770a05..c528b9e 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiExpectTest.java
@@ -41,7 +41,7 @@ public class ServerWithSecurityGroupsApiExpectTest extends BaseNovaApiExpectTest
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/server_with_security_groups.json")).build()
- ).getServerWithSecurityGroupsExtensionForZone("az-1.region-a.geo-1").get();
+ ).getServerWithSecurityGroupsApi("az-1.region-a.geo-1").get();
ServerWithSecurityGroups server = api.get("8d0a6ca5-8849-4b3d-b86e-f24c92490ebb");
assertEquals(server.getId(), "8d0a6ca5-8849-4b3d-b86e-f24c92490ebb");
@@ -55,7 +55,7 @@ public class ServerWithSecurityGroupsApiExpectTest extends BaseNovaApiExpectTest
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getServerWithSecurityGroupsExtensionForZone("az-1.region-a.geo-1").get();
+ ).getServerWithSecurityGroupsApi("az-1.region-a.geo-1").get();
assertNull(api.get("8d0a6ca5-8849-4b3d-b86e-f24c92490ebb"));
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiLiveTest.java
index 8be4f9a..a6c3266 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/ServerWithSecurityGroupsApiLiveTest.java
@@ -38,15 +38,15 @@ import com.google.common.collect.Iterables;
public class ServerWithSecurityGroupsApiLiveTest extends BaseNovaApiLiveTest {
private ServerApi serverApi;
private Optional<? extends ServerWithSecurityGroupsApi> apiOption;
- private String zone;
+ private String region;
@BeforeGroups(groups = {"integration", "live"})
@Override
public void setup() {
super.setup();
- zone = Iterables.getLast(api.getConfiguredZones(), "nova");
- serverApi = api.getServerApiForZone(zone);
- apiOption = api.getServerWithSecurityGroupsExtensionForZone(zone);
+ region = Iterables.getLast(api.getConfiguredRegions(), "nova");
+ serverApi = api.getServerApi(region);
+ apiOption = api.getServerWithSecurityGroupsApi(region);
}
public void testGetServer() {
@@ -62,8 +62,8 @@ public class ServerWithSecurityGroupsApiLiveTest extends BaseNovaApiLiveTest {
// Create a new server to verify the groups work as expected
Server testServer = null;
try {
- testServer = createServerInZone(zone);
-
+ testServer = createServerInRegion(region);
+
ServerWithSecurityGroups results = apiOption.get().get(testServer.getId());
assertEquals(results.getId(), testServer.getId());
assertEquals(results.getSecurityGroupNames(), ImmutableSet.of("default"));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java
index d04dd8e..2f48412 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiExpectTest.java
@@ -52,10 +52,10 @@ public class SimpleTenantUsageApiExpectTest extends BaseNovaApiExpectTest {
.endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200)
.payload(payloadFromResource("/simple_tenant_usages.json")).build())
- .getSimpleTenantUsageExtensionForZone("az-1.region-a.geo-1").get();
-
+ .getSimpleTenantUsageApi("az-1.region-a.geo-1").get();
+
Set<? extends SimpleTenantUsage> results = api.list().toSet();
-
+
SimpleTenantUsage usage = Iterables.getOnlyElement(results);
assertEquals(usage.getTenantId(), "f8535069c3fb404cb61c873b1a0b4921");
assertEquals(usage.getTotalHours(), 4.888888888888889e-07);
@@ -78,11 +78,11 @@ public class SimpleTenantUsageApiExpectTest extends BaseNovaApiExpectTest {
.endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200)
.payload(payloadFromResource("/simple_tenant_usage.json")).build())
- .getSimpleTenantUsageExtensionForZone("az-1.region-a.geo-1").get();
+ .getSimpleTenantUsageApi("az-1.region-a.geo-1").get();
SimpleTenantUsage usage = api.get("test-1234");
assertEquals(usage.getTenantId(), "f8535069c3fb404cb61c873b1a0b4921");
-
+
SimpleTenantUsage expected = SimpleTenantUsage.builder().tenantId("f8535069c3fb404cb61c873b1a0b4921").totalHours(4.833333333333333E-7).totalLocalGbUsage(1.933333333333333E-05)
.start(dateService.iso8601DateParse("2012-04-18 13:32:07.255743")).stop(dateService.iso8601DateParse("2012-04-18 13:32:07.255743"))
.totalMemoryMbUsage(0.0014847999999999999).totalVcpusUsage(7.249999999999999E-07).serverUsages(
@@ -90,7 +90,7 @@ public class SimpleTenantUsageApiExpectTest extends BaseNovaApiExpectTest {
SimpleServerUsage.builder().hours(2.4166666666666665e-07).uptime(91149).flavorLocalGb(50).instanceName("test1").tenantId("f8535069c3fb404cb61c873b1a0b4921").flavorVcpus(2).flavorMemoryMb(4096).instanceStatus(SimpleServerUsage.Status.ACTIVE).flavorName("m1.medium").instanceCreated(this.dateService.iso8601SecondsDateParse("2012-04-17T12:12:58")).build(),
SimpleServerUsage.builder().hours(2.4166666666666665e-07).uptime(84710).flavorLocalGb(30).instanceName("mish_test").tenantId("f8535069c3fb404cb61c873b1a0b4921").flavorVcpus(1).flavorMemoryMb(2048).instanceStatus(SimpleServerUsage.Status.ACTIVE).flavorName("m1.small").instanceCreated(this.dateService.iso8601SecondsDateParse("2012-04-17T14:00:17")).build()
)).build();
-
+
assertEquals(usage, expected);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiLiveTest.java
index 58b9581..e562f04 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/SimpleTenantUsageApiLiveTest.java
@@ -33,8 +33,8 @@ import com.google.common.base.Optional;
public class SimpleTenantUsageApiLiveTest extends BaseNovaApiLiveTest {
public void testList() throws Exception {
- for (String zoneId : api.getConfiguredZones()) {
- Optional<? extends SimpleTenantUsageApi> optApi = api.getSimpleTenantUsageExtensionForZone(zoneId);
+ for (String regionId : api.getConfiguredRegions()) {
+ Optional<? extends SimpleTenantUsageApi> optApi = api.getSimpleTenantUsageApi(regionId);
if (optApi.isPresent() && identity.endsWith(":admin")) {
SimpleTenantUsageApi api = optApi.get();
Set<? extends SimpleTenantUsage> usages = api.list().toSet();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java
index 1e68dba..48e6aef 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiExpectTest.java
@@ -41,7 +41,7 @@ public class VirtualInterfaceApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/virtual_interfaces_list.json")).build()
- ).getVirtualInterfaceExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVirtualInterfaceApi("az-1.region-a.geo-1").get();
VirtualInterface vif = Iterables.getOnlyElement(api.listOnServer("1"));
assertEquals(vif.getId(), "02315827-b05c-4668-9c05-75c68838074a");
@@ -55,7 +55,7 @@ public class VirtualInterfaceApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVirtualInterfaceExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVirtualInterfaceApi("az-1.region-a.geo-1").get();
assertTrue(api.listOnServer("1").isEmpty());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiLiveTest.java
index c27d17c..27990a7 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VirtualInterfaceApiLiveTest.java
@@ -35,22 +35,21 @@ import com.google.common.collect.Iterables;
@Test(groups = "live", testName = "VirtualInterfaceApiLiveTest", singleThreaded = true)
public class VirtualInterfaceApiLiveTest extends BaseNovaApiLiveTest {
private Optional<? extends VirtualInterfaceApi> apiOption;
- private String zone;
-
+ private String region;
@BeforeClass(groups = {"integration", "live"})
@Override
public void setup() {
super.setup();
- zone = Iterables.getLast(api.getConfiguredZones(), "nova");
- apiOption = api.getVirtualInterfaceExtensionForZone(zone);
+ region = Iterables.getLast(api.getConfiguredRegions(), "nova");
+ apiOption = api.getVirtualInterfaceApi(region);
}
public void testListVirtualInterfaces() {
if (apiOption.isPresent()) {
Server testServer = null;
try {
- testServer = createServerInZone(zone);
+ testServer = createServerInRegion(region);
Set<? extends VirtualInterface> results = apiOption.get().listOnServer(testServer.getId()).toSet();
for (VirtualInterface vif : results) {
assertNotNull(vif.getId());
@@ -58,7 +57,7 @@ public class VirtualInterfaceApiLiveTest extends BaseNovaApiLiveTest {
}
} finally {
if (testServer != null) {
- api.getServerApiForZone(zone).delete(testServer.getId());
+ api.getServerApi(region).delete(testServer.getId());
}
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
index e2ba73d..520ead2 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiExpectTest.java
@@ -56,7 +56,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/volume_list.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Set<? extends Volume> volumes = api.list().toSet();
assertEquals(volumes, ImmutableSet.of(testVolume()));
@@ -69,7 +69,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Set<? extends Volume> volumes = api.list().toSet();
assertTrue(volumes.isEmpty());
@@ -82,7 +82,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/volume_list_detail.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Set<? extends Volume> volumes = api.listInDetail().toSet();
assertEquals(volumes, ImmutableSet.of(testVolume()));
@@ -95,12 +95,12 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Set<? extends Volume> volumes = api.listInDetail().toSet();
assertTrue(volumes.isEmpty());
}
-
+
public void testCreateVolume() {
URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-volumes");
VolumeApi api = requestsSendResponses(
@@ -111,7 +111,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
.payload(payloadFromStringWithContentType("{\"volume\":{\"display_name\":\"jclouds-test-volume\",\"display_description\":\"description of test volume\",\"size\":1}}", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/volume_details.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Volume volume = api.create(1, CreateVolumeOptions.Builder.name("jclouds-test-volume").description("description of test volume"));
assertEquals(volume, testVolume());
@@ -129,7 +129,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
.payload(payloadFromStringWithContentType("{\"volume\":{\"display_name\":\"jclouds-test-volume\",\"display_description\":\"description of test volume\",\"size\":1}}", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(404).payload(payloadFromResource("/volume_details.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
api.create(1, CreateVolumeOptions.Builder.name("jclouds-test-volume").description("description of test volume"));
}
@@ -141,7 +141,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/volume_details.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Volume volume = api.get("1");
assertEquals(volume, testVolume());
@@ -161,7 +161,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
assertNull(api.get("1"));
}
@@ -173,7 +173,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/attachment_details.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
assertTrue(api.delete("1"));
}
@@ -185,7 +185,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
assertFalse(api.delete("1"));
}
@@ -197,7 +197,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/attachment_list.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Set<? extends VolumeAttachment> attachments = api.listAttachmentsOnServer("instance-1").toSet();
assertEquals(attachments, ImmutableSet.of(testAttachment()));
@@ -217,11 +217,11 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(401).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
api.listAttachmentsOnServer("instance-2");
}
-
+
public void testGetAttachment() {
URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments/1");
VolumeApi api = requestsSendResponses(
@@ -229,7 +229,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/attachment_details.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
VolumeAttachment attachment = api.getAttachmentForVolumeOnServer("1", "instance-1");
assertEquals(attachment, testAttachment());
@@ -242,7 +242,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
assertNull(api.getAttachmentForVolumeOnServer("1", "instance-1"));
}
@@ -255,7 +255,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
authenticatedGET().endpoint(endpoint).method("POST")
.payload(payloadFromStringWithContentType("{\"volumeAttachment\":{\"volumeId\":\"1\",\"device\":\"/dev/vdc\"}}", MediaType.APPLICATION_JSON)).endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/attachment_details.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
VolumeAttachment result = api.attachVolumeToServerAsDevice("1", "instance-1", "/dev/vdc");
assertEquals(result, testAttachment());
@@ -270,7 +270,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
authenticatedGET().endpoint(endpoint).method("POST")
.payload(payloadFromStringWithContentType("{\"volumeAttachment\":{\"volumeId\":\"1\",\"device\":\"/dev/vdc\"}}", MediaType.APPLICATION_JSON)).endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
api.attachVolumeToServerAsDevice("1", "instance-1", "/dev/vdc");
}
@@ -282,7 +282,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/attachment_details.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
assertTrue(api.detachVolumeFromServer("1", "instance-1"));
}
@@ -294,7 +294,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
assertFalse(api.detachVolumeFromServer("1", "instance-1"));
}
@@ -306,7 +306,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/snapshot_list.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Set<? extends VolumeSnapshot> snapshots = api.listSnapshots().toSet();
assertEquals(snapshots, ImmutableSet.of(testSnapshot()));
@@ -319,7 +319,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Set<? extends VolumeSnapshot> snapshots = api.listSnapshots().toSet();
assertTrue(snapshots.isEmpty());
@@ -332,7 +332,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/snapshot_details.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
VolumeSnapshot snapshot = api.getSnapshot("1");
assertEquals(snapshot, testSnapshot());
@@ -345,7 +345,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
assertNull(api.getSnapshot("1"));
}
@@ -357,7 +357,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/snapshot_list_detail.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Set<? extends VolumeSnapshot> snapshots = api.listSnapshotsInDetail().toSet();
assertEquals(snapshots, ImmutableSet.of(testSnapshot()));
@@ -379,12 +379,12 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
Set<? extends VolumeSnapshot> snapshots = api.listSnapshotsInDetail().toSet();
assertTrue(snapshots.isEmpty());
}
-
+
public void testCreateSnapshot() {
URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/os-snapshots");
VolumeApi api = requestsSendResponses(
@@ -395,7 +395,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
.payload(payloadFromStringWithContentType("{\"snapshot\":{\"display_name\":\"jclouds-live-test\",\"volume_id\":\"13\",\"display_description\":\"jclouds live test snapshot\",\"force\":\"true\"}}", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/snapshot_details.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
VolumeSnapshot snapshot = api.createSnapshot("13", CreateVolumeSnapshotOptions.Builder.name("jclouds-live-test").description("jclouds live test snapshot").force());
assertEquals(snapshot, testSnapshot());
@@ -412,7 +412,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
.payload(payloadFromStringWithContentType("{\"snapshot\":{\"display_name\":\"jclouds-live-test\",\"volume_id\":\"13\",\"display_description\":\"jclouds live test snapshot\",\"force\":\"true\"}}", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(401).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
api.createSnapshot("13", CreateVolumeSnapshotOptions.Builder.name("jclouds-live-test").description("jclouds live test snapshot").force());
}
@@ -424,7 +424,7 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/snapshot_details.json")).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
assertTrue(api.deleteSnapshot("1"));
}
@@ -437,11 +437,11 @@ public class VolumeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(401).build()
- ).getVolumeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeApi("az-1.region-a.geo-1").get();
api.deleteSnapshot("1");
}
-
+
protected Volume testVolume() {
return Volume.builder().status(Volume.Status.IN_USE).description("This is a test volume").zone("nova").name("test")
.attachments(ImmutableSet.of(testAttachment())).size(1).id("1").created(dateService.iso8601SecondsDateParse("2012-04-23 12:16:45")).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiLiveTest.java
index 930cecd..d1d701d 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeApiLiveTest.java
@@ -46,7 +46,7 @@ import com.google.common.collect.Iterables;
public class VolumeApiLiveTest extends BaseNovaApiLiveTest {
private Optional<? extends VolumeApi> volumeOption;
- private String zone;
+ private String region;
private String availabilityZone;
private Volume testVolume;
@@ -56,11 +56,11 @@ public class VolumeApiLiveTest extends BaseNovaApiLiveTest {
@Override
public void setup() {
super.setup();
- zone = Iterables.getLast(api.getConfiguredZones(), "nova");
- volumeOption = api.getVolumeExtensionForZone(zone);
+ region = Iterables.getLast(api.getConfiguredRegions(), "nova");
+ volumeOption = api.getVolumeApi(region);
- Optional<? extends AvailabilityZoneApi> availabilityZoneApi = api.getAvailabilityZoneApi(zone);
- availabilityZone = availabilityZoneApi.isPresent() ? Iterables.getLast(availabilityZoneApi.get().list()).getName() : zone;
+ Optional<? extends AvailabilityZoneApi> availabilityZoneApi = api.getAvailabilityZoneApi(region);
+ availabilityZone = availabilityZoneApi.isPresent() ? Iterables.getLast(availabilityZoneApi.get().list()).getName() : region;
}
@AfterClass(groups = { "integration", "live" })
@@ -221,7 +221,7 @@ public class VolumeApiLiveTest extends BaseNovaApiLiveTest {
String server_id = null;
try {
CreateServerOptions createServerOptions = CreateServerOptions.Builder.availabilityZone(availabilityZone);
- final String serverId = server_id = createServerInZone(zone, createServerOptions).getId();
+ final String serverId = server_id = createServerInRegion(region, createServerOptions).getId();
Set<? extends VolumeAttachment> attachments = volumeOption.get().listAttachmentsOnServer(serverId).toSet();
assertNotNull(attachments);
@@ -274,7 +274,7 @@ public class VolumeApiLiveTest extends BaseNovaApiLiveTest {
} finally {
if (server_id != null)
- api.getServerApiForZone(zone).delete(server_id);
+ api.getServerApi(region).delete(server_id);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
index 57be07c..b905b57 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiExpectTest.java
@@ -53,7 +53,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/attachment_list.json")).build()
- ).getVolumeAttachmentExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeAttachmentApi("az-1.region-a.geo-1").get();
Set<? extends VolumeAttachment> attachments = api.listAttachmentsOnServer("instance-1").toSet();
assertEquals(attachments, ImmutableSet.of(testAttachment()));
@@ -73,11 +73,11 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(401).build()
- ).getVolumeAttachmentExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeAttachmentApi("az-1.region-a.geo-1").get();
api.listAttachmentsOnServer("instance-2");
}
-
+
public void testGetAttachment() {
URI endpoint = URI.create("https://az-1.region-a.geo-1.compute.hpcloudsvc.com/v2/3456/servers/instance-1/os-volume_attachments/1");
VolumeAttachmentApi api = requestsSendResponses(
@@ -85,7 +85,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/attachment_details.json")).build()
- ).getVolumeAttachmentExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeAttachmentApi("az-1.region-a.geo-1").get();
VolumeAttachment attachment = api.getAttachmentForVolumeOnServer("1", "instance-1");
assertEquals(attachment, testAttachment());
@@ -98,7 +98,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeAttachmentExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeAttachmentApi("az-1.region-a.geo-1").get();
assertNull(api.getAttachmentForVolumeOnServer("1", "instance-1"));
}
@@ -111,7 +111,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
authenticatedGET().endpoint(endpoint).method("POST")
.payload(payloadFromStringWithContentType("{\"volumeAttachment\":{\"volumeId\":\"1\",\"device\":\"/dev/vdc\"}}", MediaType.APPLICATION_JSON)).endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/attachment_details.json")).build()
- ).getVolumeAttachmentExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeAttachmentApi("az-1.region-a.geo-1").get();
VolumeAttachment result = api.attachVolumeToServerAsDevice("1", "instance-1", "/dev/vdc");
assertEquals(result, testAttachment());
@@ -126,7 +126,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
authenticatedGET().endpoint(endpoint).method("POST")
.payload(payloadFromStringWithContentType("{\"volumeAttachment\":{\"volumeId\":\"1\",\"device\":\"/dev/vdc\"}}", MediaType.APPLICATION_JSON)).endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeAttachmentExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeAttachmentApi("az-1.region-a.geo-1").get();
api.attachVolumeToServerAsDevice("1", "instance-1", "/dev/vdc");
}
@@ -138,7 +138,7 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/attachment_details.json")).build()
- ).getVolumeAttachmentExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeAttachmentApi("az-1.region-a.geo-1").get();
assertTrue(api.detachVolumeFromServer("1", "instance-1"));
}
@@ -150,11 +150,11 @@ public class VolumeAttachmentApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeAttachmentExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeAttachmentApi("az-1.region-a.geo-1").get();
assertFalse(api.detachVolumeFromServer("1", "instance-1"));
}
-
+
protected Volume testVolume() {
return Volume.builder().status(Volume.Status.IN_USE).description("This is a test volume").zone("nova").name("test")
.attachments(ImmutableSet.of(testAttachment())).size(1).id("1").created(dateService.iso8601SecondsDateParse("2012-04-23 12:16:45")).build();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiLiveTest.java
index 473e5c7..3c34563 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeAttachmentApiLiveTest.java
@@ -44,17 +44,17 @@ public class VolumeAttachmentApiLiveTest extends BaseNovaApiLiveTest {
private Optional<? extends VolumeApi> volumeApi;
private Optional<? extends VolumeAttachmentApi> volumeAttachmentApi;
-
- private String zone;
+
+ private String region;
private Volume testVolume;
@BeforeClass(groups = {"integration", "live"})
@Override
public void setup() {
super.setup();
- zone = Iterables.getLast(api.getConfiguredZones(), "nova");
- volumeApi = api.getVolumeExtensionForZone(zone);
- volumeAttachmentApi = api.getVolumeAttachmentExtensionForZone(zone);
+ region = Iterables.getLast(api.getConfiguredRegions(), "nova");
+ volumeApi = api.getVolumeApi(region);
+ volumeAttachmentApi = api.getVolumeAttachmentApi(region);
}
@AfterClass(groups = { "integration", "live" })
@@ -80,7 +80,7 @@ public class VolumeAttachmentApiLiveTest extends BaseNovaApiLiveTest {
CreateVolumeOptions options = CreateVolumeOptions.Builder
.name("jclouds-test-volume")
.description("description of test volume")
- .availabilityZone(zone);
+ .availabilityZone(region);
testVolume = volumeApi.get().create(1, options);
assertTrue(retry(new Predicate<VolumeApi>() {
@@ -96,9 +96,9 @@ public class VolumeAttachmentApiLiveTest extends BaseNovaApiLiveTest {
if (volumeApi.isPresent()) {
String server_id = null;
try {
- final String serverId = server_id = createServerInZone(zone).getId();
+ final String serverId = server_id = createServerInRegion(region).getId();
- Set<? extends VolumeAttachment> attachments =
+ Set<? extends VolumeAttachment> attachments =
volumeAttachmentApi.get().listAttachmentsOnServer(serverId).toSet();
assertNotNull(attachments);
final int before = attachments.size();
@@ -146,7 +146,7 @@ public class VolumeAttachmentApiLiveTest extends BaseNovaApiLiveTest {
} finally {
if (server_id != null)
- api.getServerApiForZone(zone).delete(server_id);
+ api.getServerApi(region).delete(server_id);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java
index 2e84833..2c8e8c0 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiExpectTest.java
@@ -51,7 +51,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/volume_type_list.json")).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
Set<? extends VolumeType> types = api.list().toSet();
assertEquals(types, ImmutableSet.of(testVolumeType()));
@@ -64,7 +64,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/volume_type.json")).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
VolumeType type = api.get("8");
assertEquals(type, testVolumeType());
@@ -77,7 +77,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertNull(api.get("8"));
}
@@ -91,7 +91,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
.payload(payloadFromStringWithContentType("{\"volume_type\":{\"name\":\"jclouds-test-1\"}}", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/volume_type.json")).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
VolumeType type = api.create("jclouds-test-1");
assertEquals(type, testVolumeType());
@@ -106,7 +106,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
.payload(payloadFromStringWithContentType("{\"volume_type\":{\"name\":\"jclouds-test-1\",\"extra_specs\":{}}}", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/volume_type.json")).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
VolumeType type = api.create("jclouds-test-1", CreateVolumeTypeOptions.NONE);
assertEquals(type, testVolumeType());
@@ -121,7 +121,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
.payload(payloadFromStringWithContentType("{\"volume_type\":{\"name\":\"jclouds-test-1\",\"extra_specs\":{\"x\": \"y\"}}}", MediaType.APPLICATION_JSON))
.build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/volume_type.json")).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
VolumeType type = api.create("jclouds-test-1", CreateVolumeTypeOptions.Builder.specs(ImmutableMap.of("x", "y")));
assertEquals(type, testVolumeType());
@@ -134,7 +134,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(200).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertTrue(api.delete("8"));
}
@@ -146,7 +146,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertFalse(api.delete("8"));
}
@@ -158,7 +158,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromResource("/volume_type_extra_specs.json")).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertEquals(api.getExtraSpecs("9"), ImmutableMap.of("test", "value1"));
}
@@ -170,7 +170,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertTrue(api.getExtraSpecs("9").isEmpty());
}
@@ -184,7 +184,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
.method("POST")
.payload(payloadFromStringWithContentType("{\"extra_specs\":{\"test1\":\"somevalue\"}}", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(200).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertTrue(api.updateExtraSpecs("9", ImmutableMap.of("test1", "somevalue")));
}
@@ -198,7 +198,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
.method("PUT")
.payload(payloadFromStringWithContentType("{\"test1\":\"somevalue\"}", MediaType.APPLICATION_JSON)).build(),
HttpResponse.builder().statusCode(200).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertTrue(api.updateExtraSpec("5", "test1", "somevalue"));
}
@@ -210,7 +210,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(200).payload(payloadFromStringWithContentType("{\"test1\":\"another value\"}", MediaType.APPLICATION_JSON)).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertEquals(api.getExtraSpec("5", "test1"), "another value");
}
@@ -222,7 +222,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertNull(api.getExtraSpec("5", "test1"));
}
@@ -234,7 +234,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(200).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertTrue(api.deleteExtraSpec("5", "test1"));
}
@@ -246,7 +246,7 @@ public class VolumeTypeApiExpectTest extends BaseNovaApiExpectTest {
responseWithKeystoneAccess, extensionsOfNovaRequest, extensionsOfNovaResponse,
authenticatedGET().endpoint(endpoint).method("DELETE").build(),
HttpResponse.builder().statusCode(404).build()
- ).getVolumeTypeExtensionForZone("az-1.region-a.geo-1").get();
+ ).getVolumeTypeApi("az-1.region-a.geo-1").get();
assertFalse(api.deleteExtraSpec("5", "test1"));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiLiveTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiLiveTest.java
index 4dda6bb..84b47cc 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiLiveTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/extensions/VolumeTypeApiLiveTest.java
@@ -43,7 +43,7 @@ import com.google.common.collect.Iterables;
public class VolumeTypeApiLiveTest extends BaseNovaApiLiveTest {
private Optional<? extends VolumeTypeApi> volumeTypeOption;
- private String zone;
+ private String region;
private VolumeType testVolumeType;
@@ -51,8 +51,8 @@ public class VolumeTypeApiLiveTest extends BaseNovaApiLiveTest {
@Override
public void setup() {
super.setup();
- zone = Iterables.getLast(api.getConfiguredZones(), "nova");
- volumeTypeOption = api.getVolumeTypeExtensionForZone(zone);
+ region = Iterables.getLast(api.getConfiguredRegions(), "nova");
+ volumeTypeOption = api.getVolumeTypeApi(region);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/744cd5d7/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ExtensionApiExpectTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ExtensionApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ExtensionApiExpectTest.java
index 8c58fa3..6b8d279 100644
--- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ExtensionApiExpectTest.java
+++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ExtensionApiExpectTest.java
@@ -50,9 +50,9 @@ public class ExtensionApiExpectTest extends BaseNovaApiExpectTest {
NovaApi apiWhenExtensionsExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, listExtensions, listExtensionsResponse);
- assertEquals(apiWhenExtensionsExist.getConfiguredZones(), ImmutableSet.of("az-1.region-a.geo-1", "az-2.region-a.geo-1", "az-3.region-a.geo-1"));
+ assertEquals(apiWhenExtensionsExist.getConfiguredRegions(), ImmutableSet.of("az-1.region-a.geo-1", "az-2.region-a.geo-1", "az-3.region-a.geo-1"));
- assertEquals(apiWhenExtensionsExist.getExtensionApiForZone("az-1.region-a.geo-1").list().toString(),
+ assertEquals(apiWhenExtensionsExist.getExtensionApi("az-1.region-a.geo-1").list().toString(),
new ParseExtensionListTest().expected().toString());
}
@@ -69,7 +69,7 @@ public class ExtensionApiExpectTest extends BaseNovaApiExpectTest {
NovaApi apiWhenNoServersExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, listExtensions, listExtensionsResponse);
- assertTrue(apiWhenNoServersExist.getExtensionApiForZone("az-1.region-a.geo-1").list().isEmpty());
+ assertTrue(apiWhenNoServersExist.getExtensionApi("az-1.region-a.geo-1").list().isEmpty());
}
// TODO: gson deserializer for Multimap
@@ -87,7 +87,7 @@ public class ExtensionApiExpectTest extends BaseNovaApiExpectTest {
NovaApi apiWhenExtensionsExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, getExtension, getExtensionResponse);
- assertEquals(apiWhenExtensionsExist.getExtensionApiForZone("az-1.region-a.geo-1").get("RS-PIE")
+ assertEquals(apiWhenExtensionsExist.getExtensionApi("az-1.region-a.geo-1").get("RS-PIE")
.toString(), new ParseExtensionTest().expected().toString());
}
@@ -105,6 +105,6 @@ public class ExtensionApiExpectTest extends BaseNovaApiExpectTest {
NovaApi apiWhenNoExtensionsExist = requestsSendResponses(keystoneAuthWithUsernameAndPasswordAndTenantName,
responseWithKeystoneAccess, getExtension, getExtensionResponse);
- assertNull(apiWhenNoExtensionsExist.getExtensionApiForZone("az-1.region-a.geo-1").get("RS-PIE"));
+ assertNull(apiWhenNoExtensionsExist.getExtensionApi("az-1.region-a.geo-1").get("RS-PIE"));
}
}