diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2019-05-14 17:24:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-14 17:24:29 +0200 |
| commit | c808bddebc10cc929d2bc8512f5ffe8b6ea32554 (patch) | |
| tree | eb7b6d06425c46026899e507ef20d5feb5a27296 /config-provisioning | |
| parent | 01ac4cf6c88718df85ff6d3699920ef60487928d (diff) | |
| parent | 36fdf72e6d5529fb4aa20a9eeaf08b15f8131846 (diff) | |
Merge pull request #9391 from vespa-engine/freva/add-publiccd
Add public cd system name
Diffstat (limited to 'config-provisioning')
| -rw-r--r-- | config-provisioning/abi-spec.json | 2 | ||||
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java | 20 |
2 files changed, 19 insertions, 3 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index a44f239c1e6..fc9a3e011d9 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -754,6 +754,7 @@ "public static com.yahoo.config.provision.SystemName valueOf(java.lang.String)", "public static com.yahoo.config.provision.SystemName defaultSystem()", "public static com.yahoo.config.provision.SystemName from(java.lang.String)", + "public java.lang.String value()", "public static java.util.Set all()" ], "fields": [ @@ -761,6 +762,7 @@ "public static final enum com.yahoo.config.provision.SystemName cd", "public static final enum com.yahoo.config.provision.SystemName main", "public static final enum com.yahoo.config.provision.SystemName Public", + "public static final enum com.yahoo.config.provision.SystemName PublicCd", "public static final enum com.yahoo.config.provision.SystemName vaas" ] }, diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java index db01bb91b3b..b73a821d3cf 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java @@ -23,6 +23,9 @@ public enum SystemName { /** System accessible for the public */ Public, + /** Continuous deployment system for testing the Public system */ + PublicCd, + /** VaaS */ vaas; // TODO: Remove this and use public everywhere @@ -31,17 +34,28 @@ public enum SystemName { } public static SystemName from(String value) { - switch (value) { + switch (value.toLowerCase()) { case "dev": return dev; case "cd": return cd; case "main": return main; - case "public": - case "Public": return Public; + case "public": return Public; + case "publiccd": return PublicCd; case "vaas": return vaas; default: throw new IllegalArgumentException(String.format("'%s' is not a valid system", value)); } } + public String value() { + switch (this) { + case dev: return "dev"; + case cd: return "cd"; + case main: return "main"; + case Public: return "public"; + case PublicCd: return "publiccd"; + default : throw new IllegalStateException(); + } + } + public static Set<SystemName> all() { return EnumSet.allOf(SystemName.class); } |