Introducing unique ids for node slot configurations. Hub injects UID …

…of the matched configuration to the new request payload. This allows to avoid secondary matching on the node, it knows immediately what slot configuration to use.

java/server/src/org/openqa/grid/common/RegistrationRequest.java

@@ -29,9 +29,6 @@
 import org.openqa.grid.internal.utils.configuration.GridNodeConfiguration.CollectionOfDesiredCapabilitiesDeSerializer;
 import org.openqa.grid.internal.utils.configuration.GridNodeConfiguration.CollectionOfDesiredCapabilitiesSerializer;
 import org.openqa.selenium.MutableCapabilities;
-import org.openqa.selenium.Platform;
-import org.openqa.selenium.net.NetworkUtils;
-import org.openqa.selenium.remote.CapabilityType;
 
 import java.util.List;
 
@@ -103,9 +100,9 @@ public RegistrationRequest(GridNodeConfiguration configuration, String name, Str
     this.description = description;
 
     // make sure we have something that looks like a valid host
-    fixUpHost();
+    this.configuration.fixUpHost();
     // make sure the capabilities are updated with required fields
-    fixUpCapabilities();
+    this.configuration.fixUpCapabilities();
   }
 
   public String getName() {
@@ -241,31 +238,6 @@ public static RegistrationRequest build(GridNodeConfiguration configuration, Str
     return pendingRequest;
   }
 
-  private void fixUpCapabilities() {
-    if (configuration.capabilities == null) {
-      return; // assumes the caller set it/wants it this way
-    }
-
-    Platform current = Platform.getCurrent();
-    for (MutableCapabilities cap : configuration.capabilities) {
-      if (cap.getPlatform() == null) {
-        cap.setCapability(CapabilityType.PLATFORM, current);
-      }
-      if (cap.getCapability(SELENIUM_PROTOCOL) == null) {
-        cap.setCapability(SELENIUM_PROTOCOL, SeleniumProtocol.WebDriver.toString());
-      }
-    }
-  }
-
-  private void fixUpHost() {
-    NetworkUtils util = new NetworkUtils();
-    if (configuration.host == null || "ip".equalsIgnoreCase(configuration.host)) {
-      configuration.host = util.getIp4NonLoopbackAddressOfThisMachine().getHostAddress();
-    } else if ("host".equalsIgnoreCase(configuration.host)) {
-      configuration.host = util.getIp4NonLoopbackAddressOfThisMachine().getHostName();
-    }
-  }
-
   /**
    * Validate the current setting and throw a config exception is an invalid setup is detected.
    *

java/server/src/org/openqa/grid/internal/TestSlot.java

@@ -23,6 +23,7 @@
 import org.openqa.grid.internal.listeners.TestSessionListener;
 import org.openqa.grid.internal.utils.CapabilityMatcher;
 import org.openqa.grid.internal.utils.configuration.GridHubConfiguration;
+import org.openqa.grid.internal.utils.configuration.GridNodeConfiguration;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -132,6 +133,8 @@ public TestSession getNewSession(Map<String, Object> desiredCapabilities) {
       }
       if (matches(desiredCapabilities)) {
         log.info("Trying to create a new session on test slot " + this.capabilities);
+        desiredCapabilities.put(GridNodeConfiguration.CONFIG_UUID_CAPABILITY,
+                                capabilities.get(GridNodeConfiguration.CONFIG_UUID_CAPABILITY));
         TestSession session = new TestSession(this, desiredCapabilities, Clock.systemUTC());
         currentSession = session;
         lastSessionStart = System.currentTimeMillis();

java/server/src/org/openqa/grid/internal/utils/SelfRegisteringRemote.java

@@ -166,6 +166,7 @@ public void addBrowser(DesiredCapabilities cap, int instances) {
     }
     cap.setCapability(RegistrationRequest.MAX_INSTANCES, instances);
     registrationRequest.getConfiguration().capabilities.add(cap);
+    registrationRequest.getConfiguration().fixUpCapabilities();
   }
 
   /**

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

@@ -51,9 +51,11 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 public class GridNodeConfiguration extends GridConfiguration {
   public static final String DEFAULT_NODE_CONFIG_FILE = "defaults/DefaultNodeWebDriver.json";
+  public static final String CONFIG_UUID_CAPABILITY = "_CONFIG_UUID";
 
   /*
    * IMPORTANT - Keep these constant values in sync with the ones specified in
@@ -520,6 +522,7 @@ public void fixUpCapabilities() {
       if (cap.getCapability(RegistrationRequest.SELENIUM_PROTOCOL) == null) {
         cap.setCapability(RegistrationRequest.SELENIUM_PROTOCOL, SeleniumProtocol.WebDriver.toString());
       }
+      cap.setCapability(CONFIG_UUID_CAPABILITY, UUID.randomUUID().toString());
     }
   }
 

java/server/src/org/openqa/grid/web/servlet/RegistrationServlet.java

@@ -178,6 +178,7 @@ private void considerV2Json(GridNodeConfiguration configuration, JsonObject json
         MutableCapabilities cap = converter.toType(capabilities.get(i), DesiredCapabilities.class);
         configuration.capabilities.add(cap);
       }
+      configuration.fixUpCapabilities();
     }
   }
 

java/server/test/org/openqa/grid/e2e/GridE2ETests.java

@@ -35,7 +35,7 @@
 import org.openqa.grid.e2e.misc.WebDriverPriorityDemo;
 import org.openqa.grid.e2e.node.BrowserTimeOutTest;
 import org.openqa.grid.e2e.node.CrashWhenStartingBrowserTest;
-import org.openqa.grid.e2e.node.DefaultProxyFindsFirefoxLocationsTest;
+import org.openqa.grid.e2e.node.DefaultProxyInjectsConfigurationUuidTest;
 import org.openqa.grid.e2e.node.DefaultProxyIsUnregisteredIfDownForTooLongTest;
 import org.openqa.grid.e2e.node.NodeGoingDownAndUpTest;
 import org.openqa.grid.e2e.node.NodeRecoveryTest;
@@ -48,7 +48,7 @@
     BrowserTimeOutTest.class,
     ConfigInheritanceTest.class,
     CrashWhenStartingBrowserTest.class,
-    DefaultProxyFindsFirefoxLocationsTest.class,
+    DefaultProxyInjectsConfigurationUuidTest.class,
     DefaultProxyIsUnregisteredIfDownForTooLongTest.class,
     ExtraServletUtilTest.class,
     Grid1HeartbeatTest.class,