You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2014/01/07 17:55:31 UTC

[1/2] git commit: Finishes autoscale mock webserver test refactoring.

Updated Branches:
  refs/heads/1.7.x 76b3dfa82 -> 24a37bde7


Finishes autoscale mock webserver test refactoring.


Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/bf5d8341
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/bf5d8341
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/bf5d8341

Branch: refs/heads/1.7.x
Commit: bf5d8341bf89c0d8bfadff58b677689fa1a96118
Parents: 76b3dfa
Author: Zack Shoylev <za...@rackspace.com>
Authored: Tue Dec 17 17:07:07 2013 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Tue Jan 7 10:52:32 2014 -0600

----------------------------------------------------------------------
 .../v1/features/ScalingPolicyApiExpectTest.java | 265 ------------
 .../v1/features/ScalingPolicyApiMockTest.java   | 415 +++++++++++++++++++
 .../v1/features/WebhookApiExpectTest.java       | 187 ---------
 .../v1/features/WebhookApiMockTest.java         | 317 ++++++++++++++
 .../v1/internal/BaseAutoscaleExpectTest.java    |   2 +-
 .../src/test/resources/access_rax.json          | 249 -----------
 6 files changed, 733 insertions(+), 702 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bf5d8341/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiExpectTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiExpectTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiExpectTest.java
