Updated Branches: refs/heads/master d7ed1bf09 -> 5768bc911
Renames domain classes for consitency Project: http://git-wip-us.apache.org/repos/asf/jclouds-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-examples/commit/5768bc91 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-examples/tree/5768bc91 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-examples/diff/5768bc91 Branch: refs/heads/master Commit: 5768bc91140815d225281a51619c571aec0205ae Parents: d7ed1bf Author: Zack Shoylev <[email protected]> Authored: Thu Jan 16 13:34:42 2014 -0600 Committer: Zack Shoylev <[email protected]> Committed: Wed Feb 12 15:10:55 2014 -0600 ---------------------------------------------------------------------- rackspace/pom.xml | 7 +------ .../examples/rackspace/autoscale/AutoscaleCleanup.java | 10 +++++----- .../examples/rackspace/autoscale/CreatePolicy.java | 10 +++++----- .../examples/rackspace/autoscale/CreateWebhook.java | 4 ++-- .../examples/rackspace/autoscale/ExecuteWebhook.java | 4 ++-- .../examples/rackspace/autoscale/UpdatePolicy.java | 8 ++++---- .../org/jclouds/examples/rackspace/autoscale/Utils.java | 6 +++--- 7 files changed, 22 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/5768bc91/rackspace/pom.xml ---------------------------------------------------------------------- diff --git a/rackspace/pom.xml b/rackspace/pom.xml index ffbca61..83ce268 100644 --- a/rackspace/pom.xml +++ b/rackspace/pom.xml @@ -22,7 +22,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <properties> - <jclouds.version>1.7.0</jclouds.version> + <jclouds.version>1.7.1</jclouds.version> </properties> <groupId>org.apache.jclouds.examples</groupId> <artifactId>rackspace-examples</artifactId> @@ -117,11 +117,6 @@ </dependency> <dependency> <groupId>org.apache.jclouds.labs</groupId> - <artifactId>rackspace-autoscale</artifactId> - <version>${jclouds.version}</version> - </dependency> - <dependency> - <groupId>org.apache.jclouds.labs</groupId> <artifactId>rackspace-autoscale-us</artifactId> <version>${jclouds.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/5768bc91/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/AutoscaleCleanup.java ---------------------------------------------------------------------- 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 7e069cd..b1c715e 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 @@ -29,10 +29,10 @@ import java.util.concurrent.TimeUnit; import org.jclouds.ContextBuilder; import org.jclouds.rackspace.autoscale.v1.AutoscaleApi; import org.jclouds.rackspace.autoscale.v1.domain.GroupState; +import org.jclouds.rackspace.autoscale.v1.domain.CreateScalingPolicy; +import org.jclouds.rackspace.autoscale.v1.domain.CreateScalingPolicy.ScalingPolicyTargetType; +import org.jclouds.rackspace.autoscale.v1.domain.CreateScalingPolicy.ScalingPolicyType; import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy; -import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy.ScalingPolicyTargetType; -import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy.ScalingPolicyType; -import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicyResponse; import org.jclouds.rackspace.autoscale.v1.features.GroupApi; import org.jclouds.rackspace.autoscale.v1.features.PolicyApi; @@ -84,7 +84,7 @@ public class AutoscaleCleanup implements Closeable { // Remove ALL policies and groups with that name for (GroupState g : groupApi.listGroupStates()) { PolicyApi pa = autoscaleApi.getPolicyApiForZoneAndGroup(ZONE, g.getId()); - for(ScalingPolicyResponse p : pa.list()) { + 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()); String policyId = p.getId(); @@ -93,7 +93,7 @@ public class AutoscaleCleanup implements Closeable { System.out.format("Removing servers %n"); // Update policy to 0 servers - ScalingPolicy scalingPolicy = ScalingPolicy.builder() + CreateScalingPolicy scalingPolicy = CreateScalingPolicy.builder() .cooldown(3) .type(ScalingPolicyType.WEBHOOK) .name(NAME) http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/5768bc91/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/CreatePolicy.java ---------------------------------------------------------------------- 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 c277e40..5fc1c69 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 @@ -34,9 +34,9 @@ import org.jclouds.rackspace.autoscale.v1.domain.LaunchConfiguration; import org.jclouds.rackspace.autoscale.v1.domain.LaunchConfiguration.LaunchConfigurationType; import org.jclouds.rackspace.autoscale.v1.domain.LoadBalancer; import org.jclouds.rackspace.autoscale.v1.domain.Personality; -import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy; -import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy.ScalingPolicyTargetType; -import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy.ScalingPolicyType; +import org.jclouds.rackspace.autoscale.v1.domain.CreateScalingPolicy; +import org.jclouds.rackspace.autoscale.v1.domain.CreateScalingPolicy.ScalingPolicyTargetType; +import org.jclouds.rackspace.autoscale.v1.domain.CreateScalingPolicy.ScalingPolicyType; import org.jclouds.rackspace.autoscale.v1.features.GroupApi; import com.google.common.collect.ImmutableList; @@ -109,9 +109,9 @@ public class CreatePolicy implements Closeable { .type(LaunchConfigurationType.LAUNCH_SERVER) .build(); - List<ScalingPolicy> scalingPolicies = Lists.newArrayList(); + List<CreateScalingPolicy> scalingPolicies = Lists.newArrayList(); - ScalingPolicy scalingPolicy = ScalingPolicy.builder() + CreateScalingPolicy scalingPolicy = CreateScalingPolicy.builder() .cooldown(0) .type(ScalingPolicyType.WEBHOOK) .name(NAME) http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/5768bc91/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/CreateWebhook.java ---------------------------------------------------------------------- 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 5c4b878..893a643 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 @@ -27,7 +27,7 @@ import java.io.IOException; import org.jclouds.ContextBuilder; import org.jclouds.rackspace.autoscale.v1.AutoscaleApi; -import org.jclouds.rackspace.autoscale.v1.domain.WebhookResponse; +import org.jclouds.rackspace.autoscale.v1.domain.Webhook; import org.jclouds.rackspace.autoscale.v1.features.GroupApi; import org.jclouds.rackspace.autoscale.v1.features.PolicyApi; import org.jclouds.rackspace.autoscale.v1.features.WebhookApi; @@ -83,7 +83,7 @@ public class CreateWebhook implements Closeable { private void createWebhook() { System.out.format("Create Webhook%n"); - FluentIterable<WebhookResponse> result = webhookApi.create(NAME, ImmutableMap.<String, Object>of()); + FluentIterable<Webhook> result = webhookApi.create(NAME, ImmutableMap.<String, Object>of()); System.out.format(" %s%n", result.first().get()); } http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/5768bc91/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/ExecuteWebhook.java ---------------------------------------------------------------------- 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 8f68398..2f6d7cc 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 @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit; import org.jclouds.ContextBuilder; import org.jclouds.rackspace.autoscale.v1.AutoscaleApi; -import org.jclouds.rackspace.autoscale.v1.domain.WebhookResponse; +import org.jclouds.rackspace.autoscale.v1.domain.Webhook; import org.jclouds.rackspace.autoscale.v1.features.GroupApi; import org.jclouds.rackspace.autoscale.v1.features.PolicyApi; import org.jclouds.rackspace.autoscale.v1.features.WebhookApi; @@ -94,7 +94,7 @@ public class ExecuteWebhook implements Closeable { System.out.format("Execute Webhook - again, anonymously%n"); - WebhookResponse webhook = webhookApi.list().first().get(); + Webhook webhook = webhookApi.list().first().get(); try { result = AutoscaleUtils.execute(webhook.getAnonymousExecutionURI().get()); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/5768bc91/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/UpdatePolicy.java ---------------------------------------------------------------------- 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 0d94097..1719f43 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 @@ -27,9 +27,9 @@ import java.io.IOException; import org.jclouds.ContextBuilder; import org.jclouds.rackspace.autoscale.v1.AutoscaleApi; -import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy; -import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy.ScalingPolicyTargetType; -import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy.ScalingPolicyType; +import org.jclouds.rackspace.autoscale.v1.domain.CreateScalingPolicy; +import org.jclouds.rackspace.autoscale.v1.domain.CreateScalingPolicy.ScalingPolicyTargetType; +import org.jclouds.rackspace.autoscale.v1.domain.CreateScalingPolicy.ScalingPolicyType; import org.jclouds.rackspace.autoscale.v1.features.GroupApi; import org.jclouds.rackspace.autoscale.v1.features.PolicyApi; @@ -81,7 +81,7 @@ public class UpdatePolicy implements Closeable { String policyId = policyApi.list().first().get().getId(); - ScalingPolicy scalingPolicy = ScalingPolicy.builder() + CreateScalingPolicy scalingPolicy = CreateScalingPolicy.builder() .cooldown(3) .type(ScalingPolicyType.WEBHOOK) .name(NAME) http://git-wip-us.apache.org/repos/asf/jclouds-examples/blob/5768bc91/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/Utils.java ---------------------------------------------------------------------- diff --git a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/Utils.java b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/Utils.java index 3e6e8af..3dea50f 100644 --- a/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/Utils.java +++ b/rackspace/src/main/java/org/jclouds/examples/rackspace/autoscale/Utils.java @@ -22,7 +22,7 @@ import static org.jclouds.examples.rackspace.autoscale.Constants.NAME; import org.jclouds.rackspace.autoscale.v1.domain.Group; import org.jclouds.rackspace.autoscale.v1.domain.GroupState; -import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicyResponse; +import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy; import org.jclouds.rackspace.autoscale.v1.features.GroupApi; import org.jclouds.rackspace.autoscale.v1.features.PolicyApi; @@ -35,7 +35,7 @@ public class Utils { public static String getGroupId(GroupApi groupApi) { for ( GroupState state : groupApi.listGroupStates() ) { Group g = groupApi.get(state.getId()); - for ( ScalingPolicyResponse policy : g.getScalingPolicies() ) { + for ( ScalingPolicy policy : g.getScalingPolicies() ) { if (policy.getName().equals(NAME)) return g.getId(); } } @@ -44,7 +44,7 @@ public class Utils { } public static String getPolicyId(PolicyApi policyApi) { - for ( ScalingPolicyResponse policy : policyApi.list() ) { + for ( ScalingPolicy policy : policyApi.list() ) { if (policy.getName().equals(NAME)) return policy.getId(); }
