Skip to content

Commit eefc804

Browse files
diemoldiemol
committed
[grid] ContainerInfo is actually the config of the container
1 parent bbd7551 commit eefc804

7 files changed

Lines changed: 23 additions & 22 deletions

File tree

java/server/src/org/openqa/selenium/docker/ContainerInfo.java renamed to java/server/src/org/openqa/selenium/docker/ContainerConfig.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@
2626
import java.util.Map;
2727

2828
@Beta
29-
public class ContainerInfo {
29+
public class ContainerConfig {
3030

3131
private final Image image;
3232
// Port bindings, keyed on the container port, with values being host ports
3333
private final Multimap<String, Map<String, Object>> portBindings;
3434

35-
private ContainerInfo(Image image, Multimap<String, Map<String, Object>> portBindings) {
35+
private ContainerConfig(Image image, Multimap<String, Map<String, Object>> portBindings) {
3636
this.image = Require.nonNull("Container image", image);
3737
this.portBindings = Require.nonNull("Port bindings", portBindings);
3838
}
3939

40-
public static ContainerInfo image(Image image) {
41-
return new ContainerInfo(image, HashMultimap.create());
40+
public static ContainerConfig image(Image image) {
41+
return new ContainerConfig(image, HashMultimap.create());
4242
}
4343

44-
public ContainerInfo map(Port containerPort, Port hostPort) {
44+
public ContainerConfig map(Port containerPort, Port hostPort) {
4545
Require.nonNull("Container port", containerPort);
4646
Require.nonNull("Host port", hostPort);
4747

@@ -55,12 +55,12 @@ public ContainerInfo map(Port containerPort, Port hostPort) {
5555
containerPort.getPort() + "/" + containerPort.getProtocol(),
5656
ImmutableMap.of("HostPort", String.valueOf(hostPort.getPort()), "HostIp", ""));
5757

58-
return new ContainerInfo(image, updatedBindings);
58+
return new ContainerConfig(image, updatedBindings);
5959
}
6060

6161
@Override
6262
public String toString() {
63-
return "ContainerInfo{" +
63+
return "ContainerConfig{" +
6464
"image=" + image +
6565
", portBindings=" + portBindings +
6666
'}';

‎java/server/src/org/openqa/selenium/docker/Docker.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ public Image getImage(String name) {
5252
.orElseThrow(() -> new DockerException("Unable to get image " + name));
5353
}
5454

55-
public Container create(ContainerInfo info) {
56-
Require.nonNull("Container info", info);
55+
public Container create(ContainerConfig config) {
56+
Require.nonNull("Container config", config);
5757

58-
LOG.info("Creating image from " + info);
58+
LOG.info("Creating image from " + config);
5959

6060
return getDocker()
61-
.map(protocol -> protocol.create(info))
62-
.orElseThrow(() -> new DockerException("Unable to create container: " + info));
61+
.map(protocol -> protocol.create(config))
62+
.orElseThrow(() -> new DockerException("Unable to create container: " + config));
6363
}
6464

6565
private Optional<DockerProtocol> getDocker() {

‎java/server/src/org/openqa/selenium/docker/DockerProtocol.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public interface DockerProtocol {
2424

2525
Image getImage(String imageName) throws DockerException;
2626

27-
Container create(ContainerInfo info);
27+
Container create(ContainerConfig info);
2828
void startContainer(ContainerId id) throws DockerException;
2929
void stopContainer(ContainerId id, Duration timeout) throws DockerException;
3030
boolean exists(ContainerId id);

‎java/server/src/org/openqa/selenium/docker/v1_40/CreateContainer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.openqa.selenium.docker.Container;
2121
import org.openqa.selenium.docker.ContainerId;
22-
import org.openqa.selenium.docker.ContainerInfo;
22+
import org.openqa.selenium.docker.ContainerConfig;
2323
import org.openqa.selenium.docker.DockerException;
2424
import org.openqa.selenium.docker.DockerProtocol;
2525
import org.openqa.selenium.internal.Require;
@@ -51,7 +51,7 @@ public CreateContainer(DockerProtocol protocol, HttpHandler client) {
5151
this.client = Require.nonNull("HTTP client", client);
5252
}
5353

54-
public Container apply(ContainerInfo info) {
54+
public Container apply(ContainerConfig info) {
5555
HttpResponse res = DockerMessages.throwIfNecessary(
5656
client.execute(
5757
new HttpRequest(POST, "/v1.40/containers/create")

‎java/server/src/org/openqa/selenium/docker/v1_40/V140Docker.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.openqa.selenium.docker.Container;
2121
import org.openqa.selenium.docker.ContainerId;
22-
import org.openqa.selenium.docker.ContainerInfo;
22+
import org.openqa.selenium.docker.ContainerConfig;
2323
import org.openqa.selenium.docker.DockerException;
2424
import org.openqa.selenium.docker.DockerProtocol;
2525
import org.openqa.selenium.docker.Image;
@@ -84,12 +84,12 @@ public Image getImage(String imageName) throws DockerException {
8484
}
8585

8686
@Override
87-
public Container create(ContainerInfo info) {
88-
Require.nonNull("Container info", info);
87+
public Container create(ContainerConfig config) {
88+
Require.nonNull("Container config", config);
8989

90-
LOG.info("Creating container: " + info);
90+
LOG.info("Creating container: " + config);
9191

92-
return createContainer.apply(info);
92+
return createContainer.apply(config);
9393
}
9494

9595
@Override

‎java/server/src/org/openqa/selenium/grid/docker/DockerOptions.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ private URI getDockerUri() {
9595
}
9696

9797
private boolean isEnabled(HttpClient.Factory clientFactory) {
98-
if (!config.getAll(DOCKER_SECTION, "configs").isPresent()) {
98+
if (config.getAll(DOCKER_SECTION, "configs").isEmpty()) {
9999
return false;
100100
}
101101

‎java/server/src/org/openqa/selenium/grid/docker/DockerSessionFactory.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import java.util.logging.Level;
6363
import java.util.logging.Logger;
6464

65-
import static org.openqa.selenium.docker.ContainerInfo.image;
65+
import static org.openqa.selenium.docker.ContainerConfig.image;
6666
import static org.openqa.selenium.remote.Dialect.W3C;
6767
import static org.openqa.selenium.remote.http.Contents.string;
6868
import static org.openqa.selenium.remote.http.HttpMethod.GET;
@@ -169,6 +169,7 @@ public Optional<ActiveSession> apply(CreateSessionRequest sessionRequest) {
169169

170170
SessionId id = new SessionId(response.getSessionId());
171171
Capabilities capabilities = new ImmutableCapabilities((Map<?, ?>) response.getValue());
172+
// Start video container here, with env var containing the IP of the browser container and session is as the video file name
172173

173174
Dialect downstream = sessionRequest.getDownstreamDialects().contains(result.getDialect()) ?
174175
result.getDialect() :

0 commit comments

Comments
 (0)