corrected formatting and small bug in CloneAndRegisterMachineFromIMachineIfNotAlreadyExistsLiveTest

labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/AttachNicToMachine.java

@@ -61,5 +61,5 @@ public class AttachNicToMachine implements Function<NetworkInterfaceCard, Void>
 	private boolean hasBridgedAdapter(NetworkInterfaceCard nic) {
 		return nic.getNetworkAdapter().getNetworkAttachmentType()
 				.equals(NetworkAttachmentType.Bridged);
-	}	
+   }
 }

labs/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CloneAndRegisterMachineFromIMachineIfNotAlreadyExistsLiveTest.java

@@ -23,6 +23,8 @@ import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_IMAGE
 import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_INSTALLATION_KEY_SEQUENCE;
 import static org.testng.Assert.assertEquals;
 
+import java.util.Set;
+
 import org.jclouds.config.ValueOfConfigurationKeyOrNull;
 import org.jclouds.virtualbox.BaseVirtualBoxClientLiveTest;
 import org.jclouds.virtualbox.domain.CloneSpec;
@@ -52,117 +54,102 @@ import com.google.inject.Injector;
  * @author Andrea Turli
  */
 @Test(groups = "live", singleThreaded = true, testName = "CloneAndRegisterMachineFromIMachineIfNotAlreadyExistsLiveTest")
-public class CloneAndRegisterMachineFromIMachineIfNotAlreadyExistsLiveTest extends
+public class CloneAndRegisterMachineFromIMachineIfNotAlreadyExistsLiveTest extends BaseVirtualBoxClientLiveTest {
-		BaseVirtualBoxClientLiveTest {
 
-	private static final boolean IS_LINKED_CLONE = true;
+   private static final boolean IS_LINKED_CLONE = true;
 
-	private CloneSpec cloneSpec;
+   private MasterSpec sourceMachineSpec;
-	private MasterSpec sourceMachineSpec;
+   private CleanupMode mode = CleanupMode.Full;
+   private VmSpec clonedVmSpec;
+   private NetworkSpec cloneNetworkSpec;
 
-	private CleanupMode mode = CleanupMode.Full;
+   @Override
+   @BeforeClass(groups = "live")
+   public void setupClient() {
+      super.setupClient();
+      String sourceName = VIRTUALBOX_IMAGE_PREFIX
+               + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, getClass().getSimpleName());
+      String cloneName = VIRTUALBOX_IMAGE_PREFIX + "Clone#"
+               + CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, getClass().getSimpleName());
 
-  private VmSpec clonedVmSpec;
+      StorageController ideController = StorageController
+               .builder()
+               .name("IDE Controller")
+               .bus(StorageBus.IDE)
+               .attachISO(0, 0, operatingSystemIso)
+               .attachHardDisk(
+                        HardDisk.builder().diskpath(adminDisk).controllerPort(0).deviceSlot(1).autoDelete(true).build())
+               .attachISO(1, 1, guestAdditionsIso).build();
 
-  private NetworkSpec cloneNetworkSpec;
+      VmSpec sourceVmSpec = VmSpec.builder().id(sourceName).name(sourceName).osTypeId("").memoryMB(512)
+               .cleanUpMode(CleanupMode.Full).controller(ideController).forceOverwrite(true).build();
 
-	@Override
+      Injector injector = context.utils().injector();
-	@BeforeClass(groups = "live")
+      Function<String, String> configProperties = injector.getInstance(ValueOfConfigurationKeyOrNull.class);
-	public void setupClient() {
+      IsoSpec isoSpec = IsoSpec
-		super.setupClient();
+               .builder()
-		String sourceName = VIRTUALBOX_IMAGE_PREFIX
+               .sourcePath(operatingSystemIso)
-				+ CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, getClass()
+               .installationScript(
-						.getSimpleName());
+                        configProperties.apply(VIRTUALBOX_INSTALLATION_KEY_SEQUENCE).replace("HOSTNAME",
-		String cloneName = VIRTUALBOX_IMAGE_PREFIX
+                                 sourceVmSpec.getVmName())).build();
-				+ "Clone#"
-				+ CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_HYPHEN, getClass()
-						.getSimpleName());
 
-		StorageController ideController = StorageController
+      NetworkAdapter networkAdapter = NetworkAdapter.builder().networkAttachmentType(NetworkAttachmentType.Bridged)
-				.builder()
+               .build();
-				.name("IDE Controller")
-				.bus(StorageBus.IDE)
-				.attachISO(0, 0, operatingSystemIso)
-				.attachHardDisk(
-						HardDisk.builder().diskpath(adminDisk)
-								.controllerPort(0).deviceSlot(1)
-								.autoDelete(true).build())
-				.attachISO(1, 1, guestAdditionsIso).build();
 
-		VmSpec sourceVmSpec = VmSpec.builder().id(sourceName).name(sourceName)
+      NetworkInterfaceCard networkInterfaceCard = NetworkInterfaceCard.builder().addNetworkAdapter(networkAdapter)
-				.osTypeId("").memoryMB(512).cleanUpMode(CleanupMode.Full)
+               .build();
-				.controller(ideController).forceOverwrite(true).build();
 