deleted file mode 100644
index a30c4a7..0000000
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiExpectTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License");you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.rackspace.autoscale.v1.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-import java.util.List;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.http.HttpResponse;
-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.internal.BaseAutoscaleApiExpectTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.Lists;
-
-/**
- * Tests Scaling Policy Api Guice wiring and parsing
- *
- * @author Zack Shoylev
- */
-@Test(groups = "unit", testName = "GroupApiExpectTest")
-public class ScalingPolicyApiExpectTest extends BaseAutoscaleApiExpectTest {
-
-   public void testCreateScalingPolicy() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_policy_create_request.json", MediaType.APPLICATION_JSON)).build(),
-            HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_policy_create_response.json")).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
-
-      ScalingPolicy scalingPolicy = ScalingPolicy.builder()
-            .cooldown(1800)
-            .type(ScalingPolicyType.WEBHOOK)
-            .name("scale up by one server")
-            .targetType(ScalingPolicyTargetType.INCREMENTAL)
-            .target("1")
-            .build();
-      scalingPolicies.add(scalingPolicy);
-
-      FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.create(scalingPolicies);
-
-      assertNotNull(scalingPolicyResponse);
-      assertEquals(scalingPolicyResponse.size(), 1);
-      assertEquals(scalingPolicyResponse.get(0).getCooldown(), 1800);
-      assertEquals(scalingPolicyResponse.get(0).getId(), "dceb14ac-b2b3-4f06-aac9-a5b6cd5d40e1");
-      assertEquals(scalingPolicyResponse.get(0).getName(), "scale up by one server");
-      assertEquals(scalingPolicyResponse.get(0).getTarget(), "1");
-      assertEquals(scalingPolicyResponse.get(0).getLinks().size(), 1);
-   }
-
-   public void testCreateScalingPolicyFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_policy_create_request.json", MediaType.APPLICATION_JSON)).build(),
-            HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_policy_create_response.json")).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
-
-      ScalingPolicy scalingPolicy = ScalingPolicy.builder()
-            .cooldown(1800)
-            .type(ScalingPolicyType.WEBHOOK)
-            .name("scale up by one server")
-            .targetType(ScalingPolicyTargetType.INCREMENTAL)
-            .target("1")
-            .build();
-      scalingPolicies.add(scalingPolicy);
-
-      FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.create(scalingPolicies);
-
-      assertTrue(scalingPolicyResponse.size() == 0);
-   }
-
-   public void testListScalingPolicies() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("GET").endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_policy_list_response.json")).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.list();
-
-      assertNotNull(scalingPolicyResponse);
-      assertEquals(scalingPolicyResponse.size(), 2);
-      assertEquals(scalingPolicyResponse.get(0).getCooldown(), 150);
-      assertEquals(scalingPolicyResponse.get(0).getId(), "policyId1");
-      assertEquals(scalingPolicyResponse.get(0).getName(), "scale up by one server");
-      assertEquals(scalingPolicyResponse.get(0).getTarget(), "1");
-      assertEquals(scalingPolicyResponse.get(0).getLinks().size(), 1);
-   }
-
-   public void testListScalingPoliciesFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("GET").endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_policy_list_response.json")).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.list();
-
-      assertEquals(scalingPolicyResponse.size(), 0);
-   }
-
-   public void testGetScalingPolicies() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies/policyId");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("GET").endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_policy_get_response.json")).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      ScalingPolicyResponse scalingPolicyResponse = api.get("policyId");
-
-      assertNotNull(scalingPolicyResponse);
-      assertEquals(scalingPolicyResponse.getCooldown(), 150);
-      assertEquals(scalingPolicyResponse.getId(), "policyId");
-      assertEquals(scalingPolicyResponse.getName(), "scale up by one server");
-      assertEquals(scalingPolicyResponse.getTarget(), "1");
-      assertEquals(scalingPolicyResponse.getLinks().size(), 1);
-   }
-
-   public void testGetScalingPoliciesFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies/policyId");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("GET").endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_policy_get_response.json")).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      ScalingPolicyResponse scalingPolicyResponse = api.get("policyId");
-
-      assertNull(scalingPolicyResponse);
-   }
-
-   public void testUpdateScalingPolicy() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies/policyId");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("PUT").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_policy_update_request.json", MediaType.APPLICATION_JSON)).build(),
-            HttpResponse.builder().statusCode(201).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      ScalingPolicy scalingPolicy = ScalingPolicy.builder()
-            .cooldown(6)
-            .type(ScalingPolicyType.WEBHOOK)
-            .name("scale down by 5 percent")
-            .targetType(ScalingPolicyTargetType.PERCENT_CHANGE)
-            .target("-5")
-            .build();
-
-      boolean result = api.update("policyId", scalingPolicy);
-      assertTrue(result);
-   }
-
-   public void testUpdateScalingPolicyFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies/policyId");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("PUT").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_policy_update_request.json", MediaType.APPLICATION_JSON)).build(),
-            HttpResponse.builder().statusCode(404).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      ScalingPolicy scalingPolicy = ScalingPolicy.builder()
-            .cooldown(6)
-            .type(ScalingPolicyType.WEBHOOK)
-            .name("scale down by 5 percent")
-            .targetType(ScalingPolicyTargetType.PERCENT_CHANGE)
-            .target("-5")
-            .build();
-
-      boolean result = api.update("policyId", scalingPolicy);
-      assertFalse(result);
-   }
-
-   public void testDeleteScalingPolicy() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies/policyId");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("DELETE").endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(201).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      boolean result = api.delete("policyId");
-      assertTrue(result);
-   }
-
-   public void testDeleteScalingPolicyFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies/policyId");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("DELETE").endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(404).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      boolean result = api.delete("policyId");
-      assertFalse(result);
-   }
-
-   public void testExecuteScalingPolicy() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies/policyId/execute");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("POST").endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(201).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      boolean result = api.execute("policyId");
-      assertTrue(result);
-   }
-
-   public void testExecuteScalingPolicyFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/groupId1/policies/policyId/execute");
-      PolicyApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("POST").endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(404).build()
-            ).getPolicyApiForZoneAndGroup("DFW", "groupId1");
-
-      boolean result = api.execute("policyId");
-      assertFalse(result);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bf5d8341/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java
new file mode 100644
index 0000000..2ec11f1
--- /dev/null
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java
@@ -0,0 +1,415 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License");you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.autoscale.v1.features;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.List;
+
+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.ScalingPolicyResponse;
+import org.jclouds.rackspace.autoscale.v1.internal.BaseAutoscaleApiMockTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Lists;
+import com.squareup.okhttp.mockwebserver.MockResponse;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
+
+/**
+ * Tests Scaling Policy Api Guice wiring and parsing
+ *
+ * @author Zack Shoylev
+ */
+@Test(groups = "unit", testName = "ScalingPolicyApiMockTest")
+public class ScalingPolicyApiMockTest extends BaseAutoscaleApiMockTest {
+
+   public void testCreateScalingPolicy() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/autoscale_policy_create_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");         
+
+         List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
+
+         ScalingPolicy scalingPolicy = ScalingPolicy.builder()
+               .cooldown(1800)
+               .type(ScalingPolicyType.WEBHOOK)
+               .name("scale up by one server")
+               .targetType(ScalingPolicyTargetType.INCREMENTAL)
+               .target("1")
+               .build();
+         scalingPolicies.add(scalingPolicy);
+
+         FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.create(scalingPolicies);
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "POST", "/v1.0/888888/groups/groupId1/policies", "/autoscale_policy_create_request.json");
+
+         /*
+          * Check response
+          */
+         assertNotNull(scalingPolicyResponse);
+         assertEquals(scalingPolicyResponse.size(), 1);
+         assertEquals(scalingPolicyResponse.get(0).getCooldown(), 1800);
+         assertEquals(scalingPolicyResponse.get(0).getId(), "dceb14ac-b2b3-4f06-aac9-a5b6cd5d40e1");
+         assertEquals(scalingPolicyResponse.get(0).getName(), "scale up by one server");
+         assertEquals(scalingPolicyResponse.get(0).getTarget(), "1");
+         assertEquals(scalingPolicyResponse.get(0).getLinks().size(), 1);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testCreateScalingPolicyFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/autoscale_policy_create_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");         
+
+         List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
+
+         ScalingPolicy scalingPolicy = ScalingPolicy.builder()
+               .cooldown(1800)
+               .type(ScalingPolicyType.WEBHOOK)
+               .name("scale up by one server")
+               .targetType(ScalingPolicyTargetType.INCREMENTAL)
+               .target("1")
+               .build();
+         scalingPolicies.add(scalingPolicy);
+
+         FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.create(scalingPolicies);
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "POST", "/v1.0/888888/groups/groupId1/policies", "/autoscale_policy_create_request.json");
+
+         /*
+          * Check response
+          */
+         assertTrue(scalingPolicyResponse.isEmpty(), "Expected no policy response, but was: " + scalingPolicyResponse);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testListScalingPolicies() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/autoscale_policy_list_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");         
+
+         FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.list();
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "GET", "/v1.0/888888/groups/groupId1/policies");
+
+         /*
+          * Check response
+          */
+         assertNotNull(scalingPolicyResponse);
+         assertEquals(scalingPolicyResponse.size(), 2);
+         assertEquals(scalingPolicyResponse.get(0).getCooldown(), 150);
+         assertEquals(scalingPolicyResponse.get(0).getId(), "policyId1");
+         assertEquals(scalingPolicyResponse.get(0).getName(), "scale up by one server");
+         assertEquals(scalingPolicyResponse.get(0).getTarget(), "1");
+         assertEquals(scalingPolicyResponse.get(0).getLinks().size(), 1);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testListScalingPoliciesFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/autoscale_policy_list_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");         
+
+         FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.list();
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "GET", "/v1.0/888888/groups/groupId1/policies");
+
+         /*
+          * Check response
+          */
+         assertTrue(scalingPolicyResponse.isEmpty(), "Expected no policy response, but was: " + scalingPolicyResponse);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testGetScalingPolicies() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/autoscale_policy_get_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");         
+
+         ScalingPolicyResponse scalingPolicyResponse = api.get("policyId");
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "GET", "/v1.0/888888/groups/groupId1/policies/policyId");
+
+         /*
+          * Check response
+          */
+         assertNotNull(scalingPolicyResponse);
+         assertEquals(scalingPolicyResponse.getCooldown(), 150);
+         assertEquals(scalingPolicyResponse.getId(), "policyId");
+         assertEquals(scalingPolicyResponse.getName(), "scale up by one server");
+         assertEquals(scalingPolicyResponse.getTarget(), "1");
+         assertEquals(scalingPolicyResponse.getLinks().size(), 1);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testGetScalingPoliciesFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/autoscale_policy_get_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");         
+
+         ScalingPolicyResponse scalingPolicyResponse = api.get("policyId");
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "GET", "/v1.0/888888/groups/groupId1/policies/policyId");
+
+         /*
+          * Check response
+          */
+         assertNull(scalingPolicyResponse);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testUpdateScalingPolicy() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");
+
+         ScalingPolicy scalingPolicy = ScalingPolicy.builder()
+               .cooldown(6)
+               .type(ScalingPolicyType.WEBHOOK)
+               .name("scale down by 5 percent")
+               .targetType(ScalingPolicyTargetType.PERCENT_CHANGE)
+               .target("-5")
+               .build();
+
+         boolean result = api.update("policyId", scalingPolicy);
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "PUT", "/v1.0/888888/groups/groupId1/policies/policyId", "/autoscale_policy_update_request.json");
+
+         /*
+          * Check response
+          */
+         assertTrue(result);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testUpdateScalingPolicyFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");
+
+         ScalingPolicy scalingPolicy = ScalingPolicy.builder()
+               .cooldown(6)
+               .type(ScalingPolicyType.WEBHOOK)
+               .name("scale down by 5 percent")
+               .targetType(ScalingPolicyTargetType.PERCENT_CHANGE)
+               .target("-5")
+               .build();
+
+         boolean result = api.update("policyId", scalingPolicy);
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "PUT", "/v1.0/888888/groups/groupId1/policies/policyId", "/autoscale_policy_update_request.json");
+
+         /*
+          * Check response
+          */
+         assertFalse(result);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testDeleteScalingPolicy() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");
+
+         boolean result = api.delete("policyId");
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "DELETE", "/v1.0/888888/groups/groupId1/policies/policyId");
+
+         /*
+          * Check response
+          */
+         assertTrue(result);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testDeleteScalingPolicyFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");
+
+         boolean result = api.delete("policyId");
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "DELETE", "/v1.0/888888/groups/groupId1/policies/policyId");
+
+         /*
+          * Check response
+          */
+         assertFalse(result);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testExecuteScalingPolicy() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");
+
+         boolean result = api.execute("policyId");
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "POST", "/v1.0/888888/groups/groupId1/policies/policyId/execute");
+
+         /*
+          * Check response
+          */
+         assertTrue(result);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testExecuteScalingPolicyFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");
+
+         boolean result = api.execute("policyId");
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "POST", "/v1.0/888888/groups/groupId1/policies/policyId/execute");
+
+         /*
+          * Check response
+          */
+         assertFalse(result);
+      } finally {
+         server.shutdown();
+      }
+   }
+}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bf5d8341/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiExpectTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiExpectTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiExpectTest.java
deleted file mode 100644
index bfd7d7a..0000000
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiExpectTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.rackspace.autoscale.v1.features;
-
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
-import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-
-import javax.ws.rs.core.MediaType;
-
-import org.jclouds.http.HttpResponse;
-import org.jclouds.rackspace.autoscale.v1.domain.Webhook;
-import org.jclouds.rackspace.autoscale.v1.domain.WebhookResponse;
-import org.jclouds.rackspace.autoscale.v1.internal.BaseAutoscaleApiExpectTest;
-import org.testng.annotations.Test;
-
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-
-/**
- * Tests WebhookApi Guice wiring and parsing
- *
- * @author Zack Shoylev
- */
-@Test(groups = "unit", testName = "WebhookApiExpectTest")
-public class WebhookApiExpectTest extends BaseAutoscaleApiExpectTest {
-
-   public void testCreateWebhook() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/1234567890/policies/321456/webhooks");
-      WebhookApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhook_create_request.json", MediaType.APPLICATION_JSON)).build(),
-            HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_webhook_create_response.json")).build()
-            ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
-
-      FluentIterable<WebhookResponse> webhooks = api.create("PagerDuty", ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook"));
-      assertEquals(webhooks.first().get().getName(), "PagerDuty");
-      assertEquals(webhooks.first().get().getMetadata().get("notes"), "PagerDuty will fire this webhook");
-   }
-
-   public void testCreateWebhookFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/1234567890/policies/321456/webhooks");
-      WebhookApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhook_create_request.json", MediaType.APPLICATION_JSON)).build(),
-            HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_webhook_create_response.json")).build()
-            ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
-
-      FluentIterable<WebhookResponse> webhooks = api.create("PagerDuty", ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook"));
-      assertTrue(webhooks.isEmpty());
-   }
-
-   public void testCreateWebhooks() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/1234567890/policies/321456/webhooks");
-      WebhookApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhooks_create_request.json", MediaType.APPLICATION_JSON)).build(),
-            HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_webhooks_create_response.json")).build()
-            ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
-
-      FluentIterable<WebhookResponse> webhooks = api.create(ImmutableList.of(
-               Webhook.builder().name("PagerDuty").metadata(ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook")).build(),
-               Webhook.builder().name("Nagios").metadata(ImmutableMap.<String, Object>of()).build()
-            ));
-      assertEquals(webhooks.size(), 2);
-      assertEquals(webhooks.first().get().getName(), "PagerDuty");
-      assertEquals(webhooks.first().get().getMetadata().get("notes"), "PagerDuty will fire this webhook");
-   }
-
-   public void testCreateWebhooksFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/1234567890/policies/321456/webhooks");
-      WebhookApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("POST").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhooks_create_request.json", MediaType.APPLICATION_JSON)).build(),
-            HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_webhooks_create_response.json")).build()
-            ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
-
-      FluentIterable<WebhookResponse> webhooks = api.create(ImmutableList.of(
-               Webhook.builder().name("PagerDuty").metadata(ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook")).build(),
-               Webhook.builder().name("Nagios").metadata(ImmutableMap.<String, Object>of()).build()
-            ));
-      assertTrue(webhooks.isEmpty());
-   }
-
-   public void testListWebhooks() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/1234567890/policies/321456/webhooks");
-      WebhookApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("GET").endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_webhook_list_response.json")).build()
-            ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
-
-      FluentIterable<WebhookResponse> webhooks = api.list();
-      assertEquals(webhooks.size(), 2);
-      assertEquals(webhooks.first().get().getName(), "PagerDuty");
-      assertEquals(webhooks.first().get().getMetadata().get("notes"), "PagerDuty will fire this webhook");
-   }
-
-   public void testListWebhooksFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/1234567890/policies/321456/webhooks");
-      WebhookApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("GET").endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_webhook_list_response.json")).build()
-            ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
-
-      FluentIterable<WebhookResponse> webhooks = api.list();
-      assertEquals(webhooks.size(), 0);
-   }
-
-   public void testUpdateWebhook() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/1234567890/policies/321456/webhooks/5555");
-      WebhookApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("PUT").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhook_update_request.json", MediaType.APPLICATION_JSON)).build(),
-            HttpResponse.builder().statusCode(201).build()
-            ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
-
-      boolean success = api.update("5555", "alice", ImmutableMap.<String, Object>of("notes", "this is for Alice"));
-      assertTrue(success);
-   }
-
-   public void testUpdateWebhookFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/1234567890/policies/321456/webhooks/5555");
-      WebhookApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().method("PUT").endpoint(endpoint).payload(payloadFromResourceWithContentType("/autoscale_webhook_update_request.json", MediaType.APPLICATION_JSON)).build(),
-            HttpResponse.builder().statusCode(404).build()
-            ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
-
-      boolean success = api.update("5555", "alice", ImmutableMap.<String, Object>of("notes", "this is for Alice"));
-      assertFalse(success);
-   }
-
-   public void testGetWebhook() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/1234567890/policies/321456/webhooks/5555");
-      WebhookApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(201).payload(payloadFromResource("/autoscale_webhook_get_response.json")).build()
-            ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
-
-      WebhookResponse webhook = api.get("5555");
-      assertEquals(webhook.getName(), "alice");
-      assertEquals(webhook.getLinks().size(), 2);
-   }
-
-   public void testGetWebhookFail() {
-      URI endpoint = URI.create("https://dfw.autoscale.api.rackspacecloud.com/v1.0/888888/groups/1234567890/policies/321456/webhooks/5555");
-      WebhookApi api = requestsSendResponses(
-            keystoneAuthWithUsernameAndPasswordAndTenantName,
-            responseWithKeystoneAccess,
-            authenticatedGET().endpoint(endpoint).build(),
-            HttpResponse.builder().statusCode(404).payload(payloadFromResource("/autoscale_webhook_get_response.json")).build()
-            ).getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");
-
-      WebhookResponse webhook = api.get("5555");
-      assertNull(webhook);
-   }
-}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bf5d8341/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiMockTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiMockTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiMockTest.java
new file mode 100644
index 0000000..de3a3db
--- /dev/null
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiMockTest.java
@@ -0,0 +1,317 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.autoscale.v1.features;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+
+import java.io.IOException;
+
+import org.jclouds.rackspace.autoscale.v1.AutoscaleApi;
+import org.jclouds.rackspace.autoscale.v1.domain.Webhook;
+import org.jclouds.rackspace.autoscale.v1.domain.WebhookResponse;
+import org.jclouds.rackspace.autoscale.v1.internal.BaseAutoscaleApiMockTest;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.squareup.okhttp.mockwebserver.MockResponse;
+import com.squareup.okhttp.mockwebserver.MockWebServer;
+
+/**
+ * Tests WebhookApi Guice wiring and parsing
+ *
+ * @author Zack Shoylev
+ */
+@Test(groups = "unit", testName = "WebhookApiMockTest")
+public class WebhookApiMockTest extends BaseAutoscaleApiMockTest {
+
+   public void testCreateWebhook() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/autoscale_webhook_create_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         WebhookApi api = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");         
+
+         FluentIterable<WebhookResponse> webhooks = api.create("PagerDuty", ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook"));
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "POST", "/v1.0/888888/groups/1234567890/policies/321456/webhooks", "/autoscale_webhook_create_request.json");
+
+         /*
+          * Check response
+          */
+         assertEquals(webhooks.first().get().getName(), "PagerDuty");
+         assertEquals(webhooks.first().get().getMetadata().get("notes"), "PagerDuty will fire this webhook");
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testCreateWebhookFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/autoscale_webhook_create_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         WebhookApi api = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");         
+
+         FluentIterable<WebhookResponse> webhooks = api.create("PagerDuty", ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook"));
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "POST", "/v1.0/888888/groups/1234567890/policies/321456/webhooks", "/autoscale_webhook_create_request.json");
+
+         /*
+          * Check response
+          */
+         assertTrue(webhooks.isEmpty(), "Expected no webhooks, but was: " + webhooks);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testCreateWebhooks() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/autoscale_webhooks_create_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         WebhookApi api = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");         
+
+         FluentIterable<WebhookResponse> webhooks = api.create(ImmutableList.of(
+               Webhook.builder().name("PagerDuty").metadata(ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook")).build(),
+               Webhook.builder().name("Nagios").metadata(ImmutableMap.<String, Object>of()).build()
+               ));
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "POST", "/v1.0/888888/groups/1234567890/policies/321456/webhooks", "/autoscale_webhooks_create_request.json");
+
+         /*
+          * Check response
+          */
+         assertEquals(webhooks.size(), 2);
+         assertEquals(webhooks.first().get().getName(), "PagerDuty");
+         assertEquals(webhooks.first().get().getMetadata().get("notes"), "PagerDuty will fire this webhook");
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testCreateWebhooksFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/autoscale_webhooks_create_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         WebhookApi api = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");         
+
+         FluentIterable<WebhookResponse> webhooks = api.create(ImmutableList.of(
+               Webhook.builder().name("PagerDuty").metadata(ImmutableMap.<String, Object>of("notes", "PagerDuty will fire this webhook")).build(),
+               Webhook.builder().name("Nagios").metadata(ImmutableMap.<String, Object>of()).build()
+               ));
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "POST", "/v1.0/888888/groups/1234567890/policies/321456/webhooks", "/autoscale_webhooks_create_request.json");
+
+         /*
+          * Check response
+          */
+         assertTrue(webhooks.isEmpty(), "Expected no webhooks, but was: " + webhooks);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testListWebhooks() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/autoscale_webhook_list_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         WebhookApi api = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");         
+
+         FluentIterable<WebhookResponse> webhooks = api.list();
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "GET", "/v1.0/888888/groups/1234567890/policies/321456/webhooks");
+
+         /*
+          * Check response
+          */
+         assertEquals(webhooks.size(), 2);
+         assertEquals(webhooks.first().get().getName(), "PagerDuty");
+         assertEquals(webhooks.first().get().getMetadata().get("notes"), "PagerDuty will fire this webhook");
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testListWebhooksFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/autoscale_webhook_list_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         WebhookApi api = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");         
+
+         FluentIterable<WebhookResponse> webhooks = api.list();
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "GET", "/v1.0/888888/groups/1234567890/policies/321456/webhooks");
+
+         /*
+          * Check response
+          */
+         assertTrue(webhooks.isEmpty(), "Expected no webhooks, but was: " + webhooks);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testUpdateWebhook() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201)));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         WebhookApi api = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");         
+
+         boolean success = api.update("5555", "alice", ImmutableMap.<String, Object>of("notes", "this is for Alice"));
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "PUT", "/v1.0/888888/groups/1234567890/policies/321456/webhooks/5555", "/autoscale_webhook_update_request.json");
+
+         /*
+          * Check response
+          */
+         assertTrue(success);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testUpdateWebhookFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404)));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         WebhookApi api = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");         
+
+         boolean success = api.update("5555", "alice", ImmutableMap.<String, Object>of("notes", "this is for Alice"));
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "PUT", "/v1.0/888888/groups/1234567890/policies/321456/webhooks/5555", "/autoscale_webhook_update_request.json");
+
+         /*
+          * Check response
+          */
+         assertFalse(success);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testGetWebhook() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/autoscale_webhook_get_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         WebhookApi api = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");         
+
+         WebhookResponse webhook = api.get("5555");
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "GET", "/v1.0/888888/groups/1234567890/policies/321456/webhooks/5555");
+
+         /*
+          * Check response
+          */
+         assertEquals(webhook.getName(), "alice");
+         assertEquals(webhook.getLinks().size(), 2);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testGetWebhookFail() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(404).setBody(stringFromResource("/autoscale_webhook_get_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         WebhookApi api = autoscaleApi.getWebhookApiForZoneAndGroupAndPolicy("DFW", "1234567890", "321456");         
+
+         WebhookResponse webhook = api.get("5555");
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "GET", "/v1.0/888888/groups/1234567890/policies/321456/webhooks/5555");
+
+         /*
+          * Check response
+          */
+         assertNull(webhook);
+      } finally {
+         server.shutdown();
+      }
+   }
+}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bf5d8341/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleExpectTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleExpectTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleExpectTest.java
index 4e5668d..1168449 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleExpectTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/internal/BaseAutoscaleExpectTest.java
@@ -54,7 +54,7 @@ public class BaseAutoscaleExpectTest<T> extends BaseRestApiExpectTest<T> {
       authToken = "bb03a23aa8271291a7aaa9aaa2aaaaaa";
       responseWithKeystoneAccess = HttpResponse.builder()
             .statusCode(200)
-            .payload(payloadFromResourceWithContentType("/access_rax.json", "application/json"))
+            .payload(payloadFromResourceWithContentType("/access.json", "application/json"))
             .build();
       // now, createContext arg will need tenant prefix
       identityWithTenantId = KeystoneFixture.INSTANCE.getTenantId() + ":" + identity;

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bf5d8341/rackspace-autoscale/src/test/resources/access_rax.json
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/resources/access_rax.json b/rackspace-autoscale/src/test/resources/access_rax.json
deleted file mode 100644
index 2fba05d..0000000
--- a/rackspace-autoscale/src/test/resources/access_rax.json
+++ /dev/null
@@ -1,249 +0,0 @@
-{
-    "access":{
-        "token":{
-            "id":"bb03a23aa8271291a7aaa9aaa2aaaaaa",
-            "expires":"2013-08-02T16:55:24.229-05:00",
-            "tenant":{
-                "id":"888888",
-                "name":"888888"
-            },
-            "RAX-AUTH:authenticatedBy":[
-                "PASSWORD"
-            ]
-        },
-        "serviceCatalog":[
-            {
-                "name":"cloudFilesCDN",
-                "endpoints":[
-                    {
-                        "region":"ORD",
-                        "tenantId":"MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c",
-                        "publicURL":"https:\/\/cdn2.clouddrive.com\/v1\/MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c"
-                    },
-                    {
-                        "region":"DFW",
-                        "tenantId":"MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c",
-                        "publicURL":"https:\/\/cdn1.clouddrive.com\/v1\/MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c"
-                    },
-                    {
-                        "region":"SYD",
-                        "tenantId":"MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c",
-                        "publicURL":"https:\/\/cdn4.clouddrive.com\/v1\/MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c"
-                    }
-                ],
-                "type":"rax:object-cdn"
-            },
-            {
-                "name":"cloudFiles",
-                "endpoints":[
-                    {
-                        "region":"ORD",
-                        "tenantId":"MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c",
-                        "publicURL":"https:\/\/storage101.ord1.clouddrive.com\/v1\/MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c",
-                        "internalURL":"https:\/\/snet-storage101.ord1.clouddrive.com\/v1\/MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c"
-                    },
-                    {
-                        "region":"DFW",
-                        "tenantId":"MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c",
-                        "publicURL":"https:\/\/storage101.dfw1.clouddrive.com\/v1\/MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c",
-                        "internalURL":"https:\/\/snet-storage101.dfw1.clouddrive.com\/v1\/MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c"
-                    },
-                    {
-                        "region":"SYD",
-                        "tenantId":"MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c",
-                        "publicURL":"https:\/\/storage101.syd2.clouddrive.com\/v1\/MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c",
-                        "internalURL":"https:\/\/snet-storage101.syd2.clouddrive.com\/v1\/MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c"
-                    }
-                ],
-                "type":"object-store"
-            },
-            {
-                "name":"cloudLoadBalancers",
-                "endpoints":[
-                    {
-                        "region":"SYD",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/syd.loadbalancers.api.rackspacecloud.com\/v1.0\/888888"
-                    },
-                    {
-                        "region":"DFW",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/dfw.loadbalancers.api.rackspacecloud.com\/v1.0\/888888"
-                    },
-                    {
-                        "region":"ORD",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/ord.loadbalancers.api.rackspacecloud.com\/v1.0\/888888"
-                    }
-                ],
-                "type":"rax:load-balancer"
-            },
-            {
-                "name":"cloudDatabases",
-                "endpoints":[
-                    {
-                        "region":"SYD",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/syd.databases.api.rackspacecloud.com\/v1.0\/888888"
-                    },
-                    {
-                        "region":"DFW",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/dfw.databases.api.rackspacecloud.com\/v1.0\/888888"
-                    },
-                    {
-                        "region":"ORD",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/ord.databases.api.rackspacecloud.com\/v1.0\/888888"
-                    }
-                ],
-                "type":"rax:database"
-            },
-            {
-                "name":"cloudBlockStorage",
-                "endpoints":[
-                    {
-                        "region":"SYD",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/syd.blockstorage.api.rackspacecloud.com\/v1\/888888"
-                    },
-                    {
-                        "region":"DFW",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/dfw.blockstorage.api.rackspacecloud.com\/v1\/888888"
-                    },
-                    {
-                        "region":"ORD",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/ord.blockstorage.api.rackspacecloud.com\/v1\/888888"
-                    }
-                ],
-                "type":"volume"
-            },
-            {
-                "name":"cloudServersOpenStack",
-                "endpoints":[
-                    {
-                        "region":"SYD",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/syd.servers.api.rackspacecloud.com\/v2\/888888",
-                        "versionInfo":"https:\/\/syd.servers.api.rackspacecloud.com\/v2",
-                        "versionList":"https:\/\/syd.servers.api.rackspacecloud.com\/",
-                        "versionId":"2"
-                    },
-                    {
-                        "region":"DFW",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/dfw.servers.api.rackspacecloud.com\/v2\/888888",
-                        "versionInfo":"https:\/\/dfw.servers.api.rackspacecloud.com\/v2",
-                        "versionList":"https:\/\/dfw.servers.api.rackspacecloud.com\/",
-                        "versionId":"2"
-                    },
-                    {
-                        "region":"ORD",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/ord.servers.api.rackspacecloud.com\/v2\/888888",
-                        "versionInfo":"https:\/\/ord.servers.api.rackspacecloud.com\/v2",
-                        "versionList":"https:\/\/ord.servers.api.rackspacecloud.com\/",
-                        "versionId":"2"
-                    }
-                ],
-                "type":"compute"
-            },
-            {
-                "name":"autoscale",
-                "endpoints":[
-                    {
-                        "region":"ORD",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/ord.autoscale.api.rackspacecloud.com\/v1.0\/888888",
-                        "versionInfo":null,
-                        "versionList":null,
-                        "versionId":"1.0"
-                    },
-                    {
-                        "region":"DFW",
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/dfw.autoscale.api.rackspacecloud.com\/v1.0\/888888",
-                        "versionInfo":null,
-                        "versionList":null,
-                        "versionId":"1.0"
-                    }
-                ],
-                "type":"rax:autoscale"
-            },
-            {
-                "name":"cloudMonitoring",
-                "endpoints":[
-                    {
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/monitoring.api.rackspacecloud.com\/v1.0\/888888"
-                    }
-                ],
-                "type":"rax:monitor"
-            },
-            {
-                "name":"cloudBackup",
-                "endpoints":[
-                    {
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/backup.api.rackspacecloud.com\/v1.0\/888888"
-                    }
-                ],
-                "type":"rax:backup"
-            },
-            {
-                "name":"cloudServers",
-                "endpoints":[
-                    {
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/servers.api.rackspacecloud.com\/v1.0\/888888",
-                        "versionInfo":"https:\/\/servers.api.rackspacecloud.com\/v1.0",
-                        "versionList":"https:\/\/servers.api.rackspacecloud.com\/",
-                        "versionId":"1.0"
-                    }
-                ],
-                "type":"compute"
-            },
-            {
-                "name":"cloudDNS",
-                "endpoints":[
-                    {
-                        "tenantId":"888888",
-                        "publicURL":"https:\/\/dns.api.rackspacecloud.com\/v1.0\/888888"
-                    }
-                ],
-                "type":"rax:dns"
-            }
-        ],
-        "user":{
-            "id":"335853",
-            "roles":[
-                {
-                    "id":"10000150",
-                    "description":"Checkmate Access role",
-                    "name":"checkmate"
-                },
-                {
-                    "tenantId":"MossoCloudFS_0d629063-aa0f-4bf9-9e04-62e1fd6aaa2c",
-                    "id":"5",
-                    "description":"A Role that allows a user access to keystone Service methods",
-                    "name":"object-store:default"
-                },
-                {
-                    "tenantId":"888888",
-                    "id":"6",
-                    "description":"A Role that allows a user access to keystone Service methods",
-                    "name":"compute:default"
-                },
-                {
-                    "id":"3",
-                    "description":"User Admin Role.",
-                    "name":"identity:user-admin"
-                }
-            ],
-            "name":"test",
-            "RAX-AUTH:defaultRegion":"ORD"
-        }
-    }
-}


[2/2] git commit: JCLOUDS-418 Add schedule Scaling Policy type

Posted by za...@apache.org.
JCLOUDS-418 Add schedule Scaling Policy type


Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/24a37bde
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/24a37bde
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/24a37bde

Branch: refs/heads/1.7.x
Commit: 24a37bde7dde45b9ee2f14242352435f2ec3d85c
Parents: bf5d834
Author: Zack Shoylev <za...@rackspace.com>
Authored: Thu Jan 2 18:42:42 2014 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Tue Jan 7 10:52:34 2014 -0600

----------------------------------------------------------------------
 .../autoscale/v1/domain/ScalingPolicy.java      | 146 +++++++++++++++++--
 .../v1/domain/ScalingPolicyResponse.java        |   7 +-
 .../v1/functions/ParseGroupResponse.java        |   1 +
 .../functions/ParseScalingPoliciesResponse.java |   1 +
 .../functions/ParseScalingPolicyResponse.java   |   1 +
 .../autoscale/v1/internal/ParseHelper.java      |  10 +-
 .../v1/features/ScalingPolicyApiLiveTest.java   |  55 +++++++
 .../v1/features/ScalingPolicyApiMockTest.java   |  95 ++++++++++++
 .../v1/features/WebhookApiLiveTest.java         |  30 ++--
 ...scale_policy_schedule_at_create_request.json |  11 ++
 ...cale_policy_schedule_at_create_response.json |  20 +++
 ...ale_policy_schedule_cron_create_request.json |  11 ++
 ...le_policy_schedule_cron_create_response.json |  20 +++
 13 files changed, 380 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java
index cfc2163..6420ee3 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicy.java
@@ -21,14 +21,17 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.beans.ConstructorProperties;
 import java.util.EnumSet;
+import java.util.Map;
 
 
 import com.google.common.base.Objects;
 import com.google.common.base.Objects.ToStringHelper;
 import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 
 /**
- * Autoscale ScalingPolicy. This class is used for requests.
+ * Auto Scale ScalingPolicy. This class is used for requests.
  * 
  * @see GroupApi#create(GroupConfiguration, LaunchConfiguration, java.util.List)
  * @see Group#getScalingPolicies()
@@ -41,18 +44,19 @@ public class ScalingPolicy implements Comparable<ScalingPolicy>{
    private final int cooldown;
    private final String target;
    private final ScalingPolicyTargetType targetType;
+   private final Map<String, String> args;
 
    @ConstructorProperties({
-      "name", "type", "cooldown", "target", "targetType"
+      "name", "type", "cooldown", "target", "targetType", "args"
    })
-   protected ScalingPolicy(String name, ScalingPolicyType type, int cooldown, String target, ScalingPolicyTargetType targetType) {
-
+   protected ScalingPolicy(String name, ScalingPolicyType type, int cooldown, String target, ScalingPolicyTargetType targetType, Map<String, String> args) {
       this.name = checkNotNull(name, "name required");
       this.type = type;
       checkArgument(cooldown >= 0, "cooldown should be non-negative");
       this.cooldown = cooldown;
       this.target = target;
       this.targetType = targetType;
+      this.args = args;
    }
 
    /**
@@ -98,9 +102,46 @@ public class ScalingPolicy implements Comparable<ScalingPolicy>{
       return this.targetType;
    }
 
+   /**
+    * @return The scheduling string, if any.
+    * @see ScalingPolicy.Builder#atSchedule(String)
+    * @see ScalingPolicy.Builder#cronSchedule(String)
+    */
+   protected Map<String, String> getSchedulingArgs() {
+      return this.args;
+   }
+
+   /**
+    * @return The scheduling string, if any.
+    * @see ScalingPolicy.Builder#atSchedule(String)
+    * @see ScalingPolicy.Builder#cronSchedule(String)
+    */
+   public String getSchedulingString() {
+      if (this.args != null) {
+         for (Map.Entry<String, String> entry : this.args.entrySet()) {
+            return entry.getValue();
+         }
+      }
+      return null;
+   }
+
+   /**
+    * @return The type of the schedule this policy uses.
+    */
+   public ScalingPolicyScheduleType getSchedulingType() {
+      if(this.args != null) {
+         for (ScalingPolicyScheduleType type : ScalingPolicyScheduleType.values()) {
+            if (this.args.get(type.toString()) != null) {
+               return type;
+            }
+         }
+      }
+      return null;
+   }
+
    @Override
    public int hashCode() {
-      return Objects.hashCode(name, type, cooldown, target, targetType);
+      return Objects.hashCode(name, type, cooldown, target, targetType, args);
    }
 
    @Override
@@ -112,7 +153,8 @@ public class ScalingPolicy implements Comparable<ScalingPolicy>{
             Objects.equal(this.type, that.type) &&
             Objects.equal(this.cooldown, that.cooldown) &&
             Objects.equal(this.target, that.target) &&
-            Objects.equal(this.targetType, that.targetType);
+            Objects.equal(this.targetType, that.targetType) &&
+            Objects.equal(this.args, that.args);
    }
 
    protected ToStringHelper string() {
@@ -121,7 +163,8 @@ public class ScalingPolicy implements Comparable<ScalingPolicy>{
             .add("type", type)
             .add("cooldown", cooldown)
             .add("target", target)
-            .add("targetType", "targetType");
+            .add("targetType", targetType)
+            .add("args", args);
    }
 
    @Override
@@ -143,6 +186,7 @@ public class ScalingPolicy implements Comparable<ScalingPolicy>{
       protected int cooldown;
       protected String target;
       protected ScalingPolicyTargetType targetType;
+      protected Map<String, String> args;
 
       /** 
        * @param name The name of this ScalingPolicy.
@@ -155,7 +199,7 @@ public class ScalingPolicy implements Comparable<ScalingPolicy>{
       }
 
       /** 
-       * @param name The type for this ScalingPolicy.
+       * @param type The type for this ScalingPolicy.
        * @return The builder object.
        * @see ScalingPolicyType
        * @see ScalingPolicy#getType()
@@ -186,7 +230,7 @@ public class ScalingPolicy implements Comparable<ScalingPolicy>{
       }
 
       /** 
-       * @param target type The target type of this ScalingPolicy.
+       * @param targetType The target type of this ScalingPolicy.
        * @return The builder object.
        * @see ScalingPolicyTargetType
        * @see ScalingPolicy#getTargetType()
@@ -196,20 +240,62 @@ public class ScalingPolicy implements Comparable<ScalingPolicy>{
          return this;
       }
 
+      /** 
+       * @param cron This parameter specifies the recurring time when the policy will be executed as a cron entry. 
+       * For example, if this is parameter is set to "1 0 * * *",
+       * the policy will be executed at one minute past midnight (00:01)
+       * every day of the month, and every day of the week.
+       * You can either provide "cron" or "at" for a given policy, but not both.
+       * @return The builder object.
+       * @see ScalingPolicyTargetType
+       * @see ScalingPolicy#getTargetType()
+       * @see <a href="http://en.wikipedia.org/wiki/Cron">Cron</a>
+       */
+      public Builder cronSchedule(String cron) {
+         this.type = ScalingPolicyType.SCHEDULE;
+         this.args = ImmutableMap.of("cron", cron);
+         return this;
+      }
+
+      /** 
+       * @param at This parameter specifies the time at which this policy will be executed.
+       * This property is mutually exclusive with the "cron" parameter.
+       * You can either provide "cron" or "at" for a given policy, but not both.
+       * Example date string: "2013-12-05T03:12:00Z"
+       * @return The builder object.
+       * @see ScalingPolicyTargetType
+       * @see ScalingPolicy#getTargetType()
+       */
+      public Builder atSchedule(String at) {
+         this.type = ScalingPolicyType.SCHEDULE;
+         this.args = ImmutableMap.of("at", at);
+         return this;
+      }
+
+      private Builder scheduleArgs(Map<String, String> args) {
+         this.args = args;
+         return this;
+      }
+
       /**
        * @return A new ScalingPolicy object.
        */
       public ScalingPolicy build() {
-         return new ScalingPolicy(name, type, cooldown, target, targetType);
+         return new ScalingPolicy(name, type, cooldown, target, targetType, args);
       }
 
+      /**
+       * @param in The target scaling policy
+       * @return The scaling policy builder
+       */
       public Builder fromScalingPolicy(ScalingPolicy in) {
          return this
                .name(in.getName())
                .type(in.getType())
                .cooldown(in.getCooldown())
                .target(in.getTarget())
-               .targetType(in.getTargetType());
+               .targetType(in.getTargetType())
+               .scheduleArgs(in.getSchedulingArgs());
       }        
    }
 
@@ -222,7 +308,8 @@ public class ScalingPolicy implements Comparable<ScalingPolicy>{
     * Enumerates different types of scaling policies
     */
    public static enum ScalingPolicyType {
-      WEBHOOK("webhook");
+      WEBHOOK("webhook"),
+      SCHEDULE("schedule");
 
       private final String name;
 
@@ -271,4 +358,39 @@ public class ScalingPolicy implements Comparable<ScalingPolicy>{
          return Optional.absent();
       }
    }
+
+   /**
+    * Enumerates different types of targets a policy might have
+    */
+   public static enum ScalingPolicyScheduleType {
+      /**
+       * Example: "1 0 * * *"
+       * @see ScalingPolicy.Builder#cronSchedule(String)
+       */
+      AT("at"),
+      /**
+       * Example date string: "2013-12-05T03:12:00Z"
+       * @see ScalingPolicy.Builder#atSchedule(String)
+       */
+      CRON("cron");
+
+      private final String name;
+
+      private ScalingPolicyScheduleType(String name) {
+         this.name = name;
+      }
+
+      public String toString() {
+         return name;
+      }
+
+      public static Optional<ScalingPolicyTargetType> getByValue(String value){
+         for (final ScalingPolicyTargetType element : EnumSet.allOf(ScalingPolicyTargetType.class)) {
+            if (element.toString().equals(value)) {
+               return Optional.of(element);
+            }
+         }
+         return Optional.absent();
+      }
+   }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicyResponse.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicyResponse.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicyResponse.java
index eb1249e..0bf0302 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicyResponse.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/domain/ScalingPolicyResponse.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.beans.ConstructorProperties;
 import java.util.List;
+import java.util.Map;
 
 import org.jclouds.openstack.v2_0.domain.Link;
 
@@ -38,10 +39,10 @@ public class ScalingPolicyResponse extends ScalingPolicy{
    private final String id;
 
    @ConstructorProperties({
-      "name", "type", "cooldown", "target", "targetType", "links", "id"
+      "name", "type", "cooldown", "target", "targetType", "args", "links", "id"
    })
-   public ScalingPolicyResponse(String name, ScalingPolicyType type, int cooldown, String target, ScalingPolicyTargetType targetType, List<Link> links, String id) {
-      super(name, type, cooldown, target, targetType);
+   public ScalingPolicyResponse(String name, ScalingPolicyType type, int cooldown, String target, ScalingPolicyTargetType targetType, Map<String, String> args, List<Link> links, String id) {
+      super(name, type, cooldown, target, targetType, args);
       this.id = checkNotNull(id, "id required");
       this.links = ImmutableList.copyOf(checkNotNull(links, "links required"));
    }

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupResponse.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupResponse.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupResponse.java
index 79e29a7..27d6309 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupResponse.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseGroupResponse.java
@@ -132,6 +132,7 @@ public class ParseGroupResponse implements Function<HttpResponse, Group> {
                      ((Double)scalingPolicyMap.get("cooldown")).intValue(),
                      DoubleMath.isMathematicalInteger(d) ? Integer.toString(d.intValue()) : Double.toString(d), 
                            targetType,
+                           (Map<String, String>) scalingPolicyMap.get("args"),
                            ImmutableList.copyOf(links.build()),
                            (String) scalingPolicyMap.get("id")
                      );

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPoliciesResponse.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPoliciesResponse.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPoliciesResponse.java
index e02160c..c003575 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPoliciesResponse.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPoliciesResponse.java
@@ -84,6 +84,7 @@ public class ParseScalingPoliciesResponse implements Function<HttpResponse, Flue
                      ((Double)scalingPolicyMap.get("cooldown")).intValue(),
                      DoubleMath.isMathematicalInteger(d) ? Integer.toString(d.intValue()) : Double.toString(d),
                            targetType,
+                           (Map<String, String>) scalingPolicyMap.get("args"),
                            ImmutableList.copyOf(links.build()),
                            (String) scalingPolicyMap.get("id")
                      );

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPolicyResponse.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPolicyResponse.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPolicyResponse.java
index 968254d..392761f 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPolicyResponse.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/functions/ParseScalingPolicyResponse.java
@@ -81,6 +81,7 @@ public class ParseScalingPolicyResponse implements Function<HttpResponse, Scalin
                   ((Double)scalingPolicyMap.get("cooldown")).intValue(),
                   DoubleMath.isMathematicalInteger(d) ? Integer.toString(d.intValue()) : Double.toString(d),
                         targetType,
+                        (Map<String, String>) scalingPolicyMap.get("args"),
                         ImmutableList.copyOf(links.build()),
                         (String) scalingPolicyMap.get("id")
                   );

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/internal/ParseHelper.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/internal/ParseHelper.java b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/internal/ParseHelper.java
index 9e00579..8dc43f3 100644
--- a/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/internal/ParseHelper.java
+++ b/rackspace-autoscale/src/main/java/org/jclouds/rackspace/autoscale/v1/internal/ParseHelper.java
@@ -28,6 +28,8 @@ import com.google.common.collect.Maps;
 import com.google.common.primitives.Floats;
 import com.google.common.primitives.Ints;
 
+import static org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy.ScalingPolicyType;
+
 /**
  * @author Zack Shoylev
  * 
@@ -75,7 +77,7 @@ public class ParseHelper {
       }
       return scalingPoliciesListBuilder.build();
    }
-   
+
    public static ImmutableMap<String, Object> buildScalingPolicyMap(ScalingPolicy scalingPolicy) {
       ImmutableMap.Builder<String, Object> scalingPolicyMapBuilder = ImmutableMap.builder();
       scalingPolicyMapBuilder.put("cooldown", scalingPolicy.getCooldown());
@@ -97,6 +99,12 @@ public class ParseHelper {
          scalingPolicyMapBuilder.put(scalingPolicy.getTargetType().toString(), targetString);
       }
 
+      if (scalingPolicy.getSchedulingType() != null
+            && scalingPolicy.getType().equals(ScalingPolicyType.SCHEDULE)) {
+         // Have to use getters to rebuild map
+         scalingPolicyMapBuilder.put("args", ImmutableMap.of(scalingPolicy.getSchedulingType().toString(),scalingPolicy.getSchedulingString()));
+      }
+
       return scalingPolicyMapBuilder.build();
    }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
index 124b9ba..cd1c664 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiLiveTest.java
@@ -32,6 +32,7 @@ import org.jclouds.rackspace.autoscale.v1.domain.LaunchConfiguration.LaunchConfi
 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.ScalingPolicyScheduleType;
 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;
@@ -170,6 +171,60 @@ public class ScalingPolicyApiLiveTest extends BaseAutoscaleApiLiveTest {
    }
 
    @Test
+   public void testCreateScheduleCronPolicy() {
+      for (String zone : api.getConfiguredZones()) {
+
+         PolicyApi policyApi = api.getPolicyApiForZoneAndGroup(zone, created.get(zone).get(0).getId());
+
+         List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
+
+         ScalingPolicy scalingPolicy = ScalingPolicy.builder()
+               .cooldown(3)
+               .type(ScalingPolicyType.SCHEDULE)
+               .name("scale up by one server")
+               .targetType(ScalingPolicyTargetType.INCREMENTAL)
+               .target("1")
+               .cronSchedule("23 * * * *")
+               .build();
+         scalingPolicies.add(scalingPolicy);
+
+         FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = policyApi.create(scalingPolicies);
+         assertNotNull(scalingPolicyResponse.iterator().next().getId());
+         assertEquals(scalingPolicyResponse.iterator().next().getCooldown(), 3);
+         assertEquals(scalingPolicyResponse.iterator().next().getTarget(), "1");
+         assertEquals(scalingPolicyResponse.iterator().next().getSchedulingType(), ScalingPolicyScheduleType.CRON);
+         assertEquals(scalingPolicyResponse.iterator().next().getSchedulingString(), "23 * * * *");
+      }
+   }
+
+   @Test
+   public void testCreateScheduleAtPolicy() {
+      for (String zone : api.getConfiguredZones()) {
+
+         PolicyApi policyApi = api.getPolicyApiForZoneAndGroup(zone, created.get(zone).get(0).getId());
+
+         List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
+
+         ScalingPolicy scalingPolicy = ScalingPolicy.builder()
+               .cooldown(3)
+               .type(ScalingPolicyType.SCHEDULE)
+               .name("scale up by one server")
+               .targetType(ScalingPolicyTargetType.INCREMENTAL)
+               .target("1")
+               .atSchedule("2020-12-05T03:12:00Z")
+               .build();
+         scalingPolicies.add(scalingPolicy);
+
+         FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = policyApi.create(scalingPolicies);
+         assertNotNull(scalingPolicyResponse.iterator().next().getId());
+         assertEquals(scalingPolicyResponse.iterator().next().getCooldown(), 3);
+         assertEquals(scalingPolicyResponse.iterator().next().getTarget(), "1");
+         assertEquals(scalingPolicyResponse.iterator().next().getSchedulingType(), ScalingPolicyScheduleType.AT);
+         assertEquals(scalingPolicyResponse.iterator().next().getSchedulingString(), "2020-12-05T03:12:00Z");
+      }
+   }
+
+   @Test
    public void testListPolicy() {
       for (String zone : api.getConfiguredZones()) {
 

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java
index 2ec11f1..0a324cc 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/ScalingPolicyApiMockTest.java
@@ -27,6 +27,7 @@ import java.util.List;
 
 import org.jclouds.rackspace.autoscale.v1.AutoscaleApi;
 import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy;
+import org.jclouds.rackspace.autoscale.v1.domain.ScalingPolicy.ScalingPolicyScheduleType;
 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;
@@ -126,6 +127,100 @@ public class ScalingPolicyApiMockTest extends BaseAutoscaleApiMockTest {
       }
    }
 
+   public void testCreateCronScheduleScalingPolicy() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/autoscale_policy_schedule_cron_create_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");         
+
+         List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
+
+         ScalingPolicy scalingPolicy = ScalingPolicy.builder()
+               .cooldown(2)
+               .type(ScalingPolicyType.SCHEDULE)
+               .name("scale down by 5.5 percent at 11pm")
+               .targetType(ScalingPolicyTargetType.PERCENT_CHANGE)
+               .target("-5.5")
+               .cronSchedule("23 * * * *")
+               .build();
+         scalingPolicies.add(scalingPolicy);
+
+         FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.create(scalingPolicies);
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "POST", "/v1.0/888888/groups/groupId1/policies", "/autoscale_policy_schedule_cron_create_request.json");
+
+         /*
+          * Check response
+          */
+         assertNotNull(scalingPolicyResponse);
+         assertEquals(scalingPolicyResponse.size(), 1);
+         assertEquals(scalingPolicyResponse.get(0).getCooldown(), 2);
+         assertEquals(scalingPolicyResponse.get(0).getId(), "30707675-8e7c-4ea5-9358-c21648afcf29");
+         assertEquals(scalingPolicyResponse.get(0).getName(), "scale down by 5.5 percent at 11pm");
+         assertEquals(scalingPolicyResponse.get(0).getTarget(), "-5.5");
+         assertEquals(scalingPolicyResponse.get(0).getType(), ScalingPolicyType.SCHEDULE);
+         assertEquals(scalingPolicyResponse.get(0).getSchedulingType(), ScalingPolicyScheduleType.CRON);
+         assertEquals(scalingPolicyResponse.get(0).getSchedulingString(), "23 * * * *");
+         assertEquals(scalingPolicyResponse.get(0).getLinks().size(), 1);
+      } finally {
+         server.shutdown();
+      }
+   }
+
+   public void testCreateAtScheduleScalingPolicy() throws IOException, InterruptedException {
+      MockWebServer server = mockOpenStackServer();
+      server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+      server.enqueue(addCommonHeaders(new MockResponse().setResponseCode(201).setBody(stringFromResource("/autoscale_policy_schedule_at_create_response.json"))));
+
+      try {
+         AutoscaleApi autoscaleApi = api(server.getUrl("/").toString(), "rackspace-autoscale", overrides);
+         PolicyApi api = autoscaleApi.getPolicyApiForZoneAndGroup("DFW", "groupId1");         
+
+         List<ScalingPolicy> scalingPolicies = Lists.newArrayList();
+
+         ScalingPolicy scalingPolicy = ScalingPolicy.builder()
+               .cooldown(2)
+               .type(ScalingPolicyType.SCHEDULE)
+               .name("scale down by 5.5 percent on the 5th")
+               .targetType(ScalingPolicyTargetType.PERCENT_CHANGE)
+               .target("-5.5")
+               .atSchedule("2013-06-05T03:12Z")
+               .build();
+         scalingPolicies.add(scalingPolicy);
+
+         FluentIterable<ScalingPolicyResponse> scalingPolicyResponse = api.create(scalingPolicies);
+
+         /*
+          * Check request
+          */
+         assertAuthentication(server);
+         assertRequest(server.takeRequest(), "POST", "/v1.0/888888/groups/groupId1/policies", "/autoscale_policy_schedule_at_create_request.json");
+
+         /*
+          * Check response
+          */
+         assertNotNull(scalingPolicyResponse);
+         assertEquals(scalingPolicyResponse.size(), 1);
+         assertEquals(scalingPolicyResponse.get(0).getCooldown(), 2);
+         assertEquals(scalingPolicyResponse.get(0).getId(), "9f7c5801-6b25-4f5a-af07-4bb752e23d53");
+         assertEquals(scalingPolicyResponse.get(0).getName(), "scale down by 5.5 percent on the 5th");
+         assertEquals(scalingPolicyResponse.get(0).getTarget(), "-5.5");
+         assertEquals(scalingPolicyResponse.get(0).getType(), ScalingPolicyType.SCHEDULE);
+         assertEquals(scalingPolicyResponse.get(0).getSchedulingType(), ScalingPolicyScheduleType.AT);
+         assertEquals(scalingPolicyResponse.get(0).getSchedulingString(), "2013-06-05T03:12Z");
+         assertEquals(scalingPolicyResponse.get(0).getLinks().size(), 1);
+      } finally {
+         server.shutdown();
+      }
+   }
+
    public void testListScalingPolicies() throws IOException, InterruptedException {
       MockWebServer server = mockOpenStackServer();
       server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
index 99d1457..58adad6 100644
--- a/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
+++ b/rackspace-autoscale/src/test/java/org/jclouds/rackspace/autoscale/v1/features/WebhookApiLiveTest.java
@@ -173,16 +173,16 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
       for (String zone : api.getConfiguredZones()) {
          Group g = created.get(zone).get(0);
          WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
-         FluentIterable<WebhookResponse> webhookList = webhookApi.create(
+         FluentIterable<WebhookResponse> webhookResponse = webhookApi.create(
                ImmutableList.of(
                      Webhook.builder().name("test5").metadata(null).build(),
                      Webhook.builder().name("test6").metadata(ImmutableMap.<String, Object>of("notes2", "different test")).build()
                      ));
 
-         assertEquals(webhookList.get(0).getName(), "test5");
-         assertNull(webhookList.get(0).getMetadata().get("notes"));
-         assertEquals(webhookList.get(1).getName(), "test6");
-         assertEquals(webhookList.get(1).getMetadata().get("notes2"), "different test");
+         assertEquals(webhookResponse.get(0).getName(), "test5");
+         assertNull(webhookResponse.get(0).getMetadata().get("notes"));
+         assertEquals(webhookResponse.get(1).getName(), "test6");
+         assertEquals(webhookResponse.get(1).getMetadata().get("notes2"), "different test");
       }
    }
 
@@ -204,12 +204,18 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
    public void testGetWebhook() {
       for (String zone : api.getConfiguredZones()) {
          Group g = created.get(zone).get(0);
-         WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
-         WebhookResponse webhookList = webhookApi.list().first().get();
-         WebhookResponse webhookGet = webhookApi.get(webhookList.getId());
-         assertNotNull(webhookList);
-         assertNotNull(webhookGet);
-         assertEquals(webhookList, webhookGet);
+         WebhookApi webhookApi;
+         boolean foundWebhook = false;
+         for (ScalingPolicyResponse sp :  g.getScalingPolicies()) {
+            webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), sp.getId());
+            WebhookResponse webhookResponse = webhookApi.list().first().get();
+            if (webhookResponse != null) {
+               WebhookResponse webhookGet = webhookApi.get(webhookResponse.getId());
+               assertEquals(webhookResponse, webhookGet);
+               foundWebhook = true;
+            }
+         }
+         assertTrue(foundWebhook, "No webhooks were found, and some were expected");
       }
    }
 
