diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2021-07-21 11:47:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-07-21 11:47:09 +0000 |
| commit | 1be8408f26d3f20cf2ffb923a956b7ba6dfbd994 (patch) | |
| tree | 081ced3904a8be5a8bbc506f995f9abd1e5b7fe5 /bpmn/so-bpmn-infrastructure-flows/src | |
| parent | f5c314b7b783887e4dad9d41751e2c3674cb4fdb (diff) | |
| parent | 6258c7a3dea0340ff2b82db82875e04fee777c33 (diff) | |
Merge "Fix issues in AN NSSMF for allocate &modify flow"
Diffstat (limited to 'bpmn/so-bpmn-infrastructure-flows/src')
3 files changed, 7 insertions, 5 deletions
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/AllocateSliceSubnet.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/AllocateSliceSubnet.bpmn index 07077a1cab..4012467df9 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/AllocateSliceSubnet.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/AllocateSliceSubnet.bpmn @@ -77,7 +77,8 @@ nss.sendSyncResponse(execution)</bpmn:script> <camunda:in source="jobId" target="jobId" /> <camunda:in source="sliceParams" target="sliceParams" /> <camunda:out source="WorkflowException" target="WorkflowException" /> - <camunda:in source="servicename" target="servicename" /> + <camunda:in source="servicename" target="servicename" /> + <camunda:in source="sst" target="sst" /> </bpmn:extensionElements> <bpmn:incoming>Flow_1kk0exp</bpmn:incoming> <bpmn:outgoing>Flow_09b50tn</bpmn:outgoing> @@ -105,7 +106,8 @@ nss.prepareInitOperationStatus(execution)</bpmn:script> <camunda:in source="jobId" target="jobId" /> <camunda:in source="sliceParams" target="sliceParams" /> <camunda:out source="WorkflowException" target="WorkflowException" /> - <camunda:in source="servicename" target="servicename" /> + <camunda:in source="servicename" target="servicename" /> + <camunda:in source="sst" target="sst" /> </bpmn:extensionElements> <bpmn:incoming>Flow_1fij4ds</bpmn:incoming> <bpmn:outgoing>Flow_1coedjo</bpmn:outgoing> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateAccessNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateAccessNSSI.bpmn index 9b449013b1..9df7398f8c 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateAccessNSSI.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoAllocateAccessNSSI.bpmn @@ -353,7 +353,7 @@ nss.createModifyNssiQueryJobStatus(execution)</bpmn:script> <camunda:in source="modifyRanNssiJobId" target="jobId" /> <camunda:in source="modifySliceParams" target="sliceParams" /> <camunda:out source="WorkflowException" target="WorkflowException" /> - <camunda:in source="servicename" target="servicename" /> + <camunda:in source="ranModelName" target="servicename" /> </bpmn:extensionElements> <bpmn:incoming>Flow_10j50jb</bpmn:incoming> <bpmn:outgoing>Flow_05s0wso</bpmn:outgoing> @@ -500,7 +500,7 @@ nss.prepareFailedOperationStatusUpdate(execution)</bpmn:script> <bpmn:extensionElements> <camunda:in source="msoRequestId" target="msoRequestId" /> <camunda:in source="globalSubscriberId" target="globalSubscriberId" /> - <camunda:in source="ANNF_NSSI" target="serviceInstanceID" /> + <camunda:in source="RANNFServiceInstanceId" target="serviceInstanceID" /> <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" /> <camunda:in source="ANNF_sliceProfileInstanceId" target="sliceProfileId" /> <camunda:in source="snssaiList" target="snssaiList" /> diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoModifyAccessNSSI.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoModifyAccessNSSI.bpmn index c346097c70..3844770023 100644 --- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoModifyAccessNSSI.bpmn +++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoModifyAccessNSSI.bpmn @@ -73,7 +73,7 @@ nss.getNssisFromAai(execution)</bpmn:script> </bpmn:scriptTask> <bpmn:sequenceFlow id="Flow_1fpw4gf" sourceRef="Activity_0c8tzf1" targetRef="Activity_1so8vif" /> <bpmn:sequenceFlow id="Flow_05cl21h" sourceRef="Activity_1so8vif" targetRef="Activity_0uxxkp1" /> - <bpmn:scriptTask id="Activity_0uxxkp1" name="update AAI relationships"> + <bpmn:scriptTask id="Activity_0uxxkp1" name="update AAI relationships" scriptFormat="groovy"> <bpmn:incoming>Flow_05cl21h</bpmn:incoming> <bpmn:outgoing>Flow_1jwk3jy</bpmn:outgoing> <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.* |