diff options
Diffstat (limited to 'bpmn')
3 files changed, 15 insertions, 11 deletions
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateAccessNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateAccessNSSI.groovy index 1d75cf5216..5d243437e0 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateAccessNSSI.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateAccessNSSI.groovy @@ -73,9 +73,9 @@ class DoActivateAccessNSSI extends AbstractServiceTaskProcessor { private static final String KEY_SLICE_PROFILE = "SliceProfile" private static final String KEY_NSSI = "NSSI" - private static final String AN_NF = "AN-NF" - private static final String TN_FH = "TN-FH" - private static final String TN_MH = "TN-MH" + private static final String AN_NF = "AN_NF" + private static final String TN_FH = "TN_FH" + private static final String TN_MH = "TN_MH" private static final String ACTIVATE = "activateInstance" private static final String DEACTIVATE = "deactivateInstance" @@ -205,13 +205,13 @@ class DoActivateAccessNSSI extends AbstractServiceTaskProcessor { input.addProperty("sNSSAI", sNssai.toString()) JsonObject wrapinput = new JsonObject() - wrapinput.addProperty("Action", action) + wrapinput.addProperty("action", action) JsonObject CommonHeader = new JsonObject() - CommonHeader.addProperty("TimeStamp", new Date(System.currentTimeMillis()).format("yyyy-MM-dd'T'HH:mm:ss.sss", TimeZone.getDefault())) - CommonHeader.addProperty("APIver", "1.0") - CommonHeader.addProperty("RequestID", reqId) - CommonHeader.addProperty("SubRequestID", "1") + CommonHeader.addProperty("timestamp",new Date(System.currentTimeMillis()).format("yyyy-MM-dd'T'HH:mm:ss.sss'Z'", TimeZone.getDefault())) + CommonHeader.addProperty("api-ver", "1.0") + CommonHeader.addProperty("request-id", reqId) + CommonHeader.addProperty("sub-request-id", "1") JsonObject body = new JsonObject() body.add("input", wrapinput) @@ -219,12 +219,12 @@ class DoActivateAccessNSSI extends AbstractServiceTaskProcessor { JsonObject sdnrRequest = new JsonObject() JsonObject payload = new JsonObject() payload.add("input", input) - wrapinput.addProperty("Payload", payload.toString()) - wrapinput.add("CommonHeader", CommonHeader) + wrapinput.addProperty("payload", payload.toString()) + wrapinput.add("common-header", CommonHeader) body.add("input", wrapinput) sdnrRequest.add("body", body) sdnrRequest.addProperty("version", "1.0") - sdnrRequest.addProperty("rpc-name", "activateRANSlice") + sdnrRequest.addProperty("rpc-name", "activateRANSliceInstance") sdnrRequest.addProperty("correlation-id", reqId) sdnrRequest.addProperty("type", "request") diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateSliceService.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateSliceService.groovy index 3d9f67653b..d0fe1e9469 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateSliceService.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoActivateSliceService.groovy @@ -158,6 +158,8 @@ class DoActivateSliceService extends AbstractServiceTaskProcessor { ActDeActNssi actDeActNssi = new ActDeActNssi() actDeActNssi.setNsiId(customerInfo.nsiId) actDeActNssi.setNssiId(nssInstance.nssiId) + actDeActNssi.setSnssaiList(Arrays.asList(customerInfo.snssai)) + nbiRequest.setEsrInfo(esrInfo) nbiRequest.setServiceInfo(serviceInfo) diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy index 5a3859fff4..4cc6e6d478 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeAllocateAccessNSSI.groovy @@ -192,6 +192,8 @@ class DoDeAllocateAccessNSSI extends AbstractServiceTaskProcessor { input.addProperty("RANNFNSSIId", anNfNssiId) input.addProperty("callbackURL", callbackURL.toString()) input.addProperty("sNSSAI", sNssai) + input.addProperty("globalSubscriberId", execution.getVariable("globalSubscriberId") as String) + input.addProperty("subscriptionServiceType", execution.getVariable("subscriptionServiceType") as String) input.addProperty("sliceProfileId",sliceProfileId) input.add("additionalproperties", new JsonObject()) |