From c8bbe64403b41e10b16e885c1282c3861ddcb844 Mon Sep 17 00:00:00 2001
From: Kedar Dave <kedar.p.dave@gmail.com>
Date: Fri, 3 Jun 2011 00:16:36 -0500
Subject: [PATCH] cleanup and refine vmclientlivetest

---
 .../vpdc/features/VMClientLiveTest.java       | 38 +++++--------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java
index db58130890..33a06932b0 100644
--- a/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java
+++ b/providers/savvis-symphonyvpdc/src/test/java/org/jclouds/savvis/vpdc/features/VMClientLiveTest.java
@@ -21,11 +21,9 @@ package org.jclouds.savvis.vpdc.features;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.testng.Assert.assertEquals;
 
-import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.jclouds.Constants;
 import org.jclouds.cim.OSType;
 import org.jclouds.compute.domain.CIMOperatingSystem;
 import org.jclouds.compute.domain.ExecResponse;
@@ -194,8 +192,8 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
          // fetch the task again, in savvis, task.getOwner is populated with vApp after task has finished
          task = restContext.getApi().getBrowsingClient().getTask(task.getId());
          
-         vm = restContext.getApi().getBrowsingClient().getVM(task.getOwner().getHref(), GetVMOptions.NONE);
-         assert vm.getHref() != null : vm;
+         VM newVM = restContext.getApi().getBrowsingClient().getVM(task.getOwner().getHref(), GetVMOptions.NONE);
+         assert newVM.getHref() != null : newVM;
       }
    }
    
@@ -242,7 +240,7 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
       }
    }
 
-   @Test(dependsOnMethods="testPowerOnVM")
+   @Test(dependsOnMethods="testCreateVirtualMachine")
    public void testCloneVApp() throws Exception {
 	   billingSiteId = restContext.getApi().getBrowsingClient().getOrg(null).getId();// default
 	   vpdcId = Iterables.find(restContext.getApi().getBrowsingClient().getOrg(billingSiteId).getVDCs(),
@@ -264,7 +262,11 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
                restContext.getApi().getBrowsingClient().getVDCInOrg(billingSiteId, vpdcId).getAvailableNetworks(), 0)
                .getId();
 	   
-       Task task = client.cloneVApp(vm.getHref(), "clonedvm", networkTierName);
+	   String clonedVMName = vm.getName() + "clone";
+	   
+	   System.out.printf("Cloning vm - name %s in vpdcId %s in network %s, newVM name is %s%n", vm.getName(), vpdcId, networkTierName, clonedVMName);
+	   
+       Task task = client.cloneVApp(vm.getHref(), clonedVMName, networkTierName);
        
        // make sure there's no error
        assert task.getId() != null && task.getError() == null : task;
@@ -273,8 +275,8 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
        // fetch the task again, in savvis, task.getOwner is populated with vApp after task has finished
        task = restContext.getApi().getBrowsingClient().getTask(task.getId());
        
-       vm = restContext.getApi().getBrowsingClient().getVM(task.getOwner().getHref(), GetVMOptions.NONE);
-       assert vm.getHref() != null : vm;
+       VM clonedVM = restContext.getApi().getBrowsingClient().getVM(task.getOwner().getHref(), GetVMOptions.NONE);
+       assert clonedVM.getHref() != null : clonedVM;
    }
 
    private void conditionallyCheckSSH() {
@@ -304,26 +306,6 @@ public class VMClientLiveTest extends BaseVPDCClientLiveTest {
       }
    }
 
-   @Test(dependsOnMethods="testCreateVirtualMachine")
-   public void testPowerOffVM() throws Exception {
-      Task task = client.powerOffVM(vm.getHref());
-      
-      // make sure there's no error
-      assert task.getId() != null && task.getError() == null : task;
-
-      assert this.taskTester.apply(task.getId());
-   }
-
-   @Test(dependsOnMethods="testPowerOffVM")
-   public void testPowerOnVM() throws Exception {
-      Task task = client.powerOnVM(vm.getHref());
-      
-      // make sure there's no error
-      assert task.getId() != null && task.getError() == null : task;
-
-      assert this.taskTester.apply(task.getId());
-   }
-
    @AfterGroups(groups = "live")
    protected void tearDown() {
       if (vm != null) {