diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-07-08 15:51:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-08 15:51:21 +0200 |
commit | fe5bf326e052a15d938e4c1dccc627f614f3ff24 (patch) | |
tree | 70a68712582d29fbd258a96b4eafaa2b460ca331 /config-model/src/test | |
parent | 5000ff0b5f2db5dbde1999375966f37501d9d620 (diff) |
Revert "Minor cleanup in config-model"
Diffstat (limited to 'config-model/src/test')
-rwxr-xr-x | config-model/src/test/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV2BuilderTest.java | 33 |
1 files changed, 27 insertions, 6 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 093b0765530..1a41d2689a2 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 @@ -2,7 +2,7 @@ package com.yahoo.vespa.model.builder.xml.dom; import com.yahoo.cloud.config.log.LogdConfig; -import com.yahoo.config.model.ConfigModelContext.ApplicationType; +import com.yahoo.config.model.ConfigModelContext; import com.yahoo.config.model.api.ConfigServerSpec; import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.config.model.deploy.DeployState; @@ -16,12 +16,13 @@ import com.yahoo.vespa.model.admin.monitoring.Monitoring; import org.junit.Before; import org.junit.Test; import org.w3c.dom.Element; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertEquals; /** * @author hmusum @@ -35,6 +36,16 @@ public class DomAdminV2BuilderTest extends DomBuilderTest { root = new MockRoot("root"); } + // Supported for backwards compatibility + private Element servicesConfigserver() { + return XML.getDocument( + "<admin version=\"2.0\">" + + " <configserver hostalias=\"mockhost\"/>" + + " <adminserver hostalias=\"mockhost\"/>" + + "</admin>").getDocumentElement(); + + } + private Element servicesOverride() { return XML.getDocument( "<admin version=\"2.0\">" + @@ -120,10 +131,19 @@ public class DomAdminV2BuilderTest extends DomBuilderTest { } /** + * Tests that configserver works (deprecated, but allowed in admin 2.0) + */ + @Test + public void adminWithConfigserverElement() { + Admin admin = buildAdmin(servicesConfigserver()); + assertEquals(1, admin.getConfigservers().size()); + } + + /** * Tests that configservers/configserver works */ @Test - public void adminWithConfigServersElement() { + public void adminWithConfigserversElement() { Admin admin = buildAdmin(servicesConfigservers()); assertEquals(1, admin.getConfigservers().size()); } @@ -182,12 +202,13 @@ public class DomAdminV2BuilderTest extends DomBuilderTest { } private Admin buildAdmin(Element xml) { - return buildAdmin(xml, false, List.of()); + return buildAdmin(xml, false, new ArrayList<>()); } - private Admin buildAdmin(Element xml, boolean multitenant, List<ConfigServerSpec> configServers) { + private Admin buildAdmin(Element xml, boolean multitenant, List<ConfigServerSpec> configServerSpecs) { DeployState deployState = DeployState.createTestState(); - DomAdminV2Builder domAdminBuilder = new DomAdminV2Builder(ApplicationType.DEFAULT, multitenant, configServers); + final DomAdminV2Builder domAdminBuilder = + new DomAdminV2Builder(ConfigModelContext.ApplicationType.DEFAULT, multitenant, configServerSpecs); Admin admin = domAdminBuilder.build(deployState, root, xml); admin.addPerHostServices(root.hostSystem().getHosts(), deployState); return admin; |