diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-11-15 11:43:53 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2022-11-15 11:43:53 +0100 |
commit | 804f8c1ca523b5756057580c4941bedfc7069ea0 (patch) | |
tree | 73b639ea364aa5f9a4638dd9e75e34590658ec7f /config-model/src/test/java | |
parent | 60e0c807988226eba418e9c80da2fd0b8f5e9015 (diff) |
Respect requested cloud account without nodes tag
Diffstat (limited to 'config-model/src/test/java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index e172e68c0ee..251c18dbdd6 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -17,6 +17,7 @@ import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.model.provision.SingleNodeProvisioner; import com.yahoo.config.model.test.MockApplicationPackage; import com.yahoo.config.model.test.MockRoot; +import com.yahoo.config.provision.CloudAccount; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.Flavor; import com.yahoo.config.provision.RegionName; @@ -35,7 +36,6 @@ import com.yahoo.container.usability.BindingsOverviewHandler; import com.yahoo.net.HostName; import com.yahoo.prelude.cluster.QrMonitorConfig; import com.yahoo.search.config.QrStartConfig; -import com.yahoo.vespa.defaults.Defaults; import com.yahoo.vespa.model.AbstractService; import com.yahoo.vespa.model.VespaModel; import com.yahoo.vespa.model.container.ApplicationContainer; @@ -67,7 +67,13 @@ import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests for "core functionality" of the container model, e.g. ports, or the 'components' and 'bundles' configs. @@ -423,6 +429,27 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { } @Test + void cloud_account_without_nodes_tag() throws Exception { + String servicesXml = "<container id='default' version='1.0' />"; + ApplicationPackage applicationPackage = new MockApplicationPackage.Builder().withServices(servicesXml).build(); + CloudAccount cloudAccount = CloudAccount.from("000000000000"); + InMemoryProvisioner provisioner = new InMemoryProvisioner(true, false, "host1.yahoo.com", "host2.yahoo.com"); + VespaModel model = new VespaModel(new NullConfigModelRegistry(), new DeployState.Builder() + .modelHostProvisioner(provisioner) + .provisioned(provisioner.startProvisionedRecording()) + .applicationPackage(applicationPackage) + .properties(new TestProperties().setMultitenant(true) + .setHostedVespa(true) + .setCloudAccount(cloudAccount)) + .build()); + assertEquals(2, model.hostSystem().getHosts().size()); + assertEquals(List.of(cloudAccount), model.provisioned().all().values() + .stream() + .map(capacity -> capacity.cloudAccount().get()) + .collect(Collectors.toList())); + } + + @Test void renderers_named_JsonRenderer_are_not_allowed() { assertThrows(IllegalArgumentException.class, () -> { createModel(root, generateContainerElementWithRenderer("JsonRenderer")); |