Fix issue where -host is not honored in all server modes.

Also increase the scope of -host to all roles [standalone, hub, and
node]

Author: mach6

java/server/src/org/openqa/grid/internal/cli/CommonCliOptions.java

@@ -66,6 +66,16 @@ public abstract class CommonCliOptions {
   )
   private String role;
 
+  /**
+   * Hostname or IP to use. Defaults to {@code null}. Automatically determined when {@code null}.
+   */
+  @Parameter(
+      names = "-host",
+      description =  "<String> IP or hostname : usually determined automatically. Most commonly useful in exotic network configurations (e.g. network with VPN)"
+  )
+  // initially defaults to null from type
+  private String host;
+
   /**
    * Port to bind to. Default determined by configuration type.
    */
@@ -133,6 +143,9 @@ void fillCommonConfiguration(StandaloneConfiguration configuration) {
     if (log != null) {
       configuration.log = log;
     }
+    if (host != null) {
+      configuration.host = host;
+    }
     if (port != null) {
       configuration.port = port;
     }

java/server/src/org/openqa/grid/internal/cli/CommonGridCliOptions.java

@@ -57,16 +57,6 @@ abstract class CommonGridCliOptions extends CommonCliOptions {
   )
   private Map<String, String> custom;
 
-  /**
-   * Hostname or IP to use. Defaults to {@code null}. Automatically determined when {@code null}.
-   */
-  @Parameter(
-      names = "-host",
-      description =  "<String> IP or hostname : usually determined automatically. Most commonly useful in exotic network configurations (e.g. network with VPN)"
-  )
-  // initially defaults to null from type
-  private String host;
-
   /**
    * Max "browser" sessions a node can handle. Default determined by configuration type.
    */
@@ -102,9 +92,6 @@ void fillCommonGridConfiguration(GridConfiguration configuration) {
     if (custom != null) {
       configuration.custom = custom;
     }
-    if (host != null) {
-      configuration.host = host;
-    }
     if (maxSession != null) {
       configuration.maxSession = maxSession;
     }

java/server/src/org/openqa/grid/internal/utils/configuration/GridConfiguration.java

@@ -44,13 +44,6 @@ public class GridConfiguration extends StandaloneConfiguration {
   @Expose
   public Map<String, String> custom = new HashMap<>();
 
-  /**
-   * Hostname or IP to use. Defaults to {@code null}. Automatically determined when {@code null}.
-   */
-  @Expose
-  // initially defaults to null from type
-  public String host;
-
   /**
    * Max "browser" sessions a node can handle. Default determined by configuration type.
    */
@@ -87,7 +80,6 @@ public void merge(GridConfiguration other) {
     }
     super.merge(other);
 
-    // don't merge 'host'
     if (isMergeAble(other.cleanUpCycle, cleanUpCycle)) {
       cleanUpCycle = other.cleanUpCycle;
     }
@@ -125,7 +117,6 @@ public String toString(String format) {
     sb.append(super.toString(format));
     sb.append(toString(format, "cleanUpCycle", cleanUpCycle));
     sb.append(toString(format, "custom", custom));
-    sb.append(toString(format, "host", host));
     sb.append(toString(format, "maxSession", maxSession));
     sb.append(toString(format, "servlets", servlets));
     sb.append(toString(format, "withoutServlets", withoutServlets));

java/server/src/org/openqa/grid/internal/utils/configuration/StandaloneConfiguration.java

@@ -124,6 +124,13 @@ public class StandaloneConfiguration {
   @Expose
   public String log;
 
+  /**
+   * Hostname or IP to use. Defaults to {@code null}. Automatically determined when {@code null}.
+   */
+  @Expose
+  // initially defaults to null from type
+  public String host;
+
   /**
    * Port to bind to. Default determined by configuration type.
    */
@@ -188,8 +195,8 @@ public void merge(StandaloneConfiguration other) {
     if (isMergeAble(other.timeout, timeout)) {
       timeout = other.timeout;
     }
-    // role, port, log, debug, version, enablePassThrough, and help are not merged, they are only consumed by the
-    // immediately running process and should never affect a remote
+    // role, host, port, log, debug, version, enablePassThrough, and help are not merged,
+    // they are only consumed by the immediately running process and should never affect a remote
   }
 
   /**
@@ -236,6 +243,7 @@ public String toString(String format) {
     sb.append(toString(format, "debug", debug));
     sb.append(toString(format, "jettyMaxThreads", jettyMaxThreads));
     sb.append(toString(format, "log", log));
+    sb.append(toString(format, "host", host));
     sb.append(toString(format, "port", port));
     sb.append(toString(format, "role", role));
     sb.append(toString(format, "timeout", timeout));

java/server/src/org/openqa/grid/web/Hub.java

@@ -176,6 +176,7 @@ private void initServer() {
       httpConfig.setSecurePort(config.port);
 
       ServerConnector http = new ServerConnector(server, new HttpConnectionFactory(httpConfig));
+      http.setHost(config.host);
       http.setPort(config.port);
 
       server.addConnector(http);

java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java

@@ -184,6 +184,9 @@ public boolean boot() {
     if (configuration.port == null) {
       configuration.port = 4444;
     }
+    if (configuration.host != null) {
+      http.setHost(configuration.host);
+    }
     http.setPort(configuration.port);
     http.setIdleTimeout(500000);
 

java/server/test/org/openqa/grid/internal/utils/configuration/StandaloneConfigurationTest.java

@@ -42,6 +42,8 @@ public void testDefaults() {
     assertEquals(StandaloneConfiguration.DEFAULT_BROWSER_TIMEOUT, sc.browserTimeout);
     assertEquals(StandaloneConfiguration.DEFAULT_DEBUG_TOGGLE, sc.debug);
     assertEquals(StandaloneConfiguration.DEFAULT_TIMEOUT, sc.timeout);
+    assertEquals(StandaloneConfiguration.DEFAULT_PORT, sc.port);
+    assertEquals(null, sc.host);
     assertNull(sc.jettyMaxThreads);
     assertNull(sc.log);
   }
@@ -58,6 +60,8 @@ public void testConstructorEqualsDefaultConfig() {
     assertEquals(expected.timeout, actual.timeout);
     assertEquals(expected.jettyMaxThreads, actual.jettyMaxThreads);
     assertEquals(expected.log, actual.log);
+    assertEquals(expected.port, actual.port);
+    assertEquals(null, actual.host);
   }
 
   @Test