From: subhash kumar singh <subhash.kumar.singh@huawei.com>
Date: Sat, 14 Apr 2018 12:36:40 +0000 (+0000)
Subject: Fix get variable name for crate model info
X-Git-Tag: v1.2.1~144^2~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F53%2F42853%2F1;p=so.git

Fix get variable name for crate model info

Fix get variable name for crate model info

Change-Id: I33a6ef37f865b5a528732f79d5ebc6a525470f90
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/DoDeleteE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteE2EServiceInstance.groovy
index 003210f602..e799ecff45 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteE2EServiceInstance.groovy
@@ -337,12 +337,13 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
 
         try {
             utils.log("DEBUG", " ***** Inside prepareDecomposeService of create generic e2e service ***** ", isDebugEnabled)
-            String modelInvariantUuid = execution.getVariable("model-invariant-id")
+            String modelInvariantUuid = execution.getVariable("model-invariant-id-original")
+            String modelVersionId = execution.getVariable("model-version-id-original")
             //here modelVersion is not set, we use modelUuid to decompose the service.
             String serviceModelInfo = """{
             "modelInvariantUuid":"${modelInvariantUuid}",
-            "modelUuid":"${modelUuid}",
-            "modelVersion":""
+            "modelUuid":"",
+            "modelVersion":"${modelVersionId}"
              }"""
             execution.setVariable("serviceModelInfo", serviceModelInfo)