From d9fb2fbfa7f8c6b481bc8553f3035395f687664a Mon Sep 17 00:00:00 2001
From: hyu2010 <hyu2010b@gmail.com>
Date: Mon, 21 Dec 2020 10:37:26 -0500
Subject: Fixes for bugs found in Transport Slicing integration

This update contains for the fixes for the following JIRAs:

SO-3429: Transport Slicing integration: fix resource operation
         status table mapping
SO-3434: Transport Slicing integration: modelUuid and modelInvariantUuid
         are missing from service-instance

Issue-ID: SO-3429
Issue-ID: SO-3434

Signed-off-by: hyu2010 <hyu2010b@gmail.com>
Change-Id: I7a9b7b7a3e40d967c138067a01f2c045fb3e4b56
Signed-off-by: hyu2010 <hyu2010b@gmail.com>
---
 .../src/main/resources/subprocess/DoAllocateTransportNSSI.bpmn          | 2 +-
 .../src/main/resources/subprocess/DoDeallocateTransportNSSI.bpmn        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'bpmn/so-bpmn-infrastructure-flows')

diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateTransportNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateTransportNSSI.bpmn
index 4f83c872a1..f3bd700d9a 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateTransportNSSI.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateTransportNSSI.bpmn
@@ -164,7 +164,7 @@ css.prepareOofSelection(execution)</bpmn:script>
       <bpmn:incoming>SequenceFlow_0n4xku8</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0kixzdj</bpmn:outgoing>
       <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
-execution.setVariable("orchestrationStatus", "activated")
+execution.setVariable("orchestrationStatus", "deactivated")
 def runScript = new TnAllocateNssi()
 runScript.updateAAIOrchStatus(execution)</bpmn:script>
     </bpmn:scriptTask>
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeallocateTransportNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeallocateTransportNSSI.bpmn
index bd759caffd..9dbc9909fc 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeallocateTransportNSSI.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeallocateTransportNSSI.bpmn
@@ -29,7 +29,7 @@ ex.processJavaException(execution)</bpmn:script>
       <bpmn:incoming>SequenceFlow_1jygjln</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1qv8qw1</bpmn:outgoing>
       <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
-def runScript = new TnAllocateNssi()
+def runScript = new DoDeallocateTnNssi()
 runScript.prepareUpdateJobStatus(execution,"finished","100","Deallocated TN NSSI successfully")</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:sequenceFlow id="SequenceFlow_03s744c" sourceRef="StartEvent_1nbljfd" targetRef="ScriptTask_1tc44ge" />
-- 
cgit 1.2.3-korg