X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2Fso-bpmn-tasks%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fso%2Fbpmn%2Finfrastructure%2Fworkflow%2Ftasks%2FWorkflowActionBBTasks.java;h=a327f0670aedfb89464c7de9d1b30cf495a65827;hb=0ea204d5d1db87a34be2581d8ea4790d0dfacb8b;hp=359f8ea1646d944483d4cd42d90f23efb19837ac;hpb=6dbb05c1b633e64db599ca24041d795545106d65;p=so.git

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
index 359f8ea164..a327f0670a 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
@@ -23,7 +23,6 @@ package org.onap.so.bpmn.infrastructure.workflow.tasks;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 import java.util.UUID;
 
 import javax.persistence.EntityNotFoundException;
@@ -38,13 +37,8 @@ import org.onap.so.bpmn.servicedecomposition.entities.ExecuteBuildingBlock;
 import org.onap.so.bpmn.servicedecomposition.entities.WorkflowResourceIds;
 import org.onap.so.bpmn.servicedecomposition.tasks.BBInputSetupUtils;
 import org.onap.so.client.aai.AAIObjectType;
-import org.onap.so.client.aai.entities.AAIResultWrapper;
-import org.onap.so.client.aai.entities.Relationships;
-import org.onap.so.client.aai.entities.uri.AAIResourceUri;
-import org.onap.so.client.aai.entities.uri.AAIUriFactory;
 import org.onap.so.client.exception.ExceptionBuilder;
-import org.onap.so.db.catalog.beans.CvnfcCustomization;
-import org.onap.so.db.catalog.beans.VnfVfmoduleCvnfcConfigurationCustomization;
+import org.onap.so.db.catalog.beans.CvnfcConfigurationCustomization;
 import org.onap.so.db.catalog.client.CatalogDbClient;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.client.RequestsDbClient;
@@ -370,16 +364,21 @@ public class WorkflowActionBBTasks {
 	protected void postProcessingExecuteBBActivateVfModule(DelegateExecution execution, 
 			ExecuteBuildingBlock ebb, List<ExecuteBuildingBlock> flowsToExecute) {
 		try {
+			String serviceInstanceId = ebb.getWorkflowResourceIds().getServiceInstanceId();
 			String vnfId = ebb.getWorkflowResourceIds().getVnfId();
 			String vfModuleId = ebb.getResourceId();
 			ebb.getWorkflowResourceIds().setVfModuleId(vfModuleId);
+			String serviceModelUUID = bbInputSetupUtils.getAAIServiceInstanceById(serviceInstanceId).getModelVersionId();
 			String vnfCustomizationUUID = bbInputSetupUtils.getAAIGenericVnf(vnfId).getModelCustomizationId();
 			String vfModuleCustomizationUUID = bbInputSetupUtils.getAAIVfModule(vnfId, vfModuleId).getModelCustomizationId();
 			List<Vnfc> vnfcs = workflowAction.getRelatedResourcesInVfModule(vnfId, vfModuleId, Vnfc.class, AAIObjectType.VNFC);
+			logger.debug("Vnfc Size: {}", vnfcs.size());
 			for(Vnfc vnfc : vnfcs) {
 				String modelCustomizationId = vnfc.getModelCustomizationId();
-				VnfVfmoduleCvnfcConfigurationCustomization fabricConfig = 
-						catalogDbClient.getVnfVfmoduleCvnfcConfigurationCustomizationByVnfCustomizationUuidAndVfModuleCustomizationUuidAndCvnfcCustomizationUuid(vnfCustomizationUUID, vfModuleCustomizationUUID, modelCustomizationId);
+				logger.debug("Processing Vnfc: {}", modelCustomizationId);
+				CvnfcConfigurationCustomization fabricConfig = 
+						catalogDbClient.getCvnfcCustomization(serviceModelUUID,vnfCustomizationUUID,
+								vfModuleCustomizationUUID, modelCustomizationId);
 				if(fabricConfig != null && fabricConfig.getConfigurationResource() != null 
 						&& fabricConfig.getConfigurationResource().getToscaNodeType() != null 
 						&& fabricConfig.getConfigurationResource().getToscaNodeType().contains(FABRIC_CONFIGURATION)) {
@@ -393,6 +392,7 @@ public class WorkflowActionBBTasks {
 					ExecuteBuildingBlock activateConfigBB = getExecuteBBForConfig(ACTIVATE_FABRIC_CONFIGURATION_BB, ebb, configurationId, configurationResourceKeys);
 					flowsToExecute.add(assignConfigBB);
 					flowsToExecute.add(activateConfigBB);
+					flowsToExecute.stream().forEach(executeBB -> logger.info("Flows to Execute After Post Processing: {}", executeBB.getBuildingBlock().getBpmnFlowName()));
 					execution.setVariable("flowsToExecute", flowsToExecute);
 					execution.setVariable("completed", false);
 				} else {