-		Injector injector = context.utils().injector();
+      this.cloneNetworkSpec = NetworkSpec.builder().addNIC(0L, networkInterfaceCard).build();
-		Function<String, String> configProperties = injector
-				.getInstance(ValueOfConfigurationKeyOrNull.class);
-		IsoSpec isoSpec = IsoSpec
-				.builder()
-				.sourcePath(operatingSystemIso)
-				.installationScript(
-						configProperties.apply(
-								VIRTUALBOX_INSTALLATION_KEY_SEQUENCE).replace(
-								"HOSTNAME", sourceVmSpec.getVmName())).build();
 
-		NetworkAdapter networkAdapter = NetworkAdapter.builder()
+      sourceMachineSpec = MasterSpec.builder().iso(isoSpec).vm(sourceVmSpec).network(cloneNetworkSpec).build();
-				.networkAttachmentType(NetworkAttachmentType.Bridged).build();
-		
-		NetworkInterfaceCard networkInterfaceCard = NetworkInterfaceCard
-				.builder().addNetworkAdapter(networkAdapter).build();
 
-		this.cloneNetworkSpec = NetworkSpec.builder()
+      this.clonedVmSpec = VmSpec.builder().id(cloneName).name(cloneName).memoryMB(512).cleanUpMode(mode)
-				.addNIC(0L, networkInterfaceCard).build();
+               .forceOverwrite(true).build();
-		
-		sourceMachineSpec = MasterSpec.builder().iso(isoSpec).vm(sourceVmSpec)
-				.network(cloneNetworkSpec).build();
 
-		this.clonedVmSpec = VmSpec.builder().id(cloneName).name(cloneName)
+   }
-				.memoryMB(512).cleanUpMode(mode).forceOverwrite(true).build();
 
-		
+   @Test
+   public void testCloneMachineFromAnotherMachine() throws Exception {
+      CloneSpec cloneSpec = null;
+      try {
 
-	}
+         IMachine source = getSourceNode();
 
-	@Test
+         cloneSpec = CloneSpec.builder().vm(clonedVmSpec).network(cloneNetworkSpec).master(source)
-	public void testCloneMachineFromAnotherMachine() throws Exception {
+                  .linked(IS_LINKED_CLONE).build();
-		try {
-			IMachine source = getSourceNode();
-      CloneSpec cloneSpec = CloneSpec.builder().vm(clonedVmSpec).network(cloneNetworkSpec).master(source)
-          .linked(IS_LINKED_CLONE)
-	        .build();
-			if (source.getCurrentSnapshot() != null) {
-				ISession session = manager.get().openMachineSession(source);
-				session.getConsole().deleteSnapshot(
-						source.getCurrentSnapshot().getId());
-				session.unlockMachine();
-			}
 
-			IMachine clone = new CloneAndRegisterMachineFromIMachineIfNotAlreadyExists(
+         if (source.getCurrentSnapshot() != null) {
-					manager, workingDir,machineUtils).apply(cloneSpec);
+            ISession session = manager.get().openMachineSession(source);
-			assertEquals(clone.getName(), cloneSpec.getVmSpec().getVmName());
+            session.getConsole().deleteSnapshot(source.getCurrentSnapshot().getId());
-			
+            session.unlockMachine();
-			new LaunchMachineIfNotAlreadyRunning(manager.get(), ExecutionType.GUI, "").apply(clone);
+         }
-			
-			// TODO ssh into the node
-			
-		} finally {
-			for (VmSpec spec : ImmutableSet.of(cloneSpec.getVmSpec(),
-					sourceMachineSpec.getVmSpec()))
-				undoVm(spec);
-		}
-	}
 
-	private IMachine getSourceNode() {
+         IMachine clone = new CloneAndRegisterMachineFromIMachineIfNotAlreadyExists(manager, workingDir, machineUtils)
-		try {
+                  .apply(cloneSpec);
-			Injector injector = context.utils().injector();
+         assertEquals(clone.getName(), cloneSpec.getVmSpec().getVmName());
-			return injector.getInstance(
+
-					CreateAndRegisterMachineFromIsoIfNotAlreadyExists.class)
+         new LaunchMachineIfNotAlreadyRunning(manager.get(), ExecutionType.GUI, "").apply(clone);
-					.apply(sourceMachineSpec);
+
-		} catch (IllegalStateException e) {
+         // TODO ssh into the node
-			// already created
+
-			return manager.get().getVBox()
+      } finally {
-					.findMachine(sourceMachineSpec.getVmSpec().getVmId());
+         Set<VmSpec> specs = cloneSpec == null ? ImmutableSet.of(sourceMachineSpec.getVmSpec()) : ImmutableSet.of(
-		}
+                  cloneSpec.getVmSpec(), sourceMachineSpec.getVmSpec());
-	}
+         for (VmSpec spec : specs) {
+            undoVm(spec);
+         }
+
+      }
+   }
+
+   private IMachine getSourceNode() {
+      try {
+         Injector injector = context.utils().injector();
+         return injector.getInstance(CreateAndRegisterMachineFromIsoIfNotAlreadyExists.class).apply(sourceMachineSpec);
+      } catch (IllegalStateException e) {
+         // already created
+         return manager.get().getVBox().findMachine(sourceMachineSpec.getVmSpec().getVmId());
+      }
+   }
 
 }