issue 384: added DetachDistroMedium and RetrieveBridgedInterface + Test

This commit is contained in:
andreaturli 2011-11-25 22:45:25 +00:00
parent 4214382b8d
commit 3de92bd292
2 changed files with 217 additions and 0 deletions

View File

@ -0,0 +1,129 @@
package org.jclouds.virtualbox.functions;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.compute.options.RunScriptOptions.Builder.runAsRoot;
import java.net.NetworkInterface;
import java.net.SocketException;
import java.util.Collections;
import java.util.Enumeration;
import java.util.List;
import java.util.regex.Pattern;
import javax.annotation.Resource;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.logging.Logger;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Splitter;
import com.google.common.base.Throwables;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
import com.google.inject.name.Named;
public class RetrieveActiveBridgedInterfaces implements
Function<String, List<String>> {
@Resource
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
protected Logger logger = Logger.NULL;
private ComputeServiceContext context;
@Inject
public RetrieveActiveBridgedInterfaces(ComputeServiceContext context) {
super();
this.context = context;
}
@Override
public List<String> apply(String hostId) {
// Bridged Network
String command = "vboxmanage list bridgedifs";
String bridgedIfBlocks = context
.getComputeService()
.runScriptOnNode(hostId, command,
runAsRoot(false).wrapInInitScript(false)).getOutput();
List<String> bridgedInterfaces = retrieveBridgedInterfaceNames(bridgedIfBlocks);
checkNotNull(bridgedInterfaces);
// union of bridgedNetwork with inet up and !loopback
List<String> activeNetworkInterfaceNames = Lists.newArrayList();
Enumeration<NetworkInterface> nets;
try {
Iterable<String> filterdBridgedInterface = null;
nets = NetworkInterface.getNetworkInterfaces();
for (NetworkInterface inet : Collections.list(nets)) {
filterdBridgedInterface = Iterables.filter(bridgedInterfaces,
new IsActiveBridgedInterface(inet));
for (String filterInetName : filterdBridgedInterface) {
activeNetworkInterfaceNames.add(filterInetName);
}
}
} catch (SocketException e) {
logger.error(e, "Problem in listing network interfaces.");
propagate(e);
}
return activeNetworkInterfaceNames;
}
protected static List<String> retrieveBridgedInterfaceNames(
String bridgedIfBlocks) {
List<String> bridgedInterfaceNames = Lists.newArrayList();
// separate the different bridge block
for (String bridgedIfBlock : Splitter.on(
Pattern.compile("(?m)^[ \t]*\r?\n")).split(bridgedIfBlocks)) {
Iterable<String> bridgedIfName = Iterables.filter(Splitter.on("\n")
.split(bridgedIfBlock), new Predicate<String>() {
@Override
public boolean apply(String arg0) {
return arg0.startsWith("Name:");
}
});
for (String bridgedInterfaceName : bridgedIfName) {
for (String string : Splitter.on("Name:").split(
bridgedInterfaceName)) {
if (!string.isEmpty())
bridgedInterfaceNames.add(string.trim());
}
}
}
return bridgedInterfaceNames;
}
protected <T> T propagate(Exception e) {
Throwables.propagate(e);
assert false;
return null;
}
private class IsActiveBridgedInterface implements Predicate<String> {
private NetworkInterface networkInterface;
public IsActiveBridgedInterface(NetworkInterface networkInterface) {
super();
this.networkInterface = networkInterface;
}
@Override
public boolean apply(String bridgedInterfaceName) {
try {
return (bridgedInterfaceName.startsWith(networkInterface
.getDisplayName()) && networkInterface.isUp() && !networkInterface
.isLoopback());
} catch (SocketException e) {
logger.error(e, "Problem in listing network interfaces.");
propagate(e);
}
return false;
}
};
}

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.jclouds.virtualbox.experiment.TestUtils.computeServiceForLocalhostAndGuest;
import static org.jclouds.virtualbox.functions.RetrieveActiveBridgedInterfaces.retrieveBridgedInterfaceNames;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import java.util.List;
import org.jclouds.compute.ComputeServiceContext;
import org.jclouds.domain.Credentials;
import org.jclouds.virtualbox.BaseVirtualBoxClientLiveTest;
import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
/**
* @author Andrea Turli
*/
@Test(groups = "live", singleThreaded = true, testName = "RetrieveActiveBridgedInterfacesLiveTest")
public class RetrieveActiveBridgedInterfacesLiveTest extends
BaseVirtualBoxClientLiveTest {
public static final String TEST1 = "Name: eth0\n"
+ "GUID: 30687465-0000-4000-8000-00261834d0cb\n"
+ "Dhcp: Disabled\n"
+ "IPAddress: 209.x.x.x\n"
+ "NetworkMask: 255.255.255.0\n"
+ "IPV6Address: fe80:0000:0000:0000:0226:18ff:fe34:d0cb\n"
+ "IPV6NetworkMaskPrefixLength: 64\n"
+ "HardwareAddress: 00:26:18:34:d0:cb\n"
+ "MediumType: Ethernet\n"
+ "Status: Up\n"
+ "VBoxNetworkName: HostInterfaceNetworking-eth0\n"
+ "\n"
+ "Name: vbox0\n"
+ "GUID: 786f6276-0030-4000-8000-5a3ded993fed\n"
+ "Dhcp: Disabled\n"
+ "IPAddress: 192.168.56.1\n"
+ "NetworkMask: 255.255.255.0\n"
+ "IPV6Address: fe80:0000:0000:0000:0226:18ff:fe34:d0cb\n"
+ "IPV6NetworkMaskPrefixLength: 0\n"
+ "HardwareAddress: 5a:3d:ed:99:3f:ed\n"
+ "MediumType: Ethernet\n"
+ "Status: Down\n"
+ "VBoxNetworkName: HostInterfaceNetworking-vbox0\n";
public static final List<String> expectedBridgedInterfaces = ImmutableList.of("eth0", "vbox0");
private String guestId = "guest";
private String hostId = "host";
@Test
public void retrieveBridgedInterfaceNamesTest() {
List<String> activeBridgedInterfaceNames = retrieveBridgedInterfaceNames(TEST1);
assertEquals(activeBridgedInterfaceNames, expectedBridgedInterfaces);
}
@Test
public void retrieveAvailableBridgedInterfaceInfoTest() {
ComputeServiceContext localHostContext = computeServiceForLocalhostAndGuest(
hostId, "localhost", guestId, "localhost", new Credentials("toor",
"password"));
List<String> bridgedInterface = new RetrieveActiveBridgedInterfaces(
localHostContext).apply(hostId);
assertFalse(bridgedInterface.isEmpty());
}
}