diff options
Diffstat (limited to 'config-application-package/src/test/java/com/yahoo/config/application')
6 files changed, 29 insertions, 18 deletions
diff --git a/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorComplexTest.java b/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorComplexTest.java index 5687084713c..9fac08c29d9 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorComplexTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorComplexTest.java @@ -3,8 +3,8 @@ package com.yahoo.config.application; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeploymentInstanceSpec; -import com.yahoo.config.application.api.xml.DeploymentSpecXmlReader; import com.yahoo.config.model.application.provider.FilesApplicationPackage; +import com.yahoo.config.provision.CloudName; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; @@ -14,7 +14,6 @@ import org.w3c.dom.Document; import javax.xml.transform.TransformerException; import java.io.File; -import java.io.IOException; import static org.junit.Assert.assertEquals; @@ -52,8 +51,8 @@ public class HostedOverrideProcessorComplexTest { <redundancy>1</redundancy> </content> <content id="filedocument" version="1.0"> - <nodes count="2" groups="2"> - <resources disk="32Gb" memory="8Gb" vcpu="4"/> + <nodes count="2" groups="2" required="true"> + <resources disk="37Gb" memory="9Gb" vcpu="3"/> </nodes> <redundancy>1</redundancy> </content> @@ -62,6 +61,7 @@ public class HostedOverrideProcessorComplexTest { assertOverride(InstanceName.from("beta1"), Environment.prod, RegionName.from("aws-us-west-2a"), + CloudName.GCP, expected); } @@ -95,7 +95,7 @@ public class HostedOverrideProcessorComplexTest { <redundancy>1</redundancy> </content> <content id="filedocument" version="1.0"> - <nodes count="2" groups="2"> + <nodes count="2" groups="2" required="true"> <resources disk="32Gb" memory="8Gb" vcpu="4"/> </nodes> <redundancy>1</redundancy> @@ -105,14 +105,15 @@ public class HostedOverrideProcessorComplexTest { assertOverride(InstanceName.from("beta1"), Environment.prod, RegionName.from("aws-us-east-1b"), + CloudName.AWS, expected); } - private void assertOverride(InstanceName instance, Environment environment, RegionName region, String expected) throws TransformerException { + private void assertOverride(InstanceName instance, Environment environment, RegionName region, CloudName cloud, String expected) throws TransformerException { ApplicationPackage app = FilesApplicationPackage.fromFile(new File(servicesFile).getParentFile()); Document inputDoc = Xml.getDocument(app.getServices()); Tags tags = app.getDeploymentSpec().instance(instance).map(DeploymentInstanceSpec::tags).orElse(Tags.empty()); - Document newDoc = new OverrideProcessor(instance, environment, region, tags).process(inputDoc); + Document newDoc = new OverrideProcessor(instance, environment, region, cloud, tags).process(inputDoc); assertEquals(expected, Xml.documentAsString(newDoc, true)); } diff --git a/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTagsTest.java b/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTagsTest.java index 88e207c662d..0cdbed3999c 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTagsTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTagsTest.java @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.application; +import com.yahoo.config.provision.Cloud; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; @@ -112,7 +113,7 @@ public class HostedOverrideProcessorTagsTest { private void assertOverride(InstanceName instance, Environment environment, RegionName region, Tags tags, String expected) throws TransformerException { Document inputDoc = Xml.getDocument(new StringReader(input)); - Document newDoc = new OverrideProcessor(instance, environment, region, tags).process(inputDoc); + Document newDoc = new OverrideProcessor(instance, environment, region, Cloud.defaultCloud().name(), tags).process(inputDoc); TestBase.assertDocument(expected, newDoc); } diff --git a/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTest.java index 262c315923d..66aec3a333e 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/HostedOverrideProcessorTest.java @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.application; +import com.yahoo.config.provision.Cloud; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; @@ -211,7 +212,7 @@ public class HostedOverrideProcessorTest { private void assertOverride(InstanceName instance, Environment environment, RegionName region, Tags tags, String expected) throws TransformerException { Document inputDoc = Xml.getDocument(new StringReader(input)); - Document newDoc = new OverrideProcessor(instance, environment, region, tags).process(inputDoc); + Document newDoc = new OverrideProcessor(instance, environment, region, Cloud.defaultCloud().name(), tags).process(inputDoc); TestBase.assertDocument(expected, newDoc); } diff --git a/config-application-package/src/test/java/com/yahoo/config/application/MultiOverrideProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/MultiOverrideProcessorTest.java index a2ba99fb21a..5382576edc1 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/MultiOverrideProcessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/MultiOverrideProcessorTest.java @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.application; +import com.yahoo.config.provision.Cloud; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; @@ -126,13 +127,13 @@ public class MultiOverrideProcessorTest { private void assertOverride(Environment environment, RegionName region, String expected) throws TransformerException { Document inputDoc = Xml.getDocument(new StringReader(input)); - Document newDoc = new OverrideProcessor(InstanceName.from("default"), environment, region, Tags.empty()).process(inputDoc); + Document newDoc = new OverrideProcessor(InstanceName.from("default"), environment, region, Cloud.defaultCloud().name(), Tags.empty()).process(inputDoc); TestBase.assertDocument(expected, newDoc); } private void assertOverrideWithIds(Environment environment, RegionName region, String expected) throws TransformerException { Document inputDoc = Xml.getDocument(new StringReader(inputWithIds)); - Document newDoc = new OverrideProcessor(InstanceName.from("default"), environment, region, Tags.empty()).process(inputDoc); + Document newDoc = new OverrideProcessor(InstanceName.from("default"), environment, region, Cloud.defaultCloud().name(), Tags.empty()).process(inputDoc); TestBase.assertDocument(expected, newDoc); } diff --git a/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java index 034d494d96e..e5e36615b09 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/OverrideProcessorTest.java @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.application; +import com.yahoo.config.provision.Cloud; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; @@ -299,6 +300,7 @@ public class OverrideProcessorTest { new OverrideProcessor(InstanceName.from("default"), Environment.from("prod"), RegionName.from("us-west"), + Cloud.defaultCloud().name(), Tags.empty()).process(inputDoc); } @@ -314,6 +316,7 @@ public class OverrideProcessorTest { new OverrideProcessor(InstanceName.from("default"), Environment.defaultEnvironment(), RegionName.from("us-west"), + Cloud.defaultCloud().name(), Tags.empty()).process(inputDoc); } @@ -369,7 +372,7 @@ public class OverrideProcessorTest { private void assertOverride(String input, Environment environment, RegionName region, String expected) throws TransformerException { Document inputDoc = Xml.getDocument(new StringReader(input)); - Document newDoc = new OverrideProcessor(InstanceName.from("default"), environment, region, Tags.empty()).process(inputDoc); + Document newDoc = new OverrideProcessor(InstanceName.from("default"), environment, region, Cloud.defaultCloud().name(), Tags.empty()).process(inputDoc); TestBase.assertDocument(expected, newDoc); } diff --git a/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java b/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java index b187c4c8837..247c81a24ad 100644 --- a/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/application/XmlPreprocessorTest.java @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.application; +import com.yahoo.config.provision.Cloud; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.InstanceName; import com.yahoo.config.provision.RegionName; @@ -53,6 +54,7 @@ public class XmlPreprocessorTest { InstanceName.defaultName(), Environment.dev, RegionName.defaultName(), + Cloud.defaultCloud().name(), Tags.empty()).run()); // Difference from dev: node1 @@ -88,6 +90,7 @@ public class XmlPreprocessorTest { InstanceName.defaultName(), Environment.staging, RegionName.defaultName(), + Cloud.defaultCloud().name(), Tags.empty()).run()); String expectedPerfUsWest = @@ -121,7 +124,7 @@ public class XmlPreprocessorTest { InstanceName.defaultName(), Environment.perf, RegionName.from("us-west"), - Tags.empty()).run()); + Cloud.defaultCloud().name(), Tags.empty()).run()); String expectedPerfUsEastAndCentral = """ @@ -155,14 +158,14 @@ public class XmlPreprocessorTest { InstanceName.defaultName(), Environment.perf, RegionName.from("us-east"), - Tags.empty()).run()); + Cloud.defaultCloud().name(), Tags.empty()).run()); TestBase.assertDocument(expectedPerfUsEastAndCentral, new XmlPreProcessor(appDir, services, InstanceName.defaultName(), Environment.perf, RegionName.from("us-central"), - Tags.empty()).run()); + Cloud.defaultCloud().name(), Tags.empty()).run()); String expectedProdUsWest = """ @@ -204,7 +207,7 @@ public class XmlPreprocessorTest { InstanceName.defaultName(), Environment.prod, RegionName.from("us-west"), - Tags.empty()).run()); + Cloud.defaultCloud().name(), Tags.empty()).run()); String expectedProdUsEastAndCentral = """ @@ -246,14 +249,14 @@ public class XmlPreprocessorTest { InstanceName.defaultName(), Environment.prod, RegionName.from("us-east"), - Tags.empty()).run()); + Cloud.defaultCloud().name(), Tags.empty()).run()); TestBase.assertDocument(expectedProdUsEastAndCentral, new XmlPreProcessor(appDir, services, InstanceName.defaultName(), Environment.prod, RegionName.from("us-central"), - Tags.empty()).run()); + Cloud.defaultCloud().name(), Tags.empty()).run()); } @Test @@ -304,6 +307,7 @@ public class XmlPreprocessorTest { InstanceName.defaultName(), Environment.prod, RegionName.defaultName(), + Cloud.defaultCloud().name(), Tags.empty()).run()); TestBase.assertDocument(expectedProd, docDev); } |