From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 31 Dec 2018 17:21:27 +0200
Subject: 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>
---
 .../onap/vid/asdc/parser/ServiceModelInflator.kt   | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 vid-app-common/src/main/java/org/onap/vid/asdc/parser/ServiceModelInflator.kt

(limited to 'vid-app-common/src/main/java/org/onap/vid/asdc/parser/ServiceModelInflator.kt')

diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/parser/ServiceModelInflator.kt b/vid-app-common/src/main/java/org/onap/vid/asdc/parser/ServiceModelInflator.kt
new file mode 100644
index 000000000..79ab0459a
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/parser/ServiceModelInflator.kt
@@ -0,0 +1,43 @@
+package org.onap.vid.asdc.parser
+
+import org.onap.vid.model.*
+import org.springframework.stereotype.Component
+
+@Component
+class ServiceModelInflator {
+
+    data class Names (val modelCustomizationName: String?, val modelKey: String?)
+
+    fun toNamesByVersionId(model: ServiceModel): Map<String, Names> {
+        return emptyMap<String, Names>()
+                .plus(inflate(model.networks))
+                .plus(inflate(model.vnfs))
+                .plus(inflate(model.vnfGroups))
+    }
+
+    private fun inflate(instances: Map<String, *>): Map<String, Names> {
+        return instances.entries.map { inflate(it.key, it.value) }.fold(emptyMap()) { acc, it -> acc.plus(it) }
+    }
+
+    private fun inflate(modelKey: String, vnf: VNF): Map<String, Names> {
+        return mapOf(vnf.uuid to Names(vnf.modelCustomizationName, modelKey))
+                .plus(inflate(vnf.vfModules))
+                .plus(inflate(vnf.volumeGroups))
+    }
+
+    private fun inflate(modelKey: String, instance: Any?): Map<String, Names> {
+        return when (instance) {
+            is Network -> mapOf(instance.uuid to Names(instance.modelCustomizationName, modelKey))
+            is VfModule -> mapOf(instance.uuid to Names(instance.modelCustomizationName, modelKey))
+            is VolumeGroup -> mapOf(instance.uuid to Names(instance.modelCustomizationName, modelKey))
+            is ResourceGroup -> mapOf(instance.uuid to Names(instance.modelCustomizationName, modelKey))
+            is VNF -> inflate(modelKey, instance)
+
+            else -> {
+                // sink
+                emptyMap()
+            }
+        }
+    }
+
+}
-- 
cgit 1.2.3-korg