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

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/VolumeGroupInstantiationCommand.java b/vid-app-common/src/main/java/org/onap/vid/job/command/VolumeGroupInstantiationCommand.java
new file mode 100644
index 000000000..b2a3da472
--- /dev/null
+++ b/vid-app-common/src/main/java/org/onap/vid/job/command/VolumeGroupInstantiationCommand.java
@@ -0,0 +1,83 @@
+package org.onap.vid.job.command;
+
+
+import org.apache.commons.lang3.StringUtils;
+import org.onap.vid.changeManagement.RequestDetailsWrapper;
+import org.onap.vid.job.*;
+import org.onap.vid.job.command.CommandParentData.CommandDataKey;
+import org.onap.vid.model.serviceInstantiation.VfModule;
+import org.onap.vid.mso.model.VolumeGroupRequestDetails;
+import org.onap.vid.services.AsyncInstantiationBusinessLogic;
+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.Collections;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+public class VolumeGroupInstantiationCommand extends ResourceInstantiationCommand {
+    @Inject
+    private AsyncInstantiationBusinessLogic asyncInstantiationBL;
+
+    @Inject
+    protected JobsBrokerService jobsBrokerService;
+
+    @Inject
+    protected JobAdapter jobAdapter;
+
+    @Override
+    protected String getRequestPath() {
+        return asyncInstantiationBL.getVolumeGroupInstantiationPath(commandParentData.getInstanceId(CommandDataKey.SERVICE_INSTANCE_ID),commandParentData.getInstanceId(CommandDataKey.VNF_INSTANCE_ID));
+    }
+
+    @Override
+    protected RequestDetailsWrapper<VolumeGroupRequestDetails> generateMSORequest(JobAdapter.AsyncJobRequest request, String userId) {
+        return asyncInstantiationBL.generateVolumeGroupInstantiationRequest(
+                (VfModule) getSharedData().getRequest(),
+                commandParentData.getModelInfo(CommandDataKey.SERVICE_MODEL_INFO),
+                commandParentData.getInstanceId(CommandDataKey.SERVICE_INSTANCE_ID),
+                commandParentData.getModelInfo(CommandDataKey.VNF_MODEL_INFO),
+                commandParentData.getInstanceId(CommandDataKey.VNF_INSTANCE_ID),
+                getSharedData().getUserId()
+        );
+    }
+
+    @Override
+    protected NextCommand getNextCommand(String requestId, String instanceId){
+        return new NextCommand(
+                Job.JobStatus.RESOURCE_IN_PROGRESS,
+                new VolumeGroupInProgressStatusCommand(getSharedData(), requestId, instanceId, commandParentData)
+        );
+    }
+
+    @Override
+    protected String getJobAuditMSOStatus() {
+        return "VOLUME_GROUP_REQUESTED";
+    }
+
+    @Override
+    public NextCommand call() {
+        String vgName = ((VfModule)getSharedData().getRequest()).getVolumeGroupInstanceName();
+        if(StringUtils.isNotEmpty(vgName)){
+            return super.call();//create volume group
+        }else {
+            //go to vf module creation
+            VfModule request = (VfModule) getSharedData().getRequest();
+            Map<String, Object> dataForChild = buildDataForChild();
+            List<String> vfModuleJob = Collections.singletonList(jobsBrokerService.add(
+                    jobAdapter.createChildJob(JobType.VfmoduleInstantiation, Job.JobStatus.CREATING, request, getSharedData(), dataForChild)).toString());
+
+            return new NextCommand(Job.JobStatus.RESOURCE_IN_PROGRESS, new WatchingCommand(getSharedData(), vfModuleJob, false));
+        }
+
+    }
+
+    private Map<String, Object> buildDataForChild() {
+       return commandParentData.getParentData();
+    }
+
+}