diff options
author | HÃ¥kon Hallingstad <hakon@oath.com> | 2018-12-03 20:40:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-03 20:40:06 +0100 |
commit | 45907798a1cf2c5364c9e0f24c7815adf7110c87 (patch) | |
tree | 1e2f4d9ac716a7e6983a55d034a6c2f3aa3f07d8 /service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java | |
parent | 9c5f6713a54387b035a565e62ff30bb0a7b54cf8 (diff) |
Revert "Revert "Add infrastructure applications to DuperModel""
Diffstat (limited to 'service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java')
-rw-r--r-- | service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java index 5a57451a298..275fa8568c2 100644 --- a/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java +++ b/service-monitor/src/test/java/com/yahoo/vespa/service/monitor/internal/ModelGeneratorTest.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.service.monitor.internal; import com.yahoo.cloud.config.ConfigserverConfig; +import com.yahoo.config.model.api.ApplicationInfo; import com.yahoo.config.model.api.SuperModel; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; @@ -11,6 +12,7 @@ import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference; import com.yahoo.vespa.applicationmodel.ServiceCluster; import com.yahoo.vespa.applicationmodel.ServiceInstance; import com.yahoo.vespa.applicationmodel.ServiceStatus; +import com.yahoo.vespa.service.monitor.application.DuperModel; import com.yahoo.vespa.service.monitor.ServiceModel; import com.yahoo.vespa.service.monitor.application.ConfigServerApplication; import com.yahoo.vespa.service.monitor.internal.slobrok.SlobrokMonitorManagerImpl; @@ -36,7 +38,8 @@ public class ModelGeneratorTest { SuperModel superModel = ExampleModel.createExampleSuperModelWithOneRpcPort(HOSTNAME, PORT); ConfigserverConfig config = ConfigserverUtil.createExampleConfigserverConfig(); - DuperModel duperModel = new DuperModel(config); + ApplicationInfo configServerInfo = new ConfigServerApplication().makeApplicationInfoFromConfig(config); + DuperModel duperModel = new DuperModel(false, true, true, configServerInfo); ModelGenerator modelGenerator = new ModelGenerator(); Zone zone = new Zone(Environment.from(ENVIRONMENT), RegionName.from(REGION)); |