Merge pull request #152 from andreaturli/dev

issue 384: AttachBridgedAdapterToMachine + Test
This commit is contained in:
Adrian Cole 2011-11-15 04:20:42 -08:00
commit 81f662302e
2 changed files with 147 additions and 0 deletions

View File

@ -0,0 +1,59 @@
/*
* 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 static org.virtualbox_4_1.NetworkAdapterType.Am79C973;
import static org.virtualbox_4_1.NetworkAttachmentType.Bridged;
import javax.annotation.Nullable;
import org.virtualbox_4_1.IMachine;
import org.virtualbox_4_1.INetworkAdapter;
import com.google.common.base.Function;
/**
* @author Andrea Turli
*/
public class AttachBridgedAdapterToMachine implements Function<IMachine, Void> {
private long adapterIndex;
private String macAddress;
private String hostInterface;
public AttachBridgedAdapterToMachine(long adapterSlot, String macAddress,
String hostInterface) {
this.adapterIndex = adapterSlot;
this.macAddress = macAddress;
this.hostInterface = hostInterface;
}
@Override
public Void apply(@Nullable IMachine machine) {
INetworkAdapter networkAdapter = machine.getNetworkAdapter(adapterIndex);
networkAdapter.setAttachmentType(Bridged);
networkAdapter.setAdapterType(Am79C973);
networkAdapter.setMACAddress(macAddress);
networkAdapter.setBridgedInterface(hostInterface);
networkAdapter.setEnabled(true);
machine.saveSettings();
return null;
}
}

View File

@ -0,0 +1,88 @@
/*
* 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 static org.easymock.EasyMock.expect;
import static org.easymock.classextension.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay;
import static org.easymock.classextension.EasyMock.verify;
import static org.virtualbox_4_1.NetworkAdapterType.Am79C973;
import static org.virtualbox_4_1.NetworkAttachmentType.Bridged;
import org.testng.annotations.Test;
import org.virtualbox_4_1.IMachine;
import org.virtualbox_4_1.INetworkAdapter;
import org.virtualbox_4_1.VBoxException;
/**
* @author Andrea Turli
*/
@Test(groups = "unit", testName = "AttachBridgedAdapterToMachineTest")
public class AttachBridgedAdapterToMachineTest {
private String macAddress;
private String hostInterface;
@Test
public void testApplyNetworkingToNonExistingAdapter() throws Exception {
Long adapterId = 0l;
IMachine machine = createMock(IMachine.class);
INetworkAdapter networkAdapter = createMock(INetworkAdapter.class);
expect(machine.getNetworkAdapter(adapterId)).andReturn(networkAdapter);
networkAdapter.setAttachmentType(Bridged);
networkAdapter.setAdapterType(Am79C973);
networkAdapter.setMACAddress(macAddress);
networkAdapter.setBridgedInterface(hostInterface);
networkAdapter.setEnabled(true);
machine.saveSettings();
replay(machine, networkAdapter);
new AttachBridgedAdapterToMachine(adapterId, macAddress, hostInterface)
.apply(machine);
verify(machine, networkAdapter);
}
@Test(expectedExceptions = VBoxException.class)
public void testRethrowInvalidAdapterSlotException() throws Exception {
Long adapterId = 30l;
IMachine machine = createMock(IMachine.class);
INetworkAdapter networkAdapter = createMock(INetworkAdapter.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);
new AttachBridgedAdapterToMachine(adapterId, macAddress, hostInterface)
.apply(machine);
verify(machine, networkAdapter);
}
}