From a7a5e809c4261e34b8545ee0e73ed96e609d1411 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Wed, 12 Jun 2019 07:50:21 +0200
Subject: Revert "Remove vaas"

---
 .../src/main/java/com/yahoo/config/provision/SystemName.java       | 7 ++++++-
 .../src/test/java/com/yahoo/config/provision/SystemNameTest.java   | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'config-provisioning/src')

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
-- 
cgit v1.2.3