You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/07/01 21:14:51 UTC

[04/24] JCLOUDS-151 - CloudStack refactored to remove async, *Client renamed to *Api.

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/c6986efd/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiLiveTest.java
new file mode 100644
index 0000000..1825372
--- /dev/null
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiLiveTest.java
@@ -0,0 +1,219 @@
+/*
+ * 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.cloudstack.features;
+
+import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.zoneId;
+import static org.jclouds.util.Predicates2.retry;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
+import java.net.URI;
+import java.net.URLDecoder;
+import java.util.Set;
+
+import org.jclouds.cloudstack.domain.AsyncCreateResponse;
+import org.jclouds.cloudstack.domain.AsyncJob;
+import org.jclouds.cloudstack.domain.ExtractMode;
+import org.jclouds.cloudstack.domain.Network;
+import org.jclouds.cloudstack.domain.OSType;
+import org.jclouds.cloudstack.domain.Template;
+import org.jclouds.cloudstack.domain.TemplateExtraction;
+import org.jclouds.cloudstack.domain.TemplateMetadata;
+import org.jclouds.cloudstack.domain.VirtualMachine;
+import org.jclouds.cloudstack.domain.Volume;
+import org.jclouds.cloudstack.domain.Zone;
+import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
+import org.jclouds.cloudstack.options.CreateTemplateOptions;
+import org.jclouds.cloudstack.options.ListNetworksOptions;
+import org.jclouds.cloudstack.options.ListVolumesOptions;
+import org.jclouds.cloudstack.options.RegisterTemplateOptions;
+import org.jclouds.logging.Logger;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+
+/**
+ * Tests behavior of {@code TemplateApi}
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "live", singleThreaded = true, testName = "TemplateApiLiveTest")
+public class TemplateApiLiveTest extends BaseCloudStackApiLiveTest {
+
+   private static final String IMPORT_VHD_URL = "http://www.frontiertown.co.uk/jclouds/empty.vhd";
+   private VirtualMachine vmForCreation;
+   private VirtualMachine vmForRegistration;
+   private Template createdTemplate;
+   private Template registeredTemplate;
+
+   @Test
+   public void testListTemplates() throws Exception {
+      Set<Template> response = client.getTemplateApi().listTemplates();
+      assert null != response;
+      long templateCount = response.size();
+      assertTrue(templateCount >= 0);
+      for (Template template : response) {
+         Template newDetails = Iterables.getOnlyElement(client.getTemplateApi().listTemplates(
+               zoneId(template.getZoneId()).id(template.getId())));
+         Logger.CONSOLE.info("Checking template: " + template);
+
+         assertEquals(template, newDetails);
+         assertEquals(template, client.getTemplateApi().getTemplateInZone(template.getId(), template.getZoneId()));
+         assert template.getId() != null : template;
+         assert template.getName() != null : template;
+         assert template.getDisplayText() != null : template;
+         assert template.getCreated() != null : template;
+         assert template.getFormat() != null && template.getFormat() != Template.Format.UNRECOGNIZED : template;
+         assert template.getOSType() != null : template;
+         assert template.getOSTypeId() != null : template;
+         assert template.getAccount() != null : template;
+         assert template.getZone() != null : template;
+         assert template.getZoneId() != null : template;
+         assert (template.getStatus() == null ||
+            template.getStatus() == Template.Status.DOWNLOADED) : template;
+         assert template.getType() != null && template.getType() != Template.Type.UNRECOGNIZED : template;
+         assert template.getHypervisor() != null : template;
+         assert template.getDomain() != null : template;
+         assert template.getDomainId() != null : template;
+         assert template.getSize() > 0 : template;
+      }
+   }
+
+   @Test(enabled = true)
+   public void testCreateTemplate() throws Exception {
+      Zone zone = Iterables.getFirst(client.getZoneApi().listZones(), null);
+      assertNotNull(zone);
+      Iterable<Network> networks = client.getNetworkApi().listNetworks(ListNetworksOptions.Builder.zoneId(zone.getId()).isDefault(true));
+      networks = Iterables.filter(networks, new Predicate<Network>() {
+         @Override
+         public boolean apply(Network network) {
+            return network != null && network.getState().equals("Implemented");
+         }
+      });
+      assertTrue(Iterables.size(networks) >= 1);
+      Network network = Iterables.get(networks, 0);
+      assertNotNull(network);
+
+      // Create a VM and stop it
+      String defaultTemplate = template != null ? template.getImageId() : null;
+      vmForCreation = VirtualMachineApiLiveTest.createVirtualMachineInNetwork(network, defaultTemplate, client, jobComplete, virtualMachineRunning);
+      assertTrue(jobComplete.apply(client.getVirtualMachineApi().stopVirtualMachine(vmForCreation.getId())), vmForCreation.toString());
+
+      // Work out the VM's volume
+      Set<Volume> volumes = client.getVolumeApi().listVolumes(ListVolumesOptions.Builder.virtualMachineId(vmForCreation.getId()));
+      assertEquals(volumes.size(), 1);
+      Volume volume = Iterables.getOnlyElement(volumes);
+
+      // Create a template
+      CreateTemplateOptions options = CreateTemplateOptions.Builder.volumeId(volume.getId());
+      AsyncCreateResponse response = client.getTemplateApi().createTemplate(TemplateMetadata.builder().name(prefix+"-createTemplate").osTypeId(vmForCreation.getGuestOSId()).displayText("jclouds live testCreateTemplate").build(), options);
+      assertTrue(jobComplete.apply(response.getJobId()), vmForCreation.toString());
+      createdTemplate = client.getTemplateApi().getTemplateInZone(response.getId(), vmForCreation.getZoneId());
+
+      // Assertions
+      assertNotNull(createdTemplate);
+   }
+
+   @Test(enabled = true, dependsOnMethods = "testRegisterTemplate")
+   public void testExtractTemplate() throws Exception {
+      // Initiate the extraction and wait for it to complete
+      AsyncCreateResponse response = client.getTemplateApi().extractTemplate(registeredTemplate.getId(), ExtractMode.HTTP_DOWNLOAD, registeredTemplate.getZoneId());
+      assertTrue(jobComplete.apply(response.getJobId()), registeredTemplate.toString());
+
+      // Get the result
+      AsyncJob<TemplateExtraction> asyncJob = client.getAsyncJobApi().getAsyncJob(response.getJobId());
+      TemplateExtraction extract = asyncJob.getResult();
+      assertNotNull(extract);
+
+      // Check that the URL can be retrieved
+      String extractUrl = extract.getUrl();
+      assertNotNull(extractUrl);
+      URI uri = new URI(URLDecoder.decode(extractUrl, "utf-8"));
+      assertTrue(cloudStackContext.utils().http().exists(uri), "does not exist: " + uri);
+   }
+
+   @Test(enabled = true)
+   public void testRegisterTemplate() throws Exception {
+      Zone zone = Iterables.getFirst(client.getZoneApi().listZones(), null);
+      assertNotNull(zone);
+      Iterable<Network> networks = client.getNetworkApi().listNetworks(ListNetworksOptions.Builder.zoneId(zone.getId()).isDefault(true));
+      networks = Iterables.filter(networks, new Predicate<Network>() {
+         @Override
+         public boolean apply(Network network) {
+            return network != null && network.getName().equals("Virtual Network");
+         }
+      });
+      assertEquals(Iterables.size(networks), 1);
+      Network network = Iterables.getOnlyElement(networks, null);
+      assertNotNull(network);
+      Set<OSType> osTypes = client.getGuestOSApi().listOSTypes();
+      OSType osType = Iterables.getFirst(osTypes, null);
+
+      // Register a template
+      RegisterTemplateOptions options = RegisterTemplateOptions.Builder.bits(32).isExtractable(true);
+      TemplateMetadata templateMetadata = TemplateMetadata.builder().name(prefix+"-registerTemplate").osTypeId(osType.getId()).displayText("jclouds live testRegisterTemplate").build();
+      Set<Template> templates = client.getTemplateApi().registerTemplate(templateMetadata, "VHD", "XenServer", IMPORT_VHD_URL, zone.getId(), options);
+      registeredTemplate = Iterables.getOnlyElement(templates, null);
+      assertNotNull(registeredTemplate);
+
+      // Ensure it is available
+      final String zoneId = zone.getId();
+      Predicate<Template> templateReadyPredicate = new Predicate<Template>() {
+         @Override
+         public boolean apply(Template template) {
+            if (template == null) return false;
+            Template t2 = client.getTemplateApi().getTemplateInZone(template.getId(), zoneId);
+            Logger.CONSOLE.info("%s", t2.getStatus());
+            return t2.getStatus() == Template.Status.DOWNLOADED;
+         }
+      };
+      assertTrue(retry(templateReadyPredicate, 60000).apply(registeredTemplate));
+
+      // Create a VM that uses this template
+      vmForRegistration = VirtualMachineApiLiveTest.createVirtualMachineInNetwork(network, registeredTemplate.getId(), client, jobComplete, virtualMachineRunning);
+      assertNotNull(vmForRegistration);
+   }
+
+
+   @AfterGroups(groups = "live")
+   @Override
+   protected void tearDownContext() {
+      if (vmForCreation != null) {
+         assertTrue(jobComplete.apply(client.getVirtualMachineApi().stopVirtualMachine(vmForCreation.getId())), vmForCreation.toString());
+         assertTrue(jobComplete.apply(client.getVirtualMachineApi().destroyVirtualMachine(vmForCreation.getId())), vmForCreation.toString());
+         assertTrue(virtualMachineDestroyed.apply(vmForCreation));
+      }
+      if (vmForRegistration != null) {
+         assertTrue(jobComplete.apply(client.getVirtualMachineApi().stopVirtualMachine(vmForRegistration.getId())), vmForRegistration.toString());
+         assertTrue(jobComplete.apply(client.getVirtualMachineApi().destroyVirtualMachine(vmForRegistration.getId())), vmForRegistration.toString());
+         assert virtualMachineDestroyed.apply(vmForRegistration);
+      }
+      if (createdTemplate != null) {
+         AsyncCreateResponse deleteJob = client.getTemplateApi().deleteTemplate(createdTemplate.getId());
+         assertTrue(jobComplete.apply(deleteJob.getJobId()));
+      }
+      if (registeredTemplate != null) {
+         AsyncCreateResponse deleteJob = client.getTemplateApi().deleteTemplate(registeredTemplate.getId());
+         assertTrue(jobComplete.apply(deleteJob.getJobId()));
+      }
+      super.tearDownContext();
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/c6986efd/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java
new file mode 100644
index 0000000..e390c2e
--- /dev/null
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateApiTest.java
@@ -0,0 +1,402 @@
+/*
+ * 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.cloudstack.features;
+
+import static org.jclouds.reflect.Reflection2.method;
+
+import java.io.IOException;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.cloudstack.domain.ExtractMode;
+import org.jclouds.cloudstack.domain.Template;
+import org.jclouds.cloudstack.domain.TemplateFilter;
+import org.jclouds.cloudstack.domain.TemplateMetadata;
+import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
+import org.jclouds.cloudstack.options.AccountInDomainOptions;
+import org.jclouds.cloudstack.options.CreateTemplateOptions;
+import org.jclouds.cloudstack.options.DeleteTemplateOptions;
+import org.jclouds.cloudstack.options.ExtractTemplateOptions;
+import org.jclouds.cloudstack.options.ListTemplatesOptions;
+import org.jclouds.cloudstack.options.RegisterTemplateOptions;
+import org.jclouds.cloudstack.options.UpdateTemplateOptions;
+import org.jclouds.cloudstack.options.UpdateTemplatePermissionsOptions;
+import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
+import org.jclouds.functions.IdentityFunction;
+import org.jclouds.http.HttpRequest;
+import org.jclouds.http.functions.ParseFirstJsonValueNamed;
+import org.jclouds.http.functions.ReleasePayloadAndReturn;
+import org.jclouds.http.functions.UnwrapOnlyJsonValue;
+import org.jclouds.rest.internal.GeneratedHttpRequest;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Functions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.reflect.Invokable;
+/**
+ * Tests behavior of {@code TemplateApi}
+ * 
+ * @author Adrian Cole
+ */
+// NOTE:without testName, this will not call @Before* and fail w/NPE during
+// surefire
+@Test(groups = "unit", testName = "TemplateApiTest")
+public class TemplateApiTest extends BaseCloudStackApiTest<TemplateApi> {
+
+   public void testCreateTemplate() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "createTemplate", TemplateMetadata.class, CreateTemplateOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build()));
+
+      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=createTemplate&name=thename&ostypeid=10&displaytext=description HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   public void testCreateTemplateOptions() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "createTemplate", TemplateMetadata.class, CreateTemplateOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build(), CreateTemplateOptions.Builder.bits(32).isFeatured(true).isPublic(true).passwordEnabled(true).requiresHVM(true).snapshotId("11").volumeId("12")));
+
+      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=createTemplate&bits=32&isfeatured=true&ispublic=true&passwordenabled=true&requireshvm=true&snapshotid=11&volumeid=12&name=thename&ostypeid=10&displaytext=description HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   HttpRequest registerTemplate = HttpRequest.builder().method("GET")
+                                             .endpoint("http://localhost:8080/client/api")
+                                             .addQueryParam("response", "json")
+                                             .addQueryParam("command", "registerTemplate")
+                                             .addQueryParam("format", "QCOW2")
+                                             .addQueryParam("hypervisor", "xen")
+                                             .addQueryParam("url", "http%3A//example.com/")
+                                             .addQueryParam("zoneid", "20")
+                                             .addQueryParam("name", "thename")
+                                             .addQueryParam("ostypeid", "10")
+                                             .addQueryParam("displaytext", "description").build();
+
+   public void testRegisterTemplate() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "registerTemplate", TemplateMetadata.class, String.class, String.class, String.class, String.class, RegisterTemplateOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build(), Template.Format.QCOW2, "xen", "http://example.com/", 20));
+
+      assertRequestLineEquals(httpRequest, registerTemplate.getRequestLine());
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   HttpRequest registerTemplateOptions = HttpRequest.builder().method("GET")
+                                                    .endpoint("http://localhost:8080/client/api")
+                                                    .addQueryParam("response", "json")
+                                                    .addQueryParam("command", "registerTemplate")
+                                                    .addQueryParam("format", "QCOW2")
+                                                    .addQueryParam("hypervisor", "xen")
+                                                    .addQueryParam("url", "http%3A//example.com/")
+                                                    .addQueryParam("zoneid", "20")
+                                                    .addQueryParam("account", "mydomain")
+                                                    .addQueryParam("domainid", "3")
+                                                    .addQueryParam("bits", "32")
+                                                    .addQueryParam("checksum", "ABC")
+                                                    .addQueryParam("isextractable", "true")
+                                                    .addQueryParam("isfeatured", "true")
+                                                    .addQueryParam("ispublic", "true")
+                                                    .addQueryParam("passwordenabled", "true")
+                                                    .addQueryParam("requireshvm", "true")
+                                                    .addQueryParam("name", "thename")
+                                                    .addQueryParam("ostypeid", "10")
+                                                    .addQueryParam("displaytext", "description").build();
+
+   public void testRegisterTemplateOptions() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "registerTemplate", TemplateMetadata.class, String.class, String.class, String.class, String.class, RegisterTemplateOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build(), Template.Format.QCOW2, "xen", "http://example.com/", 20,
+         RegisterTemplateOptions.Builder.accountInDomain("mydomain", "3").bits(32).checksum("ABC").isExtractable(true).isFeatured(true).isPublic(true).passwordEnabled(true).requiresHVM(true)));
+
+      assertRequestLineEquals(httpRequest, registerTemplateOptions.getRequestLine());
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   public void testUpdateTemplate() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "updateTemplate", String.class, UpdateTemplateOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
+
+      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplate&id=17 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   public void testUpdateTemplateOptions() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "updateTemplate", String.class, UpdateTemplateOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, UpdateTemplateOptions.Builder.bootable(true).displayText("description").format(Template.Format.VHD).name("thename").osTypeId("12").passwordEnabled(true)));
+
+      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplate&id=17&bootable=true&displaytext=description&format=VHD&name=thename&ostypeid=12&passwordenabled=true HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   HttpRequest copyTemplate = HttpRequest.builder().method("GET")
+                                         .endpoint("http://localhost:8080/client/api")
+                                         .addQueryParam("response", "json")
+                                         .addQueryParam("command", "copyTemplate")
+                                         .addQueryParam("id", "17")
+                                         .addQueryParam("sourcezoneid", "18")
+                                         .addQueryParam("destzoneid", "19").build();
+
+   public void testCopyTemplate() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "copyTemplateToZone", String.class, String.class, String.class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, 18, 19));
+
+      assertRequestLineEquals(httpRequest,copyTemplate.getRequestLine());
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   public void testDeleteTemplate() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "deleteTemplate", String.class, DeleteTemplateOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
+
+      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=deleteTemplate&id=17 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   public void testDeleteTemplateOptions() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "deleteTemplate", String.class, DeleteTemplateOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, DeleteTemplateOptions.Builder.zoneId("8")));
+
+      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=deleteTemplate&id=17&zoneid=8 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   public void testListTemplates() throws SecurityException, NoSuchMethodException, IOException {
+      Invokable<?, ?> method = method(TemplateApi.class, "listTemplates");
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
+
+      assertRequestLineEquals(httpRequest,
+            "GET http://localhost:8080/client/api?response=json&command=listTemplates&listAll=true&templatefilter=executable HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testListTemplatesOptions() throws SecurityException, NoSuchMethodException, IOException {
+      Invokable<?, ?> method = method(TemplateApi.class, "listTemplates", ListTemplatesOptions.class);
+      GeneratedHttpRequest httpRequest = processor
+            .createRequest(
+                  method, ImmutableList.<Object> of(
+                  ListTemplatesOptions.Builder.accountInDomain("adrian", "6").hypervisor("xen")
+                        .filter(TemplateFilter.FEATURED)));
+
+      assertRequestLineEquals(
+            httpRequest,
+            "GET http://localhost:8080/client/api?response=json&command=listTemplates&listAll=true&account=adrian&domainid=6&hypervisor=xen&templatefilter=featured HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testGetTemplate() throws SecurityException, NoSuchMethodException, IOException {
+      Invokable<?, ?> method = method(TemplateApi.class, "getTemplateInZone", String.class, String.class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5, 1));
+
+      assertRequestLineEquals(
+            httpRequest,
+            "GET http://localhost:8080/client/api?response=json&command=listTemplates&listAll=true&templatefilter=executable&id=5&zoneid=1 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest,
+            Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testUpdateTemplatePermissions() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "updateTemplatePermissions", String.class, UpdateTemplatePermissionsOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
+
+      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplatePermissions&id=17 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   public void testUpdateTemplatePermissionsOptions() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "updateTemplatePermissions", String.class, UpdateTemplatePermissionsOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, UpdateTemplatePermissionsOptions.Builder.accounts(ImmutableSet.of("5", "6")).isExtractable(true).isFeatured(true).isPublic(true).op(UpdateTemplatePermissionsOptions.Operation.add)));
+
+      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplatePermissions&id=17&accounts=5,6&isextractable=true&isfeatured=true&ispublic=true&op=add HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   public void testListTemplatePermissions() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "listTemplatePermissions", String.class, AccountInDomainOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
+
+      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=listTemplatePermissions&listAll=true&id=17 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   public void testListTemplatePermissionsOptions() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "listTemplatePermissions", String.class, AccountInDomainOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, AccountInDomainOptions.Builder.accountInDomain("fred", "8")));
+
+      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=listTemplatePermissions&listAll=true&id=17&account=fred&domainid=8 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   HttpRequest extractTemplate = HttpRequest.builder().method("GET")
+                                            .endpoint("http://localhost:8080/client/api")
+                                            .addQueryParam("response", "json")
+                                            .addQueryParam("command", "extractTemplate")
+                                            .addQueryParam("id", "3")
+                                            .addQueryParam("mode", "HTTP_DOWNLOAD")
+                                            .addQueryParam("zoneid", "5").build();
+
+   public void testExtractTemplate() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "extractTemplate", String.class, ExtractMode.class, String.class, ExtractTemplateOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, ExtractMode.HTTP_DOWNLOAD, 5));
+
+      assertRequestLineEquals(httpRequest, extractTemplate.getRequestLine());
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+
+   HttpRequest extractTemplateOptions = HttpRequest.builder().method("GET")
+                                                   .endpoint("http://localhost:8080/client/api")
+                                                   .addQueryParam("response", "json")
+                                                   .addQueryParam("command", "extractTemplate")
+                                                   .addQueryParam("id", "3")
+                                                   .addQueryParam("mode", "HTTP_DOWNLOAD")
+                                                   .addQueryParam("zoneid", "5")
+                                                   .addQueryParam("url", "http%3A//example.com/").build();
+
+   public void testExtractTemplateOptions() throws NoSuchMethodException {
+      Invokable<?, ?> method = method(TemplateApi.class, "extractTemplate", String.class, ExtractMode.class, String.class, ExtractTemplateOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, ExtractMode.HTTP_DOWNLOAD, 5, ExtractTemplateOptions.Builder.url("http://example.com/")));
+
+      assertRequestLineEquals(httpRequest, extractTemplateOptions.getRequestLine());
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+   }
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/c6986efd/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateAsyncClientTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateAsyncClientTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateAsyncClientTest.java
deleted file mode 100644
index d4acbff..0000000
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateAsyncClientTest.java
+++ /dev/null
@@ -1,402 +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.cloudstack.features;
-
-import static org.jclouds.reflect.Reflection2.method;
-
-import java.io.IOException;
-
-import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
-import org.jclouds.Fallbacks.NullOnNotFoundOr404;
-import org.jclouds.cloudstack.domain.ExtractMode;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.TemplateFilter;
-import org.jclouds.cloudstack.domain.TemplateMetadata;
-import org.jclouds.cloudstack.internal.BaseCloudStackAsyncClientTest;
-import org.jclouds.cloudstack.options.AccountInDomainOptions;
-import org.jclouds.cloudstack.options.CreateTemplateOptions;
-import org.jclouds.cloudstack.options.DeleteTemplateOptions;
-import org.jclouds.cloudstack.options.ExtractTemplateOptions;
-import org.jclouds.cloudstack.options.ListTemplatesOptions;
-import org.jclouds.cloudstack.options.RegisterTemplateOptions;
-import org.jclouds.cloudstack.options.UpdateTemplateOptions;
-import org.jclouds.cloudstack.options.UpdateTemplatePermissionsOptions;
-import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
-import org.jclouds.functions.IdentityFunction;
-import org.jclouds.http.HttpRequest;
-import org.jclouds.http.functions.ParseFirstJsonValueNamed;
-import org.jclouds.http.functions.ReleasePayloadAndReturn;
-import org.jclouds.http.functions.UnwrapOnlyJsonValue;
-import org.jclouds.rest.internal.GeneratedHttpRequest;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.reflect.Invokable;
-/**
- * Tests behavior of {@code TemplateAsyncClient}
- * 
- * @author Adrian Cole
- */
-// NOTE:without testName, this will not call @Before* and fail w/NPE during
-// surefire
-@Test(groups = "unit", testName = "TemplateAsyncClientTest")
-public class TemplateAsyncClientTest extends BaseCloudStackAsyncClientTest<TemplateAsyncClient> {
-
-   public void testCreateTemplate() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "createTemplate", TemplateMetadata.class, CreateTemplateOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build()));
-
-      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=createTemplate&name=thename&ostypeid=10&displaytext=description HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   public void testCreateTemplateOptions() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "createTemplate", TemplateMetadata.class, CreateTemplateOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build(), CreateTemplateOptions.Builder.bits(32).isFeatured(true).isPublic(true).passwordEnabled(true).requiresHVM(true).snapshotId("11").volumeId("12")));
-
-      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=createTemplate&bits=32&isfeatured=true&ispublic=true&passwordenabled=true&requireshvm=true&snapshotid=11&volumeid=12&name=thename&ostypeid=10&displaytext=description HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   HttpRequest registerTemplate = HttpRequest.builder().method("GET")
-                                             .endpoint("http://localhost:8080/client/api")
-                                             .addQueryParam("response", "json")
-                                             .addQueryParam("command", "registerTemplate")
-                                             .addQueryParam("format", "QCOW2")
-                                             .addQueryParam("hypervisor", "xen")
-                                             .addQueryParam("url", "http%3A//example.com/")
-                                             .addQueryParam("zoneid", "20")
-                                             .addQueryParam("name", "thename")
-                                             .addQueryParam("ostypeid", "10")
-                                             .addQueryParam("displaytext", "description").build();
-
-   public void testRegisterTemplate() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "registerTemplate", TemplateMetadata.class, String.class, String.class, String.class, String.class, RegisterTemplateOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build(), Template.Format.QCOW2, "xen", "http://example.com/", 20));
-
-      assertRequestLineEquals(httpRequest, registerTemplate.getRequestLine());
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   HttpRequest registerTemplateOptions = HttpRequest.builder().method("GET")
-                                                    .endpoint("http://localhost:8080/client/api")
-                                                    .addQueryParam("response", "json")
-                                                    .addQueryParam("command", "registerTemplate")
-                                                    .addQueryParam("format", "QCOW2")
-                                                    .addQueryParam("hypervisor", "xen")
-                                                    .addQueryParam("url", "http%3A//example.com/")
-                                                    .addQueryParam("zoneid", "20")
-                                                    .addQueryParam("account", "mydomain")
-                                                    .addQueryParam("domainid", "3")
-                                                    .addQueryParam("bits", "32")
-                                                    .addQueryParam("checksum", "ABC")
-                                                    .addQueryParam("isextractable", "true")
-                                                    .addQueryParam("isfeatured", "true")
-                                                    .addQueryParam("ispublic", "true")
-                                                    .addQueryParam("passwordenabled", "true")
-                                                    .addQueryParam("requireshvm", "true")
-                                                    .addQueryParam("name", "thename")
-                                                    .addQueryParam("ostypeid", "10")
-                                                    .addQueryParam("displaytext", "description").build();
-
-   public void testRegisterTemplateOptions() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "registerTemplate", TemplateMetadata.class, String.class, String.class, String.class, String.class, RegisterTemplateOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(TemplateMetadata.builder().name("thename").osTypeId("10").displayText("description").build(), Template.Format.QCOW2, "xen", "http://example.com/", 20,
-         RegisterTemplateOptions.Builder.accountInDomain("mydomain", "3").bits(32).checksum("ABC").isExtractable(true).isFeatured(true).isPublic(true).passwordEnabled(true).requiresHVM(true)));
-
-      assertRequestLineEquals(httpRequest, registerTemplateOptions.getRequestLine());
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   public void testUpdateTemplate() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "updateTemplate", String.class, UpdateTemplateOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
-
-      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplate&id=17 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   public void testUpdateTemplateOptions() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "updateTemplate", String.class, UpdateTemplateOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, UpdateTemplateOptions.Builder.bootable(true).displayText("description").format(Template.Format.VHD).name("thename").osTypeId("12").passwordEnabled(true)));
-
-      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplate&id=17&bootable=true&displaytext=description&format=VHD&name=thename&ostypeid=12&passwordenabled=true HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   HttpRequest copyTemplate = HttpRequest.builder().method("GET")
-                                         .endpoint("http://localhost:8080/client/api")
-                                         .addQueryParam("response", "json")
-                                         .addQueryParam("command", "copyTemplate")
-                                         .addQueryParam("id", "17")
-                                         .addQueryParam("sourcezoneid", "18")
-                                         .addQueryParam("destzoneid", "19").build();
-
-   public void testCopyTemplate() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "copyTemplateToZone", String.class, String.class, String.class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, 18, 19));
-
-      assertRequestLineEquals(httpRequest,copyTemplate.getRequestLine());
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   public void testDeleteTemplate() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "deleteTemplate", String.class, DeleteTemplateOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
-
-      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=deleteTemplate&id=17 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   public void testDeleteTemplateOptions() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "deleteTemplate", String.class, DeleteTemplateOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, DeleteTemplateOptions.Builder.zoneId("8")));
-
-      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=deleteTemplate&id=17&zoneid=8 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   public void testListTemplates() throws SecurityException, NoSuchMethodException, IOException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "listTemplates");
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
-
-      assertRequestLineEquals(httpRequest,
-            "GET http://localhost:8080/client/api?response=json&command=listTemplates&listAll=true&templatefilter=executable HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
-      checkFilters(httpRequest);
-
-   }
-
-   public void testListTemplatesOptions() throws SecurityException, NoSuchMethodException, IOException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "listTemplates", ListTemplatesOptions.class);
-      GeneratedHttpRequest httpRequest = processor
-            .createRequest(
-                  method, ImmutableList.<Object> of(
-                  ListTemplatesOptions.Builder.accountInDomain("adrian", "6").hypervisor("xen")
-                        .filter(TemplateFilter.FEATURED)));
-
-      assertRequestLineEquals(
-            httpRequest,
-            "GET http://localhost:8080/client/api?response=json&command=listTemplates&listAll=true&account=adrian&domainid=6&hypervisor=xen&templatefilter=featured HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
-
-      checkFilters(httpRequest);
-
-   }
-
-   public void testGetTemplate() throws SecurityException, NoSuchMethodException, IOException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "getTemplateInZone", String.class, String.class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5, 1));
-
-      assertRequestLineEquals(
-            httpRequest,
-            "GET http://localhost:8080/client/api?response=json&command=listTemplates&listAll=true&templatefilter=executable&id=5&zoneid=1 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest,
-            Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
-
-      checkFilters(httpRequest);
-
-   }
-
-   public void testUpdateTemplatePermissions() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "updateTemplatePermissions", String.class, UpdateTemplatePermissionsOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
-
-      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplatePermissions&id=17 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   public void testUpdateTemplatePermissionsOptions() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "updateTemplatePermissions", String.class, UpdateTemplatePermissionsOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, UpdateTemplatePermissionsOptions.Builder.accounts(ImmutableSet.of("5", "6")).isExtractable(true).isFeatured(true).isPublic(true).op(UpdateTemplatePermissionsOptions.Operation.add)));
-
-      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=updateTemplatePermissions&id=17&accounts=5,6&isextractable=true&isfeatured=true&ispublic=true&op=add HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   public void testListTemplatePermissions() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "listTemplatePermissions", String.class, AccountInDomainOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17));
-
-      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=listTemplatePermissions&listAll=true&id=17 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   public void testListTemplatePermissionsOptions() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "listTemplatePermissions", String.class, AccountInDomainOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(17, AccountInDomainOptions.Builder.accountInDomain("fred", "8")));
-
-      assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=listTemplatePermissions&listAll=true&id=17&account=fred&domainid=8 HTTP/1.1");
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   HttpRequest extractTemplate = HttpRequest.builder().method("GET")
-                                            .endpoint("http://localhost:8080/client/api")
-                                            .addQueryParam("response", "json")
-                                            .addQueryParam("command", "extractTemplate")
-                                            .addQueryParam("id", "3")
-                                            .addQueryParam("mode", "HTTP_DOWNLOAD")
-                                            .addQueryParam("zoneid", "5").build();
-
-   public void testExtractTemplate() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "extractTemplate", String.class, ExtractMode.class, String.class, ExtractTemplateOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, ExtractMode.HTTP_DOWNLOAD, 5));
-
-      assertRequestLineEquals(httpRequest, extractTemplate.getRequestLine());
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-
-   HttpRequest extractTemplateOptions = HttpRequest.builder().method("GET")
-                                                   .endpoint("http://localhost:8080/client/api")
-                                                   .addQueryParam("response", "json")
-                                                   .addQueryParam("command", "extractTemplate")
-                                                   .addQueryParam("id", "3")
-                                                   .addQueryParam("mode", "HTTP_DOWNLOAD")
-                                                   .addQueryParam("zoneid", "5")
-                                                   .addQueryParam("url", "http%3A//example.com/").build();
-
-   public void testExtractTemplateOptions() throws NoSuchMethodException {
-      Invokable<?, ?> method = method(TemplateAsyncClient.class, "extractTemplate", String.class, ExtractMode.class, String.class, ExtractTemplateOptions[].class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(3, ExtractMode.HTTP_DOWNLOAD, 5, ExtractTemplateOptions.Builder.url("http://example.com/")));
-
-      assertRequestLineEquals(httpRequest, extractTemplateOptions.getRequestLine());
-      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
-      assertPayloadEquals(httpRequest, null, null, false);
-
-      assertResponseParserClassEquals(method, httpRequest, UnwrapOnlyJsonValue.class);
-      assertSaxResponseParserClassEquals(method, null);
-      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
-
-      checkFilters(httpRequest);
-   }
-}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/c6986efd/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java
deleted file mode 100644
index 8afcf99..0000000
--- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/TemplateClientLiveTest.java
+++ /dev/null
@@ -1,219 +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.cloudstack.features;
-
-import static org.jclouds.cloudstack.options.ListTemplatesOptions.Builder.zoneId;
-import static org.jclouds.util.Predicates2.retry;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
-
-import java.net.URI;
-import java.net.URLDecoder;
-import java.util.Set;
-
-import org.jclouds.cloudstack.domain.AsyncCreateResponse;
-import org.jclouds.cloudstack.domain.AsyncJob;
-import org.jclouds.cloudstack.domain.ExtractMode;
-import org.jclouds.cloudstack.domain.Network;
-import org.jclouds.cloudstack.domain.OSType;
-import org.jclouds.cloudstack.domain.Template;
-import org.jclouds.cloudstack.domain.TemplateExtraction;
-import org.jclouds.cloudstack.domain.TemplateMetadata;
-import org.jclouds.cloudstack.domain.VirtualMachine;
-import org.jclouds.cloudstack.domain.Volume;
-import org.jclouds.cloudstack.domain.Zone;
-import org.jclouds.cloudstack.internal.BaseCloudStackClientLiveTest;
-import org.jclouds.cloudstack.options.CreateTemplateOptions;
-import org.jclouds.cloudstack.options.ListNetworksOptions;
-import org.jclouds.cloudstack.options.ListVolumesOptions;
-import org.jclouds.cloudstack.options.RegisterTemplateOptions;
-import org.jclouds.logging.Logger;
-import org.testng.annotations.AfterGroups;
-import org.testng.annotations.Test;
-
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-
-/**
- * Tests behavior of {@code TemplateClient}
- * 
- * @author Adrian Cole
- */
-@Test(groups = "live", singleThreaded = true, testName = "TemplateClientLiveTest")
-public class TemplateClientLiveTest extends BaseCloudStackClientLiveTest {
-
-   private static final String IMPORT_VHD_URL = "http://www.frontiertown.co.uk/jclouds/empty.vhd";
-   private VirtualMachine vmForCreation;
-   private VirtualMachine vmForRegistration;
-   private Template createdTemplate;
-   private Template registeredTemplate;
-
-   @Test
-   public void testListTemplates() throws Exception {
-      Set<Template> response = client.getTemplateClient().listTemplates();
-      assert null != response;
-      long templateCount = response.size();
-      assertTrue(templateCount >= 0);
-      for (Template template : response) {
-         Template newDetails = Iterables.getOnlyElement(client.getTemplateClient().listTemplates(
-               zoneId(template.getZoneId()).id(template.getId())));
-         Logger.CONSOLE.info("Checking template: " + template);
-
-         assertEquals(template, newDetails);
-         assertEquals(template, client.getTemplateClient().getTemplateInZone(template.getId(), template.getZoneId()));
-         assert template.getId() != null : template;
-         assert template.getName() != null : template;
-         assert template.getDisplayText() != null : template;
-         assert template.getCreated() != null : template;
-         assert template.getFormat() != null && template.getFormat() != Template.Format.UNRECOGNIZED : template;
-         assert template.getOSType() != null : template;
-         assert template.getOSTypeId() != null : template;
-         assert template.getAccount() != null : template;
-         assert template.getZone() != null : template;
-         assert template.getZoneId() != null : template;
-         assert (template.getStatus() == null ||
-            template.getStatus() == Template.Status.DOWNLOADED) : template;
-         assert template.getType() != null && template.getType() != Template.Type.UNRECOGNIZED : template;
-         assert template.getHypervisor() != null : template;
-         assert template.getDomain() != null : template;
-         assert template.getDomainId() != null : template;
-         assert template.getSize() > 0 : template;
-      }
-   }
-
-   @Test(enabled = true)
-   public void testCreateTemplate() throws Exception {
-      Zone zone = Iterables.getFirst(client.getZoneClient().listZones(), null);
-      assertNotNull(zone);
-      Iterable<Network> networks = client.getNetworkClient().listNetworks(ListNetworksOptions.Builder.zoneId(zone.getId()).isDefault(true));
-      networks = Iterables.filter(networks, new Predicate<Network>() {
-         @Override
-         public boolean apply(Network network) {
-            return network != null && network.getState().equals("Implemented");
-         }
-      });
-      assertTrue(Iterables.size(networks) >= 1);
-      Network network = Iterables.get(networks, 0);
-      assertNotNull(network);
-
-      // Create a VM and stop it
-      String defaultTemplate = template != null ? template.getImageId() : null;
-      vmForCreation = VirtualMachineClientLiveTest.createVirtualMachineInNetwork(network, defaultTemplate, client, jobComplete, virtualMachineRunning);
-      assertTrue(jobComplete.apply(client.getVirtualMachineClient().stopVirtualMachine(vmForCreation.getId())), vmForCreation.toString());
-
-      // Work out the VM's volume
-      Set<Volume> volumes = client.getVolumeClient().listVolumes(ListVolumesOptions.Builder.virtualMachineId(vmForCreation.getId()));
-      assertEquals(volumes.size(), 1);
-      Volume volume = Iterables.getOnlyElement(volumes);
-
-      // Create a template
-      CreateTemplateOptions options = CreateTemplateOptions.Builder.volumeId(volume.getId());
-      AsyncCreateResponse response = client.getTemplateClient().createTemplate(TemplateMetadata.builder().name(prefix+"-createTemplate").osTypeId(vmForCreation.getGuestOSId()).displayText("jclouds live testCreateTemplate").build(), options);
-      assertTrue(jobComplete.apply(response.getJobId()), vmForCreation.toString());
-      createdTemplate = client.getTemplateClient().getTemplateInZone(response.getId(), vmForCreation.getZoneId());
-
-      // Assertions
-      assertNotNull(createdTemplate);
-   }
-
-   @Test(enabled = true, dependsOnMethods = "testRegisterTemplate")
-   public void testExtractTemplate() throws Exception {
-      // Initiate the extraction and wait for it to complete
-      AsyncCreateResponse response = client.getTemplateClient().extractTemplate(registeredTemplate.getId(), ExtractMode.HTTP_DOWNLOAD, registeredTemplate.getZoneId());
-      assertTrue(jobComplete.apply(response.getJobId()), registeredTemplate.toString());
-
-      // Get the result
-      AsyncJob<TemplateExtraction> asyncJob = client.getAsyncJobClient().getAsyncJob(response.getJobId());
-      TemplateExtraction extract = asyncJob.getResult();
-      assertNotNull(extract);
-
-      // Check that the URL can be retrieved
-      String extractUrl = extract.getUrl();
-      assertNotNull(extractUrl);
-      URI uri = new URI(URLDecoder.decode(extractUrl, "utf-8"));
-      assertTrue(cloudStackContext.utils().http().exists(uri), "does not exist: " + uri);
-   }
-
-   @Test(enabled = true)
-   public void testRegisterTemplate() throws Exception {
-      Zone zone = Iterables.getFirst(client.getZoneClient().listZones(), null);
-      assertNotNull(zone);
-      Iterable<Network> networks = client.getNetworkClient().listNetworks(ListNetworksOptions.Builder.zoneId(zone.getId()).isDefault(true));
-      networks = Iterables.filter(networks, new Predicate<Network>() {
-         @Override
-         public boolean apply(Network network) {
-            return network != null && network.getName().equals("Virtual Network");
-         }
-      });
-      assertEquals(Iterables.size(networks), 1);
-      Network network = Iterables.getOnlyElement(networks, null);
-      assertNotNull(network);
-      Set<OSType> osTypes = client.getGuestOSClient().listOSTypes();
-      OSType osType = Iterables.getFirst(osTypes, null);
-
-      // Register a template
-      RegisterTemplateOptions options = RegisterTemplateOptions.Builder.bits(32).isExtractable(true);
-      TemplateMetadata templateMetadata = TemplateMetadata.builder().name(prefix+"-registerTemplate").osTypeId(osType.getId()).displayText("jclouds live testRegisterTemplate").build();
-      Set<Template> templates = client.getTemplateClient().registerTemplate(templateMetadata, "VHD", "XenServer", IMPORT_VHD_URL, zone.getId(), options);
-      registeredTemplate = Iterables.getOnlyElement(templates, null);
-      assertNotNull(registeredTemplate);
-
-      // Ensure it is available
-      final String zoneId = zone.getId();
-      Predicate<Template> templateReadyPredicate = new Predicate<Template>() {
-         @Override
-         public boolean apply(Template template) {
-            if (template == null) return false;
-            Template t2 = client.getTemplateClient().getTemplateInZone(template.getId(), zoneId);
-            Logger.CONSOLE.info("%s", t2.getStatus());
-            return t2.getStatus() == Template.Status.DOWNLOADED;
-         }
-      };
-      assertTrue(retry(templateReadyPredicate, 60000).apply(registeredTemplate));
-
-      // Create a VM that uses this template
-      vmForRegistration = VirtualMachineClientLiveTest.createVirtualMachineInNetwork(network, registeredTemplate.getId(), client, jobComplete, virtualMachineRunning);
-      assertNotNull(vmForRegistration);
-   }
-
-
-   @AfterGroups(groups = "live")
-   @Override
-   protected void tearDownContext() {
-      if (vmForCreation != null) {
-         assertTrue(jobComplete.apply(client.getVirtualMachineClient().stopVirtualMachine(vmForCreation.getId())), vmForCreation.toString());
-         assertTrue(jobComplete.apply(client.getVirtualMachineClient().destroyVirtualMachine(vmForCreation.getId())), vmForCreation.toString());
-         assertTrue(virtualMachineDestroyed.apply(vmForCreation));
-      }
-      if (vmForRegistration != null) {
-         assertTrue(jobComplete.apply(client.getVirtualMachineClient().stopVirtualMachine(vmForRegistration.getId())), vmForRegistration.toString());
-         assertTrue(jobComplete.apply(client.getVirtualMachineClient().destroyVirtualMachine(vmForRegistration.getId())), vmForRegistration.toString());
-         assert virtualMachineDestroyed.apply(vmForRegistration);
-      }
-      if (createdTemplate != null) {
-         AsyncCreateResponse deleteJob = client.getTemplateClient().deleteTemplate(createdTemplate.getId());
-         assertTrue(jobComplete.apply(deleteJob.getJobId()));
-      }
-      if (registeredTemplate != null) {
-         AsyncCreateResponse deleteJob = client.getTemplateClient().deleteTemplate(registeredTemplate.getId());
-         assertTrue(jobComplete.apply(deleteJob.getJobId()));
-      }
-      super.tearDownContext();
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/c6986efd/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupApiLiveTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupApiLiveTest.java
new file mode 100644
index 0000000..3385243
--- /dev/null
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupApiLiveTest.java
@@ -0,0 +1,71 @@
+/*
+ * 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.cloudstack.features;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.Random;
+import java.util.Set;
+
+import org.jclouds.cloudstack.domain.VMGroup;
+import org.jclouds.cloudstack.internal.BaseCloudStackApiLiveTest;
+import org.jclouds.cloudstack.options.ListVMGroupsOptions;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.Iterables;
+
+/**
+ * Tests behavior of {@code VMGroupApi}
+ *
+ * @author Richard Downer
+ */
+@Test(groups = "live", singleThreaded = true, testName = "VMGroupApiLiveTest")
+public class VMGroupApiLiveTest extends BaseCloudStackApiLiveTest {
+
+   private VMGroup groupCreated;
+
+   public VMGroupApiLiveTest() {
+      prefix += "2";
+   }
+
+   @Test
+   public void testCreateListDestroyVMGroup() {
+      VMGroupApi vmGroupClient = client.getVMGroupApi();
+      String name = "jclouds-test-" + (Integer.toHexString(new Random().nextInt()));
+      groupCreated = vmGroupClient.createInstanceGroup(name);
+      assertEquals(groupCreated.getName(), name);
+
+      Set<VMGroup> search = vmGroupClient.listInstanceGroups(ListVMGroupsOptions.Builder.name(name));
+      assertEquals(1, search.size());
+      VMGroup groupFound = Iterables.getOnlyElement(search);
+      assertEquals(groupFound, groupCreated);
+
+      vmGroupClient.deleteInstanceGroup(groupCreated.getId());
+      groupCreated = null;
+   }
+
+   @AfterGroups(groups = "live")
+   @Override
+   protected void tearDownContext() {
+      if (groupCreated != null) {
+         client.getVMGroupApi().deleteInstanceGroup(groupCreated.getId());
+      }
+      super.tearDownContext();
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/c6986efd/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupApiTest.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupApiTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupApiTest.java
new file mode 100644
index 0000000..af0ba51
--- /dev/null
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VMGroupApiTest.java
@@ -0,0 +1,171 @@
+/*
+ * 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.cloudstack.features;
+
+import static org.jclouds.reflect.Reflection2.method;
+
+import java.io.IOException;
+
+import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404;
+import org.jclouds.Fallbacks.NullOnNotFoundOr404;
+import org.jclouds.Fallbacks.VoidOnNotFoundOr404;
+import org.jclouds.cloudstack.internal.BaseCloudStackApiTest;
+import org.jclouds.cloudstack.options.CreateVMGroupOptions;
+import org.jclouds.cloudstack.options.ListVMGroupsOptions;
+import org.jclouds.cloudstack.options.UpdateVMGroupOptions;
+import org.jclouds.fallbacks.MapHttp4xxCodesToExceptions;
+import org.jclouds.functions.IdentityFunction;
+import org.jclouds.http.functions.ParseFirstJsonValueNamed;
+import org.jclouds.http.functions.ReleasePayloadAndReturn;
+import org.jclouds.rest.internal.GeneratedHttpRequest;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Functions;
+import com.google.common.collect.ImmutableList;
+import com.google.common.reflect.Invokable;
+/**
+ * Tests behavior of {@code VMGroupApi}
+ *
+ * @author Richard Downer
+ */
+// NOTE:without testName, this will not call @Before* and fail w/NPE during
+// surefire
+@Test(groups = "unit", testName = "VMGroupApiTest")
+public class VMGroupApiTest extends BaseCloudStackApiTest<VMGroupApi> {
+
+   public void testListVMGroups() throws SecurityException, NoSuchMethodException, IOException {
+      Invokable<?, ?> method = method(VMGroupApi.class, "listInstanceGroups", ListVMGroupsOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.of());
+
+      assertRequestLineEquals(httpRequest,
+         "GET http://localhost:8080/client/api?response=json&command=listInstanceGroups&listAll=true HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testListVMGroupsOptions() throws SecurityException, NoSuchMethodException, IOException {
+      Invokable<?, ?> method = method(VMGroupApi.class, "listInstanceGroups", ListVMGroupsOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(ListVMGroupsOptions.Builder.account("fred")
+         .domainId("5").id("6")));
+
+      assertRequestLineEquals(
+         httpRequest,
+         "GET http://localhost:8080/client/api?response=json&command=listInstanceGroups&listAll=true&account=fred&domainid=5&id=6 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, EmptySetOnNotFoundOr404.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testGetVMGroup() throws SecurityException, NoSuchMethodException, IOException {
+      Invokable<?, ?> method = method(VMGroupApi.class, "getInstanceGroup", String.class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
+
+      assertRequestLineEquals(httpRequest,
+         "GET http://localhost:8080/client/api?response=json&command=listInstanceGroups&listAll=true&id=5 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest,
+         Functions.compose(IdentityFunction.INSTANCE, IdentityFunction.INSTANCE).getClass());
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, NullOnNotFoundOr404.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testCreateVMGroup() throws SecurityException, NoSuchMethodException, IOException {
+      Invokable<?, ?> method = method(VMGroupApi.class, "createInstanceGroup", String.class, CreateVMGroupOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("goo"));
+
+      assertRequestLineEquals(httpRequest,
+         "GET http://localhost:8080/client/api?response=json&command=createInstanceGroup&name=goo HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testCreateVMGroupOptions() throws SecurityException, NoSuchMethodException, IOException {
+      Invokable<?, ?> method = method(VMGroupApi.class, "createInstanceGroup", String.class, CreateVMGroupOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("goo", CreateVMGroupOptions.Builder.account("foo").domainId("42")));
+
+      assertRequestLineEquals(httpRequest,
+         "GET http://localhost:8080/client/api?response=json&command=createInstanceGroup&name=goo&account=foo&domainid=42 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testUpdateVMGroup() throws SecurityException, NoSuchMethodException, IOException {
+      Invokable<?, ?> method = method(VMGroupApi.class, "updateInstanceGroup", String.class, UpdateVMGroupOptions[].class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5, UpdateVMGroupOptions.Builder.name("fred")));
+
+      assertRequestLineEquals(httpRequest,
+         "GET http://localhost:8080/client/api?response=json&command=updateInstanceGroup&id=5&name=fred HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ParseFirstJsonValueNamed.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, MapHttp4xxCodesToExceptions.class);
+
+      checkFilters(httpRequest);
+
+   }
+
+   public void testDeleteVMGroup() throws SecurityException, NoSuchMethodException, IOException {
+      Invokable<?, ?> method = method(VMGroupApi.class, "deleteInstanceGroup", String.class);
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(5));
+
+      assertRequestLineEquals(httpRequest,
+         "GET http://localhost:8080/client/api?response=json&command=deleteInstanceGroup&id=5 HTTP/1.1");
+      assertNonPayloadHeadersEqual(httpRequest, "");
+      assertPayloadEquals(httpRequest, null, null, false);
+
+      assertResponseParserClassEquals(method, httpRequest, ReleasePayloadAndReturn.class);
+      assertSaxResponseParserClassEquals(method, null);
+      assertFallbackClassEquals(method, VoidOnNotFoundOr404.class);
+
+      checkFilters(httpRequest);
+
+   }
+}