diff options
author | Harald Musum <musum@yahooinc.com> | 2022-07-14 12:03:07 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-07-14 12:04:07 +0200 |
commit | 62e461bafef4c5ebe116a8c2cc4989b701b1cb58 (patch) | |
tree | 2c3909bbe9e098c375c7067bcc8d9b1bb39b90bb /config-model/src/test/java/com/yahoo/config | |
parent | 439da54cb6068d6097fc65bdd8e5d0e6d108d81a (diff) |
Fail deployment if node count is not given for content cluster in hosted
Node count must be given for other zones than those that are manually deployed
Diffstat (limited to 'config-model/src/test/java/com/yahoo/config')
-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() { |