Merge "Extract getExistingCounterMap from AAITreeConverter to ModelUtil"

[vid.git] / vid-app-common / src / main / java / org / onap / vid / model / VidNotions.kt

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/VidNotions.kt b/vid-app-common/src/main/java/org/onap/vid/model/VidNotions.kt
index 66fe2dd..c6de51c 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/model/VidNotions.kt
+++ b/vid-app-common/src/main/java/org/onap/vid/model/VidNotions.kt
@@ -25,7 +25,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.annotation.JsonValue
 import com.google.common.base.CaseFormat
 
-class VidNotions(@get:JsonInclude(JsonInclude.Include.NON_NULL)
+data class VidNotions(@get:JsonInclude(JsonInclude.Include.NON_NULL)
                  val instantiationUI: InstantiationUI,
                  val modelCategory: ModelCategory,
                  val viewEditUI: InstantiationUI,
@@ -41,7 +41,8 @@ class VidNotions(@get:JsonInclude(JsonInclude.Include.NON_NULL)
         TRANSPORT_SERVICE,
         SERVICE_WITH_COLLECTION_RESOURCE,
         A_LA_CARTE_VNF_SERVICE_ROLE,
-        INFRASTRUCTURE_VPN
+        INFRASTRUCTURE_VPN,
+        ANY_ALACARTE_WHICH_NOT_EXCLUDED,
         ;
 
         @JsonValue
@@ -59,7 +60,8 @@ class VidNotions(@get:JsonInclude(JsonInclude.Include.NON_NULL)
         Transport,
         SERVICE_WITH_COLLECTION_RESOURCE,
         INFRASTRUCTURE_VPN,
-        PORT_MIRRORING,        
+        PORT_MIRRORING,
+        VLAN_TAGGING,
         @JsonProperty("other")
         OTHER
     }