Merge "fixed double encoding issue"

1 files changed, 6 insertions, 8 deletions

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVnf.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVnf.groovy
index 7fa8b4409b..808bbc1898 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVnf.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVnf.groovy
@@ -259,6 +259,9 @@ class DoCreateVnf extends AbstractServiceTaskProcessor {
 			AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectType.SERVICE_INSTANCE, serviceInstanceId)
 
 			if(resourceClient.exists(uri)){
+				Map<String, String> keys = uri.getURIKeys()
+				execution.setVariable("globalCustomer", keys.get("global-customer-id"))
+				execution.setVariable("serviceType", keys.get("service-type"))
 				execution.setVariable("GENGS_siResourceLink", uri.build().toString())
 
 			}else{
@@ -307,14 +310,9 @@ class DoCreateVnf extends AbstractServiceTaskProcessor {
 
 			//Get Service Instance Info
 			String serviceInstanceId = getVariableEnforced(execution, "DoCVNF_serviceInstanceId")
-			String siRelatedLink = getVariableEnforced(execution, "GENGS_siResourceLink")
-
-			int custStart = siRelatedLink.indexOf("customer/")
-			int custEnd = siRelatedLink.indexOf("/service-subscriptions")
-			String globalCustId = siRelatedLink.substring(custStart + 9, custEnd)
-			int serviceStart = siRelatedLink.indexOf("service-subscription/")
-			int serviceEnd = siRelatedLink.indexOf("/service-instances/")
-			String serviceType = siRelatedLink.substring(serviceStart + 21, serviceEnd)
+
+			String globalCustId = execution.getVariable("global-customer-id")
+			String serviceType = execution.getVariable("service-type")
 
 			Map<String, String> payload = new LinkedHashMap<>();
 			payload.put("vnf-id", vnfId);