@@ -255,7 +261,7 @@ public class WebhookApiLiveTest extends BaseAutoscaleApiLiveTest {
          WebhookApi webhookApi = api.getWebhookApiForZoneAndGroupAndPolicy(zone, g.getId(), g.getScalingPolicies().iterator().next().getId());
          WebhookResponse webhook = webhookApi.create("test_execute_fail", ImmutableMap.<String, Object>of("notes", "test metadata")).first().get();
          
-         URI uri = new URI(webhook.getAnonymousExecutionURI().toString() + "123");
+         URI uri = new URI(webhook.getAnonymousExecutionURI().get().toString() + "123");
          assertFalse( AutoscaleUtils.execute(uri) );
       }
    }

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_at_create_request.json
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_at_create_request.json b/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_at_create_request.json
new file mode 100644
index 0000000..17efdf9
--- /dev/null
+++ b/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_at_create_request.json
@@ -0,0 +1,11 @@
+[
+    {
+        "name":"scale down by 5.5 percent on the 5th",
+        "changePercent":-5.5,
+        "cooldown":2,
+        "type":"schedule",
+        "args":{
+            "at":"2013-06-05T03:12Z"
+        }
+    }
+]

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_at_create_response.json
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_at_create_response.json b/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_at_create_response.json
new file mode 100644
index 0000000..d3b9b1c
--- /dev/null
+++ b/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_at_create_response.json
@@ -0,0 +1,20 @@
+{
+    "policies":[
+        {
+            "args":{
+                "at":"2013-06-05T03:12Z"
+            },
+            "changePercent":-5.5,
+            "cooldown":2,
+            "id":"9f7c5801-6b25-4f5a-af07-4bb752e23d53",
+            "links":[
+                {
+                    "href":"https://dfw.autoscale.api.rackspacecloud.com/v1.0/676873/groups/605e13f6-1452-4588-b5da-ac6bb468c5bf/policies/9f7c5801-6b25-4f5a-af07-4bb752e23d53/",
+                    "rel":"self"
+                }
+            ],
+            "name":"scale down by 5.5 percent on the 5th",
+            "type":"schedule"
+        }
+    ]
+}

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_cron_create_request.json
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_cron_create_request.json b/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_cron_create_request.json
new file mode 100644
index 0000000..9c12df9
--- /dev/null
+++ b/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_cron_create_request.json
@@ -0,0 +1,11 @@
+[
+    {
+        "args":{
+            "cron":"23 * * * *"
+        },
+        "changePercent":-5.5,
+        "cooldown":2,
+        "name":"scale down by 5.5 percent at 11pm",
+        "type":"schedule"
+    }
+]

http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/24a37bde/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_cron_create_response.json
----------------------------------------------------------------------
diff --git a/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_cron_create_response.json b/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_cron_create_response.json
new file mode 100644
index 0000000..616529c
--- /dev/null
+++ b/rackspace-autoscale/src/test/resources/autoscale_policy_schedule_cron_create_response.json
@@ -0,0 +1,20 @@
+{
+    "policies":[
+        {
+            "args":{
+                "cron":"23 * * * *"
+            },
+            "changePercent":-5.5,
+            "cooldown":2,
+            "id":"30707675-8e7c-4ea5-9358-c21648afcf29",
+            "links":[
+                {
+                    "href":"https://dfw.autoscale.api.rackspacecloud.com/v1.0/676873/groups/605e13f6-1452-4588-b5da-ac6bb468c5bf/policies/30707675-8e7c-4ea5-9358-c21648afcf29/",
+                    "rel":"self"
+                }
+            ],
+            "name":"scale down by 5.5 percent at 11pm",
+            "type":"schedule"
+        }
+    ]
+}