Updated Rackspace examples to 1.9.0
diff --git a/rackspace/pom.xml b/rackspace/pom.xml
index b1c2fd8..995ffd6 100644
--- a/rackspace/pom.xml
+++ b/rackspace/pom.xml
@@ -22,11 +22,11 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jclouds.examples</groupId>
<artifactId>rackspace-examples</artifactId>
- <version>1.8.1</version>
+ <version>1.9.0</version>
<name>rackspace-examples</name>
<properties>
- <jclouds.version>1.8.1</jclouds.version>
+ <jclouds.version>1.9.0</jclouds.version>
</properties>
<dependencies>
@@ -77,6 +77,11 @@
<artifactId>rackspace-clouddns-us</artifactId>
<version>${jclouds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>rackspace-cdn-us</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
<!-- Rackspace UK dependencies -->
<dependency>
<groupId>org.apache.jclouds.provider</groupId>
@@ -118,6 +123,11 @@
<artifactId>rackspace-clouddns-uk</artifactId>
<version>${jclouds.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>rackspace-cdn-uk</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
<!-- 3rd party dependencies -->
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -129,6 +139,11 @@
<artifactId>mysql-connector-java</artifactId>
<version>5.1.25</version>
</dependency>
+ <dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <version>1.0-rc2</version>
+ </dependency>
</dependencies>
<build>
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/Authentication.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/Authentication.java
index 2887640..2b235cd 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/Authentication.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/Authentication.java
@@ -45,7 +45,7 @@
private final NovaApi nova;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key or password
@@ -87,13 +87,13 @@
}
/**
- * Calling getConfiguredZones() causes jclouds to authenticate. If authentication doesn't work, the call to
- * getConfiguredZones() will result in an org.jclouds.rest.AuthorizationException
+ * Calling getConfiguredRegions() causes jclouds to authenticate. If authentication doesn't work, the call to
+ * getConfiguredRegions() will result in an org.jclouds.rest.AuthorizationException
*/
private void authenticateOnCall() {
System.out.format("Authenticate On Call%n");
- nova.getConfiguredZones();
+ nova.getConfiguredRegions();
System.out.format(" Authenticated%n");
}
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/DeleteAll.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/DeleteAll.java
index 1e97258..c91d208 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/DeleteAll.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/DeleteAll.java
@@ -137,18 +137,18 @@
.credentials(username, apiKey)
.buildApi(CinderApi.class);
- for (String zone : cinderApi.getConfiguredZones()) {
+ for (String region : cinderApi.getConfiguredRegions()) {
try {
- System.out.format("Delete Snapshots in %s%n", zone);
- SnapshotApi snapshotApi = cinderApi.getSnapshotApiForZone(zone);
+ System.out.format("Delete Snapshots in %s%n", region);
+ SnapshotApi snapshotApi = cinderApi.getSnapshotApi(region);
for (Snapshot snapshot : snapshotApi.list()) {
System.out.format(" %s%n", snapshot.getName());
snapshotApi.delete(snapshot.getId());
}
- System.out.format("Delete Volumes in %s%n", zone);
- VolumeApi volumeApi = cinderApi.getVolumeApiForZone(zone);
+ System.out.format("Delete Volumes in %s%n", region);
+ VolumeApi volumeApi = cinderApi.getVolumeApi(region);
for (Volume volume : volumeApi.list()) {
System.out.format(" %s%n", volume.getName());
@@ -167,19 +167,19 @@
.credentials(username, apiKey)
.buildApi(NovaApi.class);
- for (String zone : novaApi.getConfiguredZones()) {
+ for (String region : novaApi.getConfiguredRegions()) {
try {
- System.out.format("Delete Key Pairs in %s%n", zone);
- KeyPairApi keyPairApi = novaApi.getKeyPairExtensionForZone(zone).get();
+ System.out.format("Delete Key Pairs in %s%n", region);
+ KeyPairApi keyPairApi = novaApi.getKeyPairApi(region).get();
for (KeyPair keyPair : keyPairApi.list()) {
System.out.format(" %s%n", keyPair.getName());
keyPairApi.delete(keyPair.getName());
}
- System.out.format("Delete Servers in %s%n", zone);
- VolumeAttachmentApi volumeAttachmentApi = novaApi.getVolumeAttachmentExtensionForZone(zone).get();
- ServerApi serverApi = novaApi.getServerApiForZone(zone);
+ System.out.format("Delete Servers in %s%n", region);
+ VolumeAttachmentApi volumeAttachmentApi = novaApi.getVolumeAttachmentApi(region).get();
+ ServerApi serverApi = novaApi.getServerApi(region);
for (Server server : serverApi.listInDetail().concat().toList()) {
for (VolumeAttachment volumeAttachment : volumeAttachmentApi.listAttachmentsOnServer(server.getId())) {
@@ -202,21 +202,21 @@
.credentials(username, apiKey)
.buildApi(TroveApi.class);
- for (String zone : troveApi.getConfiguredZones()) {
+ for (String region : troveApi.getConfiguredRegions()) {
try {
- System.out.format("Delete Database Instances of DBs and Users in %s%n", zone);
- InstanceApi instanceApi = troveApi.getInstanceApiForZone(zone);
+ System.out.format("Delete Database Instances of DBs and Users in %s%n", region);
+ InstanceApi instanceApi = troveApi.getInstanceApi(region);
for (Instance instance : instanceApi.list()) {
System.out.format(" %s%n", instance.getName());
- DatabaseApi databaseApi = troveApi.getDatabaseApiForZoneAndInstance(zone, instance.getId());
+ DatabaseApi databaseApi = troveApi.getDatabaseApi(region, instance.getId());
for (String database : databaseApi.list()) {
System.out.format(" %s%n", database);
databaseApi.delete(database);
}
- UserApi userApi = troveApi.getUserApiForZoneAndInstance(zone, instance.getId());
+ UserApi userApi = troveApi.getUserApi(region, instance.getId());
for (User user : userApi.list()) {
System.out.format(" %s%n", user.getName());
@@ -259,10 +259,10 @@
.credentials(username, apiKey)
.buildApi(CloudLoadBalancersApi.class);
- for (String zone : clbApi.getConfiguredZones()) {
+ for (String region : clbApi.getConfiguredRegions()) {
try {
- System.out.format("Delete Load Balancers in %s%n", zone);
- LoadBalancerApi lbApi = clbApi.getLoadBalancerApiForZone(zone);
+ System.out.format("Delete Load Balancers in %s%n", region);
+ LoadBalancerApi lbApi = clbApi.getLoadBalancerApi(region);
for (LoadBalancer loadBalancer : lbApi.list().concat()) {
System.out.format(" %s%n", loadBalancer.getName());
@@ -282,10 +282,10 @@
.buildApi(MarconiApi.class);
UUID uuid = UUID.randomUUID(); // any UUID can be used to list all queues
- for (String zone : marconiApi.getConfiguredZones()) {
+ for (String region : marconiApi.getConfiguredRegions()) {
try {
- System.out.format("Delete Queues in %s%n", zone);
- QueueApi queueApi = marconiApi.getQueueApiForZoneAndClient(zone, uuid);
+ System.out.format("Delete Queues in %s%n", region);
+ QueueApi queueApi = marconiApi.getQueueApi(region, uuid);
for (Queue queue : queueApi.list(false).concat()) {
System.out.format(" %s%n", queue.getName());
@@ -304,10 +304,10 @@
.credentials(username, apiKey)
.buildApi(AutoscaleApi.class);
- for (String zone : autoscaleApi.getConfiguredZones()) {
+ for (String region : autoscaleApi.getConfiguredRegions()) {
try {
- System.out.format("Delete Autoscale Groups in %s%n", zone);
- GroupApi groupApi = autoscaleApi.getGroupApiForZone(zone);
+ System.out.format("Delete Autoscale Groups in %s%n", region);
+ GroupApi groupApi = autoscaleApi.getGroupApi(region);
for (GroupState groupState : groupApi.listGroupStates()) {
System.out.format(" %s%n", groupState.getId());
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/Logging.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/Logging.java
index 03958d2..a1559bc 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/Logging.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/Logging.java
@@ -47,7 +47,7 @@
private final NovaApi nova;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -81,13 +81,13 @@
}
private void getConfiguredZones() {
- // Calling getConfiguredZones() talks to the cloud which gets logged
- Set<String> zones = nova.getConfiguredZones();
+ // Calling getConfiguredRegions() talks to the cloud which gets logged
+ Set<String> regions = nova.getConfiguredRegions();
System.out.format("Zones%n");
- for (String zone : zones) {
- System.out.format(" %s%n", zone);
+ for (String region : regions) {
+ System.out.format(" %s%n", region);
}
}
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/SmokeTest.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/SmokeTest.java
index 9189f86..7926b55 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/SmokeTest.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/SmokeTest.java
@@ -38,7 +38,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/AutoscaleCleanup.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/AutoscaleCleanup.java
index 3c31224..d2d1f6d 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/AutoscaleCleanup.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/AutoscaleCleanup.java
@@ -20,7 +20,7 @@
import static org.jclouds.examples.rackspace.autoscale.Constants.NAME;
import static org.jclouds.examples.rackspace.autoscale.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.autoscale.Constants.ZONE;
+import static org.jclouds.examples.rackspace.autoscale.Constants.REGION;
import java.io.Closeable;
import java.io.IOException;
@@ -49,7 +49,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -73,7 +73,7 @@
.credentials(username, apiKey)
.buildApi(AutoscaleApi.class);
- groupApi = autoscaleApi.getGroupApiForZone(ZONE);
+ groupApi = autoscaleApi.getGroupApi(REGION);
}
private void autoscaleCleanup() {
@@ -81,7 +81,7 @@
// Remove ALL policies and groups with that name
for (GroupState g : groupApi.listGroupStates()) {
- PolicyApi pa = autoscaleApi.getPolicyApiForZoneAndGroup(ZONE, g.getId());
+ PolicyApi pa = autoscaleApi.getPolicyApi(REGION, g.getId());
for(ScalingPolicy p : pa.list()) {
if(p.getName().equals(NAME)) {
System.out.format("Found matching policy: %s with cooldown %s%n", p.getId(), p.getCooldown());
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/Constants.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/Constants.java
index 16f167a..5b705a2 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/Constants.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/Constants.java
@@ -26,7 +26,7 @@
// To use the Rackspace Cloud (UK) set the system property or default value to "rackspace-autoscale-uk".
// Note that autoscale is not yet supported for the UK.
public static final String PROVIDER = System.getProperty("provider.autoscale", "rackspace-autoscale-us");
- public static final String ZONE = System.getProperty("zone", "DFW");
+ public static final String REGION = System.getProperty("region", "DFW");
public static final String NAME = "jclouds-example";
public static final String SERVICE_NET = "11111111-1111-1111-1111-111111111111";
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/CreatePolicy.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/CreatePolicy.java
index 14885a7..ecf9e0b 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/CreatePolicy.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/CreatePolicy.java
@@ -22,7 +22,7 @@
import static org.jclouds.examples.rackspace.autoscale.Constants.PROVIDER;
import static org.jclouds.examples.rackspace.autoscale.Constants.PUBLIC_NET;
import static org.jclouds.examples.rackspace.autoscale.Constants.SERVICE_NET;
-import static org.jclouds.examples.rackspace.autoscale.Constants.ZONE;
+import static org.jclouds.examples.rackspace.autoscale.Constants.REGION;
import java.io.Closeable;
import java.io.IOException;
@@ -59,7 +59,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -83,7 +83,7 @@
.credentials(username, apiKey)
.buildApi(AutoscaleApi.class);
- groupApi = autoscaleApi.getGroupApiForZone(ZONE);
+ groupApi = autoscaleApi.getGroupApi(REGION);
}
private void createPolicy() {
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/CreateWebhook.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/CreateWebhook.java
index a401fd9..23d19cd 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/CreateWebhook.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/CreateWebhook.java
@@ -20,7 +20,7 @@
import static org.jclouds.examples.rackspace.autoscale.Constants.NAME;
import static org.jclouds.examples.rackspace.autoscale.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.autoscale.Constants.ZONE;
+import static org.jclouds.examples.rackspace.autoscale.Constants.REGION;
import java.io.Closeable;
import java.io.IOException;
@@ -41,13 +41,11 @@
*/
public class CreateWebhook implements Closeable {
private final AutoscaleApi autoscaleApi;
- private final GroupApi groupApi;
- private final PolicyApi policyApi;
private final WebhookApi webhookApi;
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -71,11 +69,11 @@
.credentials(username, apiKey)
.buildApi(AutoscaleApi.class);
- groupApi = autoscaleApi.getGroupApiForZone(ZONE);
+ GroupApi groupApi = autoscaleApi.getGroupApi(REGION);
String groupId = Utils.getGroupId(groupApi);
- policyApi = autoscaleApi.getPolicyApiForZoneAndGroup(ZONE, groupId);
+ PolicyApi policyApi = autoscaleApi.getPolicyApi(REGION, groupId);
String policyId = Utils.getPolicyId(policyApi);
- webhookApi = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy(ZONE, groupId, policyId);
+ webhookApi = autoscaleApi.getWebhookApi(REGION, groupId, policyId);
}
private void createWebhook() {
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/ExecuteWebhook.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/ExecuteWebhook.java
index 5afc04d..abbe79c 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/ExecuteWebhook.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/ExecuteWebhook.java
@@ -19,7 +19,7 @@
package org.jclouds.examples.rackspace.autoscale;
import static org.jclouds.examples.rackspace.autoscale.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.autoscale.Constants.ZONE;
+import static org.jclouds.examples.rackspace.autoscale.Constants.REGION;
import java.io.Closeable;
import java.io.IOException;
@@ -43,13 +43,12 @@
*/
public class ExecuteWebhook implements Closeable {
private final AutoscaleApi autoscaleApi;
- private final GroupApi groupApi;
private final PolicyApi policyApi;
private final WebhookApi webhookApi;
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -73,11 +72,11 @@
.credentials(username, apiKey)
.buildApi(AutoscaleApi.class);
- groupApi = autoscaleApi.getGroupApiForZone(ZONE);
+ GroupApi groupApi = autoscaleApi.getGroupApi(REGION);
String groupId = Utils.getGroupId(groupApi);
- policyApi = autoscaleApi.getPolicyApiForZoneAndGroup(ZONE, groupId);
+ policyApi = autoscaleApi.getPolicyApi(REGION, groupId);
String policyId = Utils.getPolicyId(policyApi);
- webhookApi = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy(ZONE, groupId, policyId);
+ webhookApi = autoscaleApi.getWebhookApi(REGION, groupId, policyId);
}
private void executeWebhook() {
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/UpdatePolicy.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/UpdatePolicy.java
index 27e2658..ac716e6 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/UpdatePolicy.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/UpdatePolicy.java
@@ -20,7 +20,7 @@
import static org.jclouds.examples.rackspace.autoscale.Constants.NAME;
import static org.jclouds.examples.rackspace.autoscale.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.autoscale.Constants.ZONE;
+import static org.jclouds.examples.rackspace.autoscale.Constants.REGION;
import java.io.Closeable;
import java.io.IOException;
@@ -40,12 +40,11 @@
*/
public class UpdatePolicy implements Closeable {
private final AutoscaleApi autoscaleApi;
- private final GroupApi groupApi;
private final PolicyApi policyApi;
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -69,9 +68,9 @@
.credentials(username, apiKey)
.buildApi(AutoscaleApi.class);
- groupApi = autoscaleApi.getGroupApiForZone(ZONE);
+ GroupApi groupApi = autoscaleApi.getGroupApi(REGION);
String groupId = Utils.getGroupId(groupApi);
- policyApi = autoscaleApi.getPolicyApiForZoneAndGroup(ZONE, groupId);
+ policyApi = autoscaleApi.getPolicyApi(REGION, groupId);
}
private void updatePolicy() {
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/Constants.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/Constants.java
index 35d7def..b4dbe10 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/Constants.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/Constants.java
@@ -27,7 +27,7 @@
// The provider configures jclouds To use the Rackspace Cloud (US)
// To use the Rackspace Cloud (UK) set the system property or default value to "rackspace-cloudblockstorage-uk"
public static final String PROVIDER = System.getProperty("provider.cbs", "rackspace-cloudblockstorage-us");
- public static final String ZONE = System.getProperty("zone", "IAD");
+ public static final String REGION = System.getProperty("region", "IAD");
public static final String NAME = "jclouds-example";
public static final String POLL_PERIOD_TWENTY_SECONDS = String.valueOf(SECONDS.toMillis(20));
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateSnapshot.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateSnapshot.java
index 1cdb4aa..8b6221a 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateSnapshot.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateSnapshot.java
@@ -44,7 +44,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -68,8 +68,8 @@
cinderApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CinderApi.class);
- volumeApi = cinderApi.getVolumeApiForZone(ZONE);
- snapshotApi = cinderApi.getSnapshotApiForZone(ZONE);
+ volumeApi = cinderApi.getVolumeApi(REGION);
+ snapshotApi = cinderApi.getSnapshotApi(REGION);
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateVolumeAndAttach.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateVolumeAndAttach.java
index 82cb073..6c1aef5 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateVolumeAndAttach.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateVolumeAndAttach.java
@@ -25,7 +25,7 @@
import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.PASSWORD;
import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.POLL_PERIOD_TWENTY_SECONDS;
import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.REGION;
import static org.jclouds.scriptbuilder.domain.Statements.exec;
import java.io.Closeable;
@@ -49,7 +49,7 @@
import org.jclouds.openstack.cinder.v1.predicates.VolumePredicates;
import org.jclouds.openstack.nova.v2_0.NovaApi;
import org.jclouds.openstack.nova.v2_0.domain.VolumeAttachment;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndId;
+import org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionAndId;
import org.jclouds.openstack.nova.v2_0.extensions.VolumeAttachmentApi;
import org.jclouds.scriptbuilder.ScriptBuilder;
import org.jclouds.scriptbuilder.domain.OsFamily;
@@ -72,7 +72,7 @@
private final VolumeApi volumeApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -113,22 +113,22 @@
.buildView(ComputeServiceContext.class);
computeService = context.getComputeService();
novaApi = context.unwrapApi(NovaApi.class);
- volumeAttachmentApi = novaApi.getVolumeAttachmentExtensionForZone(ZONE).get();
+ volumeAttachmentApi = novaApi.getVolumeAttachmentApi(REGION).get();
cinderApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CinderApi.class);
- volumeApi = cinderApi.getVolumeApiForZone(ZONE);
+ volumeApi = cinderApi.getVolumeApi(REGION);
}
private NodeMetadata createServer() throws RunNodesException, TimeoutException {
System.out.format("Create Server%n");
- ZoneAndId zoneAndId = ZoneAndId.fromZoneAndId(ZONE, "performance1-1");
+ RegionAndId regionAndId = RegionAndId.fromRegionAndId(REGION, "performance1-1");
Template template = computeService.templateBuilder()
- .locationId(ZONE)
+ .locationId(REGION)
.osDescriptionMatches(".*Ubuntu 12.04.*")
- .hardwareId(zoneAndId.slashEncode())
+ .hardwareId(regionAndId.slashEncode())
.build();
Set<? extends NodeMetadata> nodes = computeService.createNodesInGroup(NAME, 1, template);
@@ -136,7 +136,7 @@
String publicAddress = nodeMetadata.getPublicAddresses().iterator().next();
// We set the password to something we know so we can login in the DetachVolume example
- novaApi.getServerApiForZone(ZONE).changeAdminPass(nodeMetadata.getProviderId(), PASSWORD);
+ novaApi.getServerApi(REGION).changeAdminPass(nodeMetadata.getProviderId(), PASSWORD);
System.out.format(" %s%n", nodeMetadata);
System.out.format(" Login: ssh %s@%s%n", nodeMetadata.getCredentials().getUser(), publicAddress);
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DeleteSnapshot.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DeleteSnapshot.java
index 92d8f40..256f1a8 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DeleteSnapshot.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DeleteSnapshot.java
@@ -40,7 +40,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -64,7 +64,7 @@
cinderApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CinderApi.class);
- snapshotApi = cinderApi.getSnapshotApiForZone(ZONE);
+ snapshotApi = cinderApi.getSnapshotApi(REGION);
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DeleteVolume.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DeleteVolume.java
index 01359fc..d13e69e 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DeleteVolume.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DeleteVolume.java
@@ -40,7 +40,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -64,7 +64,7 @@
cinderApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CinderApi.class);
- volumeApi = cinderApi.getVolumeApiForZone(ZONE);
+ volumeApi = cinderApi.getVolumeApi(REGION);
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DetachVolume.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DetachVolume.java
index 41478f4..310a0f0 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DetachVolume.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/DetachVolume.java
@@ -22,7 +22,7 @@
import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.PASSWORD;
import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.PROVIDER;
import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.ROOT;
-import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.REGION;
import static org.jclouds.scriptbuilder.domain.Statements.exec;
import java.io.Closeable;
@@ -41,7 +41,7 @@
import org.jclouds.openstack.nova.v2_0.NovaApi;
import org.jclouds.openstack.nova.v2_0.domain.Server;
import org.jclouds.openstack.nova.v2_0.domain.VolumeAttachment;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndId;
+import org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionAndId;
import org.jclouds.openstack.nova.v2_0.extensions.VolumeAttachmentApi;
import org.jclouds.openstack.nova.v2_0.features.ServerApi;
import org.jclouds.scriptbuilder.ScriptBuilder;
@@ -58,7 +58,6 @@
*/
public class DetachVolume implements Closeable {
private final ComputeService computeService;
- private final NovaApi novaApi;
private final ServerApi serverApi;
private final VolumeAttachmentApi volumeAttachmentApi;
@@ -67,7 +66,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -100,14 +99,14 @@
.modules(modules)
.buildView(ComputeServiceContext.class);
computeService = context.getComputeService();
- novaApi = context.unwrapApi(NovaApi.class);
- serverApi = novaApi.getServerApiForZone(ZONE);
- volumeAttachmentApi = novaApi.getVolumeAttachmentExtensionForZone(ZONE).get();
+ NovaApi novaApi = context.unwrapApi(NovaApi.class);
+ serverApi = novaApi.getServerApi(REGION);
+ volumeAttachmentApi = novaApi.getVolumeAttachmentApi(REGION).get();
cinderApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CinderApi.class);
- volumeApi = cinderApi.getVolumeApiForZone(ZONE);
+ volumeApi = cinderApi.getVolumeApi(REGION);
}
/**
@@ -141,8 +140,8 @@
.overrideLoginPassword(PASSWORD)
.blockOnComplete(true);
- ZoneAndId zoneAndId = ZoneAndId.fromZoneAndId(ZONE, volumeAttachment.getServerId());
- ExecResponse response = computeService.runScriptOnNode(zoneAndId.slashEncode(), script, options);
+ RegionAndId regionAndId = RegionAndId.fromRegionAndId(REGION, volumeAttachment.getServerId());
+ ExecResponse response = computeService.runScriptOnNode(regionAndId.slashEncode(), script, options);
if (response.getExitStatus() == 0) {
System.out.format(" Exit Status: %s%n", response.getExitStatus());
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListSnapshots.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListSnapshots.java
index 9e657c2..6bf3e62 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListSnapshots.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListSnapshots.java
@@ -34,11 +34,11 @@
*/
public class ListSnapshots implements Closeable {
private final CinderApi cinderApi;
- private final Set<String> zones;
+ private final Set<String> regions;
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -61,16 +61,16 @@
cinderApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CinderApi.class);
- zones = cinderApi.getConfiguredZones();
+ regions = cinderApi.getConfiguredRegions();
}
private void listSnapshots() {
System.out.format("List Snapshots%n");
- for (String zone: zones) {
- System.out.format(" %s%n", zone);
+ for (String region: regions) {
+ System.out.format(" %s%n", region);
- for (Snapshot snapshot: cinderApi.getSnapshotApiForZone(zone).listInDetail()) {
+ for (Snapshot snapshot: cinderApi.getSnapshotApi(region).listInDetail()) {
System.out.format(" %s%n", snapshot);
}
}
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumeAttachments.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumeAttachments.java
index 2662d3a..d72f0f6 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumeAttachments.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumeAttachments.java
@@ -19,7 +19,7 @@
package org.jclouds.examples.rackspace.cloudblockstorage;
import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.NAME;
-import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudblockstorage.Constants.REGION;
import java.io.Closeable;
import java.io.IOException;
@@ -44,7 +44,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -73,8 +73,8 @@
.credentials(username, apiKey)
.buildApi(NovaApi.class);
- serverApi = nova.getServerApiForZone(ZONE);
- volumeAttachmentApi = nova.getVolumeAttachmentExtensionForZone(ZONE).get();
+ serverApi = nova.getServerApi(REGION);
+ volumeAttachmentApi = nova.getVolumeAttachmentApi(REGION).get();
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumeTypes.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumeTypes.java
index e5ea197..e73d1a2 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumeTypes.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumeTypes.java
@@ -34,11 +34,11 @@
*/
public class ListVolumeTypes implements Closeable {
private final CinderApi cinderApi;
- private final Set<String> zones;
+ private final Set<String> regions;
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -61,16 +61,16 @@
cinderApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CinderApi.class);
- zones = cinderApi.getConfiguredZones();
+ regions = cinderApi.getConfiguredRegions();
}
private void listVolumeTypes() {
System.out.format("List Volumes Types%n");
- for (String zone: zones) {
- System.out.format(" %s%n", zone);
+ for (String region: regions) {
+ System.out.format(" %s%n", region);
- for (VolumeType volumeType: cinderApi.getVolumeTypeApiForZone(zone).list()) {
+ for (VolumeType volumeType: cinderApi.getVolumeTypeApi(region).list()) {
System.out.format(" %s%n", volumeType);
}
}
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumes.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumes.java
index fca0094..8ebedde 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumes.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/ListVolumes.java
@@ -34,11 +34,11 @@
*/
public class ListVolumes implements Closeable {
private final CinderApi cinderApi;
- private final Set<String> zones;
+ private final Set<String> regions;
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -61,16 +61,16 @@
cinderApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CinderApi.class);
- zones = cinderApi.getConfiguredZones();
+ regions = cinderApi.getConfiguredRegions();
}
private void listVolumes() {
System.out.format("List Volumes%n");
- for (String zone: zones) {
- System.out.format(" %s%n", zone);
+ for (String region: regions) {
+ System.out.format(" %s%n", region);
- for (Volume volume: cinderApi.getVolumeApiForZone(zone).listInDetail()) {
+ for (Volume volume: cinderApi.getVolumeApi(region).listInDetail()) {
System.out.format(" %s%n", volume);
}
}
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/Constants.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/Constants.java
index 33826e1..53c32f0 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/Constants.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/Constants.java
@@ -25,7 +25,7 @@
// The provider configures jclouds To use the Rackspace Cloud (US)
// To use the Rackspace Cloud (UK) set the system property or default value to "rackspace-clouddatabases-uk"
public static final String PROVIDER = System.getProperty("provider.cdb", "rackspace-clouddatabases-us");
- public static final String ZONE = System.getProperty("zone", "IAD");
+ public static final String REGION = System.getProperty("region", "IAD");
public static final String NAME = "jclouds-example";
public static final String PASSWORD = "0192j41dm311iaadjaoqpvplw";
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateDatabase.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateDatabase.java
index 1bc99ed..0cd8122 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateDatabase.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateDatabase.java
@@ -44,7 +44,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -68,8 +68,8 @@
.credentials(username, apiKey)
.buildApi(TroveApi.class);
- instanceApi = troveApi.getInstanceApiForZone(ZONE);
- databaseApi = troveApi.getDatabaseApiForZoneAndInstance(ZONE, getInstance().getId());
+ instanceApi = troveApi.getInstanceApi(REGION);
+ databaseApi = troveApi.getDatabaseApi(REGION, getInstance().getId());
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateInstance.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateInstance.java
index 1e12bd4..b2a3bd7 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateInstance.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateInstance.java
@@ -44,7 +44,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username.
* The second argument (args[1]) must be your API key.
@@ -69,7 +69,7 @@
.credentials(username, apiKey)
.buildApi(TroveApi.class);
- flavorApi = troveApi.getFlavorApiForZone(ZONE);
+ flavorApi = troveApi.getFlavorApi(REGION);
}
/**
@@ -84,7 +84,7 @@
TroveUtils utils = new TroveUtils(troveApi);
// This call will take a while - it ensures a working instance is created.
- Instance instance = utils.getWorkingInstance(ZONE, NAME, "" + flavor.getId(), 1);
+ Instance instance = utils.getWorkingInstance(REGION, NAME, "" + flavor.getId(), 1);
System.out.format(" %s%n", instance);
}
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateUser.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateUser.java
index 4c368b0..b888749 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateUser.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/CreateUser.java
@@ -42,7 +42,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username.
* The second argument (args[1]) must be your API key.
@@ -66,8 +66,8 @@
.credentials(username, apiKey)
.buildApi(TroveApi.class);
- instanceApi = troveApi.getInstanceApiForZone(ZONE);
- userApi = troveApi.getUserApiForZoneAndInstance(ZONE, getInstance().getId());
+ instanceApi = troveApi.getInstanceApi(REGION);
+ userApi = troveApi.getUserApi(REGION, getInstance().getId());
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteDatabase.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteDatabase.java
index 6fb7d28..8ff50db 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteDatabase.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteDatabase.java
@@ -42,7 +42,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username.
* The second argument (args[1]) must be your API key.
@@ -66,8 +66,8 @@
.credentials(username, apiKey)
.buildApi(TroveApi.class);
- instanceApi = troveApi.getInstanceApiForZone(ZONE);
- databaseApi = troveApi.getDatabaseApiForZoneAndInstance(ZONE, getInstance().getId());
+ instanceApi = troveApi.getInstanceApi(REGION);
+ databaseApi = troveApi.getDatabaseApi(REGION, getInstance().getId());
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteInstance.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteInstance.java
index 7c09dbb..551cf3b 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteInstance.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteInstance.java
@@ -41,7 +41,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username.
* The second argument (args[1]) must be your API key.
@@ -65,7 +65,7 @@
.credentials(username, apiKey)
.buildApi(TroveApi.class);
- instanceApi = troveApi.getInstanceApiForZone(ZONE);
+ instanceApi = troveApi.getInstanceApi(REGION);
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteUser.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteUser.java
index ef0bcaa..7fc65af 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteUser.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/DeleteUser.java
@@ -42,7 +42,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username.
* The second argument (args[1]) must be your API key.
@@ -66,8 +66,8 @@
.credentials(username, apiKey)
.buildApi(TroveApi.class);
- instanceApi = troveApi.getInstanceApiForZone(ZONE);
- userApi = troveApi.getUserApiForZoneAndInstance(ZONE, getInstance().getId());
+ instanceApi = troveApi.getInstanceApi(REGION);
+ userApi = troveApi.getUserApi(REGION, getInstance().getId());
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/GrantRootAccess.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/GrantRootAccess.java
index e19ab11..e3a60a0 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/GrantRootAccess.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/GrantRootAccess.java
@@ -40,7 +40,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username.
* The second argument (args[1]) must be your API key.
@@ -64,7 +64,7 @@
.credentials(username, apiKey)
.buildApi(TroveApi.class);
- instanceApi = troveApi.getInstanceApiForZone(ZONE);
+ instanceApi = troveApi.getInstanceApi(REGION);
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/TestDatabase.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/TestDatabase.java
index 6f508ca..476cd1c 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/TestDatabase.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/TestDatabase.java
@@ -67,7 +67,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username.
* The second argument (args[1]) must be your API key.
@@ -101,12 +101,12 @@
clbApi = ContextBuilder.newBuilder(provider)
.credentials(username, apiKey)
.buildApi(CloudLoadBalancersApi.class);
- lbApi = clbApi.getLoadBalancerApiForZone(ZONE);
+ lbApi = clbApi.getLoadBalancerApi(REGION);
troveApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(TroveApi.class);
- instanceApi = troveApi.getInstanceApiForZone(ZONE);
+ instanceApi = troveApi.getInstanceApi(REGION);
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CRUDReverseDNSRecords.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CRUDReverseDNSRecords.java
index 8f3b0f1..2c6f9ae 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CRUDReverseDNSRecords.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CRUDReverseDNSRecords.java
@@ -49,7 +49,7 @@
private final ReverseDNSApi reverseDNSApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -79,7 +79,7 @@
dnsApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CloudDNSApi.class);
- reverseDNSApi = dnsApi.getReverseDNSApiForService(CLOUD_SERVERS);
+ reverseDNSApi = dnsApi.getReverseDNSApi(CLOUD_SERVERS);
}
private RecordDetail createReverseDNSRecords(NodeMetadata node) throws TimeoutException {
@@ -126,7 +126,7 @@
private void deleteAllReverseDNSRecords(NodeMetadata node) throws TimeoutException {
System.out.format("Delete Reverse DNS Records%n");
- awaitComplete(dnsApi, dnsApi.getReverseDNSApiForService(CLOUD_SERVERS).deleteAll(node.getUri()));
+ awaitComplete(dnsApi, dnsApi.getReverseDNSApi(CLOUD_SERVERS).deleteAll(node.getUri()));
System.out.format(" Deleted all reverse DNS records%n");
}
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CreateDomains.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CreateDomains.java
index f3f1d9f..4425d5c 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CreateDomains.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CreateDomains.java
@@ -45,7 +45,7 @@
private final CloudDNSApi dnsApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CreateRecords.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CreateRecords.java
index 55c258b..4e4576f 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CreateRecords.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/CreateRecords.java
@@ -43,7 +43,7 @@
private final CloudDNSApi dnsApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -95,7 +95,7 @@
Set<Record> createRecords = ImmutableSet.of(createTXTRecord, createARecord);
- Set<RecordDetail> recordDetails = awaitComplete(dnsApi, dnsApi.getRecordApiForDomain(domainId).create(createRecords));
+ Set<RecordDetail> recordDetails = awaitComplete(dnsApi, dnsApi.getRecordApi(domainId).create(createRecords));
for (RecordDetail recordDetail: recordDetails) {
System.out.format(" %s%n", recordDetail);
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/DeleteDomains.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/DeleteDomains.java
index 8bbffc2..7878db2 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/DeleteDomains.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/DeleteDomains.java
@@ -40,7 +40,7 @@
private final CloudDNSApi dnsApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/DeleteRecords.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/DeleteRecords.java
index 6e02737..954f557 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/DeleteRecords.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/DeleteRecords.java
@@ -43,7 +43,7 @@
private final CloudDNSApi dnsApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -82,10 +82,10 @@
private void deleteRecords(Domain domain) throws TimeoutException {
System.out.format("Delete Records%n");
- Set<RecordDetail> recordDetails = dnsApi.getRecordApiForDomain(domain.getId()).listByType("TXT").concat().toSet();
+ Set<RecordDetail> recordDetails = dnsApi.getRecordApi(domain.getId()).listByType("TXT").concat().toSet();
Iterable<String> recordIds = Iterables.transform(recordDetails, GET_RECORD_ID);
- awaitComplete(dnsApi, dnsApi.getRecordApiForDomain(domain.getId()).delete(recordIds));
+ awaitComplete(dnsApi, dnsApi.getRecordApi(domain.getId()).delete(recordIds));
System.out.format(" Deleted %s records", Iterables.size(recordDetails));
}
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/ListDomains.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/ListDomains.java
index 65a4d62..c38e856 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/ListDomains.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/ListDomains.java
@@ -37,7 +37,7 @@
private final CloudDNSApi dnsApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/ListRecords.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/ListRecords.java
index 387c01a..8830298 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/ListRecords.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/ListRecords.java
@@ -38,7 +38,7 @@
private final CloudDNSApi dnsApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -79,7 +79,7 @@
private void listRecords(Domain domain) {
System.out.format("List Records%n");
- Iterable<RecordDetail> recordDetails = dnsApi.getRecordApiForDomain(domain.getId()).list().concat();
+ Iterable<RecordDetail> recordDetails = dnsApi.getRecordApi(domain.getId()).list().concat();
for (RecordDetail recordDetail: recordDetails) {
System.out.format(" %s%n", recordDetail);
@@ -89,7 +89,7 @@
private void listRecordsByNameAndType(Domain domain) {
System.out.format("List Records by Name and Type%n");
- Iterable<RecordDetail> recordDetails = dnsApi.getRecordApiForDomain(domain.getId()).listByNameAndType(NAME, "A").concat();
+ Iterable<RecordDetail> recordDetails = dnsApi.getRecordApi(domain.getId()).listByNameAndType(NAME, "A").concat();
for (RecordDetail recordDetail: recordDetails) {
System.out.format(" %s%n", recordDetail);
@@ -99,7 +99,7 @@
private void listRecordsByType(Domain domain) {
System.out.format("List Records by Type%n");
- Iterable<RecordDetail> recordDetails = dnsApi.getRecordApiForDomain(domain.getId()).listByType("MX").concat();
+ Iterable<RecordDetail> recordDetails = dnsApi.getRecordApi(domain.getId()).listByType("MX").concat();
for (RecordDetail recordDetail: recordDetails) {
System.out.format(" %s%n", recordDetail);
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/UpdateDomains.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/UpdateDomains.java
index 208ee20..5d4859c 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/UpdateDomains.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/UpdateDomains.java
@@ -40,7 +40,7 @@
private final CloudDNSApi dnsApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/UpdateRecords.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/UpdateRecords.java
index ff4b456..2b19303 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/UpdateRecords.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddns/UpdateRecords.java
@@ -46,7 +46,7 @@
private final CloudDNSApi dnsApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -86,24 +86,24 @@
private void updateRecord(Domain domain) throws TimeoutException {
System.out.format("Update Record%n");
- RecordDetail recordDetail = dnsApi.getRecordApiForDomain(domain.getId()).getByNameAndTypeAndData(NAME, "A", "10.0.0.1");
+ RecordDetail recordDetail = dnsApi.getRecordApi(domain.getId()).getByNameAndTypeAndData(NAME, "A", "10.0.0.1");
Record updateRecord = recordDetail.getRecord().toBuilder().data("10.0.1.0").build();
- awaitComplete(dnsApi, dnsApi.getRecordApiForDomain(domain.getId()).update(recordDetail.getId(), updateRecord));
+ awaitComplete(dnsApi, dnsApi.getRecordApi(domain.getId()).update(recordDetail.getId(), updateRecord));
- System.out.format(" %s%n", dnsApi.getRecordApiForDomain(domain.getId()).get(recordDetail.getId()));
+ System.out.format(" %s%n", dnsApi.getRecordApi(domain.getId()).get(recordDetail.getId()));
}
private void updateRecords(Domain domain) throws TimeoutException {
System.out.format("Update Records%n");
- Set<RecordDetail> recordDetails = dnsApi.getRecordApiForDomain(domain.getId()).listByType("A").concat().toSet();
+ Set<RecordDetail> recordDetails = dnsApi.getRecordApi(domain.getId()).listByType("A").concat().toSet();
Map<String, Record> idsToRecords = RecordFunctions.toRecordMap(recordDetails);
Map<String, Record> updateRecords = Maps.transformValues(idsToRecords, updateTTLAndComment(235813, "New TTL"));
- awaitComplete(dnsApi, dnsApi.getRecordApiForDomain(domain.getId()).update(updateRecords));
+ awaitComplete(dnsApi, dnsApi.getRecordApi(domain.getId()).update(updateRecords));
- Iterable<RecordDetail> recordDetailsUpdated = dnsApi.getRecordApiForDomain(domain.getId()).listByType("A").concat();
+ Iterable<RecordDetail> recordDetailsUpdated = dnsApi.getRecordApi(domain.getId()).listByType("A").concat();
for (RecordDetail recordDetailUpdated: recordDetailsUpdated) {
System.out.format(" %s%n", recordDetailUpdated);
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/AddNodes.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/AddNodes.java
index bfe0de1..4a6f51f 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/AddNodes.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/AddNodes.java
@@ -36,7 +36,7 @@
import static org.jclouds.examples.rackspace.cloudloadbalancers.Constants.NAME;
import static org.jclouds.examples.rackspace.cloudloadbalancers.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.cloudloadbalancers.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudloadbalancers.Constants.REGION;
import static org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Condition.DISABLED;
import static org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Condition.ENABLED;
@@ -49,7 +49,7 @@
private final LoadBalancerApi lbApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -74,7 +74,7 @@
clbApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CloudLoadBalancersApi.class);
- lbApi = clbApi.getLoadBalancerApiForZone(ZONE);
+ lbApi = clbApi.getLoadBalancerApi(REGION);
}
private LoadBalancer getLoadBalancer() {
@@ -122,7 +122,7 @@
private void addNodesToLoadBalancer(Set<AddNode> addNodes, LoadBalancer loadBalancer) throws TimeoutException {
System.out.format("Add Nodes%n");
- NodeApi nodeApi = clbApi.getNodeApiForZoneAndLoadBalancer(ZONE, loadBalancer.getId());
+ NodeApi nodeApi = clbApi.getNodeApi(REGION, loadBalancer.getId());
Set<Node> nodes = nodeApi.add(addNodes);
// Wait for the Load Balancer to become Active before moving on
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/Constants.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/Constants.java
index 77eb841..4ed240a 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/Constants.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/Constants.java
@@ -26,7 +26,7 @@
// The provider configures jclouds To use the Rackspace Cloud (US)
// To use the Rackspace Cloud (UK) set the system property or default value to "rackspace-cloudloadbalancers-uk"
public static final String PROVIDER = System.getProperty("provider.clb", "rackspace-cloudloadbalancers-us");
- public static final String ZONE = System.getProperty("zone", "IAD");
+ public static final String REGION = System.getProperty("region", "IAD");
public static final String NAME = "jclouds-example";
}
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/CreateLoadBalancerWithExistingServers.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/CreateLoadBalancerWithExistingServers.java
index fd524bc..fb07767 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/CreateLoadBalancerWithExistingServers.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/CreateLoadBalancerWithExistingServers.java
@@ -33,7 +33,7 @@
import static org.jclouds.examples.rackspace.cloudloadbalancers.Constants.NAME;
import static org.jclouds.examples.rackspace.cloudloadbalancers.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.cloudloadbalancers.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudloadbalancers.Constants.REGION;
import static org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type.PUBLIC;
import static org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer.Algorithm.WEIGHTED_LEAST_CONNECTIONS;
import static org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Condition.ENABLED;
@@ -47,7 +47,7 @@
private final LoadBalancerApi lbApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -71,7 +71,7 @@
clbApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CloudLoadBalancersApi.class);
- lbApi = clbApi.getLoadBalancerApiForZone(ZONE);
+ lbApi = clbApi.getLoadBalancerApi(REGION);
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/CreateLoadBalancerWithNewServers.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/CreateLoadBalancerWithNewServers.java
index 3cb7197..bbb2a94 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/CreateLoadBalancerWithNewServers.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/CreateLoadBalancerWithNewServers.java
@@ -49,7 +49,7 @@
private final LoadBalancerApi lbApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -77,7 +77,7 @@
clbApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CloudLoadBalancersApi.class);
- lbApi = clbApi.getLoadBalancerApiForZone(ZONE);
+ lbApi = clbApi.getLoadBalancerApi(REGION);
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/DeleteLoadBalancers.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/DeleteLoadBalancers.java
index a056f42..c43a381 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/DeleteLoadBalancers.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/DeleteLoadBalancers.java
@@ -40,7 +40,7 @@
private final LoadBalancerApi lbApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -63,7 +63,7 @@
clbApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CloudLoadBalancersApi.class);
- lbApi = clbApi.getLoadBalancerApiForZone(ZONE);
+ lbApi = clbApi.getLoadBalancerApi(REGION);
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/ListLoadBalancers.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/ListLoadBalancers.java
index 1456fb0..91541e3 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/ListLoadBalancers.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/ListLoadBalancers.java
@@ -37,7 +37,7 @@
private final CloudLoadBalancersApi clbApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -65,10 +65,10 @@
private void listLoadBalancers() {
System.out.format("List Load Balancers%n");
- for (String zone: clbApi.getConfiguredZones()) {
- System.out.format(" %s%n", zone);
+ for (String region: clbApi.getConfiguredRegions()) {
+ System.out.format(" %s%n", region);
- LoadBalancerApi lbApi = clbApi.getLoadBalancerApiForZone(zone);
+ LoadBalancerApi lbApi = clbApi.getLoadBalancerApi(region);
for (LoadBalancer loadBalancer: lbApi.list().concat()) {
System.out.format(" %s%n", loadBalancer);
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/RemoveNodes.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/RemoveNodes.java
index 8fdd26e..6f6ed03 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/RemoveNodes.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/RemoveNodes.java
@@ -46,7 +46,7 @@
private final LoadBalancerApi lbApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -71,7 +71,7 @@
clbApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CloudLoadBalancersApi.class);
- lbApi = clbApi.getLoadBalancerApiForZone(ZONE);
+ lbApi = clbApi.getLoadBalancerApi(REGION);
}
private LoadBalancer getLoadBalancer() {
@@ -85,7 +85,7 @@
}
private Set<Node> getNodes(LoadBalancer loadBalancer) {
- NodeApi nodeApi = clbApi.getNodeApiForZoneAndLoadBalancer(ZONE, loadBalancer.getId());
+ NodeApi nodeApi = clbApi.getNodeApi(REGION, loadBalancer.getId());
Set<Node> nodes = Sets.newHashSet();
for (Node node: nodeApi.list().concat()) {
@@ -100,7 +100,7 @@
private void removeNodesFromLoadBalancer(Set<Node> nodes, LoadBalancer loadBalancer) throws TimeoutException {
System.out.format("Remove Nodes%n");
- NodeApi nodeApi = clbApi.getNodeApiForZoneAndLoadBalancer(ZONE, loadBalancer.getId());
+ NodeApi nodeApi = clbApi.getNodeApi(REGION, loadBalancer.getId());
Iterable<Integer> nodeIds = Iterables.transform(nodes, new NodeToId());
nodeApi.remove(nodeIds);
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateLoadBalancers.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateLoadBalancers.java
index 3b3edf7..d059491 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateLoadBalancers.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateLoadBalancers.java
@@ -42,7 +42,7 @@
private final LoadBalancerApi lbApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -66,7 +66,7 @@
clbApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CloudLoadBalancersApi.class);
- lbApi = clbApi.getLoadBalancerApiForZone(ZONE);
+ lbApi = clbApi.getLoadBalancerApi(REGION);
}
private LoadBalancer getLoadBalancer() {
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateNodes.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateNodes.java
index 9dd0b8a..516387a 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateNodes.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/UpdateNodes.java
@@ -47,7 +47,7 @@
private final LoadBalancerApi lbApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -72,7 +72,7 @@
clbApi = ContextBuilder.newBuilder(PROVIDER)
.credentials(username, apiKey)
.buildApi(CloudLoadBalancersApi.class);
- lbApi = clbApi.getLoadBalancerApiForZone(ZONE);
+ lbApi = clbApi.getLoadBalancerApi(REGION);
}
private LoadBalancer getLoadBalancer() throws TimeoutException {
@@ -86,7 +86,7 @@
}
private Set<Node> getNodes(LoadBalancer loadBalancer) {
- NodeApi nodeApi = clbApi.getNodeApiForZoneAndLoadBalancer(ZONE, loadBalancer.getId());
+ NodeApi nodeApi = clbApi.getNodeApi(REGION, loadBalancer.getId());
Set<Node> nodes = Sets.newHashSet();
for (Node node: nodeApi.list().concat()) {
@@ -101,7 +101,7 @@
private void updateNodesInLoadBalancer(Set<Node> nodes, LoadBalancer loadBalancer) throws TimeoutException {
System.out.format("Update Nodes%n");
- NodeApi nodeApi = clbApi.getNodeApiForZoneAndLoadBalancer(ZONE, loadBalancer.getId());
+ NodeApi nodeApi = clbApi.getNodeApi(REGION, loadBalancer.getId());
UpdateNode updateNode = UpdateNode.builder()
.condition(ENABLED)
.weight(20)
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/Constants.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/Constants.java
index 146a03b..68d3424 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/Constants.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/Constants.java
@@ -27,7 +27,7 @@
// The provider configures jclouds To use the Rackspace Cloud (US)
// To use the Rackspace Cloud (UK) set the system property or default value to "rackspace-cloudqueues-uk"
final String PROVIDER = System.getProperty("provider.cbs", "rackspace-cloudqueues-us");
- final String ZONE = System.getProperty("zone", "IAD");
+ final String REGION = System.getProperty("region", "IAD");
final UUID PRODUCER_ID = UUID.fromString("3381af92-2b9e-11e3-b191-71861300734a");
final UUID CONSUMER_ID = UUID.fromString("3381af92-2b9e-11e3-b191-71861300734b");
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/ProducerConsumer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/ProducerConsumer.java
index c39656a..5f7bc1c 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/ProducerConsumer.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/ProducerConsumer.java
@@ -47,7 +47,7 @@
import static org.jclouds.examples.rackspace.cloudqueues.Constants.PRODUCER_ID;
import static org.jclouds.examples.rackspace.cloudqueues.Constants.PRODUCER_NAME;
import static org.jclouds.examples.rackspace.cloudqueues.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.cloudqueues.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudqueues.Constants.REGION;
/**
* Setting up a Producer/Consumer model in Cloud Queues consists of posting messages to your queue, consumers claiming
@@ -98,7 +98,7 @@
.credentials(username, apiKey)
// .modules(modules)
.buildApi(MarconiApi.class);
- queueApi = marconiApi.getQueueApiForZoneAndClient(ZONE, PRODUCER_ID);
+ queueApi = marconiApi.getQueueApi(REGION, PRODUCER_ID);
}
private void createQueue() {
@@ -148,7 +148,7 @@
protected Producer(String producerName) {
this.producerName = producerName;
- messageApi = marconiApi.getMessageApiForZoneAndClientAndQueue(ZONE, PRODUCER_ID, NAME);
+ messageApi = marconiApi.getMessageApi(REGION, PRODUCER_ID, NAME);
}
public void run() {
@@ -179,8 +179,8 @@
protected Consumer(String consumerName) {
this.consumerName = consumerName;
- messageApi = marconiApi.getMessageApiForZoneAndClientAndQueue(ZONE, CONSUMER_ID, NAME);
- claimApi = marconiApi.getClaimApiForZoneAndClientAndQueue(ZONE, CONSUMER_ID, NAME);
+ messageApi = marconiApi.getMessageApi(REGION, CONSUMER_ID, NAME);
+ claimApi = marconiApi.getClaimApi(REGION, CONSUMER_ID, NAME);
}
public void run() {
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/PublishSubscribe.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/PublishSubscribe.java
index 3a4855a..acd3d0e 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/PublishSubscribe.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/PublishSubscribe.java
@@ -48,7 +48,7 @@
import static org.jclouds.examples.rackspace.cloudqueues.Constants.PUBLISHER_ID;
import static org.jclouds.examples.rackspace.cloudqueues.Constants.PUBLISHER_NAME;
import static org.jclouds.examples.rackspace.cloudqueues.Constants.SUBSCRIBER_ID;
-import static org.jclouds.examples.rackspace.cloudqueues.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudqueues.Constants.REGION;
import static org.jclouds.openstack.marconi.v1.options.StreamMessagesOptions.Builder.limit;
/**
@@ -97,7 +97,7 @@
.credentials(username, apiKey)
// .modules(modules)
.buildApi(MarconiApi.class);
- queueApi = marconiApi.getQueueApiForZoneAndClient(ZONE, PUBLISHER_ID);
+ queueApi = marconiApi.getQueueApi(REGION, PUBLISHER_ID);
}
private void createQueue() {
@@ -147,7 +147,7 @@
protected Publisher(String publisherName) {
this.publisherName = publisherName;
- messageApi = marconiApi.getMessageApiForZoneAndClientAndQueue(ZONE, PUBLISHER_ID, NAME);
+ messageApi = marconiApi.getMessageApi(REGION, PUBLISHER_ID, NAME);
}
public void run() {
@@ -178,7 +178,7 @@
protected Subscriber(String subscriberName) {
this.subscriberName = subscriberName;
- messageApi = marconiApi.getMessageApiForZoneAndClientAndQueue(ZONE, SUBSCRIBER_ID, NAME);
+ messageApi = marconiApi.getMessageApi(REGION, SUBSCRIBER_ID, NAME);
}
/**
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/StreamMessages.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/StreamMessages.java
index c8190cd..05da8c4 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/StreamMessages.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudqueues/StreamMessages.java
@@ -44,7 +44,7 @@
import static org.jclouds.examples.rackspace.cloudqueues.Constants.PRODUCER_NAME;
import static org.jclouds.examples.rackspace.cloudqueues.Constants.PROVIDER;
import static org.jclouds.examples.rackspace.cloudqueues.Constants.PUBLISHER_ID;
-import static org.jclouds.examples.rackspace.cloudqueues.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudqueues.Constants.REGION;
import static org.jclouds.openstack.marconi.v1.options.StreamMessagesOptions.Builder.marker;
/**
@@ -88,7 +88,7 @@
.credentials(username, apiKey)
// .modules(modules)
.buildApi(MarconiApi.class);
- queueApi = marconiApi.getQueueApiForZoneAndClient(ZONE, PUBLISHER_ID);
+ queueApi = marconiApi.getQueueApi(REGION, PUBLISHER_ID);
}
private void createQueue() {
@@ -98,7 +98,7 @@
private void createMessages() throws ExecutionException, InterruptedException {
System.out.format("Create Messages%n");
- MessageApi messageApi = marconiApi.getMessageApiForZoneAndClientAndQueue(ZONE, PRODUCER_ID, NAME);
+ MessageApi messageApi = marconiApi.getMessageApi(REGION, PRODUCER_ID, NAME);
List<CreateMessage> createMessages = Lists.newArrayList();
for (int i=0; i < 10; i++) {
@@ -123,7 +123,7 @@
private void streamMessages() {
System.out.format("Stream Messages%n");
- MessageApi messageApi = marconiApi.getMessageApiForZoneAndClientAndQueue(ZONE, CONSUMER_ID, NAME);
+ MessageApi messageApi = marconiApi.getMessageApi(REGION, CONSUMER_ID, NAME);
MessageStream stream = messageApi.stream();
String marker = "";
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java
index 8a32979..62cf6da 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java
@@ -30,7 +30,7 @@
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.Template;
import org.jclouds.compute.options.RunScriptOptions;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndId;
+import org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionAndId;
import org.jclouds.predicates.SocketOpen;
import org.jclouds.scriptbuilder.ScriptBuilder;
import org.jclouds.scriptbuilder.domain.OsFamily;
@@ -60,7 +60,7 @@
/**
* To get a username and API key see
- * http://www.jclouds.org/documentation/quickstart/rackspace/
+ * http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -113,11 +113,11 @@
private Set<? extends NodeMetadata> createServer() throws RunNodesException, TimeoutException {
System.out.format("Create Server%n");
- ZoneAndId zoneAndId = ZoneAndId.fromZoneAndId(ZONE, "performance1-1");
+ RegionAndId regionAndId = RegionAndId.fromRegionAndId(REGION, "performance1-1");
Template template = computeService.templateBuilder()
- .locationId(ZONE)
- .osDescriptionMatches(".*Ubuntu 12.04.*")
- .hardwareId(zoneAndId.slashEncode())
+ .locationId(REGION)
+ .osDescriptionMatches(".*Ubuntu 14.04.*")
+ .hardwareId(regionAndId.slashEncode())
.build();
// This method will continue to poll for the server status and won't return until this server is ACTIVE
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/Constants.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/Constants.java
index 91d2c12..68cb9a2 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/Constants.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/Constants.java
@@ -27,7 +27,7 @@
// The provider configures jclouds To use the Rackspace Cloud (US)
// To use the Rackspace Cloud (UK) set the system property or default value to "rackspace-cloudservers-uk"
public static final String PROVIDER = System.getProperty("provider.cs", "rackspace-cloudservers-us");
- public static final String ZONE = System.getProperty("zone", "IAD");
+ public static final String REGION = System.getProperty("region", "IAD");
public static final String NAME = "jclouds-example";
public static final String POLL_PERIOD_TWENTY_SECONDS = String.valueOf(SECONDS.toMillis(20));
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java
index 6f40d37..4cbfc4a 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java
@@ -39,14 +39,14 @@
import static org.jclouds.examples.rackspace.cloudservers.Constants.*;
/**
- * This example creates an Ubuntu 12.04 server with 1024 MB of RAM on the Rackspace Cloud.
+ * This example creates an Ubuntu 14.04 server with 1024 MB of RAM on the Rackspace Cloud.
*
*/
public class CreateServer implements Closeable {
private final ComputeService computeService;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -86,7 +86,7 @@
* Template template = computeService.templateBuilder()
* .locationId(getLocationId())
* .osFamily(OsFamily.UBUNTU)
- * .osVersionMatches("12.04")
+ * .osVersionMatches("14.04")
* .minRam(1024)
* .build();
*/
@@ -94,7 +94,7 @@
System.out.format("Create Server%n");
Template template = computeService.templateBuilder()
- .locationId(ZONE)
+ .locationId(REGION)
.fromHardware(getHardware())
.fromImage(getImage())
.build();
@@ -141,7 +141,7 @@
/**
* This method uses the generic ComputeService.listImages() to find the image.
*
- * @return An Ubuntu 12.04 Image
+ * @return An Ubuntu 14.04 Image
*/
private Image getImage() {
System.out.format(" Images%n");
@@ -151,13 +151,13 @@
for (Image image: images) {
System.out.format(" %s%n", image);
- if (image.getOperatingSystem().getName().equals("Ubuntu 12.04 LTS (Precise Pangolin)")) {
+ if (image.getOperatingSystem().getName().startsWith("Ubuntu 14.04 LTS")) {
result = image;
}
}
if (result == null) {
- System.err.println("Image with Ubuntu 12.04 operating system not found. Using first image found.%n");
+ System.err.println("Image with Ubuntu 14.04 operating system not found. Using first image found.%n");
result = images.iterator().next();
}
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServerWithKeyPair.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServerWithKeyPair.java
index 1fc0be4..cd3a63c 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServerWithKeyPair.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServerWithKeyPair.java
@@ -24,7 +24,7 @@
import static org.jclouds.examples.rackspace.cloudservers.Constants.NAME;
import static org.jclouds.examples.rackspace.cloudservers.Constants.POLL_PERIOD_TWENTY_SECONDS;
import static org.jclouds.examples.rackspace.cloudservers.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.cloudservers.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudservers.Constants.REGION;
import static org.jclouds.scriptbuilder.domain.Statements.exec;
import java.io.Closeable;
@@ -44,7 +44,7 @@
import org.jclouds.openstack.nova.v2_0.NovaApi;
import org.jclouds.openstack.nova.v2_0.compute.options.NovaTemplateOptions;
import org.jclouds.openstack.nova.v2_0.domain.KeyPair;
-import org.jclouds.openstack.nova.v2_0.domain.zonescoped.ZoneAndId;
+import org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionAndId;
import org.jclouds.openstack.nova.v2_0.extensions.KeyPairApi;
import org.jclouds.scriptbuilder.ScriptBuilder;
import org.jclouds.scriptbuilder.domain.OsFamily;
@@ -122,7 +122,7 @@
* This method is not necessary and is here for demonstration purposes only.
*/
private void detectKeyPairExtension() {
- Optional<? extends KeyPairApi> keyPairApiExtension = novaApi.getKeyPairExtensionForZone(ZONE);
+ Optional<? extends KeyPairApi> keyPairApiExtension = novaApi.getKeyPairApi(REGION);
if (keyPairApiExtension.isPresent()) {
System.out.format(" Key Pair Extension Present%n");
@@ -141,7 +141,7 @@
private KeyPair createKeyPair() throws IOException {
System.out.format(" Create Key Pair%n");
- KeyPairApi keyPairApi = novaApi.getKeyPairExtensionForZone(ZONE).get();
+ KeyPairApi keyPairApi = novaApi.getKeyPairApi(REGION).get();
KeyPair keyPair = keyPairApi.create(NAME);
Files.write(keyPair.getPrivateKey(), keyPairFile, UTF_8);
@@ -159,11 +159,11 @@
NovaTemplateOptions options = NovaTemplateOptions.Builder.keyPairName(keyPair.getName());
- ZoneAndId zoneAndId = ZoneAndId.fromZoneAndId(ZONE, "performance1-1");
+ RegionAndId regionAndId = RegionAndId.fromRegionAndId(REGION, "performance1-1");
Template template = computeService.templateBuilder()
- .locationId(ZONE)
- .osDescriptionMatches(".*Ubuntu 12.04.*")
- .hardwareId(zoneAndId.slashEncode())
+ .locationId(REGION)
+ .osDescriptionMatches(".*Ubuntu 14.04.*")
+ .hardwareId(regionAndId.slashEncode())
.options(options)
.build();
@@ -209,7 +209,7 @@
private void deleteKeyPair(KeyPair keyPair) {
System.out.format(" Delete Key Pair%n");
- KeyPairApi keyPairApi = novaApi.getKeyPairExtensionForZone(ZONE).get();
+ KeyPairApi keyPairApi = novaApi.getKeyPairApi(REGION).get();
keyPairApi.delete(keyPair.getName());
if (keyPairFile.delete()) {
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/DeleteServer.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/DeleteServer.java
index bfaa282..bae23df 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/DeleteServer.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/DeleteServer.java
@@ -42,7 +42,7 @@
private ComputeService computeService;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ListServersWithFiltering.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ListServersWithFiltering.java
index 5358d5a..52f17f9 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ListServersWithFiltering.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ListServersWithFiltering.java
@@ -33,7 +33,7 @@
import java.util.Set;
import static org.jclouds.examples.rackspace.cloudservers.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.cloudservers.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudservers.Constants.REGION;
/**
* This example lists servers filtered by Predicates. Run the CreateServer example before this to get some results.
@@ -44,7 +44,7 @@
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -76,7 +76,7 @@
System.out.format("List Servers By Parent Location Id%n");
Set<? extends NodeMetadata> servers = computeService.listNodesDetailsMatching(NodePredicates
- .parentLocationId(ZONE));
+ .parentLocationId(REGION));
for (NodeMetadata nodeMetadata: servers) {
System.out.format(" %s%n", nodeMetadata);
diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java
index a25b27f..e7294c9 100644
--- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java
+++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/ServerMetadata.java
@@ -20,7 +20,7 @@
import static org.jclouds.examples.rackspace.cloudservers.Constants.NAME;
import static org.jclouds.examples.rackspace.cloudservers.Constants.PROVIDER;
-import static org.jclouds.examples.rackspace.cloudservers.Constants.ZONE;
+import static org.jclouds.examples.rackspace.cloudservers.Constants.REGION;
import java.io.Closeable;
import java.io.IOException;
@@ -43,11 +43,10 @@
*/
public class ServerMetadata implements Closeable {
private final ComputeService computeService;
- private final NovaApi novaApi;
private final ServerApi serverApi;
/**
- * To get a username and API key see http://www.jclouds.org/documentation/quickstart/rackspace/
+ * To get a username and API key see http://jclouds.apache.org/guides/rackspace/
*
* The first argument (args[0]) must be your username
* The second argument (args[1]) must be your API key
@@ -75,8 +74,8 @@
.credentials(username, apiKey)
.buildView(ComputeServiceContext.class);
computeService = context.getComputeService();
- novaApi = context.unwrapApi(NovaApi.class);
- serverApi = novaApi.getServerApiForZone(ZONE);
+ NovaApi novaApi = context.unwrapApi(NovaApi.class);
+ serverApi = novaApi.getServerApi(REGION);
}
/**
