diff options
39 files changed, 123 insertions, 125 deletions
diff --git a/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java b/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java index f48968ad919..e879acef3bb 100644 --- a/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java +++ b/application-preprocessor/src/main/java/com/yahoo/application/preprocessor/ApplicationPreprocessor.java @@ -39,7 +39,7 @@ public class ApplicationPreprocessor { FilesApplicationPackage.Builder applicationPackageBuilder = new FilesApplicationPackage.Builder(applicationDir); outputDir.ifPresent(applicationPackageBuilder::preprocessedDir); ApplicationPackage preprocessed = applicationPackageBuilder.build().preprocess( - Zone.from(environment.orElse(Environment.defaultEnvironment()), region.orElse(RegionName.defaultName())), + new Zone(environment.orElse(Environment.defaultEnvironment()), region.orElse(RegionName.defaultName())), (a, b) -> { }, logger); preprocessed.validateXML(); diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java index 59950375ee7..c12a9ad0d06 100644 --- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java @@ -41,13 +41,13 @@ public class FilesApplicationPackageTest { assertTrue(new File(appDir, "hosts.xml").exists()); FilesApplicationPackage app = FilesApplicationPackage.fromFile(appDir); - ApplicationPackage processed = app.preprocess(Zone.from(Environment.dev, RegionName.defaultName()), - new RuleConfigDeriver() { + ApplicationPackage processed = app.preprocess(new Zone(Environment.dev, RegionName.defaultName()), + new RuleConfigDeriver() { @Override public void derive(String ruleBaseDir, String outputDir) throws Exception { } }, - new BaseDeployLogger()); + new BaseDeployLogger()); assertTrue(new File(appDir, ".preprocessed").exists()); String expectedServices = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><services xmlns:deploy=\"vespa\" xmlns:preprocess=\"properties\" version=\"1.0\">\n" + " <admin version=\"2.0\">\n" + diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java index 6d46993175c..fed9000f72b 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java @@ -148,7 +148,7 @@ public class AdminTestCase { public void testTenantAndAppInSentinelConfig() { DeployState state = new DeployState.Builder().properties( new DeployProperties.Builder(). - zone(Zone.from(Environment.dev, RegionName.from("baz"))). + zone(new Zone(Environment.dev, RegionName.from("baz"))). applicationId(new ApplicationId.Builder(). tenant("quux"). applicationName("foo").instanceName("bim").build()).build()).build(); @@ -311,7 +311,7 @@ public class AdminTestCase { .disableFiledistributor(true) .properties( new DeployProperties.Builder(). - zone(Zone.from(Environment.dev, RegionName.from("baz"))). + zone(new Zone(Environment.dev, RegionName.from("baz"))). applicationId(new ApplicationId.Builder(). tenant("quux"). applicationName("foo").instanceName("bim").build()).build()).build(); 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 44a575936a5..5e093bdb32a 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 @@ -511,7 +511,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { " </nodes>", "</jdisc>"); - DeployState deployState = new DeployState.Builder().zone(Zone.from(Environment.dev, RegionName.from("us-east-1"))).build(); + DeployState deployState = new DeployState.Builder().zone(new Zone(Environment.dev, RegionName.from("us-east-1"))).build(); createModel(root, deployState, clusterElem); assertEquals(0, getContainerCluster("default").serviceAliases().size()); assertEquals(0, getContainerCluster("default").endpointAliases().size()); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java index 2a60672470e..a2f32694340 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/RoutingBuilderTest.java @@ -66,7 +66,7 @@ public class RoutingBuilderTest extends ContainerModelBuilderTestBase { private Container getContainer(ApplicationPackage applicationPackage, String region, Element clusterElem) throws IOException, SAXException { DeployState deployState = new DeployState.Builder() .applicationPackage(applicationPackage) - .zone(Zone.from(Environment.prod, RegionName.from(region))) + .zone(new Zone(Environment.prod, RegionName.from(region))) .build(); root = new MockRoot("root", deployState); diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java index 7d9ec9d68d6..0c41b8ecc0b 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ClusterTest.java @@ -483,10 +483,10 @@ public class ClusterTest extends ContentBaseTest { public void testZoneDependentDistributionBits() throws Exception { String xml = new ContentClusterBuilder().docTypes("test").getXml(); - ContentCluster prodWith16Bits = createWithZone(xml, Zone.from(Environment.prod, RegionName.from("us-east-3"))); + ContentCluster prodWith16Bits = createWithZone(xml, new Zone(Environment.prod, RegionName.from("us-east-3"))); assertDistributionBitsInConfig(prodWith16Bits, 16); - ContentCluster stagingNot16Bits = createWithZone(xml, Zone.from(Environment.staging, RegionName.from("us-east-3"))); + ContentCluster stagingNot16Bits = createWithZone(xml, new Zone(Environment.staging, RegionName.from("us-east-3"))); assertDistributionBitsInConfig(stagingNot16Bits, 8); } @Test diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java index 7d7215690e9..6315e05c9de 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java @@ -32,7 +32,7 @@ public class Zone { } /** Create from environment and region */ - private Zone(Environment environment, RegionName region) { + public Zone(Environment environment, RegionName region) { this(SystemName.defaultSystem(), environment, region); } @@ -53,10 +53,6 @@ public class Zone { this.nodeFlavors = Optional.ofNullable(nodeFlavors); } - public static Zone from(Environment environment, RegionName region) { - return new Zone(environment, region); - } - /** Returns the current environment */ public Environment environment() { return environment; } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java index 7700dd9392e..9e7853a8fdf 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListApplicationsHandlerTest.java @@ -42,7 +42,7 @@ public class ListApplicationsHandlerTest { handler = new ListApplicationsHandler(Runnable::run, AccessLog.voidAccessLog(), tenants, - Zone.from(Environment.dev, RegionName.from("us-east"))); + new Zone(Environment.dev, RegionName.from("us-east"))); } @Test diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java index 5e7886f0d2f..df8ed405fe3 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java @@ -87,11 +87,11 @@ public class LbServicesProducerTest { } private LbServicesConfig createModelAndGetLbServicesConfig(RegionName regionName) throws IOException, SAXException { - final Zone zone = Zone.from(Environment.prod, regionName); + final Zone zone = new Zone(Environment.prod, regionName); Map<TenantName, Map<ApplicationId, ApplicationInfo>> testModel = createTestModel(new DeployState.Builder() .properties(new DeployProperties.Builder().zone(zone).build()) .zone(zone)); - return getLbServicesConfig(Zone.from(Environment.prod, regionName), testModel); + return getLbServicesConfig(new Zone(Environment.prod, regionName), testModel); } private LbServicesConfig getLbServicesConfig(Zone zone, Map<TenantName, Map<ApplicationId, ApplicationInfo>> testModel) { @@ -105,7 +105,7 @@ public class LbServicesProducerTest { public void testConfigAliasesWithRotations() throws IOException, SAXException { Map<TenantName, Map<ApplicationId, ApplicationInfo>> testModel = createTestModel(new DeployState.Builder().rotations(rotations)); RegionName regionName = RegionName.from("us-east-1"); - LbServicesConfig conf = getLbServicesConfig(Zone.from(Environment.prod, regionName), testModel); + LbServicesConfig conf = getLbServicesConfig(new Zone(Environment.prod, regionName), testModel); final LbServicesConfig.Tenants.Applications.Hosts.Services services = conf.tenants("foo").applications("foo:prod:" + regionName.value() + ":default").hosts("foo.foo.yahoo.com").services("qrserver"); assertThat(services.servicealiases().size(), is(1)); assertThat(services.endpointaliases().size(), is(4)); diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java index 8e98e50b951..7e4d543fd18 100644 --- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java +++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java @@ -147,7 +147,7 @@ public class IdentifierTest { @Test public void application_instance_id_dotted_string_is_subindentifers_concatinated_with_dots() { DeploymentId id = new DeploymentId(com.yahoo.config.provision.ApplicationId.from("tenant", "application", "instance"), - Zone.from(Environment.prod, RegionName.from("region"))); + new Zone(Environment.prod, RegionName.from("region"))); assertEquals("tenant.application.prod.region.instance", id.dottedString()); } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java index 754a3386d89..98f8c2a3d99 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentJobs.java @@ -13,6 +13,7 @@ import com.yahoo.vespa.hosted.controller.api.integration.organization.IssueId; import java.time.Instant; import java.util.Collection; +import java.util.Comparator; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; @@ -228,7 +229,7 @@ public class DeploymentJobs { case test: return Optional.of(systemTest); case staging: return Optional.of(stagingTest); } - return from(system, Zone.from(environment, region)); + return from(system, new Zone(environment, region)); } private static Zone zone(SystemName system, String environment, String region) { @@ -236,7 +237,7 @@ public class DeploymentJobs { } private static Zone zone(String environment, String region) { - return Zone.from(Environment.from(environment), RegionName.from(region)); + return new Zone(Environment.from(environment), RegionName.from(region)); } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java index 59da90d033a..aa4d07634db 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentOrder.java @@ -107,7 +107,7 @@ public class DeploymentOrder { public List<Deployment> sortBy(List<DeploymentSpec.DeclaredZone> zones, Collection<Deployment> deployments) { List<Zone> productionZones = zones.stream() .filter(z -> z.region().isPresent()) - .map(z -> Zone.from(z.environment(), z.region().get())) + .map(z -> new Zone(z.environment(), z.region().get())) .collect(toList()); return deployments.stream() .sorted(comparingInt(deployment -> productionZones.indexOf(deployment.zone()))) diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java index 6df856d7ee2..c71409aaba9 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java @@ -339,8 +339,8 @@ public class ApplicationSerializer { } private Zone zoneFromSlime(Inspector object) { - return Zone.from(Environment.from(object.field(environmentField).asString()), - RegionName.from(object.field(regionField).asString())); + return new Zone(Environment.from(object.field(environmentField).asString()), + RegionName.from(object.field(regionField).asString())); } private Optional<ApplicationRevision> applicationRevisionFromSlime(Inspector object) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index a5a368b62f6..d64f07906ab 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -423,7 +423,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { .orElseThrow(() -> new NotExistsException(id + " not found")); DeploymentId deploymentId = new DeploymentId(application.id(), - Zone.from(Environment.from(environment), RegionName.from(region))); + new Zone(Environment.from(environment), RegionName.from(region))); Deployment deployment = application.deployments().get(deploymentId.zone()); if (deployment == null) @@ -514,7 +514,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { // DeploymentId identifies the zone and application we are dealing with DeploymentId deploymentId = new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName), - Zone.from(Environment.from(environment), RegionName.from(region))); + new Zone(Environment.from(environment), RegionName.from(region))); try { List<String> rotations = controller.applications().setGlobalRotationStatus(deploymentId, endPointStatus); return new MessageResponse(String.format("Rotations %s successfully set to %s service", rotations.toString(), inService ? "in" : "out of")); @@ -526,7 +526,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { private HttpResponse getGlobalRotationOverride(String tenantName, String applicationName, String instanceName, String environment, String region) { DeploymentId deploymentId = new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName), - Zone.from(Environment.from(environment), RegionName.from(region))); + new Zone(Environment.from(environment), RegionName.from(region))); Slime slime = new Slime(); Cursor c1 = slime.setObject().setArray("globalrotationoverride"); @@ -571,13 +571,13 @@ public class ApplicationApiHandler extends LoggingRequestHandler { private HttpResponse waitForConvergence(String tenantName, String applicationName, String instanceName, String environment, String region, HttpRequest request) { return new JacksonJsonResponse(controller.waitForConfigConvergence(new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName), - Zone.from(Environment.from(environment), RegionName.from(region))), + new Zone(Environment.from(environment), RegionName.from(region))), asLong(request.getProperty("timeout"), 1000))); } private HttpResponse services(String tenantName, String applicationName, String instanceName, String environment, String region, HttpRequest request) { ApplicationView applicationView = controller.getApplicationView(tenantName, applicationName, instanceName, environment, region); - ServiceApiResponse response = new ServiceApiResponse(Zone.from(Environment.from(environment), RegionName.from(region)), + ServiceApiResponse response = new ServiceApiResponse(new Zone(Environment.from(environment), RegionName.from(region)), new ApplicationId.Builder().tenant(tenantName).applicationName(applicationName).instanceName(instanceName).build(), controller.getConfigServerUris(Environment.from(environment), RegionName.from(region)), request.getUri()); @@ -587,7 +587,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { private HttpResponse service(String tenantName, String applicationName, String instanceName, String environment, String region, String serviceName, String restPath, HttpRequest request) { Map<?,?> result = controller.getServiceApiResponse(tenantName, applicationName, instanceName, environment, region, serviceName, restPath); - ServiceApiResponse response = new ServiceApiResponse(Zone.from(Environment.from(environment), RegionName.from(region)), + ServiceApiResponse response = new ServiceApiResponse(new Zone(Environment.from(environment), RegionName.from(region)), new ApplicationId.Builder().tenant(tenantName).applicationName(applicationName).instanceName(instanceName).build(), controller.getConfigServerUris(Environment.from(environment), RegionName.from(region)), request.getUri()); @@ -737,7 +737,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { /** Schedule restart of deployment, or specific host in a deployment */ private HttpResponse restart(String tenantName, String applicationName, String instanceName, String environment, String region, HttpRequest request) { DeploymentId deploymentId = new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName), - Zone.from(Environment.from(environment), RegionName.from(region))); + new Zone(Environment.from(environment), RegionName.from(region))); // TODO: Propagate all filters Optional<Hostname> hostname = Optional.ofNullable(request.getProperty("hostname")).map(Hostname::new); controller.applications().restart(deploymentId, hostname); @@ -758,7 +758,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { private HttpResponse log(String tenantName, String applicationName, String instanceName, String environment, String region) { try { DeploymentId deploymentId = new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName), - Zone.from(Environment.from(environment), RegionName.from(region))); + new Zone(Environment.from(environment), RegionName.from(region))); return new JacksonJsonResponse(controller.grabLog(deploymentId)); } catch (RuntimeException e) { @@ -770,7 +770,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { private HttpResponse deploy(String tenantName, String applicationName, String instanceName, String environment, String region, HttpRequest request) { ApplicationId applicationId = ApplicationId.from(tenantName, applicationName, instanceName); - Zone zone = Zone.from(Environment.from(environment), RegionName.from(region)); + Zone zone = new Zone(Environment.from(environment), RegionName.from(region)); Map<String, byte[]> dataParts = new MultipartParser().parse(request); if ( ! dataParts.containsKey("deployOptions")) @@ -821,7 +821,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { private HttpResponse deactivate(String tenantName, String applicationName, String instanceName, String environment, String region) { Application application = controller.applications().require(ApplicationId.from(tenantName, applicationName, instanceName)); - Zone zone = Zone.from(Environment.from(environment), RegionName.from(region)); + Zone zone = new Zone(Environment.from(environment), RegionName.from(region)); Deployment deployment = application.deployments().get(zone); if (deployment == null) { // Attempt to deactivate application even if the deployment is not known by the controller diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 94241d7934d..c41fc20d5c2 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -526,7 +526,7 @@ public class ControllerTest { application = application.withDeploying(Optional.of(new Change.VersionChange(Version.fromString("6.3")))); applications.store(application); try { - tester.deploy(app, Zone.from(Environment.prod, RegionName.from("us-east-3"))); + tester.deploy(app, new Zone(Environment.prod, RegionName.from("us-east-3"))); fail("Expected exception"); } catch (IllegalArgumentException e) { assertEquals("Rejecting deployment of application 'tenant1.app1' to zone prod.us-east-3 as version change to 6.3 is not tested", e.getMessage()); @@ -626,7 +626,7 @@ public class ControllerTest { Application app = tester.createApplication("app1", "tenant1", 1, 2L); // Direct deploy is allowed when project ID is missing - Zone zone = Zone.from(Environment.prod, RegionName.from("cd-us-central-1")); + Zone zone = new Zone(Environment.prod, RegionName.from("cd-us-central-1")); // Same options as used in our integration tests DeployOptions options = new DeployOptions(Optional.empty(), Optional.empty(), false, false); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java index 8ed4ae9ec19..bdb8160a3f6 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTester.java @@ -165,9 +165,9 @@ public final class ControllerTester { public Zone toZone(Environment environment) { switch (environment) { - case dev: case test: return Zone.from(environment, RegionName.from("us-east-1")); - case staging: return Zone.from(environment, RegionName.from("us-east-3")); - default: return Zone.from(environment, RegionName.from("us-west-1")); + case dev: case test: return new Zone(environment, RegionName.from("us-east-1")); + case staging: return new Zone(environment, RegionName.from("us-east-3")); + default: return new Zone(environment, RegionName.from("us-west-1")); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java index fb05552ba38..18332942c24 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ZoneRegistryMock.java @@ -88,7 +88,7 @@ public class ZoneRegistryMock extends AbstractComponent implements ZoneRegistry @Override public Optional<Duration> getDeploymentTimeToLive(Environment environment, RegionName region) { - return Optional.ofNullable(deploymentTimeToLive.get(Zone.from(environment, region))); + return Optional.ofNullable(deploymentTimeToLive.get(new Zone(environment, region))); } @Override diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirerTest.java index bc3a89f911d..ef0b05f9bb2 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DeploymentExpirerTest.java @@ -35,7 +35,7 @@ public class DeploymentExpirerTest { @Test public void testDeploymentExpiry() throws IOException, InterruptedException { tester.controllerTester().zoneRegistry().setDeploymentTimeToLive( - Zone.from(Environment.dev, RegionName.from("us-east-1")), + new Zone(Environment.dev, RegionName.from("us-east-1")), Duration.ofDays(14) ); DeploymentExpirer expirer = new DeploymentExpirer(tester.controller(), Duration.ofDays(10), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java index 7fc3f323353..8839f6a5a18 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/UpgraderTest.java @@ -692,7 +692,7 @@ public class UpgraderTest { // Dev deployment which should be ignored Application dev0 = tester.createApplication("dev0", "tenant1", 7, 1L); - tester.controllerTester().deploy(dev0, Zone.from(Environment.dev, RegionName.from("dev-region"))); + tester.controllerTester().deploy(dev0, new Zone(Environment.dev, RegionName.from("dev-region"))); // New version is released and canaries upgrade version = Version.fromString("5.1"); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java index e3d477cefeb..bf869230e8d 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java @@ -48,8 +48,8 @@ public class ApplicationSerializerTest { private static final ApplicationSerializer applicationSerializer = new ApplicationSerializer(); - private static final Zone zone1 = Zone.from(Environment.from("prod"), RegionName.from("us-west-1")); - private static final Zone zone2 = Zone.from(Environment.from("prod"), RegionName.from("us-east-3")); + private static final Zone zone1 = new Zone(Environment.from("prod"), RegionName.from("us-west-1")); + private static final Zone zone2 = new Zone(Environment.from("prod"), RegionName.from("us-east-3")); @Test public void testSerialization() { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ServiceApiResponseTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ServiceApiResponseTest.java index c5a413847d8..6cf90905679 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ServiceApiResponseTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ServiceApiResponseTest.java @@ -32,10 +32,10 @@ public class ServiceApiResponseTest { @Test public void testServiceViewResponse() throws URISyntaxException, IOException { - ServiceApiResponse response = new ServiceApiResponse(Zone.from(Environment.prod, RegionName.from("us-west-1")), - ApplicationId.from("tenant1", "application1", "default"), - Collections.singletonList(new URI("config-server1")), - new URI("http://server1:4080/request/path?foo=bar")); + ServiceApiResponse response = new ServiceApiResponse(new Zone(Environment.prod, RegionName.from("us-west-1")), + ApplicationId.from("tenant1", "application1", "default"), + Collections.singletonList(new URI("config-server1")), + new URI("http://server1:4080/request/path?foo=bar")); ApplicationView applicationView = new ApplicationView(); ClusterView clusterView = new ClusterView(); clusterView.type = "container"; @@ -63,7 +63,7 @@ public class ServiceApiResponseTest { @Test public void testServiceViewResponseWithURLs() throws URISyntaxException, IOException { - ServiceApiResponse response = new ServiceApiResponse(Zone.from(Environment.prod, RegionName.from("us-west-1")), + ServiceApiResponse response = new ServiceApiResponse(new Zone(Environment.prod, RegionName.from("us-west-1")), ApplicationId.from("tenant2", "application2", "default"), Collections.singletonList(new URI("http://cfg1.test/")), new URI("http://cfg1.test/serviceview/v1/tenant/tenant2/application/application2/environment/prod/region/us-west-1/instance/default/service/searchnode-9dujk1pa0vufxrj6n4yvmi8uc/state/v1")); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java index 75101e62754..55a4b46f4a7 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/deployment/DeploymentApiTest.java @@ -95,14 +95,14 @@ public class DeploymentApiTest extends ControllerContainerTest { private void deployCompletely(Application application, ApplicationPackage applicationPackage, long projectId, boolean success) { tester.notifyJobCompletion(application.id(), projectId, true, component); - tester.deploy(application, applicationPackage, Zone.from(Environment.test, - RegionName.from("us-east-1")), projectId); + tester.deploy(application, applicationPackage, new Zone(Environment.test, + RegionName.from("us-east-1")), projectId); tester.notifyJobCompletion(application.id(), projectId, true, systemTest); - tester.deploy(application, applicationPackage, Zone.from(Environment.staging, - RegionName.from("us-east-3")), projectId); + tester.deploy(application, applicationPackage, new Zone(Environment.staging, + RegionName.from("us-east-3")), projectId); tester.notifyJobCompletion(application.id(), projectId, success, stagingTest); if (success) { - tester.deploy(application, applicationPackage, Zone.from(Environment.prod, RegionName.from("corp-us-east-1")), + tester.deploy(application, applicationPackage, new Zone(Environment.prod,RegionName.from("corp-us-east-1")), projectId); tester.notifyJobCompletion(application.id(), projectId, true, productionCorpUsEast1); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java index 3e1a324918e..e2c3725ea5f 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java @@ -39,8 +39,8 @@ import static org.junit.Assert.assertTrue; public class ScrewdriverApiTest extends ControllerContainerTest { private static final String responseFiles = "src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/responses/"; - private static final Zone testZone = Zone.from(Environment.test, RegionName.from("us-east-1")); - private static final Zone stagingZone = Zone.from(Environment.staging, RegionName.from("us-east-3")); + private static final Zone testZone = new Zone(Environment.test, RegionName.from("us-east-1")); + private static final Zone stagingZone = new Zone(Environment.staging, RegionName.from("us-east-3")); @Test public void testGetReleaseStatus() throws Exception { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java index af99ff9de15..a00665b77cb 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/ZoneApiTest.java @@ -22,11 +22,11 @@ public class ZoneApiTest extends ControllerContainerTest { private static final String responseFiles = "src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v1/responses/"; private static final List<Zone> zones = Arrays.asList( - Zone.from(Environment.prod, RegionName.from("us-north-1")), - Zone.from(Environment.dev, RegionName.from("us-north-2")), - Zone.from(Environment.test, RegionName.from("us-north-3")), - Zone.from(Environment.staging, RegionName.from("us-north-4")) - ); + new Zone(Environment.prod, RegionName.from("us-north-1")), + new Zone(Environment.dev, RegionName.from("us-north-2")), + new Zone(Environment.test, RegionName.from("us-north-3")), + new Zone(Environment.staging, RegionName.from("us-north-4")) + ); private ContainerControllerTester tester; diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java index f887a449149..63899d808f9 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiTest.java @@ -27,11 +27,11 @@ public class ZoneApiTest extends ControllerContainerTest { private static final String responseFiles = "src/test/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/responses/"; private static final List<Zone> zones = Arrays.asList( - Zone.from(Environment.prod, RegionName.from("us-north-1")), - Zone.from(Environment.dev, RegionName.from("us-north-2")), - Zone.from(Environment.test, RegionName.from("us-north-3")), - Zone.from(Environment.staging, RegionName.from("us-north-4")) - ); + new Zone(Environment.prod, RegionName.from("us-north-1")), + new Zone(Environment.dev, RegionName.from("us-north-2")), + new Zone(Environment.test, RegionName.from("us-north-3")), + new Zone(Environment.staging, RegionName.from("us-north-4")) + ); private ContainerControllerTester tester; private ConfigServerProxyMock proxy; diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java index a5c96b2b131..704ded54479 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/InactiveAndFailedExpirerTest.java @@ -41,7 +41,7 @@ public class InactiveAndFailedExpirerTest { @Test public void inactive_and_failed_times_out() throws InterruptedException { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); List<Node> nodes = tester.makeReadyNodes(2, "default"); // Allocate then deallocate 2 nodes @@ -79,7 +79,7 @@ public class InactiveAndFailedExpirerTest { @Test public void reboot_generation_is_increased_when_node_moves_to_dirty() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); List<Node> nodes = tester.makeReadyNodes(1, "default"); // Allocate and deallocate a single node @@ -110,7 +110,7 @@ public class InactiveAndFailedExpirerTest { @Test public void node_that_wants_to_retire_is_moved_to_parked() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ClusterSpec cluster = ClusterSpec.request(ClusterSpec.Type.content, ClusterSpec.Id.from("test"), Version.fromString("6.42")); tester.makeReadyNodes(5, "default"); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java index 8b6eb3c3ba8..4dec3f9bde5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceTester.java @@ -30,7 +30,7 @@ public class MaintenanceTester { private final Curator curator = new MockCurator(); public final ManualClock clock = new ManualClock(Instant.ofEpochMilli(0L)); // determinism - private final Zone zone = Zone.from(Environment.prod, RegionName.from("us-east")); + private final Zone zone = new Zone(Environment.prod, RegionName.from("us-east")); private final NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("default"); public final NodeRepository nodeRepository = new NodeRepository(nodeFlavors, curator, clock, zone, new MockNameResolver().mockAnyLookup(), diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java index 8dac22f92e1..0e0195a5bed 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeFailTester.java @@ -54,7 +54,7 @@ public class NodeFailTester { public static final ApplicationId app1 = ApplicationId.from(TenantName.from("foo1"), ApplicationName.from("bar"), InstanceName.from("fuz")); public static final ApplicationId app2 = ApplicationId.from(TenantName.from("foo2"), ApplicationName.from("bar"), InstanceName.from("fuz")); public static final NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("default", "docker"); - private static final Zone zone = Zone.from(Environment.prod, RegionName.from("us-east")); + private static final Zone zone = new Zone(Environment.prod, RegionName.from("us-east")); private static final Duration downtimeLimitOneHour = Duration.ofMinutes(60); // Components with state diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTester.java index 86c3dba03ec..04e782c5562 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeRetirerTester.java @@ -46,7 +46,7 @@ import static org.mockito.Mockito.when; * @author freva */ public class NodeRetirerTester { - public static final Zone zone = Zone.from(Environment.prod, RegionName.from("us-east")); + public static final Zone zone = new Zone(Environment.prod, RegionName.from("us-east")); // Components with state public final ManualClock clock = new ManualClock(); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java index b07d364528e..d2ec5865a0c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainerTest.java @@ -53,7 +53,7 @@ public class OperatorChangeApplicationMaintainerTest { public void test_application_maintenance() throws InterruptedException { ManualClock clock = new ManualClock(); Curator curator = new MockCurator(); - Zone zone = Zone.from(Environment.prod, RegionName.from("us-east")); + Zone zone = new Zone(Environment.prod, RegionName.from("us-east")); this.nodeRepository = new NodeRepository(nodeFlavors, curator, clock, zone, new MockNameResolver().mockAnyLookup(), new DockerImage("docker-registry.domain.tld:8080/dist/vespa")); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java index 351ce453a70..d9a6b62bbe9 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java @@ -54,7 +54,7 @@ public class PeriodicApplicationMaintainerTest { @Before public void before() { Curator curator = new MockCurator(); - Zone zone = Zone.from(Environment.prod, RegionName.from("us-east")); + Zone zone = new Zone(Environment.prod, RegionName.from("us-east")); this.nodeRepository = new NodeRepository(nodeFlavors, curator, new ManualClock(), zone, new MockNameResolver().mockAnyLookup(), new DockerImage("docker-registry.domain.tld:8080/dist/vespa")); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java index 961b0f64b04..8195321be03 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/RetiredExpirerTest.java @@ -54,7 +54,7 @@ public class RetiredExpirerTest { @Test public void ensure_retired_nodes_time_out() throws InterruptedException { ManualClock clock = new ManualClock(); - Zone zone = Zone.from(Environment.prod, RegionName.from("us-east")); + Zone zone = new Zone(Environment.prod, RegionName.from("us-east")); NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("default"); NodeRepository nodeRepository = new NodeRepository(nodeFlavors, curator, clock, zone, new MockNameResolver().mockAnyLookup(), @@ -94,7 +94,7 @@ public class RetiredExpirerTest { @Test public void ensure_retired_groups_time_out() throws InterruptedException { ManualClock clock = new ManualClock(); - Zone zone = Zone.from(Environment.prod, RegionName.from("us-east")); + Zone zone = new Zone(Environment.prod, RegionName.from("us-east")); NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("default"); NodeRepository nodeRepository = new NodeRepository(nodeFlavors, curator, clock, zone, new MockNameResolver().mockAnyLookup(), @@ -130,7 +130,7 @@ public class RetiredExpirerTest { @Test public void ensure_early_inactivation() throws OrchestrationException { ManualClock clock = new ManualClock(); - Zone zone = Zone.from(Environment.prod, RegionName.from("us-east")); + Zone zone = new Zone(Environment.prod, RegionName.from("us-east")); NodeFlavors nodeFlavors = FlavorConfigBuilder.createDummies("default"); NodeRepository nodeRepository = new NodeRepository(nodeFlavors, curator, clock, zone, new MockNameResolver().mockAnyLookup(), diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java index f906f47e6d0..a6760ef37ce 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningTest.java @@ -28,7 +28,7 @@ public class DockerProvisioningTest { @Test public void docker_application_deployment() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); for (int i = 1; i < 10; i++) { @@ -61,7 +61,7 @@ public class DockerProvisioningTest { // In dev, test and staging you get nodes with default flavor, but we should get specified flavor for docker nodes @Test public void get_specified_flavor_not_default_flavor_for_docker() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.test, RegionName.from("corp-us-east-1"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.test, RegionName.from("corp-us-east-1"))); ApplicationId application1 = tester.makeApplicationId(); tester.makeReadyDockerNodes(1, dockerFlavor, "dockerHost"); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java index 45565cc8547..75d5862f010 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisioningTest.java @@ -61,7 +61,7 @@ public class DynamicDockerProvisioningTest { */ @Test public void relocate_nodes_from_headroom_hosts() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.perf, RegionName.from("us-east")), flavorsConfig(true)); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.perf, RegionName.from("us-east")), flavorsConfig(true)); enableDynamicAllocation(tester); tester.makeReadyNodes(4, "host-small", NodeType.host, 32); deployZoneApp(tester); @@ -109,7 +109,7 @@ public class DynamicDockerProvisioningTest { */ @Test public void relocate_nodes_from_spare_hosts() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), flavorsConfig()); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), flavorsConfig()); enableDynamicAllocation(tester); tester.makeReadyNodes(4, "host-small", NodeType.host, 32); deployZoneApp(tester); @@ -155,7 +155,7 @@ public class DynamicDockerProvisioningTest { */ @Test public void new_docker_nodes_are_marked_as_headroom_violations() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.perf, RegionName.from("us-east")), flavorsConfig(true)); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.perf, RegionName.from("us-east")), flavorsConfig(true)); enableDynamicAllocation(tester); tester.makeReadyNodes(4, "host-small", NodeType.host, 32); deployZoneApp(tester); @@ -211,7 +211,7 @@ public class DynamicDockerProvisioningTest { */ @Test public void only_preferred_container_is_moved_from_hosts_with_headroom_violations() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.perf, RegionName.from("us-east")), flavorsConfig(true)); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.perf, RegionName.from("us-east")), flavorsConfig(true)); enableDynamicAllocation(tester); tester.makeReadyNodes(4, "host-medium", NodeType.host, 32); deployZoneApp(tester); @@ -280,7 +280,7 @@ public class DynamicDockerProvisioningTest { */ @Test public void reloacte_failed_nodes() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), flavorsConfig()); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), flavorsConfig()); enableDynamicAllocation(tester); tester.makeReadyNodes(5, "host-small", NodeType.host, 32); deployZoneApp(tester); @@ -339,7 +339,7 @@ public class DynamicDockerProvisioningTest { */ @Test public void do_not_relocate_nodes_from_spare_if_no_where_to_reloacte_them() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), flavorsConfig()); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), flavorsConfig()); enableDynamicAllocation(tester); tester.makeReadyNodes(2, "host-small", NodeType.host, 32); deployZoneApp(tester); @@ -367,7 +367,7 @@ public class DynamicDockerProvisioningTest { @Test(expected = OutOfCapacityException.class) public void multiple_groups_are_on_separate_parent_hosts() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), flavorsConfig()); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), flavorsConfig()); enableDynamicAllocation(tester); tester.makeReadyNodes(5, "host-small", NodeType.host, 32); deployZoneApp(tester); @@ -390,7 +390,7 @@ public class DynamicDockerProvisioningTest { // Fail one node and redeploy, Verify that one less node is empty. // Setup test - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), flavorsConfig()); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), flavorsConfig()); enableDynamicAllocation(tester); ApplicationId application1 = tester.makeApplicationId(); tester.makeReadyNodes(5, "host-small", NodeType.host, 32); @@ -430,7 +430,7 @@ public class DynamicDockerProvisioningTest { @Test public void non_prod_do_not_have_spares() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.perf, RegionName.from("us-east")), flavorsConfig()); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.perf, RegionName.from("us-east")), flavorsConfig()); enableDynamicAllocation(tester); tester.makeReadyNodes(3, "host-small", NodeType.host, 32); deployZoneApp(tester); @@ -448,7 +448,7 @@ public class DynamicDockerProvisioningTest { @Test(expected = OutOfCapacityException.class) public void allocation_should_fail_when_host_is_not_active() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), flavorsConfig()); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), flavorsConfig()); enableDynamicAllocation(tester); tester.makeProvisionedNodes(3, "host-small", NodeType.host, 32); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java index 51866f82c52..4a20cb3e318 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/MultigroupProvisioningTest.java @@ -35,7 +35,7 @@ public class MultigroupProvisioningTest { @Test public void test_provisioning_of_multiple_groups() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -67,7 +67,7 @@ public class MultigroupProvisioningTest { */ @Test @Ignore public void test_provisioning_of_groups_with_asymmetry() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -80,7 +80,7 @@ public class MultigroupProvisioningTest { @Test public void test_provisioning_of_multiple_groups_after_flavor_migration() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -94,7 +94,7 @@ public class MultigroupProvisioningTest { @Test public void test_one_node_and_group_to_two() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -106,7 +106,7 @@ public class MultigroupProvisioningTest { @Test public void test_one_node_and_group_to_two_with_flavor_migration() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -119,7 +119,7 @@ public class MultigroupProvisioningTest { @Test public void test_provisioning_of_multiple_groups_after_flavor_migration_and_exiration() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java index b0896b10fb3..873193ac3b8 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/NodeTypeProvisioningTest.java @@ -16,6 +16,7 @@ import org.junit.Test; import java.util.HashSet; import java.util.List; +import java.util.Optional; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -29,7 +30,7 @@ public class NodeTypeProvisioningTest { @Test public void proxy_deployment() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); tester.makeReadyNodes( 1, "small", NodeType.proxy); tester.makeReadyNodes( 3, "small", NodeType.host); diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java index 8b1907fce86..afdce0d25cc 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTest.java @@ -56,7 +56,7 @@ public class ProvisioningTest { @Test public void application_deployment_constant_application_size() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); ApplicationId application2 = tester.makeApplicationId(); @@ -137,7 +137,7 @@ public class ProvisioningTest { @Test public void application_deployment_variable_application_size() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -204,7 +204,7 @@ public class ProvisioningTest { @Test public void application_deployment_multiple_flavors() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -233,7 +233,7 @@ public class ProvisioningTest { @Test public void application_deployment_with_inplace_downsize() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -281,7 +281,7 @@ public class ProvisioningTest { @Test public void application_deployment_multiple_flavors_with_replacement() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -324,7 +324,7 @@ public class ProvisioningTest { @Test public void application_deployment_above_then_at_capacity_limit() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -349,7 +349,7 @@ public class ProvisioningTest { @Test public void dev_deployment_size() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.dev, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.dev, RegionName.from("us-east"))); ApplicationId application = tester.makeApplicationId(); tester.makeReadyNodes(4, "default"); @@ -360,7 +360,7 @@ public class ProvisioningTest { @Test public void deploy_specific_vespa_version() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.dev, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.dev, RegionName.from("us-east"))); ApplicationId application = tester.makeApplicationId(); tester.makeReadyNodes(4, "default"); @@ -371,7 +371,7 @@ public class ProvisioningTest { @Test public void test_deployment_size() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.test, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.test, RegionName.from("us-east"))); ApplicationId application = tester.makeApplicationId(); tester.makeReadyNodes(4, "default"); @@ -383,7 +383,7 @@ public class ProvisioningTest { @Ignore // TODO: Re-activate when the check is reactivate in CapacityPolicies @Test(expected = IllegalArgumentException.class) public void prod_deployment_requires_redundancy() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application = tester.makeApplicationId(); tester.makeReadyNodes(10, "default"); @@ -393,7 +393,7 @@ public class ProvisioningTest { /** Dev always uses the zone default flavor */ @Test public void dev_deployment_flavor() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.dev, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.dev, RegionName.from("us-east"))); ApplicationId application = tester.makeApplicationId(); tester.makeReadyNodes(4, "default"); @@ -405,7 +405,7 @@ public class ProvisioningTest { /** Test always uses the zone default flavor */ @Test public void test_deployment_flavor() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.test, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.test, RegionName.from("us-east"))); ApplicationId application = tester.makeApplicationId(); tester.makeReadyNodes(4, "default"); @@ -416,7 +416,7 @@ public class ProvisioningTest { @Test public void staging_deployment_size() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.staging, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.staging, RegionName.from("us-east"))); ApplicationId application = tester.makeApplicationId(); tester.makeReadyNodes(14, "default"); @@ -427,7 +427,7 @@ public class ProvisioningTest { @Test public void activate_after_reservation_timeout() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); tester.makeReadyNodes(10, "default"); ApplicationId application = tester.makeApplicationId(); @@ -449,7 +449,7 @@ public class ProvisioningTest { @Test public void out_of_capacity() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); tester.makeReadyNodes(9, "default"); // need 2+2+3+3=10 ApplicationId application = tester.makeApplicationId(); @@ -464,7 +464,7 @@ public class ProvisioningTest { @Test public void out_of_desired_flavor() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); tester.makeReadyNodes(10, "small"); // need 2+2+3+3=10 tester.makeReadyNodes( 9, "large"); // need 2+2+3+3=10 @@ -489,7 +489,7 @@ public class ProvisioningTest { Flavor.Type.BARE_METAL).cost(2); b.addReplaces(flavorToRetire, newDefault); - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), b.build()); ApplicationId application = tester.makeApplicationId(); @@ -504,7 +504,7 @@ public class ProvisioningTest { @Test public void out_of_capacity_all_nodes_want_to_retire() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application = tester.makeApplicationId(); // Flag all nodes for retirement @@ -521,7 +521,7 @@ public class ProvisioningTest { @Test public void nonexisting_flavor() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application = tester.makeApplicationId(); try { @@ -535,7 +535,7 @@ public class ProvisioningTest { @Test public void highest_node_indexes_are_retired_first() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application1 = tester.makeApplicationId(); @@ -586,7 +586,7 @@ public class ProvisioningTest { FlavorConfigBuilder b = new FlavorConfigBuilder(); b.addFlavor("default", 1., 1., 10, Flavor.Type.BARE_METAL).cost(2); - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), b.build(), curator, nameResolver); tester.makeReadyNodes(4, flavorToRetire); SystemState state = prepare(application, 2, 0, 2, 0, @@ -603,7 +603,7 @@ public class ProvisioningTest { Flavor.Type.BARE_METAL).cost(2); b.addReplaces(flavorToRetire, newDefault); - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), b.build(), curator, nameResolver); // Add nodes with "new-default" flavor @@ -632,7 +632,7 @@ public class ProvisioningTest { Flavor.Type.BARE_METAL).cost(2); b.addReplaces(flavorToRetire, newDefault); - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), b.build()); ApplicationId application = tester.makeApplicationId(); @@ -652,7 +652,7 @@ public class ProvisioningTest { @Test public void application_deployment_retires_nodes_that_want_to_retire() { - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); ApplicationId application = tester.makeApplicationId(); tester.makeReadyNodes(10, "default"); @@ -687,7 +687,7 @@ public class ProvisioningTest { FlavorsConfig.Flavor.Builder largeVariantVariant = b.addFlavor("large-variant-variant", 4., 9., 101, Flavor.Type.BARE_METAL).cost(11); b.addReplaces("large-variant", largeVariantVariant); - ProvisioningTester tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east")), b.build()); + ProvisioningTester tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east")), b.build()); tester.makeReadyNodes(6, "large"); //cost = 10 tester.makeReadyNodes(6, "large-variant"); //cost = 9 tester.makeReadyNodes(6, "large-variant-variant"); //cost = 11 diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java index 521090783d5..4366cd641ec 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/VirtualNodeProvisioningTest.java @@ -40,7 +40,7 @@ public class VirtualNodeProvisioningTest { @Before public void setup() { - tester = new ProvisioningTester(Zone.from(Environment.prod, RegionName.from("us-east"))); + tester = new ProvisioningTester(new Zone(Environment.prod, RegionName.from("us-east"))); applicationId = tester.makeApplicationId(); } diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java index eaea006d429..cf07c39950c 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java @@ -38,7 +38,7 @@ public class ModelGeneratorTest { ExampleModel.createExampleSuperModelWithOneRpcPort(HOSTNAME, PORT); ModelGenerator modelGenerator = new ModelGenerator(); - Zone zone = Zone.from(Environment.from(ENVIRONMENT), RegionName.from(REGION)); + Zone zone = new Zone(Environment.from(ENVIRONMENT), RegionName.from(REGION)); List<String> configServerHosts = Stream.of("cfg1", "cfg2", "cfg3") .collect(Collectors.toList()); @@ -83,7 +83,7 @@ public class ModelGeneratorTest { ExampleModel.createExampleSuperModelWithOneRpcPort(HOSTNAME, PORT); ModelGenerator modelGenerator = new ModelGenerator(); - Zone zone = Zone.from(Environment.from(ENVIRONMENT), RegionName.from(REGION)); + Zone zone = new Zone(Environment.from(ENVIRONMENT), RegionName.from(REGION)); List<String> configServerHosts = Collections.emptyList(); |