diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-02-20 14:59:24 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-02-20 14:59:24 +0100 |
| commit | 0d714b751205606c2e5d4e7949b7217b4105975d (patch) | |
| tree | 40d071e7545064529e792b19af71d76261c2d732 /config-provisioning | |
| parent | a73368f585058bf17be541dbf836925e6f317827 (diff) | |
Create public constructor with NodeFlavors
Diffstat (limited to 'config-provisioning')
| -rw-r--r-- | config-provisioning/abi-spec.json | 1 | ||||
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index 5372e18e109..04e4a7276e2 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -695,6 +695,7 @@ "public void <init>(com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)", "public void <init>(com.yahoo.config.provision.SystemName, com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)", "public void <init>(com.yahoo.config.provision.CloudName, com.yahoo.config.provision.SystemName, com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)", + "public void <init>(com.yahoo.config.provision.CloudName, com.yahoo.config.provision.SystemName, com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName, com.yahoo.config.provision.NodeFlavors)", "public com.yahoo.config.provision.CloudName cloud()", "public com.yahoo.config.provision.SystemName system()", "public com.yahoo.config.provision.Environment environment()", diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java index 6b1e1406c8f..f2e32b1b996 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java @@ -41,12 +41,21 @@ public class Zone { /** Create from system, environment and region. Use for testing. */ public Zone(SystemName systemName, Environment environment, RegionName region) { - this(CloudName.defaultName(), systemName, environment, region, new FlavorDefaults("default"), null); + this(CloudName.defaultName(), systemName, environment, region); } /** Create from cloud, system, environment and region. Use for testing. */ public Zone(CloudName cloudName, SystemName systemName, Environment environment, RegionName region) { - this(cloudName, systemName, environment, region, new FlavorDefaults("default"), null); + this(cloudName, systemName, environment, region, null); + } + + /** Create from cloud, system, environment, region and node flavors. Use for testing. */ + public Zone(CloudName cloudName, + SystemName systemName, + Environment environment, + RegionName region, + NodeFlavors nodeFlavors) { + this(cloudName, systemName, environment, region, new FlavorDefaults("default"), nodeFlavors); } private Zone(CloudName cloudName, |