Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #427 from dralves/jclouds-vbox-nat-host-only-working-cluster-and-live-test 

added public address for vms and unit tested imachinetonodemetadata
This commit is contained in:
Adrian Cole 2012-03-12 12:35:51 -07:00
parent a5bcf3c823 fb488c192d
commit df0b86cdb7
3 changed files with 65 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/IMachineToNodeMetadata.java
View File

@ -19,6 +19,8 @@
package org.jclouds.virtualbox.functions; package org.jclouds.virtualbox.functions;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static org.jclouds.virtualbox.config.VirtualBoxComputeServiceContextModule.machineToNodeState; import static org.jclouds.virtualbox.config.VirtualBoxComputeServiceContextModule.machineToNodeState;
import java.util.HashSet; import java.util.HashSet;
@ -41,6 +43,7 @@ import org.jclouds.logging.Logger;
import org.virtualbox_4_1.IMachine; import org.virtualbox_4_1.IMachine;
import org.virtualbox_4_1.INetworkAdapter; import org.virtualbox_4_1.INetworkAdapter;
import org.virtualbox_4_1.MachineState; import org.virtualbox_4_1.MachineState;
import org.virtualbox_4_1.NetworkAttachmentType;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Splitter; import com.google.common.base.Splitter;
@ -66,23 +69,8 @@ public class IMachineToNodeMetadata implements Function<IMachine, NodeMetadata>
locationBuilder.scope(LocationScope.HOST); locationBuilder.scope(LocationScope.HOST);
nodeMetadataBuilder.location(locationBuilder.build()); nodeMetadataBuilder.location(locationBuilder.build());
HardwareBuilder hardwareBuilder = new HardwareBuilder();
hardwareBuilder.ram(vm.getMemorySize().intValue());
// TODO: Get more processor information
Set<Processor> processors = new HashSet<Processor>();
for (int i = 0; i < vm.getCPUCount(); i++) {
Processor processor = new Processor(1, 0);
processors.add(processor);
}
hardwareBuilder.processors(processors);
// TODO: How to get this?
hardwareBuilder.is64Bit(false);
nodeMetadataBuilder.hostname(vm.getName()); nodeMetadataBuilder.hostname(vm.getName());
MachineState vmState = vm.getState(); MachineState vmState = vm.getState();
NodeState nodeState = machineToNodeState.get(vmState); NodeState nodeState = machineToNodeState.get(vmState);
if (nodeState == null) if (nodeState == null)
@ -91,20 +79,32 @@ public class IMachineToNodeMetadata implements Function<IMachine, NodeMetadata>
logger.debug("Setting virtualbox node to: " + nodeState + " from machine state: " + vmState); logger.debug("Setting virtualbox node to: " + nodeState + " from machine state: " + vmState);
INetworkAdapter networkAdapter = vm.getNetworkAdapter(0l); // hardcoded set-up that works only for nat+host-only
if (networkAdapter != null) {
nodeMetadataBuilder.privateAddresses(ImmutableSet.of(networkAdapter.getNatDriver().getHostIP())); // nat adapter
for (String nameProtocolnumberAddressInboudportGuestTargetport : networkAdapter.getNatDriver().getRedirects()){ INetworkAdapter natAdapter = vm.getNetworkAdapter(0l);
checkNotNull(natAdapter, "slot 0 networkadapter");
checkState(natAdapter.getAttachmentType() == NetworkAttachmentType.NAT,
"expecting slot 0 to be a NAT attachment type (was: " + natAdapter.getAttachmentType() + ")");
int ipTermination = 0;
nodeMetadataBuilder.publicAddresses(ImmutableSet.of(natAdapter.getNatDriver().getHostIP()));
for (String nameProtocolnumberAddressInboudportGuestTargetport : natAdapter.getNatDriver().getRedirects()) {
Iterable<String> stuff = Splitter.on(',').split(nameProtocolnumberAddressInboudportGuestTargetport); Iterable<String> stuff = Splitter.on(',').split(nameProtocolnumberAddressInboudportGuestTargetport);
String protocolNumber = Iterables.get(stuff, 1); String protocolNumber = Iterables.get(stuff, 1);
String hostAddress= Iterables.get(stuff, 2); String hostAddress = Iterables.get(stuff, 2);
String inboundPort= Iterables.get(stuff, 3); String inboundPort = Iterables.get(stuff, 3);
String targetPort= Iterables.get(stuff, 5); String targetPort = Iterables.get(stuff, 5);
if ("1".equals(protocolNumber) && "22".equals(targetPort)) if ("1".equals(protocolNumber) && "22".equals(targetPort)) {
nodeMetadataBuilder.privateAddresses(ImmutableSet.of(hostAddress)).loginPort(Integer.parseInt(inboundPort)); int inPort = Integer.parseInt(inboundPort);
ipTermination = inPort % NodeCreator.NODE_PORT_INIT;
nodeMetadataBuilder.publicAddresses(ImmutableSet.of(hostAddress)).loginPort(inPort);
} }
} }
nodeMetadataBuilder.privateAddresses(ImmutableSet.of((NodeCreator.VMS_NETWORK + ipTermination) + ""));
LoginCredentials loginCredentials = new LoginCredentials("toor", "password", null, true); LoginCredentials loginCredentials = new LoginCredentials("toor", "password", null, true);
nodeMetadataBuilder.credentials(loginCredentials); nodeMetadataBuilder.credentials(loginCredentials);

