Keep track of cluster type in metrics db

1 files changed, 17 insertions, 17 deletions

diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
index d7829df4152..511d2f988d0 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepositoryTest.java
@@ -34,9 +34,9 @@ public class NodeRepositoryTest {
         NodeRepositoryTester tester = new NodeRepositoryTester();
         assertEquals(0, tester.nodeRepository().getNodes().size());
 
-        tester.addNode("id1", "host1", "default", NodeType.host);
-        tester.addNode("id2", "host2", "default", NodeType.host);
-        tester.addNode("id3", "host3", "default", NodeType.host);
+        tester.addHost("id1", "host1", "default", NodeType.host);
+        tester.addHost("id2", "host2", "default", NodeType.host);
+        tester.addHost("id3", "host3", "default", NodeType.host);
 
         assertEquals(3, tester.nodeRepository().getNodes().size());
         
@@ -50,7 +50,7 @@ public class NodeRepositoryTest {
     @Test
     public void only_allow_docker_containers_remove_in_ready() {
         NodeRepositoryTester tester = new NodeRepositoryTester();
-        tester.addNode("id1", "host1", "docker", NodeType.tenant);
+        tester.addHost("id1", "host1", "docker", NodeType.tenant);
 
         try {
             tester.nodeRepository().removeRecursively("host1"); // host1 is in state provisioned
@@ -66,9 +66,9 @@ public class NodeRepositoryTest {
     @Test
     public void only_remove_tenant_docker_containers_for_new_allocations() {
         NodeRepositoryTester tester = new NodeRepositoryTester();
-        tester.addNode("host1", "host1", "default", NodeType.tenant);
-        tester.addNode("host2", "host2", "docker", NodeType.tenant);
-        tester.addNode("cfg1", "cfg1", "docker", NodeType.config);
+        tester.addHost("host1", "host1", "default", NodeType.tenant);
+        tester.addHost("host2", "host2", "docker", NodeType.tenant);
+        tester.addHost("cfg1", "cfg1", "docker", NodeType.config);
 
         tester.setNodeState("host1", Node.State.dirty);
         tester.setNodeState("host2", Node.State.dirty);
@@ -87,8 +87,8 @@ public class NodeRepositoryTest {
     @Test
     public void fail_readying_with_hard_fail() {
         NodeRepositoryTester tester = new NodeRepositoryTester();
-        tester.addNode("host1", "host1", "default", NodeType.tenant);
-        tester.addNode("host2", "host2", "default", NodeType.tenant);
+        tester.addHost("host1", "host1", "default", NodeType.tenant);
+        tester.addHost("host2", "host2", "default", NodeType.tenant);
         tester.setNodeState("host1", Node.State.dirty);
         tester.setNodeState("host2", Node.State.dirty);
 
@@ -113,8 +113,8 @@ public class NodeRepositoryTest {
     public void delete_host_only_after_all_the_children_have_been_deleted() {
         NodeRepositoryTester tester = new NodeRepositoryTester();
 
-        tester.addNode("id1", "host1", "default", NodeType.host);
-        tester.addNode("id2", "host2", "default", NodeType.host);
+        tester.addHost("id1", "host1", "default", NodeType.host);
+        tester.addHost("id2", "host2", "default", NodeType.host);
         tester.addNode("node10", "node10", "host1", "docker", NodeType.tenant);
         tester.addNode("node11", "node11", "host1", "docker", NodeType.tenant);
         tester.addNode("node12", "node12", "host1", "docker", NodeType.tenant);
@@ -151,7 +151,7 @@ public class NodeRepositoryTest {
 
         String cfghost1 = "cfghost1";
         String cfg1 = "cfg1";
-        tester.addNode("id1", cfghost1, "default", NodeType.confighost);
+        tester.addHost("id1", cfghost1, "default", NodeType.confighost);
         tester.addNode("id2", cfg1, cfghost1, "docker", NodeType.config);
         tester.setNodeState(cfghost1, Node.State.active);
         tester.setNodeState(cfg1, Node.State.active);
@@ -177,8 +177,8 @@ public class NodeRepositoryTest {
         Instant testStart = tester.nodeRepository().clock().instant();
 
         tester.clock().advance(Duration.ofSeconds(1));
-        tester.addNode("id1", "host1", "default", NodeType.host);
-        tester.addNode("id2", "host2", "default", NodeType.host);
+        tester.addHost("id1", "host1", "default", NodeType.host);
+        tester.addHost("id2", "host2", "default", NodeType.host);
         assertFalse(tester.nodeRepository().getNode("host1").get().history().hasEventAfter(History.Event.Type.deprovisioned, testStart));
 
         // Set host 1 properties and deprovision it
@@ -196,7 +196,7 @@ public class NodeRepositoryTest {
         assertTrue(host1.history().hasEventAfter(History.Event.Type.deprovisioned, testStart));
 
         // Adding it again preserves some information from the deprovisioned host and removes it
-        tester.addNode("id2", "host1", "default", NodeType.host);
+        tester.addHost("id2", "host1", "default", NodeType.host);
         host1 = tester.nodeRepository().getNode("host1").get();
         assertEquals("This is the newly added node", "id2", host1.id());
         assertFalse("The old 'host1' is removed",
@@ -213,8 +213,8 @@ public class NodeRepositoryTest {
     public void dirty_host_only_if_we_can_dirty_children() {
         NodeRepositoryTester tester = new NodeRepositoryTester();
 
-        tester.addNode("id1", "host1", "default", NodeType.host);
-        tester.addNode("id2", "host2", "default", NodeType.host);
+        tester.addHost("id1", "host1", "default", NodeType.host);
+        tester.addHost("id2", "host2", "default", NodeType.host);
         tester.addNode("node10", "node10", "host1", "docker", NodeType.tenant);
         tester.addNode("node11", "node11", "host1", "docker", NodeType.tenant);
         tester.addNode("node12", "node12", "host1", "docker", NodeType.tenant);