From: c00149107 <chenchuanyu@huawei.com>
Date: Fri, 15 Dec 2017 07:38:49 +0000 (+0800)
Subject: Fix Unexpected service create issue
X-Git-Tag: v1.1.2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e4138949b0c7e4d5e6146f463fb47471ebfb6162;p=so.git

Fix Unexpected service create issue

Fix Unexpected service create issue.Reset the variable before update it.

Change-Id: Id0b5459ad8ea76264d8502f5d69edd4c833d8229
Issue-ID: SO-358
Signed-off-by: c00149107 <chenchuanyu@huawei.com>
---

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
index 9404364910..d15be38042 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
@@ -413,7 +413,11 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
         String nsServiceDescription = jsonUtil.getJsonValue(incomingRequest, "service.description")  
         execution.setVariable("nsServiceDescription", nsServiceDescription)
         utils.log("INFO", "Prepare VFC Request nsServiceDescription:" + nsServiceDescription, isDebugEnabled)
-        List<String> resourceList = jsonUtil.StringArrayToList(execution, resourcesStr)   
+        List<String> resourceList = jsonUtil.StringArrayToList(execution, resourcesStr) 
+        //reset the variables
+        execution.setVariable("resourceUUID", "")
+        execution.setVariable("resourceInvariantUUID", "")
+        execution.setVariable("resourceParameters", "")
         for(String resource : resourceList){
             String resourceName = jsonUtil.getJsonValue(resource, "resourceName")  
             if(StringUtils.containsIgnoreCase(resourceName, resourceType)){