diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-08-05 11:19:10 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-08-05 11:19:10 +0200 |
commit | 1485890ce1c19ccd2d4f4f4b8b4a3e014311efea (patch) | |
tree | 23e46e47c18f269a55c9d93eda4c053a3add9fa9 /orchestrator/src/test | |
parent | bf61b5704afadd2b65af9b1756830f0686f64509 (diff) |
Guard with orchestrate-missing-proxies flag
Diffstat (limited to 'orchestrator/src/test')
5 files changed, 7 insertions, 6 deletions
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java index 7d1b69d7171..957c748d0b3 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java @@ -81,7 +81,7 @@ public class OrchestratorImplTest { private static final Zone zone = Zone.defaultZone(); private final ManualClock clock = new ManualClock(); - private final ApplicationApiFactory applicationApiFactory = new ApplicationApiFactory(3, clock); + private final ApplicationApiFactory applicationApiFactory = new ApplicationApiFactory(3, 5, clock); private final InMemoryFlagSource flagSource = new InMemoryFlagSource(); private final MockCurator curator = new MockCurator(); private final ZkStatusService statusService = new ZkStatusService( diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java index 193798d35fc..83c902ed981 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorTest.java @@ -57,7 +57,7 @@ public class OrchestratorTest { var flagSource = new InMemoryFlagSource(); var timer = new TestTimer(); var clustercontroller = new ClusterControllerClientFactoryMock(); - var applicationApiFactory = new ApplicationApiFactory(3, timer.toUtcClock()); + var applicationApiFactory = new ApplicationApiFactory(3, 5, timer.toUtcClock()); var policy = new HostedVespaPolicy(new HostedVespaClusterPolicy(flagSource, zone), clustercontroller, applicationApiFactory); var zone = new Zone(SystemName.cd, Environment.prod, RegionName.from("cd-us-east-1")); this.superModelManager = new MySuperModelProvider(); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java index 6ec03ba3c44..ac7b10c034e 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ModelTestUtils.java @@ -63,8 +63,9 @@ class ModelTestUtils { new ApplicationInstanceId("application-name:foo:bar:default"); public static final int NUMBER_OF_CONFIG_SERVERS = 3; + public static final int NUMBER_OF_PROXIES = 5; public static final OrchestrationParams ORCHESTRATION_PARAMS = - HostedVespaOrchestration.create(NUMBER_OF_CONFIG_SERVERS, 0); + HostedVespaOrchestration.create(NUMBER_OF_CONFIG_SERVERS, NUMBER_OF_PROXIES); public static final ApplicationParams APPLICATION_PARAMS = ORCHESTRATION_PARAMS .getApplicationParams(OrchestratorUtil.toApplicationId( new ApplicationInstanceReference(TENANT_ID, APPLICATION_INSTANCE_ID))); @@ -92,7 +93,7 @@ class ModelTestUtils { private final ManualClock clock = new ManualClock(); ApplicationApiFactory applicationApiFactory() { - return new ApplicationApiFactory(NUMBER_OF_CONFIG_SERVERS, clock); + return new ApplicationApiFactory(NUMBER_OF_CONFIG_SERVERS, NUMBER_OF_PROXIES, clock); } HostInfos getHostInfos() { diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java index 385f7b238af..37b1615abbd 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaPolicyTest.java @@ -36,7 +36,7 @@ public class HostedVespaPolicyTest { private final ClusterControllerClientFactory clientFactory = mock(ClusterControllerClientFactory.class); private final ClusterControllerClient client = mock(ClusterControllerClient.class); private final ManualClock clock = new ManualClock(); - private final ApplicationApiFactory applicationApiFactory = new ApplicationApiFactory(3, clock); + private final ApplicationApiFactory applicationApiFactory = new ApplicationApiFactory(3, 5, clock); @Before public void setUp() { diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandlerTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandlerTest.java index f6dc6d7676c..3f1aa2d5a2e 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandlerTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostRequestHandlerTest.java @@ -79,7 +79,7 @@ class HostRequestHandlerTest { private static final ServiceMonitor serviceMonitor = mock(ServiceMonitor.class); private static final StatusService EVERY_HOST_IS_UP_HOST_STATUS_SERVICE = new ZkStatusService( new MockCurator(), mock(Metric.class), new TestTimer(), new DummyAntiServiceMonitor()); - private static final ApplicationApiFactory applicationApiFactory = new ApplicationApiFactory(3, clock); + private static final ApplicationApiFactory applicationApiFactory = new ApplicationApiFactory(3, 5, clock); static { when(serviceMonitor.getApplication(any(HostName.class))) |