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>

1 files changed, 54 insertions, 0 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/Vnf.java b/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/Vnf.java
new file mode 100644
index 000000000..a3280f4e3
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/Vnf.java
@@ -0,0 +1,54 @@
+package org.onap.vid.model.aaiTree;
+
+import org.onap.vid.aai.util.AAITreeConverter;
+import org.onap.vid.services.AAITreeNodeBuilder;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.onap.vid.aai.util.AAITreeConverter.VNF_TYPE;
+
+public class Vnf extends Node {
+
+    private Map<String, Map<String, VfModule>> vfModules = new HashMap<>();
+    private Map<String, Network> networks = new HashMap<>();
+
+    public Vnf(AAITreeNode node) {
+        super(node, AAITreeConverter.ModelType.vnf);
+    }
+
+    public Map<String, Map<String, VfModule>> getVfModules() {
+        return vfModules;
+    }
+
+    public void setVfModules(Map<String, Map<String, VfModule>> vfModules) {
+        this.vfModules = vfModules;
+    }
+
+    public Map<String, Network> getNetworks() {
+        return networks;
+    }
+
+    public void setNetworks(Map<String, Network> networks) {
+        this.networks = networks;
+    }
+
+    public static Vnf from(AAITreeNode node) {
+        Vnf vnf = new Vnf(node);
+        if (node.getAdditionalProperties().get(VNF_TYPE) != null) {
+            vnf.setInstanceType(node.getAdditionalProperties().get(VNF_TYPE).toString());
+        }
+
+        node.getChildren().forEach(child -> {
+            if (child.getType().equals(AAITreeNodeBuilder.VF_MODULE)) {
+                vnf.getVfModules().putIfAbsent(child.getNodeKey(), new HashMap<>());
+                vnf.getVfModules().get(child.getNodeKey())
+                                    .put(child.getUniqueNodeKey(), VfModule.from(child));
+            } else if (child.getType().equals(AAITreeNodeBuilder.NETWORK)) {
+                vnf.getNetworks().put(child.getUniqueNodeKey(), Network.from(child));
+            }
+        });
+
+        return vnf;
+    }
+}