diff options
| author | Øyvind Grønnesby <oyving@yahooinc.com> | 2022-06-15 13:38:25 +0200 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@yahooinc.com> | 2022-06-15 14:18:13 +0200 |
| commit | d24217c7bbe0f0b297fbd87cb2e3b7f0e0d3b12c (patch) | |
| tree | b9816465a7f91f026b9675648662d1df8e09c772 /controller-server/src/test/java/com | |
| parent | 82cc6b485145067f281a2cf68a0e823b8cde6e13 (diff) | |
Implement persisting and retrieval of scaling events
Diffstat (limited to 'controller-server/src/test/java/com')
3 files changed, 17 insertions, 1 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java index df30b6b57ee..187b8f932cf 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/CloudTrialExpirerTest.java @@ -83,6 +83,13 @@ public class CloudTrialExpirerTest { assertTrue(tester.controller().tenants().get("with-apps").isEmpty()); } + @Test + public void keep_tenants_without_applications_that_are_idle() { + registerTenant("active", "none", Duration.ofDays(364)); + expirer.maintain(); + assertPlan("active", "none"); + } + private void registerTenant(String tenantName, String plan, Duration timeSinceLastLogin) { var name = TenantName.from(tenantName); tester.createTenant(tenantName, Tenant.Type.cloud); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java index 320938f00e4..8952e93c778 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainerTest.java @@ -121,6 +121,15 @@ public class ResourceMeterMaintainerTest { assertEquals(lastRefreshTime + millisAdvanced, tester.curator().readMeteringRefreshTime()); } + @Test + public void scaling_events_report() { + tester.createTenant("tenant1"); + tester.createApplication("tenant1", "app1", "default"); + + setUpZones(); + maintainer.maintain(); + } + private void setUpZones() { ZoneApiMock zone1 = ZoneApiMock.newBuilder().withId("prod.region-2").build(); ZoneApiMock zone2 = ZoneApiMock.newBuilder().withId("test.region-3").build(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java index 94ca4268000..5936c135af9 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/controller/ControllerApiTest.java @@ -161,7 +161,7 @@ public class ControllerApiTest extends ControllerContainerTest { new ResourceSnapshot(applicationId, 12,48,1200, NodeResources.Architecture.arm64, timestamp, zoneId), new ResourceSnapshot(applicationId, 24, 96,2400, NodeResources.Architecture.x86_64, timestamp, zoneId) ); - tester.controller().serviceRegistry().meteringService().consume(snapshots); + tester.controller().serviceRegistry().resourceDatabase().writeResourceSnapshots(snapshots); tester.assertResponse( operatorRequest("http://localhost:8080/controller/v1/metering/tenant/tenantName/month/2020-02", "", Request.Method.GET), new File("metering.json") |