diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-07-14 13:40:14 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-14 13:40:14 +0200 |
commit | 3aadac85fa72b1c819a3e4601af644623da736c2 (patch) | |
tree | 25fc38e4b50287d74eea570b340a3ada8c913ac8 /config-model/src/test/java | |
parent | a30a88869a8e174ba2b104a887e4917283a75799 (diff) | |
parent | 62e461bafef4c5ebe116a8c2cc4989b701b1cb58 (diff) |
Merge pull request #23505 from vespa-engine/hmusum/fail-if-node-count-not-given-for-content-cluster-in-hosted
Fail deployment if node count is not given for content cluster in hosted
Diffstat (limited to 'config-model/src/test/java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java index f5ff48c0c69..03ab4f46c60 100644 --- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java @@ -39,7 +39,6 @@ import com.yahoo.vespa.model.test.VespaModelTester; import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg; import com.yahoo.yolean.Exceptions; import org.junit.Test; - import java.io.StringReader; import java.util.ArrayList; import java.util.List; @@ -1662,6 +1661,37 @@ public class ModelProvisioningTest { assertEquals(1, model.getAdmin().getClusterControllers().getContainers().size()); } + @Test + public void testThatStandaloneSyntaxWithClusterControllerWorksOnHostedManuallyDeployed() { + String services = + "<?xml version='1.0' encoding='utf-8' ?>" + + "<services>" + + " <container id='foo' version='1.0'>" + + " <nodes count=\"2\" />" + + " </container>" + + " <content id='bar' version='1.0'>" + + " <documents>" + + " <document type='type1' mode='index'/>" + + " </documents>" + + " <redundancy>1</redundancy>" + + " <nodes>" + + " <group>" + + " <node distribution-key='0' hostalias='node3'/>" + + " </group>" + + " </nodes>" + + " </content>" + + "</services>"; + VespaModelTester tester = new VespaModelTester(); + tester.setHosted(true); + tester.addHosts(4); + try { + VespaModel model = tester.createModel(new Zone(Environment.staging, RegionName.from("us-central-1")), services, true); + fail("expected failure"); + } catch (IllegalArgumentException e) { + assertTrue(e.getMessage().startsWith("Clusters in hosted environments must have a <nodes count='N'> tag")); + } + } + /** Deploying an application with "nodes count" standalone should give a single-node deployment */ @Test public void testThatHostedSyntaxWorksOnStandalone() { |