From: subhash kumar singh <subhash.kumar.singh@huawei.com>
Date: Thu, 31 May 2018 08:52:11 +0000 (+0800)
Subject: Throw exception if resource receipe is not avail
X-Git-Tag: v1.2.1~7^2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F49723%2F1;p=so.git

Throw exception if resource receipe is not avail

Throw exception if resource receipe is not available for the resource
in service.

Change-Id: Ic6110a1f03d9a0f22d963812eab99e571191140d
Issue-ID: SO-422
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>
---

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)
 	 }