Updated Branches: refs/heads/master 0d9920567 -> f5f038cc4
Consolidate zone to make it easier to change the zone when running the examples. Project: http://git-wip-us.apache.org/repos/asf/jclouds-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-examples/commit/17817b58 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-examples/tree/17817b58 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-examples/diff/17817b58 Branch: refs/heads/master Commit: 17817b5892afb1fbcd3af7a192f0b6cf491ec0f6 Parents: 0d99205 Author: Everett Toews <[email protected]> Authored: Thu Nov 14 10:17:45 2013 -0600 Committer: Everett Toews <[email protected]> Committed: Thu Nov 14 12:45:00 2013 -0600 ---------------------------------------------------------------------- .../rackspace/cloudblockstorage/Constants.java | 2 +- .../rackspace/clouddatabases/Constants.java | 2 +- .../rackspace/cloudfiles/Constants.java | 2 +- .../rackspace/cloudloadbalancers/Constants.java | 2 +- .../rackspace/cloudservers/Constants.java | 2 +- .../rackspace/cloudservers/CreateServer.java | 20 +------------------- 6 files changed, 6 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/17817b58/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/Constants.java ---------------------------------------------------------------------- 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 981e111..decf16d 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 @@ -29,7 +29,7 @@ public interface Constants { // 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.cbs", "DFW"); + public static final String ZONE = System.getProperty("zone", "DFW"); public static final String NAME = "jclouds-example"; public static final String POLL_PERIOD_TWENTY_SECONDS = String.valueOf(SECONDS.toMillis(20)); http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/17817b58/rackspace/src/main/java/org/jclouds/examples/rackspace/clouddatabases/Constants.java ---------------------------------------------------------------------- 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 0c86730..67500d3 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 @@ -27,7 +27,7 @@ public interface Constants { // 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.cdb", "DFW"); + public static final String ZONE = System.getProperty("zone", "DFW"); public static final String NAME = "jclouds-example"; public static final String PASSWORD = "0192j41dm311iaadjaoqpvplw"; http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/17817b58/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/Constants.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/Constants.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/Constants.java index e93f6e3..f71f2a8 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/Constants.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudfiles/Constants.java @@ -27,7 +27,7 @@ public interface Constants { // The provider configures jclouds To use the Rackspace Cloud (US) // To use the Rackspace Cloud (UK) set the system property or default value to "cloudfiles-uk" public static final String PROVIDER = System.getProperty("provider.cf", "cloudfiles-us"); - public static final String ZONE = System.getProperty("zone.cf", "DFW"); + public static final String ZONE = System.getProperty("zone", "DFW"); public static final String CONTAINER_PUBLISH = "jclouds-example-publish"; public static final String CONTAINER = "jclouds-example"; http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/17817b58/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudloadbalancers/Constants.java ---------------------------------------------------------------------- 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 d533c31..1b010fb 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 @@ -28,7 +28,7 @@ public interface Constants { // 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.clb", "DFW"); + public static final String ZONE = System.getProperty("zone", "DFW"); public static final String NAME = "jclouds-example"; } http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/17817b58/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/Constants.java ---------------------------------------------------------------------- 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 2f65c60..b58a6e1 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 @@ -29,7 +29,7 @@ public interface Constants { // 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.cs", "DFW"); + public static final String ZONE = System.getProperty("zone", "DFW"); public static final String NAME = "jclouds-example"; public static final String POLL_PERIOD_TWENTY_SECONDS = String.valueOf(SECONDS.toMillis(20)); http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/17817b58/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CreateServer.java ---------------------------------------------------------------------- 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 9b62fe1..593b6ac 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 @@ -27,7 +27,6 @@ import org.jclouds.compute.domain.Hardware; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.Template; -import org.jclouds.domain.Location; import java.io.Closeable; import java.io.IOException; @@ -96,7 +95,7 @@ public class CreateServer implements Closeable { System.out.format("Create Server%n"); Template template = computeService.templateBuilder() - .locationId(getLocationId()) + .locationId(ZONE) .fromHardware(getHardware()) .fromImage(getImage()) .build(); @@ -115,23 +114,6 @@ public class CreateServer implements Closeable { } /** - * This method uses the generic ComputeService.listAssignableLocations() to find the location. - * - * @return The first available Location - */ - private String getLocationId() { - System.out.format(" Locations%n"); - - Set<? extends Location> locations = computeService.listAssignableLocations(); - - for (Location location: locations) { - System.out.format(" %s%n", location); - } - - return locations.iterator().next().getId(); - } - - /** * This method uses the generic ComputeService.listHardwareProfiles() to find the hardware profile. * * @return The Hardware with 512 MB of RAM
