Moved parentHostHostname to Environment

10 files changed, 21 insertions, 7 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index f434e325a84..2c29ec7f160 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.admin.nodeagent;
 
-import com.yahoo.net.HostName;
 import com.yahoo.vespa.hosted.dockerapi.Container;
 import com.yahoo.vespa.hosted.dockerapi.ContainerName;
 import com.yahoo.vespa.hosted.dockerapi.Docker;
@@ -86,7 +85,6 @@ public class NodeAgentImpl implements NodeAgent {
     private NodeAttributes lastAttributesSet = null;
     ContainerNodeSpec lastNodeSpec = null;
     CpuUsageReporter lastCpuMetric = new CpuUsageReporter();
-    String parentHostname;
 
     public NodeAgentImpl(
             final String hostName,
@@ -107,7 +105,6 @@ public class NodeAgentImpl implements NodeAgent {
         this.metricReceiver = metricReceiver;
         this.environment = environment;
         this.maintainer = maintainer;
-        this.parentHostname = HostName.getLocalhost();
     }
 
     @Override
@@ -476,7 +473,7 @@ public class NodeAgentImpl implements NodeAgent {
                 .add("flavor", nodeSpec.nodeFlavor)
                 .add("state", nodeSpec.nodeState.toString())
                 .add("zone", environment.getZone())
-                .add("parentHostname", parentHostname);
+                .add("parentHostname", environment.getParentHostHostname());
 
         if (nodeSpec.owner.isPresent()) {
             dimensionsBuilder
@@ -552,7 +549,7 @@ public class NodeAgentImpl implements NodeAgent {
                 .withTag("flavor", nodeSpec.nodeFlavor)
                 .withTag("state", nodeSpec.nodeState.toString())
                 .withTag("zone", environment.getZone())
-                .withTag("parentHostname", parentHostname);
+                .withTag("parentHostname", environment.getParentHostHostname());
 
         if (nodeSpec.owner.isPresent()) scheduleMaker
                 .withTag("tenantName", nodeSpec.owner.get().tenant)
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
index 39099578843..5dda3a6b313 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/util/Environment.java
@@ -1,6 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.admin.util;
 
+import com.yahoo.net.HostName;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Arrays;
@@ -23,22 +25,26 @@ public class Environment {
     private final Set<String> configServerHosts;
     private final String environment;
     private final String region;
+    private final String parentHostHostname;
     private final InetAddressResolver inetAddressResolver;
 
     public Environment() {
         this(getConfigServerHostsFromEnvironment(),
              getEnvironmentVariable(ENVIRONMENT),
              getEnvironmentVariable(REGION),
+             HostName.getLocalhost(),
              new InetAddressResolver());
     }
 
     public Environment(Set<String> configServerHosts,
                        String environment,
                        String region,
+                       String parentHostHostname,
                        InetAddressResolver inetAddressResolver) {
         this.configServerHosts = configServerHosts;
         this.environment = environment;
         this.region = region;
+        this.parentHostHostname = parentHostHostname;
         this.inetAddressResolver = inetAddressResolver;
     }
 
@@ -52,6 +58,10 @@ public class Environment {
         return region;
     }
 
+    public String getParentHostHostname() {
+        return parentHostHostname;
+    }
+
     private static String getEnvironmentVariable(String name) {
         final String value = System.getenv(name);
         if (value == null) throw new IllegalStateException(String.format("Environment variable %s not set", name));
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
index 67e332a7387..c7a641feda4 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/DockerOperationsImplTest.java
@@ -24,9 +24,10 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 public class DockerOperationsImplTest {
-    Environment environment = new Environment(Collections.emptySet(),
+    private final Environment environment = new Environment(Collections.emptySet(),
                                               "dev",
                                               "us-east-1",
+                                              "parent.host.name.yahoo.com",
                                               new InetAddressResolver());
     private final Docker docker = mock(Docker.class);
     private final DockerOperationsImpl dockerOperations = new DockerOperationsImpl(docker, environment, new Maintainer());
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ComponentsProviderWithMocks.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ComponentsProviderWithMocks.java
index 2268f45c26a..63ba0cbb7ed 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ComponentsProviderWithMocks.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ComponentsProviderWithMocks.java
@@ -34,6 +34,7 @@ public class ComponentsProviderWithMocks implements ComponentsProvider {
     private Environment environment = new Environment(Collections.emptySet(),
                                                       "dev",
                                                       "us-east-1",
+                                                      "parent.host.name.yahoo.com",
                                                       new InetAddressResolver());
     private final MetricReceiverWrapper mr = new MetricReceiverWrapper(MetricReceiver.nullImplementation);
     private final Function<String, NodeAgent> nodeAgentFactory =
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 3a46ef54738..53e3951b648 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
@@ -54,6 +54,7 @@ public class DockerTester implements AutoCloseable {
         Environment environment = new Environment(Collections.emptySet(),
                                                   "dev",
                                                   "us-east-1",
+                                                  "parent.host.name.yahoo.com",
                                                   inetAddressResolver);
 
         MetricReceiverWrapper mr = new MetricReceiverWrapper(MetricReceiver.nullImplementation);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
index 609d876beca..3d4813a2132 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/MultiDockerTest.java
@@ -55,6 +55,7 @@ public class MultiDockerTest {
         Environment environment = new Environment(Collections.emptySet(),
                                                   "dev",
                                                   "us-east-1",
+                                                  "parent.host.name.yahoo.com",
                                                   inetAddressResolver);
 
         MetricReceiverWrapper mr = new MetricReceiverWrapper(MetricReceiver.nullImplementation);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
index 280be71e253..1221a2d7b9a 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/NodeStateTest.java
@@ -59,6 +59,7 @@ public class NodeStateTest {
         Environment environment = new Environment(Collections.emptySet(),
                                                   "dev",
                                                   "us-east-1",
+                                                  "parent.host.name.yahoo.com",
                                                   inetAddressResolver);
 
         MetricReceiverWrapper mr = new MetricReceiverWrapper(MetricReceiver.nullImplementation);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
index cef15d0ab2b..6f8362d5ade 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/RestartTest.java
@@ -48,6 +48,7 @@ public class RestartTest {
         Environment environment = new Environment(Collections.emptySet(),
                                                   "dev",
                                                   "us-east-1",
+                                                  "parent.host.name.yahoo.com",
                                                   inetAddressResolver);
 
         MetricReceiverWrapper mr = new MetricReceiverWrapper(MetricReceiver.nullImplementation);
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ResumeTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ResumeTest.java
index 1f3bc1244ab..563fd70da5a 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ResumeTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/ResumeTest.java
@@ -49,6 +49,7 @@ public class ResumeTest {
         Environment environment = new Environment(Collections.emptySet(),
                                                   "dev",
                                                   "us-east-1",
+                                                  "parent.host.name.yahoo.com",
                                                   inetAddressResolver);
 
         MetricReceiverWrapper mr = new MetricReceiverWrapper(MetricReceiver.nullImplementation);
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 a5d3efa10db..6fd969bc9e7 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
@@ -64,6 +64,7 @@ public class NodeAgentImplTest {
     Environment environment = new Environment(Collections.emptySet(),
                                               "dev",
                                               "us-east-1",
+                                              "parent.host.name.yahoo.com",
                                               new InetAddressResolver());
     private final NodeAgentImpl nodeAgent = new NodeAgentImpl(hostName, nodeRepository, orchestrator, dockerOperations,
             storageMaintainer, metricReceiver, environment, maintainer);
@@ -433,7 +434,6 @@ public class NodeAgentImplTest {
         ContainerNodeSpec.Membership membership = new ContainerNodeSpec.Membership("clustType", "clustId", "grp", 3, false);
         nodeAgent.lastNodeSpec = new ContainerNodeSpec(hostName, null, containerName, Node.State.active, "tenants",
                 "docker", version, Optional.of(owner), Optional.of(membership), null, null, null, null, null);
-        nodeAgent.parentHostname = "parent.host.name.yahoo.com";
 
         long totalContainerCpuTime = (long) ((Map) cpu_stats.get("cpu_usage")).get("total_usage");
         long totalSystemCpuTime = (long) cpu_stats.get("system_cpu_usage");