diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-06-12 07:50:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-12 07:50:21 +0200 |
| commit | a7a5e809c4261e34b8545ee0e73ed96e609d1411 (patch) | |
| tree | 6b1e547b0764bdcea9b62a478e8f1fa787627dc7 /config-provisioning | |
| parent | 1f6b2d41d946f88575d795aa733a92c9bff4611a (diff) | |
Revert "Remove vaas"
Diffstat (limited to 'config-provisioning')
3 files changed, 10 insertions, 4 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index 18f4d317019..aa9b196c0e4 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -790,7 +790,8 @@ "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 dev" + "public static final enum com.yahoo.config.provision.SystemName dev", + "public static final enum com.yahoo.config.provision.SystemName vaas" ] }, "com.yahoo.config.provision.TenantName": { 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 45962fc596a..ba462b9eb64 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 @@ -27,7 +27,10 @@ public enum SystemName { PublicCd(true, true), /** Local development system */ - dev(false, false); // TODO: Remove this and use public everywhere + dev(false, false), + + /** VaaS */ + vaas(true, true); // TODO: Remove this and use public everywhere private final boolean isPublic; private final boolean isCd; @@ -48,6 +51,7 @@ public enum SystemName { case "main": return main; 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)); } } @@ -59,6 +63,7 @@ public enum SystemName { case main: return "main"; case Public: return "public"; case PublicCd: return "publiccd"; + case vaas: return "vaas"; default : throw new IllegalStateException(); } } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java index f50005edd52..eb066958254 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java @@ -20,7 +20,7 @@ public class SystemNameTest { @Test public void allOf() { - assertEquals(Set.of(SystemName.cd, SystemName.PublicCd), SystemName.allOf(SystemName::isCd)); - assertEquals(Set.of(SystemName.PublicCd, SystemName.Public), SystemName.allOf(SystemName::isPublic)); + assertEquals(Set.of(SystemName.cd, SystemName.PublicCd, SystemName.vaas), SystemName.allOf(SystemName::isCd)); + assertEquals(Set.of(SystemName.PublicCd, SystemName.Public, SystemName.vaas), SystemName.allOf(SystemName::isPublic)); } }
\ No newline at end of file |