diff options
author | Håkon Hallingstad <hakon@oath.com> | 2017-10-22 00:34:57 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2017-10-22 00:34:57 +0200 |
commit | 5c85415772637b3f160a8f3a26306053630fee96 (patch) | |
tree | 54b63d1c22a61c43b7927812dbe00f914eccfb98 /orchestrator/src/test | |
parent | 535c1ae687415540b2d5e727957665f02f898de7 (diff) |
Remove status type parameter in application model classes
Diffstat (limited to 'orchestrator/src/test')
10 files changed, 158 insertions, 162 deletions
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java index 2dbb1562478..a54f5284ee0 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java @@ -10,11 +10,11 @@ import com.yahoo.vespa.applicationmodel.ConfigId; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.applicationmodel.ServiceCluster; import com.yahoo.vespa.applicationmodel.ServiceInstance; +import com.yahoo.vespa.applicationmodel.ServiceStatus; import com.yahoo.vespa.applicationmodel.ServiceType; import com.yahoo.vespa.applicationmodel.TenantId; import com.yahoo.vespa.orchestrator.model.NodeGroup; import com.yahoo.vespa.orchestrator.model.VespaModelUtil; -import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; import java.util.HashSet; import java.util.Optional; @@ -33,89 +33,89 @@ public class DummyInstanceLookupService implements InstanceLookupService { public static final HostName TEST3_HOST_NAME = new HostName("test3.hostname.tld"); public static final HostName TEST6_HOST_NAME = new HostName("test6.hostname.tld"); - private static final Set<ApplicationInstance<ServiceMonitorStatus>> apps = new HashSet<>(); + private static final Set<ApplicationInstance> apps = new HashSet<>(); static { - apps.add(new ApplicationInstance<>( + apps.add(new ApplicationInstance( new TenantId("test-tenant-id"), new ApplicationInstanceId("application:prod:utopia-1:instance"), TestUtil.makeServiceClusterSet( - new ServiceCluster<>( + new ServiceCluster( new ClusterId("test-cluster-id-1"), new ServiceType("storagenode"), TestUtil.makeServiceInstanceSet( - new ServiceInstance<>( + new ServiceInstance( new ConfigId("storage/storage/1"), TEST1_HOST_NAME, - ServiceMonitorStatus.UP), - new ServiceInstance<>( + ServiceStatus.UP), + new ServiceInstance( new ConfigId("storage/storage/2"), new HostName("test2.hostname.tld"), - ServiceMonitorStatus.UP))), - new ServiceCluster<>( + ServiceStatus.UP))), + new ServiceCluster( new ClusterId("clustercontroller"), new ServiceType("container-clustercontroller"), TestUtil.makeServiceInstanceSet( - new ServiceInstance<>( + new ServiceInstance( new ConfigId("clustercontroller-1"), new HostName("myclustercontroller.hostname.tld"), - ServiceMonitorStatus.UP))) + ServiceStatus.UP))) ) )); - apps.add(new ApplicationInstance<>( + apps.add(new ApplicationInstance( new TenantId("mediasearch"), new ApplicationInstanceId("imagesearch:prod:utopia-1:default"), TestUtil.makeServiceClusterSet( - new ServiceCluster<>( + new ServiceCluster( new ClusterId("image"), new ServiceType("storagenode"), TestUtil.makeServiceInstanceSet( - new ServiceInstance<>( + new ServiceInstance( new ConfigId("storage/storage/3"), TEST3_HOST_NAME, - ServiceMonitorStatus.UP), - new ServiceInstance<>( + ServiceStatus.UP), + new ServiceInstance( new ConfigId("storage/storage/4"), new HostName("test4.hostname.tld"), - ServiceMonitorStatus.UP))), - new ServiceCluster<>( + ServiceStatus.UP))), + new ServiceCluster( new ClusterId("clustercontroller"), new ServiceType("container-clustercontroller"), TestUtil.makeServiceInstanceSet( - new ServiceInstance<>( + new ServiceInstance( new ConfigId("clustercontroller-1"), new HostName("myclustercontroller2.hostname.tld"), - ServiceMonitorStatus.UP))) + ServiceStatus.UP))) ) ) ); - apps.add(new ApplicationInstance<>( + apps.add(new ApplicationInstance( new TenantId("tenant-id-3"), new ApplicationInstanceId("application-instance-3:prod:utopia-1:default"), TestUtil.makeServiceClusterSet( - new ServiceCluster<>( + new ServiceCluster( new ClusterId("cluster-id-3"), new ServiceType("storagenode"), TestUtil.makeServiceInstanceSet( - new ServiceInstance<>( + new ServiceInstance( new ConfigId("storage/storage/1"), TEST6_HOST_NAME, - ServiceMonitorStatus.UP), - new ServiceInstance<>( + ServiceStatus.UP), + new ServiceInstance( new ConfigId("storage/storage/4"), new HostName("test4.hostname.tld"), - ServiceMonitorStatus.UP))), - new ServiceCluster<>( + ServiceStatus.UP))), + new ServiceCluster( new ClusterId("clustercontroller"), new ServiceType("container-clustercontroller"), TestUtil.makeServiceInstanceSet( - new ServiceInstance<>( + new ServiceInstance( new ConfigId("clustercontroller-1"), new HostName("myclustercontroller3.hostname.tld"), - ServiceMonitorStatus.UP))) + ServiceStatus.UP))) ) )); } @@ -127,19 +127,19 @@ public class DummyInstanceLookupService implements InstanceLookupService { @Override - public Optional<ApplicationInstance<ServiceMonitorStatus>> findInstanceById( + public Optional<ApplicationInstance> findInstanceById( final ApplicationInstanceReference applicationInstanceReference) { - for (ApplicationInstance<ServiceMonitorStatus> app : apps) { + for (ApplicationInstance app : apps) { if (app.reference().equals(applicationInstanceReference)) return Optional.of(app); } return Optional.empty(); } @Override - public Optional<ApplicationInstance<ServiceMonitorStatus>> findInstanceByHost(HostName hostName) { - for (ApplicationInstance<ServiceMonitorStatus> app : apps) { - for (ServiceCluster<ServiceMonitorStatus> cluster : app.serviceClusters()) { - for (ServiceInstance<ServiceMonitorStatus> service : cluster.serviceInstances()) { + public Optional<ApplicationInstance> findInstanceByHost(HostName hostName) { + for (ApplicationInstance app : apps) { + for (ServiceCluster cluster : app.serviceClusters()) { + for (ServiceInstance service : cluster.serviceInstances()) { if (hostName.equals(service.hostName())) return Optional.of(app); } } @@ -166,7 +166,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { return hosts; } - public static Set<ApplicationInstance<ServiceMonitorStatus>> getApplications() { + public static Set<ApplicationInstance> getApplications() { return apps; } } 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 92d6216583f..8cf9d343134 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java @@ -11,7 +11,6 @@ import com.yahoo.vespa.orchestrator.policy.BatchHostStateChangeDeniedException; import com.yahoo.vespa.orchestrator.policy.HostStateChangeDeniedException; import com.yahoo.vespa.orchestrator.status.HostStatus; import com.yahoo.vespa.orchestrator.status.InMemoryStatusService; -import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -51,7 +50,7 @@ public class OrchestratorImplTest { @Before public void setUp() throws Exception { // Extract applications and hosts from dummy instance lookup service - Iterator<ApplicationInstance<ServiceMonitorStatus>> iterator = DummyInstanceLookupService.getApplications().iterator(); + Iterator<ApplicationInstance> iterator = DummyInstanceLookupService.getApplications().iterator(); ApplicationInstanceReference app1_ref = iterator.next().reference(); app1 = OrchestratorUtil.toApplicationId(app1_ref); app1_host1 = DummyInstanceLookupService.getContentHosts(app1_ref).iterator().next(); @@ -283,7 +282,7 @@ public class OrchestratorImplTest { } private boolean isInMaintenance(ApplicationId appId, HostName hostName) throws ApplicationIdNotFoundException { - for (ApplicationInstance<ServiceMonitorStatus> app : DummyInstanceLookupService.getApplications()) { + for (ApplicationInstance app : DummyInstanceLookupService.getApplications()) { if (app.reference().equals(OrchestratorUtil.toApplicationInstanceReference(appId, new DummyInstanceLookupService()))) { return clustercontroller.isInMaintenance(app, hostName); } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestUtil.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestUtil.java index 51983fa7049..9b9dc206556 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestUtil.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/TestUtil.java @@ -16,14 +16,14 @@ import java.util.Set; */ public class TestUtil { @SafeVarargs - public static <S> Set<ServiceInstance<S>> makeServiceInstanceSet( - final ServiceInstance<S>... serviceInstances) { + public static Set<ServiceInstance> makeServiceInstanceSet( + final ServiceInstance... serviceInstances) { return new HashSet<>(Arrays.asList(serviceInstances)); } @SafeVarargs - public static <S> Set<ServiceCluster<S>> makeServiceClusterSet( - final ServiceCluster<S>... serviceClusters) { + public static Set<ServiceCluster> makeServiceClusterSet( + final ServiceCluster... serviceClusters) { return new HashSet<>(Arrays.asList(serviceClusters)); } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientFactoryMock.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientFactoryMock.java index e91db49cfd5..230e36469d3 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientFactoryMock.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/controller/ClusterControllerClientFactoryMock.java @@ -6,7 +6,6 @@ import com.yahoo.vespa.applicationmodel.ClusterId; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.orchestrator.DummyInstanceLookupService; import com.yahoo.vespa.orchestrator.model.VespaModelUtil; -import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; import java.io.IOException; import java.util.HashMap; @@ -24,7 +23,7 @@ import java.util.Set; public class ClusterControllerClientFactoryMock implements ClusterControllerClientFactory { Map<String, ClusterControllerNodeState> nodes = new HashMap<>(); - public boolean isInMaintenance(ApplicationInstance<ServiceMonitorStatus> appInstance, HostName hostName) { + public boolean isInMaintenance(ApplicationInstance appInstance, HostName hostName) { try { ClusterId clusterName = VespaModelUtil.getContentClusterName(appInstance, hostName); int storageNodeIndex = VespaModelUtil.getStorageNodeIndex(appInstance, hostName); @@ -37,7 +36,7 @@ public class ClusterControllerClientFactoryMock implements ClusterControllerClie } public void setAllDummyNodesAsUp() { - for (ApplicationInstance<ServiceMonitorStatus> app : DummyInstanceLookupService.getApplications()) { + for (ApplicationInstance app : DummyInstanceLookupService.getApplications()) { Set<HostName> hosts = DummyInstanceLookupService.getContentHosts(app.reference()); for (HostName host : hosts) { ClusterId clusterName = VespaModelUtil.getContentClusterName(app, host); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java index c6a4bfa0632..3abffac3a9c 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImplTest.java @@ -3,9 +3,9 @@ package com.yahoo.vespa.orchestrator.model; import com.yahoo.vespa.applicationmodel.ApplicationInstance; import com.yahoo.vespa.applicationmodel.HostName; +import com.yahoo.vespa.applicationmodel.ServiceStatus; import com.yahoo.vespa.applicationmodel.ServiceType; import com.yahoo.vespa.orchestrator.status.HostStatus; -import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; import org.junit.Test; import java.util.ArrayList; @@ -32,30 +32,30 @@ public class ApplicationApiImplTest { HostName hostName3 = new HostName("host3"); HostName hostName4 = new HostName("host4"); - ApplicationInstance<ServiceMonitorStatus> applicationInstance = + ApplicationInstance applicationInstance = modelUtils.createApplicationInstance(Arrays.asList( modelUtils.createServiceCluster( "cluster-3", new ServiceType("service-type-3"), Arrays.asList( - modelUtils.createServiceInstance("config-id-1", hostName1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-2", hostName2, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-1", hostName1, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-2", hostName2, ServiceStatus.UP) ) ), modelUtils.createServiceCluster( "cluster-1", new ServiceType("service-type-1"), Arrays.asList( - modelUtils.createServiceInstance("config-id-3", hostName1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-4", hostName3, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-3", hostName1, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-4", hostName3, ServiceStatus.UP) ) ), modelUtils.createServiceCluster( "cluster-2", new ServiceType("service-type-2"), Arrays.asList( - modelUtils.createServiceInstance("config-id-5", hostName1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-6", hostName2, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-5", hostName1, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-6", hostName2, ServiceStatus.UP) ) ) )); @@ -89,40 +89,40 @@ public class ApplicationApiImplTest { HostName hostName6 = new HostName("host6"); HostName hostName7 = new HostName("host7"); - ApplicationInstance<ServiceMonitorStatus> applicationInstance = + ApplicationInstance applicationInstance = modelUtils.createApplicationInstance(Arrays.asList( modelUtils.createServiceCluster( "cluster-3", VespaModelUtil.STORAGENODE_SERVICE_TYPE, Arrays.asList( - modelUtils.createServiceInstance("config-id-30", hostName1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-31", hostName2, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-30", hostName1, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-31", hostName2, ServiceStatus.UP) ) ), modelUtils.createServiceCluster( "cluster-1", VespaModelUtil.STORAGENODE_SERVICE_TYPE, Arrays.asList( - modelUtils.createServiceInstance("config-id-10", hostName3, ServiceMonitorStatus.DOWN), - modelUtils.createServiceInstance("config-id-11", hostName4, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-10", hostName3, ServiceStatus.DOWN), + modelUtils.createServiceInstance("config-id-11", hostName4, ServiceStatus.UP) ) ), modelUtils.createServiceCluster( "cluster-4", new ServiceType("service-type-4"), Arrays.asList( - modelUtils.createServiceInstance("config-id-40", hostName1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-41", hostName2, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-42", hostName3, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-43", hostName5, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-40", hostName1, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-41", hostName2, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-42", hostName3, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-43", hostName5, ServiceStatus.UP) ) ), modelUtils.createServiceCluster( "cluster-2", VespaModelUtil.STORAGENODE_SERVICE_TYPE, Arrays.asList( - modelUtils.createServiceInstance("config-id-20", hostName6, ServiceMonitorStatus.DOWN), - modelUtils.createServiceInstance("config-id-21", hostName7, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-20", hostName6, ServiceStatus.DOWN), + modelUtils.createServiceInstance("config-id-21", hostName7, ServiceStatus.UP) ) ) )); @@ -158,18 +158,18 @@ public class ApplicationApiImplTest { @Test public void testUpConditionOfStorageNode() { - verifyUpConditionWith(HostStatus.NO_REMARKS, ServiceMonitorStatus.UP, true); - verifyUpConditionWith(HostStatus.NO_REMARKS, ServiceMonitorStatus.NOT_CHECKED, true); - verifyUpConditionWith(HostStatus.NO_REMARKS, ServiceMonitorStatus.DOWN, false); - verifyUpConditionWith(HostStatus.ALLOWED_TO_BE_DOWN, ServiceMonitorStatus.UP, false); - verifyUpConditionWith(HostStatus.ALLOWED_TO_BE_DOWN, ServiceMonitorStatus.NOT_CHECKED, false); - verifyUpConditionWith(HostStatus.ALLOWED_TO_BE_DOWN, ServiceMonitorStatus.DOWN, false); + verifyUpConditionWith(HostStatus.NO_REMARKS, ServiceStatus.UP, true); + verifyUpConditionWith(HostStatus.NO_REMARKS, ServiceStatus.NOT_CHECKED, true); + verifyUpConditionWith(HostStatus.NO_REMARKS, ServiceStatus.DOWN, false); + verifyUpConditionWith(HostStatus.ALLOWED_TO_BE_DOWN, ServiceStatus.UP, false); + verifyUpConditionWith(HostStatus.ALLOWED_TO_BE_DOWN, ServiceStatus.NOT_CHECKED, false); + verifyUpConditionWith(HostStatus.ALLOWED_TO_BE_DOWN, ServiceStatus.DOWN, false); } - private void verifyUpConditionWith(HostStatus hostStatus, ServiceMonitorStatus serviceStatus, boolean expectUp) { + private void verifyUpConditionWith(HostStatus hostStatus, ServiceStatus serviceStatus, boolean expectUp) { HostName hostName1 = modelUtils.createNode("host1", hostStatus); - ApplicationInstance<ServiceMonitorStatus> applicationInstance = + ApplicationInstance applicationInstance = modelUtils.createApplicationInstance(Arrays.asList( modelUtils.createServiceCluster( "cluster-1", @@ -193,22 +193,22 @@ public class ApplicationApiImplTest { HostName hostName2 = modelUtils.createNode("host2", HostStatus.NO_REMARKS); HostName hostName3 = modelUtils.createNode("host3", HostStatus.ALLOWED_TO_BE_DOWN); - ApplicationInstance<ServiceMonitorStatus> applicationInstance = + ApplicationInstance applicationInstance = modelUtils.createApplicationInstance(Arrays.asList( modelUtils.createServiceCluster( "cluster-1", new ServiceType("service-type-1"), Arrays.asList( - modelUtils.createServiceInstance("config-id-10", hostName1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-11", hostName2, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-10", hostName1, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-11", hostName2, ServiceStatus.UP) ) ), modelUtils.createServiceCluster( "cluster-2", new ServiceType("service-type-2"), Arrays.asList( - modelUtils.createServiceInstance("config-id-20", hostName1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-21", hostName3, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-20", hostName1, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-21", hostName3, ServiceStatus.UP) ) ) )); @@ -250,38 +250,38 @@ public class ApplicationApiImplTest { HostName noRemarksHost6 = modelUtils.createNode("host6", HostStatus.NO_REMARKS); HostName allowedToBeDownHost7 = modelUtils.createNode("host7", HostStatus.ALLOWED_TO_BE_DOWN); - ApplicationInstance<ServiceMonitorStatus> applicationInstance = + ApplicationInstance applicationInstance = modelUtils.createApplicationInstance(Arrays.asList( modelUtils.createServiceCluster( "cluster-4", VespaModelUtil.STORAGENODE_SERVICE_TYPE, Arrays.asList( - modelUtils.createServiceInstance("config-id-40", allowedToBeDownHost1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-41", noRemarksHost2, ServiceMonitorStatus.DOWN) + modelUtils.createServiceInstance("config-id-40", allowedToBeDownHost1, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-41", noRemarksHost2, ServiceStatus.DOWN) ) ), modelUtils.createServiceCluster( "cluster-1", new ServiceType("service-type-1"), Arrays.asList( - modelUtils.createServiceInstance("config-id-10", allowedToBeDownHost1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-11", allowedToBeDownHost3, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-10", allowedToBeDownHost1, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-11", allowedToBeDownHost3, ServiceStatus.UP) ) ), modelUtils.createServiceCluster( "cluster-3", VespaModelUtil.STORAGENODE_SERVICE_TYPE, Arrays.asList( - modelUtils.createServiceInstance("config-id-30", allowedToBeDownHost4, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-31", noRemarksHost5, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-30", allowedToBeDownHost4, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-31", noRemarksHost5, ServiceStatus.UP) ) ), modelUtils.createServiceCluster( "cluster-2", VespaModelUtil.STORAGENODE_SERVICE_TYPE, Arrays.asList( - modelUtils.createServiceInstance("config-id-20", noRemarksHost6, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("config-id-21", allowedToBeDownHost7, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("config-id-20", noRemarksHost6, ServiceStatus.UP), + modelUtils.createServiceInstance("config-id-21", allowedToBeDownHost7, ServiceStatus.UP) ) ) )); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java index 123c9bcc4c2..d17ffd4452d 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/ClusterApiImplTest.java @@ -3,9 +3,9 @@ package com.yahoo.vespa.orchestrator.model; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.applicationmodel.ServiceCluster; +import com.yahoo.vespa.applicationmodel.ServiceStatus; import com.yahoo.vespa.applicationmodel.ServiceType; import com.yahoo.vespa.orchestrator.status.HostStatus; -import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; import org.junit.Test; import java.util.ArrayList; @@ -29,15 +29,15 @@ public class ClusterApiImplTest { HostName hostName5 = modelUtils.createNode("host5", HostStatus.NO_REMARKS); - ServiceCluster<ServiceMonitorStatus> serviceCluster = modelUtils.createServiceCluster( + ServiceCluster serviceCluster = modelUtils.createServiceCluster( "cluster", new ServiceType("service-type"), Arrays.asList( - modelUtils.createServiceInstance("service-1", hostName1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("service-2", hostName2, ServiceMonitorStatus.DOWN), - modelUtils.createServiceInstance("service-3", hostName3, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("service-4", hostName4, ServiceMonitorStatus.DOWN), - modelUtils.createServiceInstance("service-5", hostName5, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("service-1", hostName1, ServiceStatus.UP), + modelUtils.createServiceInstance("service-2", hostName2, ServiceStatus.DOWN), + modelUtils.createServiceInstance("service-3", hostName3, ServiceStatus.UP), + modelUtils.createServiceInstance("service-4", hostName4, ServiceStatus.DOWN), + modelUtils.createServiceInstance("service-5", hostName5, ServiceStatus.UP) ) ); @@ -68,15 +68,15 @@ public class ClusterApiImplTest { HostName hostName5 = modelUtils.createNode("host5", HostStatus.NO_REMARKS); - ServiceCluster<ServiceMonitorStatus> serviceCluster = modelUtils.createServiceCluster( + ServiceCluster serviceCluster = modelUtils.createServiceCluster( "cluster", new ServiceType("service-type"), Arrays.asList( - modelUtils.createServiceInstance("service-1", hostName1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("service-2", hostName2, ServiceMonitorStatus.DOWN), - modelUtils.createServiceInstance("service-3", hostName3, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("service-4", hostName4, ServiceMonitorStatus.DOWN), - modelUtils.createServiceInstance("service-5", hostName5, ServiceMonitorStatus.UP) + modelUtils.createServiceInstance("service-1", hostName1, ServiceStatus.UP), + modelUtils.createServiceInstance("service-2", hostName2, ServiceStatus.DOWN), + modelUtils.createServiceInstance("service-3", hostName3, ServiceStatus.UP), + modelUtils.createServiceInstance("service-4", hostName4, ServiceStatus.DOWN), + modelUtils.createServiceInstance("service-5", hostName5, ServiceStatus.UP) ) ); @@ -92,7 +92,7 @@ public class ClusterApiImplTest { verifyNoServices(serviceCluster, false, true, hostName1, hostName2, hostName3, hostName4); } - private void verifyNoServices(ServiceCluster<ServiceMonitorStatus> serviceCluster, + private void verifyNoServices(ServiceCluster serviceCluster, boolean expectedNoServicesInGroupIsUp, boolean expectedNoServicesOutsideGroupIsDown, HostName... groupNodes) { @@ -112,12 +112,12 @@ public class ClusterApiImplTest { HostName hostName2 = new HostName("host2"); HostName hostName3 = new HostName("host3"); - ServiceCluster<ServiceMonitorStatus> serviceCluster = modelUtils.createServiceCluster( + ServiceCluster serviceCluster = modelUtils.createServiceCluster( "cluster", VespaModelUtil.STORAGENODE_SERVICE_TYPE, Arrays.asList( - modelUtils.createServiceInstance("storage-1", hostName1, ServiceMonitorStatus.UP), - modelUtils.createServiceInstance("storage-2", hostName2, ServiceMonitorStatus.DOWN) + modelUtils.createServiceInstance("storage-1", hostName1, ServiceStatus.UP), + modelUtils.createServiceInstance("storage-2", hostName2, ServiceStatus.DOWN) ) ); 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 07b72a128a6..9586f92af30 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 @@ -8,12 +8,12 @@ import com.yahoo.vespa.applicationmodel.ConfigId; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.applicationmodel.ServiceCluster; import com.yahoo.vespa.applicationmodel.ServiceInstance; +import com.yahoo.vespa.applicationmodel.ServiceStatus; import com.yahoo.vespa.applicationmodel.ServiceType; import com.yahoo.vespa.applicationmodel.TenantId; import com.yahoo.vespa.orchestrator.controller.ClusterControllerClientFactory; import com.yahoo.vespa.orchestrator.status.HostStatus; import com.yahoo.vespa.orchestrator.status.MutableStatusRegistry; -import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; import java.util.HashMap; import java.util.List; @@ -46,41 +46,41 @@ public class ModelTestUtils { } ApplicationApiImpl createApplicationApiImpl( - ApplicationInstance<ServiceMonitorStatus> applicationInstance, + ApplicationInstance applicationInstance, HostName... hostnames) { NodeGroup nodeGroup = new NodeGroup(applicationInstance, hostnames); return new ApplicationApiImpl(nodeGroup, statusRegistry, clusterControllerClientFactory); } - ApplicationInstance<ServiceMonitorStatus> createApplicationInstance( - List<ServiceCluster<ServiceMonitorStatus>> serviceClusters) { - Set<ServiceCluster<ServiceMonitorStatus>> serviceClusterSet = serviceClusters.stream() + ApplicationInstance createApplicationInstance( + List<ServiceCluster> serviceClusters) { + Set<ServiceCluster> serviceClusterSet = serviceClusters.stream() .collect(Collectors.toSet()); - return new ApplicationInstance<>( + return new ApplicationInstance( new TenantId("tenant"), new ApplicationInstanceId("application-name:foo:bar:default"), serviceClusterSet); } - ServiceCluster<ServiceMonitorStatus> createServiceCluster( + ServiceCluster createServiceCluster( String clusterId, ServiceType serviceType, - List<ServiceInstance<ServiceMonitorStatus>> serviceInstances) { - Set<ServiceInstance<ServiceMonitorStatus>> serviceInstanceSet = serviceInstances.stream() + List<ServiceInstance> serviceInstances) { + Set<ServiceInstance> serviceInstanceSet = serviceInstances.stream() .collect(Collectors.toSet()); - return new ServiceCluster<>( + return new ServiceCluster( new ClusterId(clusterId), serviceType, serviceInstanceSet); } - ServiceInstance<ServiceMonitorStatus> createServiceInstance( + ServiceInstance createServiceInstance( String configId, HostName hostName, - ServiceMonitorStatus status) { - return new ServiceInstance<>( + ServiceStatus status) { + return new ServiceInstance( new ConfigId(configId), hostName, status); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java index ddb7e901ce2..c0e012c63a2 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/NodeGroupTest.java @@ -5,7 +5,6 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstance; import com.yahoo.vespa.applicationmodel.ApplicationInstanceId; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.applicationmodel.TenantId; -import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; import org.junit.Test; import java.util.Arrays; @@ -16,7 +15,7 @@ import static org.junit.Assert.assertEquals; public class NodeGroupTest { @Test public void testBasics() { - ApplicationInstance<ServiceMonitorStatus> applicationInstance = new ApplicationInstance<>( + ApplicationInstance applicationInstance = new ApplicationInstance( new TenantId("tenant"), new ApplicationInstanceId("application-instance"), new HashSet<>()); diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java index 22d0717a6bf..33efc2a8486 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/model/VespaModelUtilTest.java @@ -8,10 +8,10 @@ import com.yahoo.vespa.applicationmodel.ConfigId; import com.yahoo.vespa.applicationmodel.HostName; import com.yahoo.vespa.applicationmodel.ServiceCluster; import com.yahoo.vespa.applicationmodel.ServiceInstance; +import com.yahoo.vespa.applicationmodel.ServiceStatus; import com.yahoo.vespa.applicationmodel.ServiceType; import com.yahoo.vespa.applicationmodel.TenantId; import com.yahoo.vespa.orchestrator.TestUtil; -import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; import org.junit.Test; import java.util.Arrays; @@ -36,31 +36,31 @@ public class VespaModelUtilTest { public static final HostName controller0Host = new HostName("controller-0"); - private static final ServiceInstance<ServiceMonitorStatus> controller0 = new ServiceInstance<>( + private static final ServiceInstance controller0 = new ServiceInstance( TestUtil.clusterControllerConfigId(CONTENT_CLUSTER_ID.toString(), 0), controller0Host, - ServiceMonitorStatus.UP); - private static final ServiceInstance<ServiceMonitorStatus> controller1 = new ServiceInstance<>( + ServiceStatus.UP); + private static final ServiceInstance controller1 = new ServiceInstance( TestUtil.clusterControllerConfigId(CONTENT_CLUSTER_ID.toString(), 1), new HostName("controller-1"), - ServiceMonitorStatus.UP); + ServiceStatus.UP); - private static final ServiceCluster<ServiceMonitorStatus> controllerCluster = - new ServiceCluster<>( + private static final ServiceCluster controllerCluster = + new ServiceCluster( new ClusterId(CONTENT_CLUSTER_ID.s() + "-controller"), VespaModelUtil.CLUSTER_CONTROLLER_SERVICE_TYPE, makeServiceInstanceSet(controller1, controller0)); // Distributor Service Cluster - private static final ServiceInstance<ServiceMonitorStatus> distributor0 = new ServiceInstance<>( + private static final ServiceInstance distributor0 = new ServiceInstance( new ConfigId("distributor-config-id"), new HostName("distributor-0"), - ServiceMonitorStatus.UP); + ServiceStatus.UP); - private static final ServiceCluster<ServiceMonitorStatus> distributorCluster = - new ServiceCluster<>( + private static final ServiceCluster distributorCluster = + new ServiceCluster( CONTENT_CLUSTER_ID, VespaModelUtil.DISTRIBUTOR_SERVICE_TYPE, makeServiceInstanceSet(distributor0)); @@ -68,27 +68,27 @@ public class VespaModelUtilTest { // Storage Node Service Cluster public static final HostName storage0Host = new HostName("storage-0"); - private static final ServiceInstance<ServiceMonitorStatus> storage0 = new ServiceInstance<>( + private static final ServiceInstance storage0 = new ServiceInstance( new ConfigId("storage-config-id"), storage0Host, - ServiceMonitorStatus.UP); + ServiceStatus.UP); - private static final ServiceCluster<ServiceMonitorStatus> storageCluster = - new ServiceCluster<>( + private static final ServiceCluster storageCluster = + new ServiceCluster( CONTENT_CLUSTER_ID, VespaModelUtil.STORAGENODE_SERVICE_TYPE, makeServiceInstanceSet(storage0)); // Secondary Distributor Service Cluster - private static final ServiceInstance<ServiceMonitorStatus> secondaryDistributor0 = new ServiceInstance<>( + private static final ServiceInstance secondaryDistributor0 = new ServiceInstance( new ConfigId("secondary-distributor-config-id"), new HostName("secondary-distributor-0"), - ServiceMonitorStatus.UP); + ServiceStatus.UP); private static final ClusterId SECONDARY_CONTENT_CLUSTER_ID = new ClusterId("secondary-content-cluster-0"); - private static final ServiceCluster<ServiceMonitorStatus> secondaryDistributorCluster = - new ServiceCluster<>( + private static final ServiceCluster secondaryDistributorCluster = + new ServiceCluster( SECONDARY_CONTENT_CLUSTER_ID, VespaModelUtil.DISTRIBUTOR_SERVICE_TYPE, makeServiceInstanceSet(secondaryDistributor0)); @@ -96,21 +96,21 @@ public class VespaModelUtilTest { // Secondary Storage Node Service Cluster public static final HostName secondaryStorage0Host = new HostName("secondary-storage-0"); - private static final ServiceInstance<ServiceMonitorStatus> secondaryStorage0 = new ServiceInstance<>( + private static final ServiceInstance secondaryStorage0 = new ServiceInstance( new ConfigId("secondary-storage-config-id"), secondaryStorage0Host, - ServiceMonitorStatus.UP); + ServiceStatus.UP); - private static final ServiceCluster<ServiceMonitorStatus> secondaryStorageCluster = - new ServiceCluster<>( + private static final ServiceCluster secondaryStorageCluster = + new ServiceCluster( SECONDARY_CONTENT_CLUSTER_ID, VespaModelUtil.STORAGENODE_SERVICE_TYPE, makeServiceInstanceSet(secondaryStorage0)); // The Application Instance - public static final ApplicationInstance<ServiceMonitorStatus> application = - new ApplicationInstance<>( + public static final ApplicationInstance application = + new ApplicationInstance( new TenantId("tenant-0"), new ApplicationInstanceId("application-0"), makeServiceClusterSet( @@ -120,8 +120,8 @@ public class VespaModelUtilTest { secondaryDistributorCluster, secondaryStorageCluster)); - private ServiceCluster<?> createServiceCluster(ServiceType serviceType) { - return new ServiceCluster<ServiceMonitorStatus>( + private ServiceCluster createServiceCluster(ServiceType serviceType) { + return new ServiceCluster( new ClusterId("cluster-id"), serviceType, new HashSet<>()); @@ -129,19 +129,19 @@ public class VespaModelUtilTest { @Test public void verifyControllerClusterIsRecognized() { - ServiceCluster<?> cluster = createServiceCluster(VespaModelUtil.CLUSTER_CONTROLLER_SERVICE_TYPE); + ServiceCluster cluster = createServiceCluster(VespaModelUtil.CLUSTER_CONTROLLER_SERVICE_TYPE); assertTrue(VespaModelUtil.isClusterController(cluster)); } @Test public void verifyNonControllerClusterIsNotRecognized() { - ServiceCluster<?> cluster = createServiceCluster(new ServiceType("foo")); + ServiceCluster cluster = createServiceCluster(new ServiceType("foo")); assertFalse(VespaModelUtil.isClusterController(cluster)); } @Test public void verifyStorageClusterIsRecognized() { - ServiceCluster<?> cluster = createServiceCluster(VespaModelUtil.STORAGENODE_SERVICE_TYPE); + ServiceCluster cluster = createServiceCluster(VespaModelUtil.STORAGENODE_SERVICE_TYPE); assertTrue(VespaModelUtil.isStorage(cluster)); cluster = createServiceCluster(VespaModelUtil.STORAGENODE_SERVICE_TYPE); assertTrue(VespaModelUtil.isStorage(cluster)); @@ -149,13 +149,13 @@ public class VespaModelUtilTest { @Test public void verifyNonStorageClusterIsNotRecognized() { - ServiceCluster<?> cluster = createServiceCluster(new ServiceType("foo")); + ServiceCluster cluster = createServiceCluster(new ServiceType("foo")); assertFalse(VespaModelUtil.isStorage(cluster)); } @Test public void verifyContentClusterIsRecognized() { - ServiceCluster<?> cluster = createServiceCluster(VespaModelUtil.DISTRIBUTOR_SERVICE_TYPE); + ServiceCluster cluster = createServiceCluster(VespaModelUtil.DISTRIBUTOR_SERVICE_TYPE); assertTrue(VespaModelUtil.isContent(cluster)); cluster = createServiceCluster(VespaModelUtil.STORAGENODE_SERVICE_TYPE); assertTrue(VespaModelUtil.isContent(cluster)); @@ -165,7 +165,7 @@ public class VespaModelUtilTest { @Test public void verifyNonContentClusterIsNotRecognized() { - ServiceCluster<?> cluster = createServiceCluster(new ServiceType("foo")); + ServiceCluster cluster = createServiceCluster(new ServiceType("foo")); assertFalse(VespaModelUtil.isContent(cluster)); } @@ -197,7 +197,7 @@ public class VespaModelUtilTest { @Test public void testGetStorageNodeAtHost() { - Optional<ServiceInstance<ServiceMonitorStatus>> service = + Optional<ServiceInstance> service = VespaModelUtil.getStorageNodeAtHost(application, storage0Host); assertTrue(service.isPresent()); assertThat(service.get()).isEqualTo(storage0); @@ -205,7 +205,7 @@ public class VespaModelUtilTest { @Test public void testGetStorageNodeAtHostWithUnknownHost() { - Optional<ServiceInstance<ServiceMonitorStatus>> service = + Optional<ServiceInstance> service = VespaModelUtil.getStorageNodeAtHost(application, new HostName("storage-1")); assertFalse(service.isPresent()); } diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java index ebd466495b9..0ae385bc717 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/resources/HostResourceTest.java @@ -23,7 +23,6 @@ import com.yahoo.vespa.orchestrator.status.ApplicationInstanceStatus; import com.yahoo.vespa.orchestrator.status.HostStatus; import com.yahoo.vespa.orchestrator.status.MutableStatusRegistry; import com.yahoo.vespa.orchestrator.status.StatusService; -import com.yahoo.vespa.service.monitor.ServiceMonitorStatus; import org.junit.Test; import javax.ws.rs.BadRequestException; @@ -70,7 +69,7 @@ public class HostResourceTest { static { when(mockInstanceLookupService.findInstanceByHost(any())) .thenReturn(Optional.of( - new ApplicationInstance<>( + new ApplicationInstance( TENANT_ID, APPLICATION_INSTANCE_ID, makeServiceClusterSet()))); @@ -79,13 +78,13 @@ public class HostResourceTest { private static final InstanceLookupService alwaysEmptyInstanceLookUpService = new InstanceLookupService() { @Override - public Optional<ApplicationInstance<ServiceMonitorStatus>> findInstanceById( + public Optional<ApplicationInstance> findInstanceById( final ApplicationInstanceReference applicationInstanceReference) { return Optional.empty(); } @Override - public Optional<ApplicationInstance<ServiceMonitorStatus>> findInstanceByHost(final HostName hostName) { + public Optional<ApplicationInstance> findInstanceByHost(final HostName hostName) { return Optional.empty(); } @@ -98,7 +97,7 @@ public class HostResourceTest { private static class AlwaysAllowPolicy implements Policy { @Override public void grantSuspensionRequest( - ApplicationInstance<ServiceMonitorStatus> applicationInstance, + ApplicationInstance applicationInstance, HostName hostName, MutableStatusRegistry hostStatusService) throws HostStateChangeDeniedException { @@ -118,7 +117,7 @@ public class HostResourceTest { @Override public void releaseSuspensionGrant( - ApplicationInstance<ServiceMonitorStatus> applicationInstance, + ApplicationInstance applicationInstance, HostName hostName, MutableStatusRegistry hostStatusRegistry) { } @@ -199,7 +198,7 @@ public class HostResourceTest { private static class AlwaysFailPolicy implements Policy { @Override public void grantSuspensionRequest( - ApplicationInstance<ServiceMonitorStatus> applicationInstance, + ApplicationInstance applicationInstance, HostName hostName, MutableStatusRegistry hostStatusRegistry) throws HostStateChangeDeniedException { doThrow(); @@ -222,7 +221,7 @@ public class HostResourceTest { @Override public void releaseSuspensionGrant( - ApplicationInstance<ServiceMonitorStatus> applicationInstance, + ApplicationInstance applicationInstance, HostName hostName, MutableStatusRegistry hostStatusRegistry) throws HostStateChangeDeniedException { doThrow(); |