diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsFetchInterfaceCommandWrapperTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsFetchInterfaceCommandWrapperTest.java index fbc9c2bcb4b..b0df5519467 100644 --- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsFetchInterfaceCommandWrapperTest.java +++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtOvsFetchInterfaceCommandWrapperTest.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.UUID; import org.junit.Assert; +import org.junit.Assume; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Spy; @@ -51,8 +52,7 @@ public class LibvirtOvsFetchInterfaceCommandWrapperTest { while(interfaces.hasMoreElements()) { NetworkInterface networkInterface = interfaces.nextElement(); if (networkInterface.getInetAddresses().hasMoreElements() && - (networkInterface.getName().startsWith("eth") || - networkInterface.getName().startsWith("wl"))) { + networkInterface.getName().matches("^(eth|wl|en).*")) { interfaceName = networkInterface.getName(); Enumeration addresses = networkInterface.getInetAddresses(); while(addresses.hasMoreElements()) { @@ -62,9 +62,13 @@ public class LibvirtOvsFetchInterfaceCommandWrapperTest { break; }; } + if (StringUtils.isNotBlank(interfaceName) && StringUtils.isNotBlank(ipAddress)) { + break; + } } } } catch (SocketException ignored) {} + Assume.assumeTrue(StringUtils.isNotBlank(interfaceName)); Ternary result = null; try { result = wrapper.getInterfaceDetails(interfaceName);