diff options
author | 2021-05-25 16:29:18 +0530 | |
---|---|---|
committer | 2021-06-14 14:36:43 +0000 | |
commit | 8b86f34f6ea29728e31c4f6799009e8562ef3b6f (patch) | |
tree | 7a621cd8627fcf374928c76982f7f65b18e1e80a /platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml | |
parent | 94a7c372094fb6c8f342dfd04984a34c975eb849 (diff) |
RanSlice DG, Templates - Integration Testing Fixes
Issue-ID: CCSDK-3314
Signed-off-by: Ahila <ahila.pandaram@wipro.com>
Change-Id: I9d3960a3fe5bc2e693d20cd6176ed57953a71eea
Diffstat (limited to 'platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml')
-rw-r--r-- | platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml | 75 |
1 files changed, 33 insertions, 42 deletions
diff --git a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml index 87c9c461..88338538 100644 --- a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml +++ b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml @@ -116,21 +116,20 @@ <outcome value='allocate'> <block atomic="true"> <set> - <parameter name='tmp.payload.trackingArea' value='`$payloadJson.input.sliceProfile.coverageAreaList[0]`'/> <parameter name='tmp.payload.callbackURL' value='`$payloadJson.input.callbackURL`'/> <parameter name='tmp.payload.RANNFNSSIId' value='`$payloadJson.input.RANNFNSSIId`'/> <parameter name='tmp.payload.RANNSSIId' value='`$payloadJson.input.RANNSSIId`'/> - <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaList_length`'/> + <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaTAList_length`'/> <parameter name='tmp.payload.dLThptPerSlice' value='`$payloadJson.input.sliceProfile.dLThptPerSlice`'/> <parameter name='tmp.payload.latency' value='`$payloadJson.input.sliceProfile.latency`'/> <parameter name='tmp.payload.maxNumberofConns' value='`$payloadJson.input.sliceProfile.maxNumberofConns`'/> <parameter name='tmp.payload.maxNumberofUEs' value='`$payloadJson.input.sliceProfile.maxNumberofUEs`'/> <parameter name='tmp.payload.resourceSharingLevel' value='`$payloadJson.input.sliceProfile.resourceSharingLevel`'/> <parameter name='tmp.payload.sliceProfileId' value='`$payloadJson.input.sliceProfile.sliceProfileId`'/> - <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.sNSSAI`'/> + <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.snssaiList[0]`'/> <parameter name='tmp.payload.uEMobilityLevel' value='`$payloadJson.input.sliceProfile.uEMobilityLevel`'/> <parameter name='tmp.payload.uLThptPerSlice' value='`$payloadJson.input.sliceProfile.uLThptPerSlice`'/> - <parameter name='tmp.payload.pLMNId' value='`$payloadJson.input.sliceProfile.pLMNIdList[0]`'/> + <parameter name='tmp.payload.pLMNId' value='`$payloadJson.input.sliceProfile.plmnIdList[0]`'/> </set> <set> <parameter name='tmp.RRMPolicyRatioID.NearRTRIC' value="`'NearRTRIC-' + $payloadJson.input.sliceProfile.sliceProfileId + '-' + $payloadJson.input.sliceProfile.coverageAreaList[0]`" /> @@ -151,17 +150,15 @@ </outcome> <outcome value='Other'> <block atomic="true"> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'> - <parameter name="string" value="`$tmp.payload.pLMNId`" /> - <parameter name="result" value="tmp.mcc"/> - <parameter name="begin-index" value="0" /> - <parameter name="end-index" value="3" /> - </execute> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'> - <parameter name="string" value="`$tmp.payload.pLMNId`" /> - <parameter name="result" value="tmp.mnc"/> - <parameter name="begin-index" value="4" /> + <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'> + <parameter name="original_string" value="`$tmp.payload.pLMNId`" /> + <parameter name="regex" value="-"/> + <parameter name="ctx_memory_result_key" value="tmp.plmnList" /> </execute> + <set> + <parameter name='tmp.mcc' value='`$tmp.plmnList[0]`'/> + <parameter name='tmp.mnc' value='`$tmp.plmnList[1]`'/> + </set> </block> </outcome> </switch> @@ -177,21 +174,20 @@ <outcome value='modify-allocate'> <block atomic="true"> <set> - <parameter name='tmp.payload.trackingArea' value='`$payloadJson.input.sliceProfile.coverageAreaList[0]`'/> <parameter name='tmp.payload.callbackURL' value='`$payloadJson.input.callbackURL`'/> <parameter name='tmp.payload.RANNFNSSIId' value='`$payloadJson.input.RANNFNSSIId`'/> <parameter name='tmp.payload.RANNSSIId' value='`$payloadJson.input.RANNSSIId`'/> - <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaList_length`'/> + <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaTAList_length`'/> <parameter name='tmp.payload.dLThptPerSlice' value='`$payloadJson.input.sliceProfile.dLThptPerSlice`'/> <parameter name='tmp.payload.latency' value='`$payloadJson.input.sliceProfile.latency`'/> <parameter name='tmp.payload.maxNumberofConns' value='`$payloadJson.input.sliceProfile.maxNumberofConns`'/> <parameter name='tmp.payload.maxNumberofUEs' value='`$payloadJson.input.sliceProfile.maxNumberofUEs`'/> <parameter name='tmp.payload.resourceSharingLevel' value='`$payloadJson.input.sliceProfile.resourceSharingLevel`'/> <parameter name='tmp.payload.sliceProfileId' value='`$payloadJson.input.sliceProfile.sliceProfileId`'/> - <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.sNSSAI`'/> + <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.snssaiList[0]`'/> <parameter name='tmp.payload.uEMobilityLevel' value='`$payloadJson.input.sliceProfile.uEMobilityLevel`'/> <parameter name='tmp.payload.uLThptPerSlice' value='`$payloadJson.input.sliceProfile.uLThptPerSlice`'/> - <parameter name='tmp.payload.pLMNId' value='`$payloadJson.input.sliceProfile.pLMNIdList[0]`'/> + <parameter name='tmp.payload.pLMNId' value='`$payloadJson.input.sliceProfile.plmnIdList[0]`'/> </set> <set> <parameter name='tmp.RRMPolicyRatioID.NearRTRIC' value="`'NearRTRIC-' + $payloadJson.input.sliceProfile.sliceProfileId + '-' + $payloadJson.input.sliceProfile.coverageAreaList[0]`" /> @@ -212,17 +208,15 @@ </outcome> <outcome value='Other'> <block atomic="true"> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'> - <parameter name="string" value="`$tmp.payload.pLMNId`" /> - <parameter name="result" value="tmp.mcc"/> - <parameter name="begin-index" value="0" /> - <parameter name="end-index" value="3" /> - </execute> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'> - <parameter name="string" value="`$tmp.payload.pLMNId`" /> - <parameter name="result" value="tmp.mnc"/> - <parameter name="begin-index" value="4" /> + <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'> + <parameter name="original_string" value="`$tmp.payload.pLMNId`" /> + <parameter name="regex" value="-"/> + <parameter name="ctx_memory_result_key" value="tmp.plmnList" /> </execute> + <set> + <parameter name='tmp.mcc' value='`$tmp.plmnList[0]`'/> + <parameter name='tmp.mnc' value='`$tmp.plmnList[1]`'/> + </set> </block> </outcome> </switch> @@ -238,21 +232,20 @@ <outcome value='modify-deallocate'> <block atomic="true"> <set> - <parameter name='tmp.payload.trackingArea' value='`$payloadJson.input.sliceProfile.coverageAreaList[0]`'/> <parameter name='tmp.payload.callbackURL' value='`$payloadJson.input.callbackURL`'/> <parameter name='tmp.payload.RANNFNSSIId' value='`$payloadJson.input.RANNFNSSIId`'/> <parameter name='tmp.payload.RANNSSIId' value='`$payloadJson.input.RANNSSIId`'/> - <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaList_length`'/> + <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaTAList_length`'/> <parameter name='tmp.payload.dLThptPerSlice' value='`$payloadJson.input.sliceProfile.dLThptPerSlice`'/> <parameter name='tmp.payload.latency' value='`$payloadJson.input.sliceProfile.latency`'/> <parameter name='tmp.payload.maxNumberofConns' value='`$payloadJson.input.sliceProfile.maxNumberofConns`'/> <parameter name='tmp.payload.maxNumberofUEs' value='`$payloadJson.input.sliceProfile.maxNumberofUEs`'/> <parameter name='tmp.payload.resourceSharingLevel' value='`$payloadJson.input.sliceProfile.resourceSharingLevel`'/> <parameter name='tmp.payload.sliceProfileId' value='`$payloadJson.input.sliceProfile.sliceProfileId`'/> - <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.sNSSAI`'/> + <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.snssaiList[0]`'/> <parameter name='tmp.payload.uEMobilityLevel' value='`$payloadJson.input.sliceProfile.uEMobilityLevel`'/> <parameter name='tmp.payload.uLThptPerSlice' value='`$payloadJson.input.sliceProfile.uLThptPerSlice`'/> - <parameter name='tmp.payload.pLMNId' value='`$payloadJson.input.sliceProfile.pLMNIdList[0]`'/> + <parameter name='tmp.payload.pLMNId' value='`$payloadJson.input.sliceProfile.plmnIdList[0]`'/> </set> <set> <parameter name='tmp.RRMPolicyRatioID.NearRTRIC' value="`'NearRTRIC-' + $payloadJson.input.sliceProfile.sliceProfileId + '-' + $payloadJson.input.sliceProfile.coverageAreaList[0]`" /> @@ -273,17 +266,15 @@ </outcome> <outcome value='Other'> <block atomic="true"> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'> - <parameter name="string" value="`$tmp.payload.pLMNId`" /> - <parameter name="result" value="tmp.mcc"/> - <parameter name="begin-index" value="0" /> - <parameter name="end-index" value="3" /> - </execute> - <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'> - <parameter name="string" value="`$tmp.payload.pLMNId`" /> - <parameter name="result" value="tmp.mnc"/> - <parameter name="begin-index" value="4" /> + <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'> + <parameter name="original_string" value="`$tmp.payload.pLMNId`" /> + <parameter name="regex" value="-"/> + <parameter name="ctx_memory_result_key" value="tmp.plmnList" /> </execute> + <set> + <parameter name='tmp.mcc' value='`$tmp.plmnList[0]`'/> + <parameter name='tmp.mnc' value='`$tmp.plmnList[1]`'/> + </set> </block> </outcome> </switch> |