summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorc00149107 <chenchuanyu@huawei.com>2017-12-15 15:35:56 +0800
committerc00149107 <chenchuanyu@huawei.com>2017-12-15 15:36:24 +0800
commit2e10063fbe0c4f407f07fb4971d629fa891b8ee2 (patch)
tree65486b11be0eedbafbe1d8711d708cd33aad4a06
parent178a3d819d60094c98fc440fa57b325a62f5bf36 (diff)
Fix Unexpected service create issue
Fix Unexpected service create issue.Reset the variable before update it. Change-Id: I4e21cecc51ee441727600315f059f7c341c2cc11 Issue-ID: SO-358 Signed-off-by: c00149107 <chenchuanyu@huawei.com>
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy6
1 files changed, 5 insertions, 1 deletions
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)){