Write container data in hosted

3 files changed, 0 insertions, 113 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/MotdContainerDataTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/MotdContainerDataTest.java
deleted file mode 100644
index 61164c1e936..00000000000
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/MotdContainerDataTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.yahoo.vespa.hosted.node.admin.containerdata;
-
-import com.yahoo.config.provision.NodeType;
-import com.yahoo.vespa.hosted.node.admin.NodeSpec;
-import com.yahoo.vespa.hosted.node.admin.component.Environment;
-import com.yahoo.vespa.hosted.node.admin.config.ConfigServerConfig;
-import com.yahoo.vespa.hosted.provision.Node;
-import org.junit.Test;
-
-import java.nio.file.Paths;
-import java.util.Collections;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class MotdContainerDataTest {
-
-    @Test
-    public void writesMotd() {
-        MotdContainerData motdContainerData = new MotdContainerData(
-                new NodeSpec.Builder()
-                        .nodeType(NodeType.tenant)
-                        .owner(new NodeSpec.Owner("tenant1", "application1", "default"))
-                        .nodeState(Node.State.dirty)
-                        .vespaVersion("7.0.0")
-                        .hostname("nope")
-                        .nodeFlavor("D-WAVE")
-                        .allowedToBeDown(false)
-                        .membership(new NodeSpec.Membership(null, null, null, 0, false))
-                        .minCpuCores(0)
-                        .minMainMemoryAvailableGb(0)
-                        .minDiskAvailableGb(0)
-                        .fastDisk(false)
-                        .ipAddresses(Collections.emptySet())
-                        .build(),
-                new Environment.Builder()
-                        .configServerConfig(new ConfigServerConfig(new ConfigServerConfig.Builder()))
-                        .system("main")
-                        .environment("prod")
-                        .region("aws-us-east-1a")
-                        .defaultFlavor("cherry")
-                        .cloud("mycloud")
-                        .build());
-
-        motdContainerData.writeTo((path, content) -> {
-            assertEquals(path, Paths.get("etc/profile.d/motd.sh"));
-
-            System.out.println(content);
-
-            assertTrue(content.contains("tenant"));
-            assertTrue(content.contains("D-WAVE"));
-            assertTrue(content.contains("[0;91m"));
-            assertTrue(content.contains("MAIN PROD AWS-US-EAST-1A"));
-            assertTrue(content.contains("tenant1:application1:default"));
-            assertTrue(content.contains("dirty"));
-            assertTrue(content.contains("wanted = unknown"));
-            assertTrue(content.contains("installed = 7.0.0"));
-        });
-
-    }
-
-}
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/PromptContainerDataTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/PromptContainerDataTest.java
deleted file mode 100644
index 24ab35fc407..00000000000
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/containerdata/PromptContainerDataTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.yahoo.vespa.hosted.node.admin.containerdata;
-
-import com.yahoo.vespa.hosted.node.admin.component.Environment;
-import com.yahoo.vespa.hosted.node.admin.config.ConfigServerConfig;
-import org.junit.Test;
-
-import java.nio.file.Paths;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class PromptContainerDataTest {
-
-    @Test
-    public void writesPrompt() {
-        PromptContainerData promptContainerData = new PromptContainerData(new Environment.Builder()
-                                                                                  .configServerConfig(new ConfigServerConfig(new ConfigServerConfig.Builder()))
-                                                                                  .system("main")
-                                                                                  .environment("prod")
-                                                                                  .region("aws-us-east-1a")
-                                                                                  .defaultFlavor("cherry")
-                                                                                  .cloud("mycloud")
-                                                                                  .build());
-
-        promptContainerData.writeTo((path, content) -> {
-            assertEquals(path, Paths.get("etc/profile.d/prompt.sh"));
-
-            assertTrue(content.contains("[0;91m"));
-            assertTrue(content.contains("AWS-US-EAST-1A"));
-        });
-
-    }
-
-}
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
index db92e4c3838..aed2ca4d83e 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImplTest.java
@@ -15,8 +15,6 @@ import com.yahoo.vespa.hosted.dockerapi.DockerImage;
 import com.yahoo.vespa.hosted.dockerapi.metrics.MetricReceiverWrapper;
 import com.yahoo.vespa.hosted.node.admin.NodeSpec;
 import com.yahoo.vespa.hosted.node.admin.config.ConfigServerConfig;
-import com.yahoo.vespa.hosted.node.admin.containerdata.ConfigServerContainerData;
-import com.yahoo.vespa.hosted.node.admin.containerdata.ContainerData;
 import com.yahoo.vespa.hosted.node.admin.docker.DockerOperations;
 import com.yahoo.vespa.hosted.node.admin.maintenance.StorageMaintainer;
 import com.yahoo.vespa.hosted.node.admin.maintenance.acl.AclMaintainer;
@@ -714,21 +712,6 @@ public class NodeAgentImplTest {
                         .withDockerImage(dockerImage)
                         .withVespaVersion(vespaVersion));
         inOrder.verify(orchestrator).resume(hostName);
-
-        // Files written in createContainerData()
-        assertFileExists(containerName, tempDirectory, "node-repository-config.xml");
-        assertFileExists(containerName, tempDirectory, "configserver-config.xml");
-    }
-
-    private void assertFileExists(ContainerName containerName, Path tempDirectory, String filename) {
-        File file = tempDirectory
-                .resolve(containerName.asString())
-                .resolve(Paths.get("/").relativize(ContainerData.containerDataPath))
-                .resolve(ConfigServerContainerData.configServerAppDir)
-                .resolve(filename)
-                .toAbsolutePath()
-                .toFile();
-        assertTrue("File " + file + " does not exist", file.exists());
     }
 
     private NodeAgentImpl makeNodeAgent(DockerImage dockerImage, boolean isRunning) {