diff options
Diffstat (limited to 'service-monitor')
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java | 7 | ||||
-rw-r--r-- | service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java index ada180cb333..885368810a8 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/DuperModelManager.java @@ -58,11 +58,10 @@ public class DuperModelManager implements DuperModelInfraApi { this.duperModel = duperModel; if (system == SystemName.dev) { + // TODO (mortent): Support controllerApplication in dev system supportedInfraApplications = - (isController ? - Stream.of(devHostApplicaton, controllerApplication) : - Stream.of(devHostApplicaton, configServerApplication) - ).collect(Collectors.toUnmodifiableMap(InfraApplication::getApplicationId, Function.identity())); + Stream.of(devHostApplicaton, configServerApplication) + .collect(Collectors.toUnmodifiableMap(InfraApplication::getApplicationId, Function.identity())); } else if (multitenant) { supportedInfraApplications = (isController ? diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java index 8f777b33081..67508f14e5a 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/duper/DuperModelManagerTest.java @@ -7,6 +7,7 @@ import com.yahoo.config.model.api.SuperModelListener; import com.yahoo.config.model.api.SuperModelProvider; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.HostName; +import com.yahoo.config.provision.SystemName; import com.yahoo.vespa.flags.InMemoryFlagSource; import org.junit.Test; import org.mockito.ArgumentCaptor; @@ -38,7 +39,7 @@ public class DuperModelManagerTest { private SuperModelListener superModelListener; private void makeManager(boolean isController) { - manager = new DuperModelManager(true, isController, superModelProvider, duperModel, flagSource); + manager = new DuperModelManager(true, isController, superModelProvider, duperModel, flagSource, SystemName.cd); when(superModelProvider.getSuperModel()).thenReturn(superModel); verify(duperModel, times(0)).add(any()); |