Merge branch 'recursive-orch'

Issue-ID: SO-3980
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl>
Change-Id: Ie0cd0f973800196d5cb1e038db4a49208a6c4a3b

diff --cc adapters/mso-catalog-db-adapter/src/main/resources/db/migration/R__MacroData.sql
Simple merge

diff --cc bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
Simple merge

diff --cc bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
Simple merge

diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ExecuteBuildingBlockBuilder.java
Simple merge

diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/Resource.java
Simple merge

diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java
Simple merge

diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
Simple merge

diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionConstants.java
Simple merge

diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/ServiceEBBLoader.java
index cb4ee01,f16365b..9d76707
--- 1/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/ServiceEBBLoader.java
--- 2/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/ServiceEBBLoader.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/ServiceEBBLoader.java
@@@ -201,8 -207,8 +209,9 @@@ public class ServiceEBBLoader 
              var serviceResource =
                      new Resource(WorkflowType.SERVICE, serviceInstanceMSO.getServiceInstanceId(), false, null);
              serviceResource.setModelInvariantId(serviceInstanceAAI.getModelInvariantId());
 +            serviceResource.setModelVersionId(serviceInstanceAAI.getModelVersionId());
              resourceList.add(serviceResource);
+             traverseServiceInstanceChildService(resourceList, serviceResource, serviceInstanceAAI);
              traverseServiceInstanceMSOVnfs(resourceList, serviceResource, aaiResourceIds, serviceInstanceMSO);
              traverseServiceInstanceMSOPnfs(resourceList, serviceResource, aaiResourceIds, serviceInstanceMSO);
              if (serviceInstanceMSO.getNetworks() != null) {

diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java
index 77cd65b,b8b9c45..b56bd90
--- 1/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java
--- 2/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java
@@@ -94,12 -93,10 +94,15 @@@ public class UserParamsServiceTraversa
          List<Resource> resourceList = new ArrayList<>();
          Resource serviceResource =
                  new Resource(WorkflowType.SERVICE, validate.getModelInfo().getModelVersionId(), false, null);
 +        ModelInfo modelInfo = validate.getModelInfo();
 +        if (modelInfo != null) {
 +            serviceResource.setModelVersionId(modelInfo.getModelVersionId());
 +            serviceResource.setModelInvariantId(modelInfo.getModelInvariantUuid());
 +        }
          resourceList.add(serviceResource);
+         if (validate.getResources().getServices() != null) {
+             setResourceListForChildServices(execution, resourceList, serviceResource, validate);
+         }
          if (validate.getResources().getVnfs() != null) {
              setResourceListForVnfs(execution, resourceList, serviceResource, validate);
          }

diff --cc bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/ServiceEBBLoaderTest.java
Simple merge

diff --cc common/src/main/java/org/onap/so/serviceinstancebeans/Service.java
index 3c3e10c,14b1ab5..90df220
--- 1/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java
--- 2/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java
@@@ -42,9 -42,12 +42,12 @@@ public class Service implements Seriali
      @JsonProperty("instanceName")
      protected String instanceName;
      @JsonProperty("instanceParams")
 -    private List<Map<String, String>> instanceParams = new ArrayList<>();
 +    private List<Map<String, Object>> instanceParams = new ArrayList<>();
      @JsonProperty("resources")
      protected Resources resources;
+     @JsonProperty("processingPriority")
+     protected Integer processingPriority = 0;
+ 
  
      public ModelInfo getModelInfo() {
          return modelInfo;