10
labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java
View File

@ -68,8 +68,7 @@ public class NodeCreator implements Function<NodeSpec, NodeAndInitialCredentials
private final Supplier<VirtualBoxManager> manager; private final Supplier<VirtualBoxManager> manager;
private final Function<CloneSpec, IMachine> cloner; private final Function<CloneSpec, IMachine> cloner;
private final AtomicInteger nodePorts; private final AtomicInteger nodes;
private final AtomicInteger nodeIps;
private MachineUtils machineUtils; private MachineUtils machineUtils;
private Function<IMachine, NodeMetadata> imachineToNodeMetadata; private Function<IMachine, NodeMetadata> imachineToNodeMetadata;
@ -78,8 +77,7 @@ public class NodeCreator implements Function<NodeSpec, NodeAndInitialCredentials
MachineUtils machineUtils, Function<IMachine, NodeMetadata> imachineToNodeMetadata) { MachineUtils machineUtils, Function<IMachine, NodeMetadata> imachineToNodeMetadata) {
this.manager = manager; this.manager = manager;
this.cloner = cloner; this.cloner = cloner;
this.nodePorts = new AtomicInteger(NODE_PORT_INIT); this.nodes = new AtomicInteger(0);
this.nodeIps = new AtomicInteger(1);
this.machineUtils = machineUtils; this.machineUtils = machineUtils;
this.imachineToNodeMetadata = imachineToNodeMetadata; this.imachineToNodeMetadata = imachineToNodeMetadata;
} }
@ -117,12 +115,12 @@ public class NodeCreator implements Function<NodeSpec, NodeAndInitialCredentials
.forceOverwrite(true).build(); .forceOverwrite(true).build();
NetworkAdapter natAdapter = NetworkAdapter.builder().networkAttachmentType(NetworkAttachmentType.NAT) NetworkAdapter natAdapter = NetworkAdapter.builder().networkAttachmentType(NetworkAttachmentType.NAT)
.tcpRedirectRule("127.0.0.1", this.nodePorts.getAndIncrement(), "", 22).build(); .tcpRedirectRule("127.0.0.1", NODE_PORT_INIT + this.nodes.getAndIncrement(), "", 22).build();
NetworkInterfaceCard natIfaceCard = NetworkInterfaceCard.builder().addNetworkAdapter(natAdapter).slot(0L).build(); NetworkInterfaceCard natIfaceCard = NetworkInterfaceCard.builder().addNetworkAdapter(natAdapter).slot(0L).build();
NetworkAdapter hostOnlyAdapter = NetworkAdapter.builder().networkAttachmentType(NetworkAttachmentType.HostOnly) NetworkAdapter hostOnlyAdapter = NetworkAdapter.builder().networkAttachmentType(NetworkAttachmentType.HostOnly)
.staticIp(VMS_NETWORK + this.nodeIps.getAndIncrement()).build(); .staticIp(VMS_NETWORK + this.nodes.getAndIncrement()).build();
NetworkInterfaceCard hostOnlyIfaceCard = NetworkInterfaceCard.builder().addNetworkAdapter(hostOnlyAdapter) NetworkInterfaceCard hostOnlyIfaceCard = NetworkInterfaceCard.builder().addNetworkAdapter(hostOnlyAdapter)
.addHostInterfaceName(HOST_ONLY_IFACE_NAME).slot(1L).build(); .addHostInterfaceName(HOST_ONLY_IFACE_NAME).slot(1L).build();

