aboutsummaryrefslogtreecommitdiffstats
path: root/vid-app-common/src/main/java/org/onap/vid/model/VidNotions.kt
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2018-12-31 17:21:27 +0200
committerIttay Stern <ittay.stern@att.com>2019-01-09 20:19:55 +0200
commit6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (patch)
tree3bd672dff83e3218232cd8665680416b7fc26a5d /vid-app-common/src/main/java/org/onap/vid/model/VidNotions.kt
parent5ec29ff5e3864f1ba6ecac71f8bffbefa400cf27 (diff)
Merge from ECOMP's repository
Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/model/VidNotions.kt')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/model/VidNotions.kt34
1 files changed, 34 insertions, 0 deletions
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
new file mode 100644
index 000000000..b49af085d
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/model/VidNotions.kt
@@ -0,0 +1,34 @@
+package org.onap.vid.model
+
+import com.fasterxml.jackson.annotation.JsonInclude
+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)
+ val instantiationUI: InstantiationUI, val modelCategory: ModelCategory, val viewEditUI: InstantiationUI) {
+ enum class InstantiationUI {
+ NETWORK_WITH_PROPERTY_NETWORK_TECHNOLOGY_EQUALS_STANDARD_SRIOV_OR_OVS,
+ SERVICE_WITH_FABRIC_CONFIGURATION,
+ LEGACY,
+ SERVICE_UUID_IS_1ffce89f_ef3f_4cbb_8b37_82134590c5de,
+ ANY_ALACARTE_NEW_UI,
+ MACRO_SERVICE,
+ SERVICE_WITH_VNF_GROUPING;
+
+ @JsonValue
+ fun toLowerCamel(): String {
+ return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, this.name)
+ }
+
+ }
+
+ enum class ModelCategory {
+ @JsonProperty("5G Provider Network")
+ IS_5G_PROVIDER_NETWORK_MODEL,
+ @JsonProperty("5G Fabric Configuration")
+ IS_5G_FABRIC_CONFIGURATION_MODEL,
+ @JsonProperty("other")
+ OTHER
+ }
+}