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

Some cleanup of RetrieveActiveBridgedInterfaces and added copyright.

This commit is contained in:
Mattias Holmqvist 2011-11-27 02:11:23 +01:00
parent 9272136548
commit 4effcc39ad
2 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
sandbox-apis/virtualbox/src/main/java/org/jclouds/virtualbox/functions/RetrieveActiveBridgedInterfaces.java
View File

@ -1,6 +1,25 @@
/**
* 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 com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.filter;
import static org.jclouds.compute.options.RunScriptOptions.Builder.runAsRoot;
import java.net.NetworkInterface;
@ -25,8 +44,10 @@ 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>> {
/**
* @author Andrea Turli
*/
public class RetrieveActiveBridgedInterfaces implements Function<String, List<String>> {
@Resource
@Named(ComputeServiceConstants.COMPUTE_LOGGER)
@ -36,7 +57,6 @@ public class RetrieveActiveBridgedInterfaces implements
@Inject
public RetrieveActiveBridgedInterfaces(ComputeServiceContext context) {
super();
this.context = context;
}
@ -54,16 +74,11 @@ public class RetrieveActiveBridgedInterfaces implements
// union of bridgedNetwork with inet up and !loopback
List<String> activeNetworkInterfaceNames = Lists.newArrayList();
Enumeration<NetworkInterface> nets;
try {
Iterable<String> filterdBridgedInterface = null;
nets = NetworkInterface.getNetworkInterfaces();
Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
for (NetworkInterface inet : Collections.list(nets)) {
filterdBridgedInterface = Iterables.filter(bridgedInterfaces,
new IsActiveBridgedInterface(inet));
for (String filterInetName : filterdBridgedInterface) {
activeNetworkInterfaceNames.add(filterInetName);
}
Iterable<String> filteredBridgedInterface = filter(bridgedInterfaces, new IsActiveBridgedInterface(inet));
Iterables.addAll(activeNetworkInterfaceNames, filteredBridgedInterface);
}
} catch (SocketException e) {
logger.error(e, "Problem in listing network interfaces.");
@ -72,23 +87,19 @@ public class RetrieveActiveBridgedInterfaces implements
return activeNetworkInterfaceNames;
}
protected static List<String> retrieveBridgedInterfaceNames(
String bridgedIfBlocks) {
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)) {
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>() {
Iterable<String> bridgedIfName = 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)) {
for (String string : Splitter.on("Name:").split(bridgedInterfaceName)) {
if (!string.isEmpty())
bridgedInterfaceNames.add(string.trim());
}
@ -108,8 +119,6 @@ public class RetrieveActiveBridgedInterfaces implements
private NetworkInterface networkInterface;
public IsActiveBridgedInterface(NetworkInterface networkInterface) {
super();
this.networkInterface = networkInterface;
}
@ -125,5 +134,5 @@ public class RetrieveActiveBridgedInterfaces implements
}
return false;
}
};
}
}

8
sandbox-apis/virtualbox/src/test/java/org/jclouds/virtualbox/functions/RetrieveActiveBridgedInterfacesLiveTest.java
View File

@ -1,4 +1,4 @@
/**
/*
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@ -37,8 +37,7 @@ import com.google.common.collect.ImmutableList;
* @author Andrea Turli
*/
@Test(groups = "live", singleThreaded = true, testName = "RetrieveActiveBridgedInterfacesLiveTest")
public class RetrieveActiveBridgedInterfacesLiveTest extends
BaseVirtualBoxClientLiveTest {
public class RetrieveActiveBridgedInterfacesLiveTest extends BaseVirtualBoxClientLiveTest {
public static final String TEST1 = "Name: eth0\n"
+ "GUID: 30687465-0000-4000-8000-00261834d0cb\n"
@ -80,8 +79,7 @@ public class RetrieveActiveBridgedInterfacesLiveTest extends
ComputeServiceContext localHostContext = computeServiceForLocalhostAndGuest(
hostId, "localhost", guestId, "localhost", new Credentials("toor",
"password"));
List<String> bridgedInterface = new RetrieveActiveBridgedInterfaces(
localHostContext).apply(hostId);
List<String> bridgedInterface = new RetrieveActiveBridgedInterfaces(localHostContext).apply(hostId);
assertFalse(bridgedInterface.isEmpty());
}