Modify CreateSliceService

Issue-ID: SO-2368

Change-Id: I0752e74b9b32c78eb27cb90a8c5725e52f6ae38b
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSliceService.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSliceService.groovy
index 7cc1a55..c3f36ef 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSliceService.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSliceService.groovy
@@ -273,7 +273,6 @@ public class CreateSliceService extends AbstractServiceTaskProcessor {
         execution.setVariable("orchestrationTaskId", taskId)
         logger.debug("BusinessKey: " + taskId)
         String serviceInstanceId = execution.getVariable("serviceInstanceId")
-        String operationId = execution.getVariable("operationId")
         String serviceInstanceName = execution.getVariable("serviceInstanceName")
         String taskName = "SliceServiceTask"
         String taskStatus = "Planning"
@@ -286,17 +285,11 @@ public class CreateSliceService extends AbstractServiceTaskProcessor {
         execution.setVariable("CSSOT_requestMethod", requestMethod)
 
         Map<String, Object> serviceProfile = execution.getVariable("serviceProfile")
-        Map<String, Object> sliceProfileTn = execution.getVariable("sliceProfileTn")
-        Map<String, Object> sliceProfileCn = execution.getVariable("sliceProfileCn")
-        Map<String, Object> sliceProfileAn = execution.getVariable("sliceProfileAn")
 
         SliceTaskParams sliceTaskParams = new SliceTaskParams()
         sliceTaskParams.setServiceId(serviceInstanceId)
         sliceTaskParams.setServiceName(serviceInstanceName)
         sliceTaskParams.setServiceProfile(serviceProfile)
-        sliceTaskParams.setSliceProfileTn(sliceProfileTn)
-        sliceTaskParams.setSliceProfileCn(sliceProfileCn)
-        sliceTaskParams.setSliceProfileAn(sliceProfileAn)
         execution.setVariable("sliceTaskParams", sliceTaskParams)
 
         String paramJson = sliceTaskParams.convertToJson()

diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateSliceService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateSliceService.bpmn
index 3e1c117..013e1b6 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateSliceService.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/process/CreateSliceService.bpmn
@@ -428,10 +428,7 @@ css.sendSyncResponse(execution)</bpmn:script>
         <camunda:in source="nstModelUuid" target="nstModelUuid" />
         <camunda:in source="nstModelInvariantUuid" target="nstModelInvariantUuid" />
         <camunda:in source="serviceProfile" target="serviceProfile" />
-        <camunda:in source="sliceProfileTn" target="sliceProfileTn" />
         <camunda:in source="msoRequestId" target="msoRequestId" />
-        <camunda:in source="sliceProfileCn" target="sliceProfileCn" />
-        <camunda:in source="sliceProfileAn" target="sliceProfileAn" />
         <camunda:in source="sliceTaskParams" target="sliceTaskParams" />
         <camunda:in source="resourceSharingLevel" target="resourceSharingLevel" />
         <camunda:out source="sliceTaskParams" target="sliceTaskParams" />