Merge "Corrected hibernate for cfvc customization table"

1 files changed, 17 insertions, 32 deletions

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 482957e006..242f125bde 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
@@ -375,38 +375,23 @@ public class WorkflowActionBBTasks {
 			List<Vnfc> vnfcs = workflowAction.getRelatedResourcesInVfModule(vnfId, vfModuleId, Vnfc.class, AAIObjectType.VNFC);
 			for(Vnfc vnfc : vnfcs) {
 				String modelCustomizationId = vnfc.getModelCustomizationId();
-				List<CvnfcCustomization> cvnfcCustomizations = catalogDbClient.getCvnfcCustomizationByVnfCustomizationUUIDAndVfModuleCustomizationUUID(vnfCustomizationUUID, vfModuleCustomizationUUID);
-				CvnfcCustomization cvnfcCustomization = null;
-				for(CvnfcCustomization cvnfc : cvnfcCustomizations) {
-					if(cvnfc.getModelCustomizationUUID().equalsIgnoreCase(modelCustomizationId)) {
-						cvnfcCustomization = cvnfc;
-					}
-				}
-				if(cvnfcCustomization != null) {
-					VnfVfmoduleCvnfcConfigurationCustomization fabricConfig = null;
-					for(VnfVfmoduleCvnfcConfigurationCustomization customization : cvnfcCustomization.getVnfVfmoduleCvnfcConfigurationCustomization()){
-						if(customization.getConfigurationResource().getToscaNodeType().contains(FABRIC_CONFIGURATION)){
-							if(fabricConfig == null) {
-								fabricConfig = customization;
-							} else {
-								throw new Exception("Multiple Fabric configs found for this vnfc");
-							}
-						}
-					}
-					if(fabricConfig != null) {
-						String configurationId = UUID.randomUUID().toString();
-						ConfigurationResourceKeys configurationResourceKeys = new ConfigurationResourceKeys();
-						configurationResourceKeys.setCvnfcCustomizationUUID(modelCustomizationId);
-						configurationResourceKeys.setVfModuleCustomizationUUID(vfModuleCustomizationUUID);
-						configurationResourceKeys.setVnfResourceCustomizationUUID(vnfCustomizationUUID);
-						configurationResourceKeys.setVnfcName(vnfc.getVnfcName());
-						ExecuteBuildingBlock assignConfigBB = getExecuteBBForConfig(ASSIGN_FABRIC_CONFIGURATION_BB, ebb, configurationId, configurationResourceKeys);
-						ExecuteBuildingBlock activateConfigBB = getExecuteBBForConfig(ACTIVATE_FABRIC_CONFIGURATION_BB, ebb, configurationId, configurationResourceKeys);
-						flowsToExecute.add(assignConfigBB);
-						flowsToExecute.add(activateConfigBB);
-						execution.setVariable("flowsToExecute", flowsToExecute);
-						execution.setVariable("completed", false);
-					}
+				VnfVfmoduleCvnfcConfigurationCustomization fabricConfig = 
+						catalogDbClient.getVnfVfmoduleCvnfcConfigurationCustomizationByVnfCustomizationUuidAndVfModuleCustomizationUuidAndCvnfcCustomizationUuid(vnfCustomizationUUID, vfModuleCustomizationUUID, modelCustomizationId);
+				if(fabricConfig != null && fabricConfig.getConfigurationResource() != null 
+						&& fabricConfig.getConfigurationResource().getToscaNodeType() != null 
+						&& fabricConfig.getConfigurationResource().getToscaNodeType().contains(FABRIC_CONFIGURATION)) {
+					String configurationId = UUID.randomUUID().toString();
+					ConfigurationResourceKeys configurationResourceKeys = new ConfigurationResourceKeys();
+					configurationResourceKeys.setCvnfcCustomizationUUID(modelCustomizationId);
+					configurationResourceKeys.setVfModuleCustomizationUUID(vfModuleCustomizationUUID);
+					configurationResourceKeys.setVnfResourceCustomizationUUID(vnfCustomizationUUID);
+					configurationResourceKeys.setVnfcName(vnfc.getVnfcName());
+					ExecuteBuildingBlock assignConfigBB = getExecuteBBForConfig(ASSIGN_FABRIC_CONFIGURATION_BB, ebb, configurationId, configurationResourceKeys);
+					ExecuteBuildingBlock activateConfigBB = getExecuteBBForConfig(ACTIVATE_FABRIC_CONFIGURATION_BB, ebb, configurationId, configurationResourceKeys);
+					flowsToExecute.add(assignConfigBB);
+					flowsToExecute.add(activateConfigBB);
+					execution.setVariable("flowsToExecute", flowsToExecute);
+					execution.setVariable("completed", false);
 				} else {
 					logger.debug("No cvnfcCustomization found for customizationId: " + modelCustomizationId);
 				}