Fix network interface configuration option enumeration

Signed-off-by: Ravi Nadahar <nadahar@rediffmail.com>

Author: Ravi Nadahar

bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/internal/net/NetworkConfigOptionProvider.java

@@ -13,7 +13,6 @@
 package org.openhab.core.config.core.internal.net;
 
 import java.net.Inet4Address;
-import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.net.URI;
@@ -22,6 +21,7 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.stream.Stream;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
@@ -30,6 +30,7 @@
 import org.openhab.core.config.core.ParameterOption;
 import org.openhab.core.net.CidrAddress;
 import org.openhab.core.net.NetUtil;
+import org.openhab.core.util.StringUtils;
 import org.osgi.service.component.annotations.Component;
 
 /**
@@ -67,8 +68,10 @@ public class NetworkConfigOptionProvider implements ConfigOptionProvider {
                 Enumeration<NetworkInterface> networkInterfaces = NetworkInterface.getNetworkInterfaces();
                 while (networkInterfaces.hasMoreElements()) {
                     NetworkInterface networkInterface = networkInterfaces.nextElement();
-                    options.add(new ParameterOption(networkInterface.getName(),
-                            getNetworkInterfaceLabel(networkInterface)));
+                    if (networkInterface.isUp()) {
+                        options.add(new ParameterOption(networkInterface.getName(),
+                                getNetworkInterfaceLabel(networkInterface)));
+                    }
                 }
                 return options;
             } catch (SocketException e) {
@@ -80,18 +83,6 @@ public class NetworkConfigOptionProvider implements ConfigOptionProvider {
     }
 
     private String getNetworkInterfaceLabel(NetworkInterface networkInterface) {
-        Enumeration<InetAddress> inetAddresses = networkInterface.getInetAddresses();
-        String hostName = null;
-        while (inetAddresses.hasMoreElements()) {
-            InetAddress inetAddress = inetAddresses.nextElement();
-            if (inetAddress instanceof Inet4Address) {
-                hostName = inetAddress.getHostName();
-                break;
-            } else if (hostName == null) {
-                hostName = inetAddress.getHostName();
-            }
-        }
-        return hostName == null ? networkInterface.getName()
-                : String.format("%s (%s)", networkInterface.getName(), hostName);
+        return Objects.requireNonNull(StringUtils.capitalizeByWhitespace(networkInterface.getName().replace('_', ' ')));
     }
 }