Merge pull request #23587 from vespa-engine/hmusum/qrserver-to-container

qrserver -> container

11 files changed, 8 insertions, 109 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
index 96e2e1d5ebd..c6fa7b8a69d 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/VespaDomBuilder.java
@@ -193,7 +193,7 @@ public class VespaDomBuilder extends VespaModelBuilder {
     }
 
     /**
-     * The SimpleConfigProducer is the producer for elements such as qrservers, gateways.
+     * The SimpleConfigProducer is the producer for elements such as container.
      * Must support overrides for that too, hence this builder
      *
      * @author vegardh
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
index 3d6332a9773..3f01ac6a103 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java
@@ -207,7 +207,7 @@ public abstract class Container extends AbstractService implements
     }
 
     /**
-     * First Qrserver or container must run on ports familiar to the user.
+     * First container must run on ports familiar to the user.
      */
     @Override
     public boolean requiresWantedPort() {
diff --git a/config-model/src/test/cfg/admin/adminconfigbaseport/hosts.xml b/config-model/src/test/cfg/admin/adminconfigbaseport/hosts.xml
deleted file mode 100644
index dfc17c11183..00000000000
--- a/config-model/src/test/cfg/admin/adminconfigbaseport/hosts.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<hosts>
-  <host name="localhost">
-    <alias>adminserver</alias>
-  </host>
-</hosts>
diff --git a/config-model/src/test/cfg/admin/adminconfigbaseport/services.xml b/config-model/src/test/cfg/admin/adminconfigbaseport/services.xml
deleted file mode 100644
index ba2c2ea42da..00000000000
--- a/config-model/src/test/cfg/admin/adminconfigbaseport/services.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<services>
-
-  <admin version="2.0">
-    <adminserver hostalias="adminserver" baseport="9999"/>
-    <adminserver hostalias="adminserver"/>
-    <logserver hostalias="adminserver"/>
-  </admin>
-
-  <search version="1.0">
-    <qrservers>
-      <qrserver hostalias="adminserver" baseport="4080"/>
-    </qrservers>
-  </search>
-
-</services>
diff --git a/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml b/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml
deleted file mode 100644
index 3c78eba2e68..00000000000
--- a/config-model/src/test/cfg/application/app_qrserverandgw/hosts.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-<hosts>
-  <host name="localhost">
-    <alias>node0</alias>
-  </host>
-</hosts>
diff --git a/config-model/src/test/cfg/application/app_qrserverandgw/schemas/message.sd b/config-model/src/test/cfg/application/app_qrserverandgw/schemas/message.sd
deleted file mode 100644
index 40457c9e636..00000000000
--- a/config-model/src/test/cfg/application/app_qrserverandgw/schemas/message.sd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search message {
-
-  document message {
-    field foo type string {
-      indexing: summary
-    }   
-  }
-}
diff --git a/config-model/src/test/cfg/application/app_qrserverandgw/services.xml b/config-model/src/test/cfg/application/app_qrserverandgw/services.xml
deleted file mode 100644
index fbcd698035e..00000000000
--- a/config-model/src/test/cfg/application/app_qrserverandgw/services.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
-
-<services version="1.0">
-
-    <admin version="2.0">
-        <adminserver hostalias="node0"/>
-    </admin>
-
-    <container version="1.0">
-      <nodes>
-        <node hostalias="node0"/>
-      </nodes>
-      <document-api/>
-      <search/>
-    </container>
-
-    <content version="1.0" id="message">
-            <redundancy>1</redundancy>
-            <documents>
-                <document type="message" mode="index"/>
-            </documents>
-                <nodes>
-                    <node hostalias="node0" distribution-key="0" />
-                </nodes>
-    </content>
-
-
-</services>
diff --git a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java b/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java
deleted file mode 100644
index 5e696682e98..00000000000
--- a/config-model/src/test/java/com/yahoo/config/model/QrserverAndGatewayPortAllocationTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.config.model;
-
-import com.yahoo.vespa.model.VespaModel;
-import com.yahoo.vespa.model.container.Container;
-import com.yahoo.vespa.model.container.ApplicationContainer;
-import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithFilePkg;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-/**
- * Tests that qrserver is assigned port Defaults.getDefaults().vespaWebServicePort() even if there is a HTTP gateway configured earlier in
- * vespa-services.xml
- *
- * @author hmusum
- */
-public class QrserverAndGatewayPortAllocationTest {
-
-    @Test
-    void testPorts() {
-        String appDir = "src/test/cfg/application/app_qrserverandgw/";
-        VespaModelCreatorWithFilePkg creator = new VespaModelCreatorWithFilePkg(appDir);
-        VespaModel vespaModel = creator.create();
-        List<ApplicationContainer> qrservers = vespaModel.getContainerClusters().get("container").getContainers();
-        assertEquals(1, qrservers.size());
-        assertEquals(Container.BASEPORT, qrservers.get(0).getSearchPort());
-    }
-
-}
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
index ac621f1ebfc..1aa010020f5 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTestCase.java
@@ -107,7 +107,7 @@ public class VespaModelTestCase {
 
     @Test
     void testHostsConfig() {
-        VespaModel model = getVespaModel(TESTDIR + "app_qrserverandgw");
+        VespaModel model = getVespaModel(TESTDIR + "app_nohosts");
         LogdConfig config = getLogdConfig(model, "");
         assertEquals(config.logserver().host(), HostName.getLocalhost());
         assertNotNull(config);
diff --git a/config-model/src/test/schema-test-files/hosts.xml b/config-model/src/test/schema-test-files/hosts.xml
index cbbab9c3fe2..0ca814c819d 100755
--- a/config-model/src/test/schema-test-files/hosts.xml
+++ b/config-model/src/test/schema-test-files/hosts.xml
@@ -6,13 +6,13 @@
     <alias>host1</alias>
     <alias>configserver</alias>
     <alias>logserver</alias>
-    <alias>qrserver</alias>
+    <alias>container</alias>
     <alias>distributor</alias>
     <alias>feeder</alias>
     <alias>rtx</alias>
     <alias>tld</alias>
-    <alias>rtc-1</alias>
-    <alias>rtc-2</alias>
+    <alias>searchnode-1</alias>
+    <alias>searchnode-2</alias>
   </host>
 
   <host name="example.yahoo.com">
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index df87d2b9f3d..b32849bb55f 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -11,8 +11,8 @@
     <logserver hostalias="logserver" />
     <slobroks>
       <slobrok hostalias="configserver" />
-      <slobrok hostalias="qrserver" />
-      <slobrok hostalias="rtc-1" />
+      <slobrok hostalias="container" />
+      <slobrok hostalias="searchnode-1" />
     </slobroks>
     <metrics>