summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2017-11-28 13:07:54 +0100
committerHarald Musum <musum@oath.com>2017-11-28 13:07:54 +0100
commit484519647a1fa2ae89260b30987afb5e3922df30 (patch)
tree1cc6af87cbd76e447fbf81b8d8378765a20a52d0 /configserver
parent366549a4805df6e42d97c814216f6693ffc1a7b6 (diff)
Remove zone from DeployProperties
zone is already present in DeployState, no need to duplicate
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
index df8ed405fe3..ddb8e441809 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java
@@ -6,7 +6,6 @@ import com.yahoo.config.application.api.ApplicationPackage;
import com.yahoo.config.model.NullConfigModelRegistry;
import com.yahoo.config.model.api.ApplicationInfo;
import com.yahoo.config.model.api.Model;
-import com.yahoo.config.model.deploy.DeployProperties;
import com.yahoo.config.model.deploy.DeployState;
import com.yahoo.config.model.test.MockApplicationPackage;
import com.yahoo.config.provision.ApplicationId;
@@ -88,10 +87,8 @@ public class LbServicesProducerTest {
private LbServicesConfig createModelAndGetLbServicesConfig(RegionName regionName) throws IOException, SAXException {
final Zone zone = new Zone(Environment.prod, regionName);
- Map<TenantName, Map<ApplicationId, ApplicationInfo>> testModel = createTestModel(new DeployState.Builder()
- .properties(new DeployProperties.Builder().zone(zone).build())
- .zone(zone));
- return getLbServicesConfig(new Zone(Environment.prod, regionName), testModel);
+ Map<TenantName, Map<ApplicationId, ApplicationInfo>> model = createTestModel(new DeployState.Builder().zone(zone));
+ return getLbServicesConfig(new Zone(Environment.prod, regionName), model);
}
private LbServicesConfig getLbServicesConfig(Zone zone, Map<TenantName, Map<ApplicationId, ApplicationInfo>> testModel) {