Update tests with new setPlan signature

5 files changed, 8 insertions, 8 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 f768ab5e61b..2e34c6511a7 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
@@ -86,7 +86,7 @@ public class CloudTrialExpirerTest {
     private void registerTenant(String tenantName, String plan, Duration timeSinceLastLogin) {
         var name = TenantName.from(tenantName);
         tester.createTenant(tenantName, Tenant.Type.cloud);
-        tester.serviceRegistry().billingController().setPlan(name, PlanId.from(plan), false);
+        tester.serviceRegistry().billingController().setPlan(name, PlanId.from(plan), false, false);
         tester.controller().tenants().updateLastLogin(name, List.of(LastLoginInfo.UserLevel.user), tester.controller().clock().instant().minus(timeSinceLastLogin));
     }
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
index 64e3a95605a..215c03030a9 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporterTest.java
@@ -490,8 +490,8 @@ public class MetricsReporterTest {
         tester.createTenant("foo", Tenant.Type.cloud);
         tester.createTenant("bar", Tenant.Type.cloud);
         tester.createTenant("fix", Tenant.Type.cloud);
-        tester.controller().serviceRegistry().billingController().setPlan(TenantName.from("foo"), PlanId.from("pay-as-you-go"), false);
-        tester.controller().serviceRegistry().billingController().setPlan(TenantName.from("bar"), PlanId.from("pay-as-you-go"), false);
+        tester.controller().serviceRegistry().billingController().setPlan(TenantName.from("foo"), PlanId.from("pay-as-you-go"), false, false);
+        tester.controller().serviceRegistry().billingController().setPlan(TenantName.from("bar"), PlanId.from("pay-as-you-go"), false, false);
 
         var reporter = createReporter(tester.controller());
         reporter.maintain();
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
index 33b7500ceac..5368cc73480 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiCloudTest.java
@@ -211,7 +211,7 @@ public class ApplicationApiCloudTest extends ControllerContainerCloudTest {
     @Test
     public void trial_tenant_limit_reached() {
         ((InMemoryFlagSource) tester.controller().flagSource()).withIntFlag(PermanentFlags.MAX_TRIAL_TENANTS.id(), 1);
-        tester.controller().serviceRegistry().billingController().setPlan(tenantName, PlanId.from("pay-as-you-go"), false);
+        tester.controller().serviceRegistry().billingController().setPlan(tenantName, PlanId.from("pay-as-you-go"), false, false);
 
         // tests that we can create the one trial tenant the flag says we can have -- and that the tenant created
         // in @Before does not count towards that limit.
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java
index 0ef242aed16..b58e5294f66 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/billing/BillingApiHandlerTest.java
@@ -102,7 +102,7 @@ public class BillingApiHandlerTest extends ControllerContainerCloudTest {
 
         billingController.addBill(tenant, bill, true);
         billingController.addBill(tenant, bill, false);
-        billingController.setPlan(tenant, PlanId.from("some-plan"), true);
+        billingController.setPlan(tenant, PlanId.from("some-plan"), true, false);
 
         var request = request("/billing/v1/tenant/tenant1/billing?until=2020-05-28").roles(tenantRole);
         tester.assertResponse(request, new File("tenant-billing-view.json"));
@@ -179,8 +179,8 @@ public class BillingApiHandlerTest extends ControllerContainerCloudTest {
         tester.controller().tenants().create(new CloudTenantSpec(tenant2, ""), new Auth0Credentials(() -> "foo", Set.of(Role.hostedOperator())));
 
         var bill = createBill();
-        billingController.setPlan(tenant, PlanId.from("some-plan"), true);
-        billingController.setPlan(tenant2, PlanId.from("some-plan"), true);
+        billingController.setPlan(tenant, PlanId.from("some-plan"), true, false);
+        billingController.setPlan(tenant2, PlanId.from("some-plan"), true, false);
         billingController.addBill(tenant, bill, false);
         billingController.addLineItem(tenant, "support", new BigDecimal("42"), "Smith");
         billingController.addBill(tenant2, bill, false);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java
index d0c95fe593e..1bb409b9906 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java
@@ -291,7 +291,7 @@ public class UserApiTest extends ControllerContainerCloudTest {
 
             var tenant1 = controller.createTenant("tenant1", Tenant.Type.cloud);
             var tenant2 = controller.createTenant("tenant2", Tenant.Type.cloud);
-            controller.serviceRegistry().billingController().setPlan(tenant2, PlanId.from("paid"), false);
+            controller.serviceRegistry().billingController().setPlan(tenant2, PlanId.from("paid"), false, false);
 
             tester.assertResponse(
                     request("/user/v1/user")