From cf438c92521ec6ab04e75b157f6d093849f80b58 Mon Sep 17 00:00:00 2001
From: "adrian.f.cole" <adrian.f.cole@3d8758e0-26b5-11de-8745-db77d3ebf521>
Date: Mon, 21 Dec 2009 09:26:03 +0000
Subject: [PATCH] Issue 112: started work on configureVApp

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2499 3d8758e0-26b5-11de-8745-db77d3ebf521
---
 .../vcloud/terremark/TerremarkVCloudAsyncClient.java |  2 +-
 .../ReturnVoidOnDeleteDefaultIp.java                 |  2 +-
 .../terremark/TerremarkVCloudClientLiveTest.java     | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)
 rename vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/{options => functions}/ReturnVoidOnDeleteDefaultIp.java (97%)

diff --git a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudAsyncClient.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudAsyncClient.java
index 2c705ea2bc..adab61c6e5 100644
--- a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudAsyncClient.java
+++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/TerremarkVCloudAsyncClient.java
@@ -67,9 +67,9 @@ import org.jclouds.vcloud.terremark.domain.NodeConfiguration;
 import org.jclouds.vcloud.terremark.domain.Protocol;
 import org.jclouds.vcloud.terremark.domain.PublicIpAddress;
 import org.jclouds.vcloud.terremark.domain.TerremarkVApp;
+import org.jclouds.vcloud.terremark.functions.ReturnVoidOnDeleteDefaultIp;
 import org.jclouds.vcloud.terremark.options.AddInternetServiceOptions;
 import org.jclouds.vcloud.terremark.options.AddNodeOptions;
-import org.jclouds.vcloud.terremark.options.ReturnVoidOnDeleteDefaultIp;
 import org.jclouds.vcloud.terremark.xml.ComputeOptionsHandler;
 import org.jclouds.vcloud.terremark.xml.CustomizationParametersHandler;
 import org.jclouds.vcloud.terremark.xml.InternetServiceHandler;
diff --git a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/ReturnVoidOnDeleteDefaultIp.java b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/functions/ReturnVoidOnDeleteDefaultIp.java
similarity index 97%
rename from vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/ReturnVoidOnDeleteDefaultIp.java
rename to vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/functions/ReturnVoidOnDeleteDefaultIp.java
index 2e7d368011..a504f6ba2c 100644
--- a/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/options/ReturnVoidOnDeleteDefaultIp.java
+++ b/vcloud/terremark/src/main/java/org/jclouds/vcloud/terremark/functions/ReturnVoidOnDeleteDefaultIp.java
@@ -21,7 +21,7 @@
  * under the License.
  * ====================================================================
  */
-package org.jclouds.vcloud.terremark.options;
+package org.jclouds.vcloud.terremark.functions;
 
 import java.lang.reflect.Constructor;
 
diff --git a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java
index 7b73e2e7ad..fb7ecab5f8 100644
--- a/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java
+++ b/vcloud/terremark/src/test/java/org/jclouds/vcloud/terremark/TerremarkVCloudClientLiveTest.java
@@ -274,14 +274,18 @@ public class TerremarkVCloudClientLiveTest extends VCloudClientLiveTest {
       node = tmClient.addNode(is.getId(), Iterables.getLast(vApp.getNetworkToAddresses().values()),
                vApp.getName() + "-SSH", 22);
 
-      node = tmClient.configureNode(node.getId(), new NodeConfiguration().changeNameTo(vApp
-               .getName()
-               + "-ssh"));
-      assertEquals(node.getName(), vApp.getName() + "-ssh");
       publicIp = is.getPublicIpAddress().getAddress();
       doCheckPass(publicIp);
    }
 
+   @Test(dependsOnMethods = { "testPublicIp" })
+   public void testConfigureNode() throws InterruptedException, ExecutionException,
+            TimeoutException, IOException {
+      node = tmClient.configureNode(node.getId(), new NodeConfiguration()
+               .changeDescriptionTo("holy cow"));
+      assertEquals(node.getDescription(), "holy cow");
+   }
+
    @Test(dependsOnMethods = "testPublicIp")
    public void testLifeCycle() throws InterruptedException, ExecutionException, TimeoutException,
             IOException {