Allow no adminserver element in services.xml

Create single config server on container node if not given

1 files changed, 11 insertions, 0 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
index 8a2a23a795d..a38f0ebe476 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java
@@ -101,6 +101,11 @@ public class DomAdminV2BuilderTest extends DomBuilderTest {
                         "</admin>").getDocumentElement();
     }
 
+    private Element servicesAdminNoAdminServerOrConfigServer() {
+        return XML.getDocument("<admin version=\"2.0\">" +
+                        "</admin>").getDocumentElement();
+    }
+
     @Test
     void multitenant() {
         List<ConfigServerSpec> configServerSpecs = Arrays.asList(
@@ -182,6 +187,12 @@ public class DomAdminV2BuilderTest extends DomBuilderTest {
         assertEquals("foobar", config.logserver().host());
     }
 
+    @Test
+    void noAdminServerOrConfigServer() {
+        Admin admin = buildAdmin(servicesAdminNoAdminServerOrConfigServer());
+        assertEquals(1, admin.getConfigservers().size());
+    }
+
     private Admin buildAdmin(Element xml) {
         return buildAdmin(xml, false, new ArrayList<>());
     }