From 9cbec08a54c14fa3ce991163b6203906e465c7e5 Mon Sep 17 00:00:00 2001
From: Marcus G K Williams <marcus.williams@intel.com>
Date: Thu, 24 May 2018 09:20:56 -0700
Subject: Fix serviceInstanceName in Homing

serviceInstanceName was not set
in CreateVcpeResCustService and not
made available in Homing Flow.

Issue-ID: SO-573
Change-Id: I9d3098aa252ceba139c75a24c71950bab70b14b6
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
---
 .../openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy  | 5 +++++
 .../src/main/resources/process/CreateVcpeResCustService.bpmn         | 1 +
 2 files changed, 6 insertions(+)

(limited to 'bpmn/MSOInfrastructureBPMN/src')

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
index 694aafc887..ce117d3655 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustService.groovy
@@ -129,6 +129,11 @@ public class CreateVcpeResCustService extends AbstractServiceTaskProcessor {
 
             serviceInstanceId = UriUtils.encode(serviceInstanceId, "UTF-8")
             execution.setVariable("serviceInstanceId", serviceInstanceId)
+            utils.log("DEBUG", "Incoming serviceInstanceId is: " + serviceInstanceId, isDebugEnabled)
+
+            String serviceInstanceName = jsonUtil.getJsonValue(createVcpeServiceRequest, "requestDetails.requestInfo.instanceName")
+            execution.setVariable("serviceInstanceName", serviceInstanceName)
+            utils.log("DEBUG", "Incoming serviceInstanceName is: " + serviceInstanceName, isDebugEnabled)
 
             String requestAction = execution.getVariable("requestAction")
             execution.setVariable("requestAction", requestAction)
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
index ea48104ba7..9342e34f59 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVcpeResCustService.bpmn
@@ -451,6 +451,7 @@ CreateVcpeResCustService.prepareCreateAllottedResourceTXC(execution)]]></bpmn2:s
         <camunda:in source="customerLocation" target="customerLocation" />
         <camunda:in source="cloudOwner" target="cloudOwner" />
         <camunda:in source="cloudRegionId" target="cloudRegionId" />
+        <camunda:in source="serviceInstanceName" target="serviceInstanceName" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_11efpvh</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1jbuf1t</bpmn2:outgoing>
-- 
cgit 1.2.3-korg