From 02fe880c449447fd342683cc4d2b68ace665640e Mon Sep 17 00:00:00 2001 From: Ahila Date: Fri, 3 Sep 2021 17:55:10 +0530 Subject: CPS-TBDMT integration testing - Bug fixes - RRMPolicymember update using listnodes API - SliceProfile update to NearRTRIC - Type errors Issue-ID: CCSDK-3437 Signed-off-by: Ahila Change-Id: Ida8539d6c92bb6644e14354c2968f90af05c69f8 --- .../json/cps-templates/cps-add-sliceprofile.json | 16 ++++++++++++ .../json/cps-templates/cps-get-cells-list.json | 3 --- .../cps-put-cuup-rrm-policy-ratio.json | 6 ++--- .../main/json/cps-templates/cps-put-nearrtric.json | 30 ++++++++++++++++++++++ .../cps-put-nrcellcu-rrm-policy-ratio.json | 6 ++--- .../cps-put-nrcelldu-rrm-policy-member.json | 2 +- .../cps-put-nrcelldu-rrm-policy-ratio.json | 8 +++--- .../cps-templates/cps-update-ran-inventory.json | 15 +++-------- .../main/json/cps-templates/cps.put-nearrtric.json | 30 ---------------------- 9 files changed, 61 insertions(+), 55 deletions(-) create mode 100644 platform-logic/restapi-templates/src/main/json/cps-templates/cps-add-sliceprofile.json create mode 100644 platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nearrtric.json delete mode 100644 platform-logic/restapi-templates/src/main/json/cps-templates/cps.put-nearrtric.json (limited to 'platform-logic/restapi-templates/src') diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-add-sliceprofile.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-add-sliceprofile.json new file mode 100644 index 00000000..b2e9af11 --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-add-sliceprofile.json @@ -0,0 +1,16 @@ +{ + "inputParameters":{ + "idNearRTRIC":${tmp.nearRTRICId} + }, +"payload": { +"sliceProfilesList":[{ + "sliceProfileId": ${tmp.payload.sliceProfileId}, + "sNSSAI": ${tmp.payload.sNSSAI}, + "resourceSharingLevel": "shared", + "uLThptPerSlice": ${tmp.nearRTRIC.dLThptPerSlice}, + "maxNumberofConns": ${tmp.nearRTRIC.maxNumberOfConns}, + "dLThptPerSlice": ${tmp.nearRTRIC.uLThptPerSlice} + } + ] +} +} diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-cells-list.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-cells-list.json index a2ebef62..e72aa37c 100644 --- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-cells-list.json +++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-cells-list.json @@ -1,8 +1,5 @@ { "inputParameters": { -"mcc": ${tmp.mcc}, -"mnc": ${tmp.mnc}, -"coverageArea": ${tmp.payload.coverageArea}, "nRTAC": ${tmp.payload.trackingArea} } } diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy-ratio.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy-ratio.json index c3a63161..0e9a414c 100644 --- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy-ratio.json +++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy-ratio.json @@ -6,9 +6,9 @@ }, "payload":{ "attributes":{ -"rRMPolicyMinRatio":${tmp.rRMPolicyDedicatedRatio.CUUP}, -"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CUUP}, -"rRMPolicyDedicatedRatio":${tmp.rRMPolicyDedicatedRatio.CUUP} +"rRMPolicyMinRatio":${tmp.rrmPolicyDedicatedRatio_CUUP_updated}, +"rRMPolicyMaxRatio":${tmp.rrmPolicyDedicatedRatio_CUUP_updated}, +"rRMPolicyDedicatedRatio":${tmp.rrmPolicyDedicatedRatio_CUUP_updated} } } } diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nearrtric.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nearrtric.json new file mode 100644 index 00000000..9eb0723d --- /dev/null +++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nearrtric.json @@ -0,0 +1,30 @@ +{ + "inputParameters":{ + "idNearRTRIC":${tmp.nearRTRICId}, + "mcc":${tmp.mcc}, + "mnc":${tmp.mnc} + }, +"payload": { +"sNSSAIList":[ +{ +"sNssai":${tmp.payload.sNSSAI}, +"status":"ACTIVE", +"configData": [ +{ +"configParameter":"dLThptPerSlice", +"configValue":${tmp.nearRTRIC.dLThptPerSlice} +}, +{ +"configParameter":"uLThptPerSlice", +"configValue":${tmp.nearRTRIC.uLThptPerSlice} +}, + +{ +"configParameter":"maxNumberOfConns", +"configValue":${tmp.nearRTRIC.maxNumberOfConns} +} +] +} +] +} +} diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy-ratio.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy-ratio.json index 9460e226..e9362058 100644 --- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy-ratio.json +++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy-ratio.json @@ -7,9 +7,9 @@ }, "payload":{ "attributes":{ -"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CellCU}, -"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CellCU}, -"rRMPolicyDedicatedRatio":${tmp.rRMPolicyDedicatedRatio.CellCU} +"rRMPolicyMaxRatio":${tmp.rrmPolicyDedicatedRatio_CellCU_new}, +"rRMPolicyMinRatio":${tmp.rrmPolicyDedicatedRatio_CellCU_new}, +"rRMPolicyDedicatedRatio":${tmp.rrmPolicyDedicatedRatio_CellCU_new} } } } diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy-member.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy-member.json index d18ba3a6..c41df07c 100644 --- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy-member.json +++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy-member.json @@ -2,7 +2,7 @@ "inputParameters":{ "idNearRTRIC": ${tmp.nearRTRICId}, "idGNBDUFunction": ${tmp.GNBDUId}, -"idNRCellCU": ${tmp.cellDULocalId}, +"idNRCellDU": ${tmp.cellDULocalId}, "id":${tmp.RRMPolicyRatio_id} }, "payload":{ diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy-ratio.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy-ratio.json index fabd0b98..5db41ba8 100644 --- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy-ratio.json +++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy-ratio.json @@ -2,14 +2,14 @@ "inputParameters":{ "idNearRTRIC": ${tmp.nearRTRICId}, "idGNBDUFunction": ${tmp.GNBDUId}, -"idNRCellCU": ${tmp.cellDULocalId}, +"idNRCellDU": ${tmp.cellDULocalId}, "id":${tmp.RRMPolicyRatio_id} }, "payload":{ "attributes":{ -"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CellDU}, -"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CellDU}, -"rRMPolicyDedicatedRatio":${tmp.rRMPolicyDedicatedRatio.CellDU} +"rRMPolicyMaxRatio":${tmp.rrmPolicyDedicatedRatio_CellDU_updated}, +"rRMPolicyMinRatio":${tmp.rrmPolicyDedicatedRatio_CellDU_updated}, +"rRMPolicyDedicatedRatio":${tmp.rrmPolicyDedicatedRatio_CellDU_updated} } } } diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-update-ran-inventory.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-update-ran-inventory.json index 52db8df3..16d0065c 100644 --- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-update-ran-inventory.json +++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-update-ran-inventory.json @@ -1,9 +1,8 @@ { +"inputParameters":{ +"rannfnssiid":${tmp.payload.RANNFNSSIId} +}, "payload":{ -"ran-inventory":{ -"ran-slices":[ -{ -"rannfnssiid":${tmp.payload.RANNFNSSIId}, "sliceProfilesList":[ { "sliceProfileId": ${tmp.payload.sliceProfileId}, @@ -14,16 +13,10 @@ "pLMNIdList":[ { "mcc":${tmp.mcc}, -"mnc":${tmp.mnc}, - +"mnc":${tmp.mnc} } ] } -], -"subnetStatus":"ACTIVE", -"slicetype":"eMBB" -} ] } } -} diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps.put-nearrtric.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps.put-nearrtric.json deleted file mode 100644 index 9eb0723d..00000000 --- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps.put-nearrtric.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "inputParameters":{ - "idNearRTRIC":${tmp.nearRTRICId}, - "mcc":${tmp.mcc}, - "mnc":${tmp.mnc} - }, -"payload": { -"sNSSAIList":[ -{ -"sNssai":${tmp.payload.sNSSAI}, -"status":"ACTIVE", -"configData": [ -{ -"configParameter":"dLThptPerSlice", -"configValue":${tmp.nearRTRIC.dLThptPerSlice} -}, -{ -"configParameter":"uLThptPerSlice", -"configValue":${tmp.nearRTRIC.uLThptPerSlice} -}, - -{ -"configParameter":"maxNumberOfConns", -"configValue":${tmp.nearRTRIC.maxNumberOfConns} -} -] -} -] -} -} -- cgit 1.2.3-korg