diff options
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java index 9b3b659c252..8531aff3b1a 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/JvmHeapSizeValidatorTest.java @@ -1,24 +1,29 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.model.application.validation; -import com.yahoo.config.ModelReference; import com.yahoo.config.application.api.ApplicationFile; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.NullConfigModelRegistry; +import com.yahoo.config.model.api.ApplicationClusterEndpoint; +import com.yahoo.config.model.api.ContainerEndpoint; import com.yahoo.config.model.api.OnnxModelCost; import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.config.model.provision.InMemoryProvisioner; import com.yahoo.config.model.test.MockApplicationPackage; +import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.NodeResources; +import com.yahoo.text.Text; import com.yahoo.vespa.model.VespaModel; import org.junit.jupiter.api.Test; import org.xml.sax.SAXException; import java.io.IOException; import java.net.URI; +import java.util.List; +import java.util.Set; import java.util.concurrent.atomic.AtomicLong; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -85,6 +90,7 @@ class JvmHeapSizeValidatorTest { .withServices(servicesXml) .build()) .modelHostProvisioner(new InMemoryProvisioner(5, new NodeResources(4, nodeGb, 125, 0.3), true)) + .endpoints(Set.of(new ContainerEndpoint("container", ApplicationClusterEndpoint.Scope.zone, List.of("c.example.com")))) .properties(new TestProperties().setHostedVespa(true).setDynamicHeapSize(true)) .onnxModelCost(new ModelCostDummy(modelCostBytes)) .build(); @@ -92,7 +98,7 @@ class JvmHeapSizeValidatorTest { private static DeployState createDeployState(double nodeGb, long modelCostBytes) { String servicesXml = - """ + Text.format(""" <?xml version="1.0" encoding="utf-8" ?> <services version='1.0'> <container version='1.0'> @@ -104,7 +110,7 @@ class JvmHeapSizeValidatorTest { <tokenizer-model path="app/tokenizer.json"/> </component> </container> - </services>""".formatted(nodeGb); + </services>""", nodeGb); return createDeployState(servicesXml, nodeGb, modelCostBytes); } @@ -114,12 +120,10 @@ class JvmHeapSizeValidatorTest { ModelCostDummy(long modelCost) { this.modelCost = modelCost; } - @Override public Calculator newCalculator(ApplicationPackage appPkg, DeployLogger logger) { return this; } + @Override public Calculator newCalculator(ApplicationPackage appPkg, ApplicationId applicationId) { return this; } @Override public long aggregatedModelCostInBytes() { return totalCost.get(); } @Override public void registerModel(ApplicationFile path) {} - @SuppressWarnings("removal") @Override public void registerModel(ModelReference ref) {} - @Override public void registerModel(URI uri) { assertEquals("https://my/url/model.onnx", uri.toString()); @@ -127,4 +131,4 @@ class JvmHeapSizeValidatorTest { } } -}
\ No newline at end of file +} |