You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ev...@apache.org on 2013/11/14 19:45:30 UTC
[2/2] git commit: Setup examples to use Rackspace performance flavors.
Setup examples to use Rackspace performance flavors.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-examples/commit/f5f038cc
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-examples/tree/f5f038cc
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-examples/diff/f5f038cc
Branch: refs/heads/master
Commit: f5f038cc4c92c85fb8bc61c7ca8a591b7b2dacad
Parents: 17817b5
Author: Everett Toews <ev...@rackspace.com>
Authored: Thu Nov 14 12:40:36 2013 -0600
Committer: Everett Toews <ev...@rackspace.com>
Committed: Thu Nov 14 12:45:10 2013 -0600
----------------------------------------------------------------------
.../examples/rackspace/cloudblockstorage/Constants.java | 2 +-
.../cloudblockstorage/CreateVolumeAndAttach.java | 5 ++++-
.../examples/rackspace/clouddatabases/Constants.java | 2 +-
.../jclouds/examples/rackspace/cloudfiles/Constants.java | 2 +-
.../examples/rackspace/cloudloadbalancers/Constants.java | 2 +-
.../rackspace/cloudservers/CloudServersPublish.java | 4 +++-
.../examples/rackspace/cloudservers/Constants.java | 2 +-
.../examples/rackspace/cloudservers/CreateServer.java | 10 +++++-----
8 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/f5f038cc/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 decf16d..8e63e3c 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", "DFW");
+ public static final String ZONE = System.getProperty("zone", "IAD");
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/f5f038cc/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudblockstorage/CreateVolumeAndAttach.java
----------------------------------------------------------------------
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 2863005..6486dee 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
@@ -38,6 +38,7 @@ import org.jclouds.openstack.cinder.v1.predicates.VolumePredicates;
import org.jclouds.openstack.nova.v2_0.NovaApi;
import org.jclouds.openstack.nova.v2_0.NovaAsyncApi;
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.extensions.VolumeAttachmentApi;
import org.jclouds.rest.RestContext;
import org.jclouds.scriptbuilder.ScriptBuilder;
@@ -121,10 +122,12 @@ public class CreateVolumeAndAttach implements Closeable {
private NodeMetadata createServer() throws RunNodesException, TimeoutException {
System.out.format("Create Server%n");
+ ZoneAndId zoneAndId = ZoneAndId.fromZoneAndId(ZONE, "performance1-1");
Template template = computeService.templateBuilder()
.locationId(ZONE)
.osDescriptionMatches(".*CentOS 6.4.*")
- .minRam(512).build();
+ .hardwareId(zoneAndId.slashEncode())
+ .build();
Set<? extends NodeMetadata> nodes = computeService.createNodesInGroup(NAME, 1, template);
NodeMetadata nodeMetadata = nodes.iterator().next();
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/f5f038cc/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 67500d3..e3a0d8a 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", "DFW");
+ public static final String ZONE = System.getProperty("zone", "IAD");
public static final String NAME = "jclouds-example";
public static final String PASSWORD = "0192j41dm311iaadjaoqpvplw";
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/f5f038cc/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 f71f2a8..eb38e2d 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", "DFW");
+ public static final String ZONE = System.getProperty("zone", "IAD");
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/f5f038cc/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 1b010fb..748ecc8 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", "DFW");
+ public static final String ZONE = System.getProperty("zone", "IAD");
public static final String NAME = "jclouds-example";
}
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/f5f038cc/rackspace/src/main/java/org/jclouds/examples/rackspace/cloudservers/CloudServersPublish.java
----------------------------------------------------------------------
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 81a6764..e3bb19a 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,6 +30,7 @@ import org.jclouds.compute.RunNodesException;
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.predicates.SocketOpen;
import org.jclouds.scriptbuilder.ScriptBuilder;
import org.jclouds.scriptbuilder.domain.OsFamily;
@@ -112,10 +113,11 @@ public class CloudServersPublish implements Closeable {
private Set<? extends NodeMetadata> createServer() throws RunNodesException, TimeoutException {
System.out.format("Create Server%n");
+ ZoneAndId zoneAndId = ZoneAndId.fromZoneAndId(ZONE, "performance1-1");
Template template = computeService.templateBuilder()
.locationId(ZONE)
.osDescriptionMatches(".*CentOS 6.4.*")
- .minRam(512)
+ .hardwareId(zoneAndId.slashEncode())
.build();
// This method will continue to poll for the server status and won't return until this server is ACTIVE
http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/f5f038cc/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 b58a6e1..852726d 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", "DFW");
+ public static final String ZONE = System.getProperty("zone", "IAD");
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/f5f038cc/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 593b6ac..78d772f 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,7 +39,7 @@ import static org.jclouds.compute.config.ComputeServiceProperties.POLL_MAX_PERIO
import static org.jclouds.examples.rackspace.cloudservers.Constants.*;
/**
- * This example creates an Ubuntu 12.04 server with 512 MB of RAM on the Rackspace Cloud.
+ * This example creates an Ubuntu 12.04 server with 1024 MB of RAM on the Rackspace Cloud.
*
* @author Everett Toews
*/
@@ -88,7 +88,7 @@ public class CreateServer implements Closeable {
* .locationId(getLocationId())
* .osFamily(OsFamily.UBUNTU)
* .osVersionMatches("12.04")
- * .minRam(512)
+ * .minRam(1024)
* .build();
*/
private void createServer() throws RunNodesException, TimeoutException {
@@ -116,7 +116,7 @@ public class CreateServer implements Closeable {
/**
* This method uses the generic ComputeService.listHardwareProfiles() to find the hardware profile.
*
- * @return The Hardware with 512 MB of RAM
+ * @return The Hardware with 1024 MB of RAM
*/
private Hardware getHardware() {
System.out.format(" Hardware Profiles (Flavors)%n");
@@ -126,13 +126,13 @@ public class CreateServer implements Closeable {
for (Hardware profile: profiles) {
System.out.format(" %s%n", profile);
- if (profile.getRam() == 512) {
+ if (profile.getProviderId().equals("performance1-1")) {
result = profile;
}
}
if (result == null) {
- System.err.println("Flavor with 512 MB of RAM not found. Using first flavor found.%n");
+ System.err.println("Performance 1-1 flavor not found. Using first flavor found.%n");
result = profiles.iterator().next();
}