diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-11-29 10:04:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-29 10:04:20 +0100 |
| commit | e8f9015fc338d9a658297282d1b36a656580ffb8 (patch) | |
| tree | 566816ac1be168fc386f58acd95780d0659778fc /configserver | |
| parent | 1bb2777ca6b2594719cbb1d168750543368ceb92 (diff) | |
Revert "Remove zone from DeployProperties"
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/model/LbServicesProducerTest.java | 7 |
1 files changed, 5 insertions, 2 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 ddb8e441809..df8ed405fe3 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,6 +6,7 @@ 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; @@ -87,8 +88,10 @@ public class LbServicesProducerTest { private LbServicesConfig createModelAndGetLbServicesConfig(RegionName regionName) throws IOException, SAXException { final Zone zone = new Zone(Environment.prod, regionName); - Map<TenantName, Map<ApplicationId, ApplicationInfo>> model = createTestModel(new DeployState.Builder().zone(zone)); - return getLbServicesConfig(new Zone(Environment.prod, regionName), model); + 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); } private LbServicesConfig getLbServicesConfig(Zone zone, Map<TenantName, Map<ApplicationId, ApplicationInfo>> testModel) { |