Merge "Throw exception if resource receipe is not avail"

1 files changed, 13 insertions, 4 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy
index ae75d54afe..9cdbdfde1c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateResources.groovy
@@ -245,10 +245,19 @@ public class DoCreateResources extends AbstractServiceTaskProcessor
 		 //String requestAction = resourceInput.getOperationType()
 		 String requestAction = "createInstance"
 		 JSONObject resourceRecipe = cutils.getResourceRecipe(execution, resourceInput.getResourceModelInfo().getModelUuid(), requestAction)
-         String recipeURL = BPMNProperties.getProperty("bpelURL", "http://mso:8080") + resourceRecipe.getString("orchestrationUri")
-		 int recipeTimeOut = resourceRecipe.getInt("recipeTimeout")
-		 String recipeParamXsd = resourceRecipe.get("paramXSD")
-		 HttpResponse resp = BpmnRestClient.post(recipeURL, requestId, recipeTimeOut, requestAction, serviceInstanceId, serviceType, resourceInput.toString(), recipeParamXsd)
+
+         if (resourceRecipe != null) {
+             String recipeURL = BPMNProperties.getProperty("bpelURL", "http://mso:8080") + resourceRecipe.getString("orchestrationUri")
+             int recipeTimeOut = resourceRecipe.getInt("recipeTimeout")
+             String recipeParamXsd = resourceRecipe.get("paramXSD")
+             HttpResponse resp = BpmnRestClient.post(recipeURL, requestId, recipeTimeOut, requestAction, serviceInstanceId, serviceType, resourceInput.toString(), recipeParamXsd)
+         } else {
+             String exceptionMessage = "Resource receipe is not found for resource modeluuid: " +
+                     resourceInput.getResourceModelInfo().getModelUuid()
+             utils.log("ERROR", exceptionMessage, isDebugEnabled)
+             exceptionUtil.buildAndThrowWorkflowException(execution, 500, exceptionMessage)
+         }
+
          utils.log("INFO", "======== end executeResourceRecipe Process ======== ", isDebugEnabled)
 	 }