diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-05-28 15:04:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-28 15:04:26 +0200 |
| commit | 4552075772789e0db6d4ab0e21157b393274432b (patch) | |
| tree | 1c33f2c1ff2897d0e3dadbc2bfa96b2385bdcaf8 /controller-server | |
| parent | 13d1a3491b1daac7a6058300e83014200e30386c (diff) | |
| parent | 8903332a7a6ce57c7777b2f6976c1da781d8b52e (diff) | |
Merge pull request #13401 from vespa-engine/mpolden/provision-exact-capacity
Support provisioning exact capacity
Diffstat (limited to 'controller-server')
2 files changed, 10 insertions, 5 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java index c8319efa348..0bc29157c06 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java @@ -37,8 +37,8 @@ public class OsUpgraderTest { @Test public void upgrade_os() { - Cloud cloud1 = new Cloud(CloudName.from("c1"), false, true, false, true); - Cloud cloud2 = new Cloud(CloudName.from("c2"), false, true, false, true); + Cloud cloud1 = Cloud.builder().name(CloudName.from("c1")).requireAccessControl(true).build(); + Cloud cloud2 = Cloud.builder().name(CloudName.from("c2")).requireAccessControl(true).build(); ZoneApi zone1 = zone("prod.eu-west-1", cloud1); ZoneApi zone2 = zone("prod.us-west-1", cloud1); ZoneApi zone3 = zone("prod.us-central-1", cloud1); @@ -110,7 +110,7 @@ public class OsUpgraderTest { @Test public void upgrade_os_with_budget() { - Cloud cloud = new Cloud(CloudName.from("cloud"), false, true, true, true); + Cloud cloud = Cloud.builder().name(CloudName.from("cloud")).reprovisionToUpgradeOs(true).requireAccessControl(true).build(); ZoneApi zone1 = zone("dev.us-east-1", cloud); ZoneApi zone2 = zone("prod.us-west-1", cloud); ZoneApi zone3 = zone("prod.us-central-1", cloud); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java index 5534b6937b2..8131a850d3b 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/OsApiTest.java @@ -37,8 +37,13 @@ public class OsApiTest extends ControllerContainerTest { private static final String responses = "src/test/java/com/yahoo/vespa/hosted/controller/restapi/os/responses/"; private static final AthenzIdentity operator = AthenzUser.fromUserId("operatorUser"); - private static final Cloud cloud1 = new Cloud(CloudName.from("cloud1"), false, true, false, false); - private static final Cloud cloud2 = new Cloud(CloudName.from("cloud2"), true, false, true, true); + private static final Cloud cloud1 = Cloud.builder().name(CloudName.from("cloud1")).build(); + private static final Cloud cloud2 = Cloud.builder().name(CloudName.from("cloud2")) + .dynamicProvisioning(true) + .allowHostSharing(false) + .reprovisionToUpgradeOs(true) + .requireAccessControl(true) + .build(); private static final ZoneApi zone1 = ZoneApiMock.newBuilder().withId("prod.us-east-3").with(cloud1.name()).build(); private static final ZoneApi zone2 = ZoneApiMock.newBuilder().withId("prod.us-west-1").with(cloud1.name()).build(); private static final ZoneApi zone3 = ZoneApiMock.newBuilder().withId("prod.eu-west-1").with(cloud2.name()).build(); |