53
labs/virtualbox/src/test/java/org/jclouds/virtualbox/functions/IMachineToNodeMetadataTest.java
View File

@ -19,38 +19,53 @@
package org.jclouds.virtualbox.functions; package org.jclouds.virtualbox.functions;
import java.util.Map; import static junit.framework.Assert.assertEquals;
import java.util.Set; import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.NodeState;
import org.jclouds.domain.Credentials;
import org.jclouds.virtualbox.VirtualBox;
import org.jclouds.virtualbox.config.VirtualBoxComputeServiceContextModule;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import org.virtualbox_4_1.IMachine;
import org.virtualbox_4_1.INATEngine;
import org.virtualbox_4_1.INetworkAdapter;
import org.virtualbox_4_1.MachineState; import org.virtualbox_4_1.MachineState;
import org.virtualbox_4_1.VirtualBoxManager; import org.virtualbox_4_1.NetworkAttachmentType;
import com.google.common.base.Suppliers; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables;
public class IMachineToNodeMetadataTest { public class IMachineToNodeMetadataTest {
@Test @Test
public void testCreate() throws Exception { public void testCreate() throws Exception {
Credentials creds = new Credentials("admin", "123456"); IMachine vm = createNiceMock(IMachine.class);
VirtualBoxManager manager = VirtualBoxManager.createInstance("");
Map<MachineState, NodeState> machineToNodeState = VirtualBoxComputeServiceContextModule.machineToNodeState; expect(vm.getName()).andReturn("mocked-vm").anyTimes();
Set<Image> images = ImmutableSet.of(); expect(vm.getState()).andReturn(MachineState.PoweredOff).once();
Set<org.jclouds.compute.domain.Hardware> hardwares = ImmutableSet.of();
VirtualBox virtualBox = new VirtualBox(); INetworkAdapter nat = createNiceMock(INetworkAdapter.class);
IMachineToNodeMetadata parser = new IMachineToNodeMetadata(); INATEngine natEng = createNiceMock(INATEngine.class);
IMachineToHardware hwParser = new IMachineToHardware(Suppliers.ofInstance(manager));
// hwParser.apply() expect(vm.getNetworkAdapter(eq(0l))).andReturn(nat).once();
expect(nat.getAttachmentType()).andReturn(NetworkAttachmentType.NAT).once();
expect(nat.getNatDriver()).andReturn(natEng).anyTimes();
expect(natEng.getHostIP()).andReturn("127.0.0.1").once();
expect(natEng.getRedirects()).andReturn(ImmutableList.of("0,1,127.0.0.1,3001,,22"));
INetworkAdapter hostOnly = createNiceMock(INetworkAdapter.class);
replay(vm, nat, natEng, hostOnly);
NodeMetadata node = new IMachineToNodeMetadata().apply(vm);
assertEquals("mocked-vm", node.getName());
assertEquals(1, node.getPrivateAddresses().size());
assertEquals((NodeCreator.VMS_NETWORK + 1), Iterables.get(node.getPrivateAddresses(), 0));
assertEquals(1, node.getPublicAddresses().size());
assertEquals("127.0.0.1", Iterables.get(node.getPublicAddresses(), 0));
assertEquals(3001, node.getLoginPort());
} }
} }