From 5a2d2303a7a8717f1f97d2c3c08cede0b3e2e8fc Mon Sep 17 00:00:00 2001 From: Mattias Holmqvist Date: Thu, 15 Dec 2011 22:51:47 +0100 Subject: [PATCH] Renamed IsoToIMachine to CreateAndInstallVm. --- .../{IsoToIMachine.java => CreateAndInstallVm.java} | 8 ++++---- ...dRegisterMachineFromIsoIfNotAlreadyExistsLiveTest.java | 2 +- ...chineLiveTest.java => CreateAndInstallVmLiveTest.java} | 6 +++--- .../virtualbox/predicates/SshAvailableLiveTest.java | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) rename sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/{IsoToIMachine.java => CreateAndInstallVm.java} (96%) rename sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/{IsoToIMachineLiveTest.java => CreateAndInstallVmLiveTest.java} (95%) diff --git a/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IsoToIMachine.java b/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java similarity index 96% rename from sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IsoToIMachine.java rename to sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java index d9ceab528f..8c17214aa1 100644 --- a/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IsoToIMachine.java +++ b/sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java @@ -47,7 +47,7 @@ import static org.jclouds.virtualbox.util.MachineUtils.*; import static org.virtualbox_4_1.LockType.Shared; import static org.virtualbox_4_1.LockType.Write; -public class IsoToIMachine implements Function { +public class CreateAndInstallVm implements Function { @Resource @Named(ComputeServiceConstants.COMPUTE_LOGGER) @@ -63,9 +63,9 @@ public class IsoToIMachine implements Function { private final ExecutionType executionType; @Inject - public IsoToIMachine(VirtualBoxManager manager, String guestId, ComputeServiceContext context, - String hostId, Predicate socketTester, - String webServerHost, int webServerPort, ExecutionType executionType) { + public CreateAndInstallVm(VirtualBoxManager manager, String guestId, ComputeServiceContext context, + String hostId, Predicate socketTester, + String webServerHost, int webServerPort, ExecutionType executionType) { this.manager = manager; this.guestId = guestId; this.context = context; diff --git a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CloneAndRegisterMachineFromIsoIfNotAlreadyExistsLiveTest.java b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CloneAndRegisterMachineFromIsoIfNotAlreadyExistsLiveTest.java index 7a9ac2d8be..07e48ef4b4 100644 --- a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CloneAndRegisterMachineFromIsoIfNotAlreadyExistsLiveTest.java +++ b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CloneAndRegisterMachineFromIsoIfNotAlreadyExistsLiveTest.java @@ -91,7 +91,7 @@ public class CloneAndRegisterMachineFromIsoIfNotAlreadyExistsLiveTest extends Ba VmSpec vmSpecification = VmSpec.builder().id(vmId).name(vmName).osTypeId(osTypeId) .controller(ideController) .forceOverwrite(true).build(); - return new IsoToIMachine(manager, guestId, localHostContext, hostId, socketTester, + return new CreateAndInstallVm(manager, guestId, localHostContext, hostId, socketTester, "127.0.0.1", 8080, HEADLESS).apply(vmSpecification); } catch (IllegalStateException e) { // already created diff --git a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/IsoToIMachineLiveTest.java b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CreateAndInstallVmLiveTest.java similarity index 95% rename from sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/IsoToIMachineLiveTest.java rename to sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CreateAndInstallVmLiveTest.java index eb2be74e52..6904324e11 100644 --- a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/IsoToIMachineLiveTest.java +++ b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/CreateAndInstallVmLiveTest.java @@ -56,8 +56,8 @@ import static org.testng.Assert.assertTrue; /** * @author Andrea Turli, Mattias Holmqvist */ -@Test(groups = "live", singleThreaded = true, testName = "IsoToIMachineLiveTest") -public class IsoToIMachineLiveTest extends BaseVirtualBoxClientLiveTest { +@Test(groups = "live", singleThreaded = true, testName = "CreateAndInstallVmLiveTest") +public class CreateAndInstallVmLiveTest extends BaseVirtualBoxClientLiveTest { Map> map = new BaseComputeServiceContextModule() { }.provideOsVersionMap(new ComputeServiceConstants.ReferenceData(), Guice.createInjector(new GsonModule()) @@ -94,7 +94,7 @@ public class IsoToIMachineLiveTest extends BaseVirtualBoxClientLiveTest { .controller(ideController) .forceOverwrite(true) .natNetworkAdapter(0, NatAdapter.builder().tcpRedirectRule("127.0.0.1", 2222, "", 22).build()).build(); - IMachine imageMachine = new IsoToIMachine(manager, guestId, localHostContext, hostId, + IMachine imageMachine = new CreateAndInstallVm(manager, guestId, localHostContext, hostId, socketTester, "127.0.0.1", 8080, HEADLESS) .apply(vmSpecification); diff --git a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/predicates/SshAvailableLiveTest.java b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/predicates/SshAvailableLiveTest.java index fe71e4de75..8cd2480423 100644 --- a/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/predicates/SshAvailableLiveTest.java +++ b/sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/predicates/SshAvailableLiveTest.java @@ -11,7 +11,7 @@ import org.jclouds.virtualbox.BaseVirtualBoxClientLiveTest; import org.jclouds.virtualbox.domain.ExecutionType; import org.jclouds.virtualbox.domain.StorageController; import org.jclouds.virtualbox.domain.VmSpec; -import org.jclouds.virtualbox.functions.IsoToIMachine; +import org.jclouds.virtualbox.functions.CreateAndInstallVm; import org.jclouds.virtualbox.functions.LaunchMachineIfNotAlreadyRunning; import org.jclouds.virtualbox.util.PropertyUtils; import org.testng.annotations.Test; @@ -74,7 +74,7 @@ public class SshAvailableLiveTest extends BaseVirtualBoxClientLiveTest { .controller(ideController) .forceOverwrite(true).build(); - return new IsoToIMachine(manager, guestId, localHostContext, + return new CreateAndInstallVm(manager, guestId, localHostContext, hostId, socketTester, "127.0.0.1", 8080, HEADLESS).apply(vmSpecification); } catch (IllegalStateException e) { // already created