diff options
author | Harald Musum <musum@yahooinc.com> | 2024-04-07 12:09:08 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2024-04-07 12:09:08 +0200 |
commit | 82aff06e654539fda7bdc6e04d53325ed99d4ba9 (patch) | |
tree | fd21579a58be51eb6eef8fea755625d025396dda | |
parent | e380bdd2a1b0eb6d2fea79ffde6ae1d5b7377857 (diff) |
Rewrite hosted test to use services.xml for hosted
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java index 934606b93ac..c4fc4ee71c6 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/JettyContainerModelBuilderTest.java @@ -6,6 +6,7 @@ import com.yahoo.config.model.builder.xml.test.DomBuilderTest; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.provision.HostsXmlProvisioner; +import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.model.test.MockRoot; import com.yahoo.container.ComponentsConfig; import com.yahoo.container.jdisc.FilterBindingsProvider; @@ -254,25 +255,16 @@ public class JettyContainerModelBuilderTest extends ContainerModelBuilderTestBas " <server port='8080' id='default'>", " </server>", " </http>", - multiNode, + " <nodes count='1' />", "", "</container>"); - String hostsxml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" + - "<hosts>\n" + - " <host name=\"mockhost-1\">\n" + - " <alias>mockhost1</alias>\n" + - " </host>\n" + - " <host name=\"mockhost-2\">\n" + - " <alias>mockhost2</alias>\n" + - " </host>\n" + - "</hosts>\n"; DeployState deployState = new DeployState.Builder() .properties( new TestProperties() .setHostedVespa(true) .setEndpointCertificateSecrets(Optional.of(new EndpointCertificateSecrets("CERT", "KEY")))) - .modelHostProvisioner(new HostsXmlProvisioner(new StringReader(hostsxml))) + .modelHostProvisioner(new InMemoryProvisioner(1, true)) .build(); MockRoot root = new MockRoot("root", deployState); createModel(root, deployState, null, clusterElem); |