mirror of https://github.com/apache/jclouds.git
Added AttachNATRedirectRuleToMachine to virtualbox.
commit 3f6de265d7342676fdeab99badd31f31cb43aadc Author: Mattias Holmqvist <mattias.holmqvist@gmail.com> Date: Sun Oct 23 23:23:49 2011 +0200 Added AttachNATRedirectRuleToMachine to virtualbox.
This commit is contained in:
parent
e399db161e
commit
041360e2e7
|
@ -0,0 +1,51 @@
|
||||||
|
/*
|
||||||
|
* Licensed to jclouds, Inc. (jclouds) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. jclouds 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.virtualbox.functions;
|
||||||
|
|
||||||
|
import com.google.common.base.Function;
|
||||||
|
import org.virtualbox_4_1.IMachine;
|
||||||
|
import org.virtualbox_4_1.INetworkAdapter;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
|
|
||||||
|
import static org.virtualbox_4_1.NATProtocol.TCP;
|
||||||
|
import static org.virtualbox_4_1.NetworkAttachmentType.NAT;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Mattias Holmqvist
|
||||||
|
*/
|
||||||
|
public class AttachNATRedirectRuleToMachine implements Function<IMachine, Void> {
|
||||||
|
|
||||||
|
private long adapterIndex;
|
||||||
|
|
||||||
|
public AttachNATRedirectRuleToMachine(long adapterSlot) {
|
||||||
|
this.adapterIndex = adapterSlot;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Void apply(@Nullable IMachine machine) {
|
||||||
|
INetworkAdapter networkAdapter = machine.getNetworkAdapter(adapterIndex);
|
||||||
|
networkAdapter.setAttachmentType(NAT);
|
||||||
|
networkAdapter.getNatDriver().addRedirect("guestssh", TCP, "127.0.0.1", 2222, "", 22);
|
||||||
|
networkAdapter.setEnabled(true);
|
||||||
|
machine.saveSettings();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
|
@ -29,11 +29,8 @@ import static org.virtualbox_4_1.AccessMode.ReadOnly;
|
||||||
import static org.virtualbox_4_1.DeviceType.DVD;
|
import static org.virtualbox_4_1.DeviceType.DVD;
|
||||||
import static org.virtualbox_4_1.LockType.Shared;
|
import static org.virtualbox_4_1.LockType.Shared;
|
||||||
import static org.virtualbox_4_1.LockType.Write;
|
import static org.virtualbox_4_1.LockType.Write;
|
||||||
import static org.virtualbox_4_1.NATProtocol.TCP;
|
|
||||||
import static org.virtualbox_4_1.NetworkAttachmentType.NAT;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import javax.inject.Named;
|
import javax.inject.Named;
|
||||||
|
@ -139,18 +136,7 @@ public class IsoToIMachine implements Function<String, IMachine> {
|
||||||
new AttachHardDiskToMachineIfNotAlreadyAttached(controllerIDE, hardDisk, manager));
|
new AttachHardDiskToMachineIfNotAlreadyAttached(controllerIDE, hardDisk, manager));
|
||||||
|
|
||||||
// NAT
|
// NAT
|
||||||
lockMachineAndApply(manager, Write, vmName, new Function<IMachine, Void>() {
|
ensureNATNetworkingIsAppliedToMachine(vmName);
|
||||||
|
|
||||||
@Override
|
|
||||||
public Void apply(IMachine machine) {
|
|
||||||
machine.getNetworkAdapter(0l).setAttachmentType(NAT);
|
|
||||||
machine.getNetworkAdapter(0l).getNatDriver().addRedirect("guestssh", TCP, "127.0.0.1", 2222, "", 22);
|
|
||||||
machine.getNetworkAdapter(0l).setEnabled(true);
|
|
||||||
machine.saveSettings();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
});
|
|
||||||
|
|
||||||
String guestAdditionsDvd = workingDir + "/VBoxGuestAdditions_4.1.2.iso";
|
String guestAdditionsDvd = workingDir + "/VBoxGuestAdditions_4.1.2.iso";
|
||||||
final IMedium guestAdditionsDvdMedium = manager.getVBox().openMedium(guestAdditionsDvd, DeviceType.DVD,
|
final IMedium guestAdditionsDvdMedium = manager.getVBox().openMedium(guestAdditionsDvd, DeviceType.DVD,
|
||||||
|
@ -211,6 +197,10 @@ public class IsoToIMachine implements Function<String, IMachine> {
|
||||||
return vm;
|
return vm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ensureNATNetworkingIsAppliedToMachine(String vmName) {
|
||||||
|
lockMachineAndApply(manager, Write, vmName, new AttachNATRedirectRuleToMachine(0l));
|
||||||
|
}
|
||||||
|
|
||||||
private void ensureMachineHasAttachedDistroMedium(String isoName, String workingDir, String controllerIDE) {
|
private void ensureMachineHasAttachedDistroMedium(String isoName, String workingDir, String controllerIDE) {
|
||||||
final String pathToIsoFile = checkFileExists(workingDir + "/" + isoName);
|
final String pathToIsoFile = checkFileExists(workingDir + "/" + isoName);
|
||||||
final IMedium distroMedium = manager.getVBox().openMedium(pathToIsoFile, DVD, ReadOnly, forceOverwrite);
|
final IMedium distroMedium = manager.getVBox().openMedium(pathToIsoFile, DVD, ReadOnly, forceOverwrite);
|
||||||
|
|
|
@ -0,0 +1,77 @@
|
||||||
|
/*
|
||||||
|
* Licensed to jclouds, Inc. (jclouds) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. jclouds 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.virtualbox.functions;
|
||||||
|
|
||||||
|
import org.testng.annotations.Test;
|
||||||
|
import org.virtualbox_4_1.*;
|
||||||
|
|
||||||
|
import static org.easymock.classextension.EasyMock.*;
|
||||||
|
import static org.virtualbox_4_1.NATProtocol.TCP;
|
||||||
|
import static org.virtualbox_4_1.NetworkAttachmentType.NAT;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Mattias Holmqvist
|
||||||
|
*/
|
||||||
|
@Test(groups = "unit", testName = "AttachNATRedirectRuleToMachineTest")
|
||||||
|
public class AttachNATRedirectRuleToMachineTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testApplyNetworkingToNonExistingAdapter() throws Exception {
|
||||||
|
Long adapterId = 0l;
|
||||||
|
IMachine machine = createMock(IMachine.class);
|
||||||
|
INetworkAdapter networkAdapter = createMock(INetworkAdapter.class);
|
||||||
|
INATEngine natEngine = createMock(INATEngine.class);
|
||||||
|
|
||||||
|
expect(machine.getNetworkAdapter(adapterId)).andReturn(networkAdapter);
|
||||||
|
networkAdapter.setAttachmentType(NAT);
|
||||||
|
expect(networkAdapter.getNatDriver()).andReturn(natEngine);
|
||||||
|
natEngine.addRedirect("guestssh", TCP, "127.0.0.1", 2222, "", 22);
|
||||||
|
networkAdapter.setEnabled(true);
|
||||||
|
machine.saveSettings();
|
||||||
|
|
||||||
|
replay(machine, networkAdapter, natEngine);
|
||||||
|
|
||||||
|
new AttachNATRedirectRuleToMachine(adapterId).apply(machine);
|
||||||
|
|
||||||
|
verify(machine, networkAdapter, natEngine);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(expectedExceptions = VBoxException.class)
|
||||||
|
public void testRethrowInvalidAdapterSlotException() throws Exception {
|
||||||
|
Long adapterId = 30l;
|
||||||
|
IMachine machine = createMock(IMachine.class);
|
||||||
|
INetworkAdapter networkAdapter = createMock(INetworkAdapter.class);
|
||||||
|
INATEngine natEngine = createMock(INATEngine.class);
|
||||||
|
|
||||||
|
String error = "VirtualBox error: Argument slot is invalid " +
|
||||||
|
"(must be slot < RT_ELEMENTS(mNetworkAdapters)) (0x80070057)";
|
||||||
|
|
||||||
|
VBoxException invalidSlotException = new VBoxException(createNiceMock(Throwable.class), error);
|
||||||
|
expect(machine.getNetworkAdapter(adapterId)).andThrow(invalidSlotException);
|
||||||
|
|
||||||
|
replay(machine, networkAdapter, natEngine);
|
||||||
|
|
||||||
|
new AttachNATRedirectRuleToMachine(adapterId).apply(machine);
|
||||||
|
|
||||||
|
verify(machine, networkAdapter, natEngine);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue