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, 15 insertions, 6 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/Group.java b/vid-app-common/src/main/java/org/onap/vid/model/Group.java
index 5f98341df..3da15879c 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/Group.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/Group.java
@@ -1,11 +1,13 @@
 package org.onap.vid.model;
 
 import org.onap.vid.asdc.beans.tosca.Input;
-import org.onap.vid.asdc.parser.ToscaParserImpl2;
+import org.onap.vid.asdc.parser.ToscaParserImpl2.Constants;
 
 import java.util.Map;
 
-public class Group {
+import static org.onap.vid.asdc.parser.ToscaParserImpl2.isModuleTypeIsBaseObjectSafe;
+
+public class Group implements MinimalNode {
 
 
     /** The uuid. */
@@ -182,7 +184,11 @@ public class Group {
 
 
     protected static GroupProperties extractPropertiesForGroup(org.onap.vid.asdc.beans.tosca.Group group){
-        String [] propertyKeys = {ToscaParserImpl2.Constants.MIN_VF_MODULE_INSTANCES, ToscaParserImpl2.Constants.MAX_VF_MODULE_INSTANCES, ToscaParserImpl2.Constants.INITIAL_COUNT};
+        String [] propertyKeys = {
+                Constants.MIN_VF_MODULE_INSTANCES,
+                Constants.MAX_VF_MODULE_INSTANCES,
+                Constants.INITIAL_COUNT,
+        };
         GroupProperties groupProperties = new GroupProperties();
 
         for(String propertyKey : propertyKeys){
@@ -191,18 +197,21 @@ public class Group {
                 setInGroupProperties(groupProperties, propertyKey, (Integer) val);
             }
         }
+
+        groupProperties.setBaseModule(isModuleTypeIsBaseObjectSafe(group.getProperties().get(Constants.VF_MODULE_TYPE)));
+
         return groupProperties;
     }
 
     private static void setInGroupProperties(GroupProperties groupProperties, String propertyKey, Integer propertyValue){
         switch (propertyKey) {
-            case ToscaParserImpl2.Constants.MIN_VF_MODULE_INSTANCES:
+            case Constants.MIN_VF_MODULE_INSTANCES:
                 groupProperties.setMinCountInstances(propertyValue);
                 break;
-            case ToscaParserImpl2.Constants.MAX_VF_MODULE_INSTANCES:
+            case Constants.MAX_VF_MODULE_INSTANCES:
                 groupProperties.setMaxCountInstances(propertyValue);
                 break;
-            case ToscaParserImpl2.Constants.INITIAL_COUNT:
+            case Constants.INITIAL_COUNT:
                 groupProperties.setInitialCount(propertyValue);
                 break;
             default: