[grid] Add redis grid model flags

Author: pujagani

java/server/src/org/openqa/selenium/grid/distributor/config/DistributorOptions.java

@@ -32,7 +32,7 @@
 public class DistributorOptions {
 
   public static final int DEFAULT_HEALTHCHECK_INTERVAL = 300;
-  static final String DISTRIBUTOR_SECTION = "distributor";
+  public static final String DISTRIBUTOR_SECTION = "distributor";
   static final String DEFAULT_DISTRIBUTOR_IMPLEMENTATION =
     "org.openqa.selenium.grid.distributor.local.LocalDistributor";
   static final String DEFAULT_SLOT_MATCHER = "org.openqa.selenium.grid.data.DefaultSlotMatcher";

java/server/src/org/openqa/selenium/grid/distributor/gridmodel/BUILD.bazel

@@ -0,0 +1,12 @@
+load("@rules_jvm_external//:defs.bzl", "artifact")
+load("//java:defs.bzl", "java_library")
+
+java_library(
+    name = "gridmodel",
+    srcs = glob(["*.java"]),
+    visibility = [
+        "//java/server/src/org/openqa/selenium/grid/commands:__pkg__",
+        "//java/server/src/org/openqa/selenium/grid/distributor:__pkg__",
+        "//java/server/src/org/openqa/selenium/grid/distributor:__subpackages__",
+    ]
+)

java/server/src/org/openqa/selenium/grid/distributor/gridmodel/local/BUILD.bazel

@@ -17,6 +17,7 @@ java_library(
         "//java/server/src/org/openqa/selenium/grid/data",
         "//java/server/src/org/openqa/selenium/grid/distributor",
         "//java/server/src/org/openqa/selenium/grid/node",
+        "//java/server/src/org/openqa/selenium/grid/server",
         "//java/server/src/org/openqa/selenium/grid/node/remote",
         artifact("com.google.guava:guava"),
     ],

java/server/src/org/openqa/selenium/grid/distributor/gridmodel/local/LocalGridModel.java

@@ -19,6 +19,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import org.openqa.selenium.events.EventBus;
+import org.openqa.selenium.grid.config.Config;
 import org.openqa.selenium.grid.data.Availability;
 import org.openqa.selenium.grid.data.NodeDrainStarted;
 import org.openqa.selenium.grid.data.NodeId;
@@ -28,6 +29,7 @@
 import org.openqa.selenium.grid.data.Slot;
 import org.openqa.selenium.grid.data.SlotId;
 import org.openqa.selenium.grid.distributor.GridModel;
+import org.openqa.selenium.grid.server.EventBusOptions;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.SessionId;
 
@@ -64,6 +66,12 @@ public LocalGridModel(EventBus events) {
     this.events.addListener(SessionClosedEvent.listener(this::release));
   }
 
+  public static GridModel create(Config config) {
+    EventBus bus = new EventBusOptions(config).getEventBus();
+    
+    return new LocalGridModel(bus);
+  }
+
   @Override
   public void add(NodeStatus node) {
     Require.nonNull("Node", node);

java/server/src/org/openqa/selenium/grid/distributor/gridmodel/redis/BUILD.bazel

@@ -1,19 +1,32 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
-load("//java:defs.bzl", "java_library")
+load("//java:version.bzl", "SE_VERSION")
+load("//java:defs.bzl", "java_export")
 
-java_library(
-    name = "redis",
+java_export(
+    name = "grid-model-redis",
     srcs = glob(["*.java"]),
-    visibility = [
-        "//java/server/src/org/openqa/selenium/grid/distributor:__pkg__",
-        "//java/server/test/org/openqa/selenium/grid:__subpackages__",
+    maven_coordinates = "org.seleniumhq.selenium:selenium-grid-model-redis:%s" % SE_VERSION,
+    pom_template = "//java/client/src/org/openqa/selenium:template-pom",
+  visibility = [
+      "//visibility:public",
+      ],
+  exports = [
+      "//java/server/src/org/openqa/selenium/grid",
     ],
     deps = [
-         "//java/client/src/org/openqa/selenium/remote",
-         "//java/server/src/org/openqa/selenium/grid/data",
-         "//java/server/src/org/openqa/selenium/grid/distributor",
-         "//java/server/src/org/openqa/selenium/redis",
-         "//java/server/src/org/openqa/selenium/grid/node",
-         "//java/server/src/org/openqa/selenium/grid/node/remote",
+        "//java:auto-service",
+        "//java/client/src/org/openqa/selenium/remote",
+        "//java/server/src/org/openqa/selenium/events",
+        "//java/server/src/org/openqa/selenium/grid",
+        "//java/server/src/org/openqa/selenium/grid/config",
+        "//java/server/src/org/openqa/selenium/grid/data",
+        "//java/server/src/org/openqa/selenium/grid/distributor",
+        "//java/server/src/org/openqa/selenium/grid/distributor/config",
+        "//java/server/src/org/openqa/selenium/redis",
+        "//java/server/src/org/openqa/selenium/grid/node",
+        "//java/server/src/org/openqa/selenium/grid/node/remote",
+        "//java/server/src/org/openqa/selenium/grid/server",
+        artifact("com.beust:jcommander"),
+        artifact("com.google.guava:guava"),
     ],
 )

java/server/src/org/openqa/selenium/grid/distributor/gridmodel/redis/RedisBackedGridModel.java

@@ -0,0 +1,98 @@
+package org.openqa.selenium.grid.distributor.gridmodel.redis;
+
+import org.openqa.selenium.events.EventBus;
+import org.openqa.selenium.grid.config.Config;
+import org.openqa.selenium.grid.data.Availability;
+import org.openqa.selenium.grid.data.NodeDrainStarted;
+import org.openqa.selenium.grid.data.NodeId;
+import org.openqa.selenium.grid.data.NodeStatus;
+import org.openqa.selenium.grid.data.Session;
+import org.openqa.selenium.grid.data.SessionClosedEvent;
+import org.openqa.selenium.grid.data.SlotId;
+import org.openqa.selenium.grid.distributor.GridModel;
+import org.openqa.selenium.grid.server.EventBusOptions;
+import org.openqa.selenium.internal.Require;
+import org.openqa.selenium.remote.SessionId;
+
+import java.net.URI;
+import java.util.Set;
+import java.util.logging.Logger;
+
+import static org.openqa.selenium.grid.data.Availability.DRAINING;
+
+public class RedisGridModel implements GridModel {
+
+  private static final Logger LOG = Logger.getLogger(RedisGridModel.class.getName());
+  private final EventBus events;
+  private final URI redisServerUri;
+
+  public RedisGridModel(EventBus events, URI redisServerUri) {
+    this.events = Require.nonNull("Event bus", events);
+    this.redisServerUri = Require.nonNull("Redis Server URI", redisServerUri);
+
+    this.events.addListener(NodeDrainStarted.listener(nodeId -> setAvailability(nodeId, DRAINING)));
+    this.events.addListener(SessionClosedEvent.listener(this::release));
+  }
+
+  public static GridModel create(Config config) {
+    EventBus bus = new EventBusOptions(config).getEventBus();
+    RedisGridModelOptions options = new RedisGridModelOptions(config);
+
+    return new RedisGridModel(bus, options.getRedisServerUri());
+  }
+
+  @Override
+  public void add(NodeStatus node) {
+
+  }
+
+  @Override
+  public void refresh(NodeStatus status) {
+
+  }
+
+  @Override
+  public void touch(NodeId id) {
+
+  }
+
+  @Override
+  public void remove(NodeId id) {
+
+  }
+
+  @Override
+  public void purgeDeadNodes() {
+
+  }
+
+  @Override
+  public Availability setAvailability(NodeId id, Availability availability) {
+    return null;
+  }
+
+  @Override
+  public boolean reserve(SlotId slotId) {
+    return false;
+  }
+
+  @Override
+  public Set<NodeStatus> getSnapshot() {
+    return null;
+  }
+
+  @Override
+  public Set<NodeStatus> nodes(Availability availability) {
+    return null;
+  }
+
+  @Override
+  public void release(SessionId id) {
+
+  }
+
+  @Override
+  public void setSession(SlotId slotId, Session session) {
+
+  }
+}

java/server/src/org/openqa/selenium/grid/distributor/gridmodel/redis/RedisGridModel.java

@@ -0,0 +1,59 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The SFC 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.openqa.selenium.grid.distributor.gridmodel.redis;
+
+import com.beust.jcommander.Parameter;
+import com.google.auto.service.AutoService;
+import org.openqa.selenium.grid.config.ConfigValue;
+import org.openqa.selenium.grid.config.HasRoles;
+import org.openqa.selenium.grid.config.Role;
+
+import java.util.Collections;
+import java.util.Set;
+
+import static org.openqa.selenium.grid.config.StandardGridRoles.DISTRIBUTOR_ROLE;
+import static org.openqa.selenium.grid.distributor.config.DistributorOptions.DISTRIBUTOR_SECTION;
+
+@SuppressWarnings("FieldMayBeFinal")
+@AutoService(HasRoles.class)
+public class RedisGridModelFlags implements HasRoles {
+
+  @Parameter(
+    names = "--redis-server",
+    description = "Address of the redis server")
+  @ConfigValue(section = DISTRIBUTOR_SECTION, name = "redis-server", example = "\"localhost::6378\"")
+  private String redisServer;
+
+  @Parameter(
+    names = "--redis-host",
+    description = "Host on which the redis server is running.")
+  @ConfigValue(section = DISTRIBUTOR_SECTION, name = "redis-host", example = "\"localhost\"")
+  private String redisServerHost;
+
+  @Parameter(
+    names = "--redis-port",
+    description = "Port on which the redis server is running.")
+  @ConfigValue(section = DISTRIBUTOR_SECTION, name = "redis-port", example = "6379")
+  private Integer redisServerPort;
+
+
+  @Override
+  public Set<Role> getRoles() {
+    return Collections.singleton(DISTRIBUTOR_ROLE);
+  }
+}