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, 93 insertions, 0 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/WatchingCommandBaseModule.java b/vid-app-common/src/main/java/org/onap/vid/job/command/WatchingCommandBaseModule.java
new file mode 100644
index 000000000..8012aa9f3
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/job/command/WatchingCommandBaseModule.java
@@ -0,0 +1,93 @@
+package org.onap.vid.job.command;
+
+import com.google.common.collect.ImmutableMap;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.vid.asdc.AsdcCatalogException;
+import org.onap.vid.job.*;
+import org.onap.vid.job.command.CommandParentData.CommandDataKey;
+import org.onap.vid.job.impl.JobSharedData;
+import org.onap.vid.model.serviceInstantiation.VfModule;
+import org.onap.vid.model.serviceInstantiation.Vnf;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Component;
+
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Component
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class WatchingCommandBaseModule extends BaseWatchingCommand {
+    @Inject
+    protected JobsBrokerService jobsBrokerService;
+
+    @Inject
+    protected JobAdapter jobAdapter;
+    private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(WatchingCommandBaseModule.class);
+
+    public WatchingCommandBaseModule(
+            JobSharedData sharedData,
+            List<String> childrenJobsIds,
+            boolean isService,
+            CommandParentData commandParentData) {
+       super(sharedData, childrenJobsIds, isService);
+        this.commandParentData = commandParentData;
+    }
+
+    public WatchingCommandBaseModule() {
+
+    }
+
+    @Override
+    protected NextCommand getNextCommand(Job.JobStatus cumulativeJobsStatus) {
+
+        if (cumulativeJobsStatus== Job.JobStatus.IN_PROGRESS) {
+            return new NextCommand(Job.JobStatus.RESOURCE_IN_PROGRESS, this);
+        }
+
+        if(cumulativeJobsStatus==Job.JobStatus.FAILED || cumulativeJobsStatus==Job.JobStatus.COMPLETED_WITH_ERRORS){
+            return new NextCommand(Job.JobStatus.COMPLETED_WITH_ERRORS);
+        }
+        Vnf request = (Vnf) getSharedData().getRequest();
+        Map<String, Object> dataForChild = buildDataForChild();
+        //Create non-base Volume groups job
+        List<VfModule> vfModules = request.getVfModules().values().stream().flatMap(vfKey -> vfKey.values().stream()).collect(Collectors.toList());
+        List<String> vgNonBaseJobs = new ArrayList<>();
+        for( VfModule vfModule : vfModules){
+            try {
+                if(!commandUtils.isVfModuleBaseModule(commandParentData.getModelInfo(CommandDataKey.SERVICE_MODEL_INFO).getModelVersionId(), vfModule.getModelInfo().getModelVersionId())) {
+                    vgNonBaseJobs.add(jobsBrokerService.add(
+                            jobAdapter.createChildJob(JobType.VolumeGroupInstantiation, Job.JobStatus.CREATING, vfModule, getSharedData(), dataForChild)).toString());
+                }
+            } catch (AsdcCatalogException e) {
+                LOG.error("Failed to retrieve service definitions from SDC, for VfModule is BaseModule. Error: "+e.getMessage() , e);
+                return new NextCommand(Job.JobStatus.COMPLETED_WITH_ERRORS);
+            }
+        }
+        return new NextCommand(Job.JobStatus.RESOURCE_IN_PROGRESS, new WatchingCommand(getSharedData(), vgNonBaseJobs, false));
+    }
+
+    @Override
+    public WatchingCommandBaseModule init(JobSharedData sharedData, Map<String, Object> commandData) {
+        super.init(sharedData, commandData);
+        commandParentData.initParentData(commandData);
+        return this;
+    }
+
+    protected Map<String, Object> buildDataForChild() {
+        return commandParentData.getParentData();
+    }
+
+    @Override
+    public Map<String, Object> getData() {
+        return ImmutableMap.<String, Object>builder()
+                .putAll(super.getData())
+                .putAll(commandParentData.getParentData())
+                .build();
+    }
+
+
+}