qrserver -> container

7 files changed, 28 insertions, 32 deletions

diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java
index 961c8f91223..859c3c3dd10 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/IntegrationTester.java
@@ -38,7 +38,7 @@ public class IntegrationTester implements  AutoCloseable {
 
     static final String MONITORING_SYSTEM = "test-system";
     static final ConsumerId CUSTOM_CONSUMER_ID = toConsumerId("custom-consumer");
-    static final String SERVICE_1_CONFIG_ID = "container/qrserver.0";
+    static final String SERVICE_1_CONFIG_ID = "container/default.0";
     static final String SERVICE_2_CONFIG_ID = "storage/cluster.storage/storage/0";
 
     private final RpcConnector connector;
@@ -104,7 +104,7 @@ public class IntegrationTester implements  AutoCloseable {
 
     private VespaServicesConfig servicesConfig() {
         return new VespaServicesConfig.Builder()
-                .service(createService(toServiceId("qrserver"), SERVICE_1_CONFIG_ID, httpPort()))
+                .service(createService(toServiceId("container"), SERVICE_1_CONFIG_ID, httpPort()))
                 .service(createService(toServiceId("storagenode"), SERVICE_2_CONFIG_ID, httpPort()))
                 .build();
     }
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java
index a52e1daf878..cedf7542233 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java
@@ -106,10 +106,10 @@ public class RpcMetricsTest {
 
             assertEquals("#Services should be 1 for config id " + SERVICE_1_CONFIG_ID, 1, services.size());
 
-            VespaService qrserver = services.get(0);
-            assertEquals(MONITORING_SYSTEM + VespaService.SEPARATOR + "qrserver", qrserver.getMonitoringName().id);
+            VespaService container = services.get(0);
+            assertEquals(MONITORING_SYSTEM + VespaService.SEPARATOR + "container", container.getMonitoringName().id);
 
-            Metrics metrics = qrserver.getMetrics();
+            Metrics metrics = container.getMetrics();
             assertEquals("Fetched number of metrics is not correct", 2, metrics.size());
             Metric m = getMetric("foo.count", metrics);
             assertNotNull("Did not find expected metric with name 'foo.count'", m);
@@ -117,7 +117,7 @@ public class RpcMetricsTest {
             assertNotNull("Did not find expected metric with name 'bar.count'", m2);
 
             try (RpcClient rpcClient = new RpcClient(tester.rpcPort())) {
-                verifyMetricsFromRpcRequest(qrserver, rpcClient);
+                verifyMetricsFromRpcRequest(container, rpcClient);
 
                 services = tester.vespaServices().getInstancesById(SERVICE_2_CONFIG_ID);
                 assertEquals("#Services should be 1 for config id " + SERVICE_2_CONFIG_ID, 1, services.size());
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelClientTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelClientTest.java
index 0ace697d545..fb93f04af74 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelClientTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelClientTest.java
@@ -10,7 +10,6 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 
-
 /**
  * @author Unknown
  */
@@ -22,18 +21,18 @@ public class ConfigSentinelClientTest {
         List<VespaService> services = new ArrayList<>();
         VespaService docproc = new VespaService("docprocservice", "docproc/cluster.x.indexing/0");
         VespaService searchnode4 = new VespaService("searchnode4", "search/cluster.x/g0/c1/r1");
-        VespaService qrserver = new VespaService("qrserver", "container/qrserver.0");
+        VespaService container = new VespaService("container", "container/default.0");
 
         services.add(searchnode4);
-        services.add(qrserver);
+        services.add(container);
         services.add(docproc);
 
         try (MockConfigSentinelClient client = new MockConfigSentinelClient(configsentinel)) {
             client.updateServiceStatuses(services);
 
-            assertEquals(6520, qrserver.getPid());
-            assertEquals("RUNNING", qrserver.getState());
-            assertTrue(qrserver.isAlive());
+            assertEquals(6520, container.getPid());
+            assertEquals("RUNNING", container.getState());
+            assertTrue(container.isAlive());
             assertEquals(6534, searchnode4.getPid());
             assertEquals("RUNNING", searchnode4.getState());
             assertTrue(searchnode4.isAlive());
@@ -50,16 +49,16 @@ public class ConfigSentinelClientTest {
             assertEquals("RUNNING", docproc.getState());
             assertTrue(docproc.isAlive());
 
-            //qrserver has yet not been checked
-            assertTrue(qrserver.isAlive());
+            // container has yet not been checked
+            assertTrue(container.isAlive());
 
             client.updateServiceStatuses(services);
 
             assertEquals(100, docproc.getPid());
             assertEquals("RUNNING", docproc.getState());
             assertTrue(docproc.isAlive());
-            //qrserver is no longer running on this node - so should be false
-            assertFalse(qrserver.isAlive());
+            // container is no longer running on this node - so should be false
+            assertFalse(container.isAlive());
         }
     }
 
@@ -81,8 +80,7 @@ public class ConfigSentinelClientTest {
 
         VespaService container = VespaService.create("container", "get/container.0", -1);
 
-        VespaService containerClusterController =
-                VespaService.create("container-clustercontroller", "get/container.0", -1);
+        VespaService containerClusterController = VespaService.create("container-clustercontroller", "get/container.0", -1);
 
         VespaService notPresent = VespaService.create("dummy","fake", -1);
 
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java
index 4af3c934198..5d21fb46ae3 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/ConfigSentinelDummy.java
@@ -20,7 +20,7 @@ public class ConfigSentinelDummy {
                     + "slobrok state=RUNNING mode=AUTO pid=6519 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"client\"\n"
                     + "searchnode3 state=RUNNING mode=AUTO pid=6529 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/g0/c1/r0\"\n"
                     + "searchnode state=RUNNING mode=AUTO pid=6526 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/g0/c0/r0\"\n"
-                    + "qrserver state=RUNNING mode=AUTO pid=6520 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"container/qrserver.0\"\n"
+                    + "container state=RUNNING mode=AUTO pid=6520 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"container/default.0\"\n"
                     + "\n";
 
 
@@ -37,7 +37,7 @@ public class ConfigSentinelDummy {
                 + "fleetcontroller state=RUNNING mode=AUTO pid=6543 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"storage/cluster.storage/fleetcontroller/0\"\n"
                 + "storagenode state=RUNNING mode=AUTO pid=6539 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"storage/cluster.storage/storage/0\"\n"
                 + "searchnode4 state=RUNNING mode=AUTO pid=6534 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/g0/c1/r1\"\n"
-                + "qrserver2 state=RUNNING mode=AUTO pid=6521 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"container/qrserver.1\"\n"
+                + "container2 state=RUNNING mode=AUTO pid=6521 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"container/default.1\"\n"
                 + "logserver state=RUNNING mode=AUTO pid=6518 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"admin/logserver\"\n"
                 + "logd state=RUNNING mode=AUTO pid=6517 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"hosts/dell-bl5s7.trondheim.corp.yahoo.com/logd\"\n"
                 + "searchnode2 state=RUNNING mode=AUTO pid=6527 exitstatus=0 autostart=TRUE autorestart=TRUE id=\"search/cluster.x/g0/c0/r1\"\n"
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MockConfigSentinelClient.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MockConfigSentinelClient.java
index 3f0d36b0c1a..14cfd2ccf3c 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MockConfigSentinelClient.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/MockConfigSentinelClient.java
@@ -1,16 +1,14 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.metricsproxy.service;
 
-import java.util.logging.Logger;
-
 /**
  * Mock config sentinel
  *
  * @author hmusum
  */
 public class MockConfigSentinelClient extends ConfigSentinelClient implements AutoCloseable {
+
     private final ConfigSentinelDummy configSentinel;
-    private final static Logger log = Logger.getLogger(MockConfigSentinelClient.class.getPackage().getName());
 
     public MockConfigSentinelClient(ConfigSentinelDummy configSentinel) {
         super();
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java
index 6c0e1865dcd..1e9e067ec0e 100644
--- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java
+++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/service/VespaServiceTest.java
@@ -36,18 +36,18 @@ public class VespaServiceTest {
 
     @Test
     public void testService() {
-        VespaService service = new VespaService("qrserver", "container/qrserver.0");
-        assertEquals("qrserver", service.getServiceName());
-        assertEquals("qrserver", service.getInstanceName());
+        VespaService service = new VespaService("container", "container/container.0");
+        assertEquals("container", service.getServiceName());
+        assertEquals("container", service.getInstanceName());
         assertEquals(-1, service.getPid());
-        assertEquals("container/qrserver.0", service.getConfigId());
+        assertEquals("container/container.0", service.getConfigId());
 
 
-        service = VespaService.create("qrserver2", "container/qrserver.0", -1);
-        assertEquals("qrserver", service.getServiceName());
-        assertEquals("qrserver2", service.getInstanceName());
+        service = VespaService.create("container2", "container/container.0", -1);
+        assertEquals("container", service.getServiceName());
+        assertEquals("container2", service.getInstanceName());
         assertEquals(-1, service.getPid());
-        assertEquals("container/qrserver.0", service.getConfigId());
+        assertEquals("container/container.0", service.getConfigId());
     }
 
     @Test
diff --git a/metrics-proxy/src/test/resources/rpc-json-output-check.json b/metrics-proxy/src/test/resources/rpc-json-output-check.json
index 701a06d82b2..4cd553e91f7 100644
--- a/metrics-proxy/src/test/resources/rpc-json-output-check.json
+++ b/metrics-proxy/src/test/resources/rpc-json-output-check.json
@@ -1 +1 @@
-{"metrics":[{"status_code":1,"application":"test-system.qrserver","dimensions":{"metrictype":"health","instance":"qrserver"},"status_msg":"SOMETHING FAILED"}]}
\ No newline at end of file
+{"metrics":[{"status_code":1,"application":"test-system.container","dimensions":{"metrictype":"health","instance":"container"},"status_msg":"SOMETHING FAILED"}]}
\ No newline at end of file