aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@verizonmedia.com>2020-09-08 09:29:46 +0200
committerHåkon Hallingstad <hakon@verizonmedia.com>2020-09-08 09:29:46 +0200
commite77c60a0bca744937bb674f2fc5b48335352abee (patch)
tree43b69c1ac32de642574a23a8ee7cab7f149aa7a7 /node-admin
parent92494ee6cb4b373c0a3ddf44997dc2a1ec35ef0d (diff)
Rename DockerImpl to DockerEngine
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/application/services.xml2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ContainerEngineMock.java (renamed from node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java)2
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/node-admin/src/main/application/services.xml b/node-admin/src/main/application/services.xml
index c5dcab34c8c..4647f5201c7 100644
--- a/node-admin/src/main/application/services.xml
+++ b/node-admin/src/main/application/services.xml
@@ -6,7 +6,7 @@
<accesslog type="vespa" fileNamePattern="logs/vespa/node-admin/access.log.%Y%m%d%H%M%S" symlinkName="access.log" />
<accesslog type="json" fileNamePattern="logs/vespa/node-admin/access-json.log.%Y%m%d%H%M%S" symlinkName="access-json.log" compressOnRotation="true" />
- <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerImpl" bundle="docker-api"/>
+ <component id="docker-api" class="com.yahoo.vespa.hosted.dockerapi.DockerEngine" bundle="docker-api"/>
<component id="metrics" class="com.yahoo.vespa.hosted.dockerapi.metrics.Metrics" bundle="docker-api"/>
<preprocess:include file="variant.xml" required="false"/>
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ContainerEngineMock.java
index 310d950c5c3..2ea48ed0e9c 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerMock.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ContainerEngineMock.java
@@ -23,7 +23,7 @@ import java.util.OptionalLong;
*
* @author freva
*/
-public class DockerMock implements ContainerEngine {
+public class ContainerEngineMock implements ContainerEngine {
private final Map<ContainerName, Container> containersByContainerName = new HashMap<>();
private static final Object monitor = new Object();
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
index da6f115463c..e7292d567c6 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
@@ -51,7 +51,7 @@ public class DockerTester implements AutoCloseable {
private final Thread loopThread;
- final ContainerEngine containerEngine = spy(new DockerMock());
+ final ContainerEngine containerEngine = spy(new ContainerEngineMock());
final NodeRepoMock nodeRepository = spy(new NodeRepoMock());
final Orchestrator orchestrator = mock(Orchestrator.class);
final StorageMaintainer storageMaintainer = mock(StorageMaintainer.class);