From: subhash kumar singh <subhash.kumar.singh@huawei.com>
Date: Wed, 10 Oct 2018 06:36:17 +0000 (+0530)
Subject: Fix reading sdncurl property
X-Git-Tag: 1.3.1~23^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=98dd6825e2caa5ac513c52efd901d90fcc6e65d4;p=so.git

Fix reading sdncurl property

Fix reading sdncurl property.

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

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
index 4b848024d6..653c1f90b9 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateE2EServiceInstance.groovy
@@ -47,7 +47,8 @@ import org.onap.so.client.aai.entities.uri.AAIUriFactory
 import org.onap.so.logger.MessageEnum
 import org.onap.so.logger.MsoLogger
 import org.onap.so.rest.APIResponse
-import org.springframework.web.util.UriUtils;
+import org.springframework.web.util.UriUtils
+import org.onap.so.bpmn.core.UrnPropertiesReader
 
 import groovy.json.*
 
@@ -119,7 +120,7 @@ public class DoCreateE2EServiceInstance extends AbstractServiceTaskProcessor {
 				execution.setVariable("productFamilyId", "")
 			}
 
-			String sdncCallbackUrl = execution.getVariable('URN_mso_workflow_sdncadapter_callback')
+			String sdncCallbackUrl = UrnPropertiesReader.getVariable("mso.workflow.sdncadapter.callback", execution)
 			if (isBlank(sdncCallbackUrl)) {
 				msg = "URN_mso_workflow_sdncadapter_callback is null"
 				msoLogger.info(msg)