Add PathScope to NodeAgentContext to resolve paths

2 files changed, 12 insertions, 12 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java
index ded99cf3778..ed45768aec8 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java
@@ -31,7 +31,7 @@ public class CoreCollectorTest {
     private final NodeAgentContext context = NodeAgentContextImpl.builder("container-123.domain.tld")
             .fileSystem(TestFileSystem.create()).build();
 
-    private final ContainerPath TEST_CORE_PATH = context.containerPath("/tmp/core.1234");
+    private final ContainerPath TEST_CORE_PATH = context.paths().of("/tmp/core.1234");
     private final String TEST_BIN_PATH = "/usr/bin/program";
     private final List<String> GDB_BACKTRACE = List.of("[New Thread 2703]",
             "Core was generated by `/usr/bin/program\'.", "Program terminated with signal 11, Segmentation fault.",
@@ -182,7 +182,7 @@ public class CoreCollectorTest {
 
     @Test
     public void metadata_for_java_heap_dump() {
-        assertEquals(JAVA_HEAP_DUMP_METADATA, coreCollector.collect(context, context.containerPath("/dump_java_pid123.hprof")));
+        assertEquals(JAVA_HEAP_DUMP_METADATA, coreCollector.collect(context, context.paths().of("/dump_java_pid123.hprof")));
     }
 
     private void mockExec(String[] cmd, String output) {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java
index 9f507f451b9..5371d69ecda 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java
@@ -48,7 +48,7 @@ public class CoredumpHandlerTest {
     private final FileSystem fileSystem = TestFileSystem.create();
     private final NodeAgentContext context = NodeAgentContextImpl.builder("container-123.domain.tld")
             .fileSystem(fileSystem).build();
-    private final ContainerPath containerCrashPath = context.containerPath("/var/crash");
+    private final ContainerPath containerCrashPath = context.paths().of("/var/crash");
     private final Path doneCoredumpsPath = fileSystem.getPath("/home/docker/dumps");
 
     private final TestTerminal terminal = new TestTerminal();
@@ -64,8 +64,8 @@ public class CoredumpHandlerTest {
 
     @Test
     public void coredump_enqueue_test() throws IOException {
-        ContainerPath crashPath = context.containerPath("/some/crash/path");
-        ContainerPath processingDir = context.containerPath("/some/other/processing");
+        ContainerPath crashPath = context.paths().of("/some/crash/path");
+        ContainerPath processingDir = context.paths().of("/some/other/processing");
 
         Files.createDirectories(crashPath);
         createFileAged(crashPath.resolve("bash.core.431"), Duration.ZERO);
@@ -98,8 +98,8 @@ public class CoredumpHandlerTest {
 
     @Test
     public void enqueue_with_hs_err_files() throws IOException {
-        ContainerPath crashPath = context.containerPath("/some/crash/path");
-        ContainerPath processingDir = context.containerPath("/some/other/processing");
+        ContainerPath crashPath = context.paths().of("/some/crash/path");
+        ContainerPath processingDir = context.paths().of("/some/other/processing");
         Files.createDirectories(crashPath);
 
         createFileAged(crashPath.resolve("java.core.69"), Duration.ofSeconds(515));
@@ -119,7 +119,7 @@ public class CoredumpHandlerTest {
 
     @Test
     public void coredump_to_process_test() throws IOException {
-        ContainerPath processingDir = context.containerPath("/some/other/processing");
+        ContainerPath processingDir = context.paths().of("/some/other/processing");
 
         // Initially there are no core dumps
         Optional<ContainerPath> enqueuedPath = coredumpHandler.enqueueCoredump(containerCrashPath, processingDir);
@@ -164,7 +164,7 @@ public class CoredumpHandlerTest {
                 "}}";
 
 
-        ContainerPath coredumpDirectory = context.containerPath("/var/crash/id-123");
+        ContainerPath coredumpDirectory = context.paths().of("/var/crash/id-123");
         Files.createDirectories(coredumpDirectory.pathOnHost());
         Files.createFile(coredumpDirectory.resolve("dump_core.456"));
         when(coreCollector.collect(eq(context), eq(coredumpDirectory.resolve("dump_core.456"))))
@@ -180,12 +180,12 @@ public class CoredumpHandlerTest {
 
     @Test(expected = IllegalStateException.class)
     public void cant_get_metadata_if_no_core_file() throws IOException {
-        coredumpHandler.getMetadata(context, context.containerPath("/fake/path"), Map::of);
+        coredumpHandler.getMetadata(context, context.paths().of("/fake/path"), Map::of);
     }
 
     @Test(expected = IllegalStateException.class)
     public void fails_to_get_core_file_if_only_compressed() throws IOException {
-        ContainerPath coredumpDirectory = context.containerPath("/path/to/coredump/proccessing/id-123");
+        ContainerPath coredumpDirectory = context.paths().of("/path/to/coredump/proccessing/id-123");
         Files.createDirectories(coredumpDirectory);
         Files.createFile(coredumpDirectory.resolve("dump_bash.core.431.lz4"));
         coredumpHandler.findCoredumpFileInProcessingDirectory(coredumpDirectory);
@@ -193,7 +193,7 @@ public class CoredumpHandlerTest {
 
     @Test
     public void process_single_coredump_test() throws IOException {
-        ContainerPath coredumpDirectory = context.containerPath("/path/to/coredump/proccessing/id-123");
+        ContainerPath coredumpDirectory = context.paths().of("/path/to/coredump/proccessing/id-123");
         Files.createDirectories(coredumpDirectory);
         Files.write(coredumpDirectory.resolve("metadata.json"), "metadata".getBytes());
         Files.createFile(coredumpDirectory.resolve("dump_bash.core.431"));