RANSlice - allocate modify : CPS Integration

Tested against CPS-TBDMT for an anchor

Issue-ID: CCSDK-3340

Signed-off-by: Ahila <ahila.pandaram@wipro.com>
Change-Id: I8f8c22cbfb70433dcae126d24817b549a9793d4e

19 files changed, 139 insertions, 222 deletions

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 b33fd781..a2ebef62 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
@@ -5,4 +5,4 @@
 "coverageArea": ${tmp.payload.coverageArea},
 "nRTAC": ${tmp.payload.trackingArea}
 }
-}
\ No newline at end of file
+}
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-cuup-rrm-policy.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-cuup-rrm-policy.json
index 98fbe426..cb6323b2 100644
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-cuup-rrm-policy.json
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-cuup-rrm-policy.json
@@ -3,4 +3,4 @@
 "idNearRTRIC": ${tmp.nearRTRICId},
 "idGNBCUUPFunction": ${tmp.idGNBCUUPFunction}
 }
-}
\ No newline at end of file
+}
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nearrtric-by-rannfnssi.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nearrtric-by-rannfnssi.json
index 83b6f4af..003fb57c 100644
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nearrtric-by-rannfnssi.json
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nearrtric-by-rannfnssi.json
@@ -1,5 +1,5 @@
 {
 "inputParameters": {
-"ranNFNSSIId": ${tmp.payload.RANNFNSSIId}
+"rANNFNSSIId": ${tmp.payload.RANNFNSSIId}
+}
 }
-}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nrcellcu-rrm-policy.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nrcellcu-rrm-policy.json
index 15ac5409..2ecbef23 100644
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nrcellcu-rrm-policy.json
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nrcellcu-rrm-policy.json
@@ -4,4 +4,4 @@
 "idGNBCUCPFunction": ${tmp.CUCPName},
 "idNRCellCU": ${tmp.cellCULocalId}
 }
-}
\ No newline at end of file
+}
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nrcelldu-rrm-policy.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nrcelldu-rrm-policy.json
index 1a01eb3a..1ff6cc7d 100644
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nrcelldu-rrm-policy.json
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-get-nrcelldu-rrm-policy.json
@@ -2,6 +2,6 @@
 "inputParameters":{
 "idNearRTRIC": ${tmp.nearRTRICId},
 "idGNBDUFunction": ${tmp.GNBDUId},
-"idNRCellCU": ${tmp.cellDULocalId}
+"idNRCellDU": ${tmp.cellDULocalId}
+}
 }
-}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy-member.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy-member.json
new file mode 100644
index 00000000..bac5e43f
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy-member.json
@@ -0,0 +1,18 @@
+{
+"inputParameters":{
+"idNearRTRIC": ${tmp.nearRTRICId},
+"idGNBCUUPFunction": ${tmp.idGNBCUUPFunction},
+"id":${tmp.RRMPolicyRatio_id}
+},
+"payload":{
+"rRMPolicyMemberList":[
+{
+"idx":${tmp.RRMPolicyMember_id},
+"mcc":${tmp.mcc},
+"mnc":${tmp.mnc},
+"sNSSAI":${tmp.payload.sNSSAI}
+}
+]
+}
+}
+
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
new file mode 100644
index 00000000..c3a63161
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy-ratio.json
@@ -0,0 +1,14 @@
+{
+"inputParameters":{
+"idNearRTRIC": ${tmp.nearRTRICId},
+"idGNBCUUPFunction": ${tmp.idGNBCUUPFunction},
+"id":${tmp.RRMPolicyRatio_id}
+},
+"payload":{
+"attributes":{
+"rRMPolicyMinRatio":${tmp.rRMPolicyDedicatedRatio.CUUP},
+"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CUUP},
+"rRMPolicyDedicatedRatio":${tmp.rRMPolicyDedicatedRatio.CUUP}
+                           }
+}
+}
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy.json
deleted file mode 100644
index 9f8842ca..00000000
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-cuup-rrm-policy.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-"inputParameters":{
-"idNearRTRIC": ${tmp.nearRTRICId},
-"idGNBCUUPFunction": ${tmp.idGNBCUUPFunction}
-},
-"payload":{
-"GNBCUUPFunction": [
-{
-"idGNBCUUPFunction": ${tmp.idGNBCUUPFunction},
-"attributes": {
-"gNBCUUPId": ${tmp.idGNBCUUPFunction},
-"RRMPolicyRatio":[
-"id":${tmp.RRMPolicyRatio_id},
-"attributes": {
-"resourceType":"PRB",
-"quotaType":"STRICT",
-"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CUUP},
-"rRMPolicyMinRatio":${tmp.rRMPolicyDedicatedRatio.CUUP},
-"rRMPolicyDedicatedRatio":{tmp.rRMPolicyDedicatedRatio.CUUP},
-"rRMPolicyMemberList":[
-{
-"idx":${tmp.RRMPolicyMember_id},
-"mcc":${tmp.mcc},
-"mnc":${tmp.mnc},
-"sNSSAI":${tmp.payload.sNSSAI}
-
-}
-]
-}
-]
-}
-}
-]
-}
-}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbcucpfunction.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbcucpfunction.json
index f137e5f9..a969ae5f 100644
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbcucpfunction.json
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbcucpfunction.json
@@ -1,43 +1,23 @@
 {
 "inputParameters":{
-"idNearRTRIC": ${tmp.nearRTRICId}
-},
-"payload":{
-"GNBCUCPFunction": [
-{
-"idGNBCUCPFunction": ${tmp.gNBCUCPList.gNBCUName},
-"attributes": {
-"gNBCUName": ${tmp.gNBCUCPList.gNBCUName},
-"gNBIdLength": ${tmp.gNBCUCPList.gNBIdLength},
-"gNBId": ${tmp.gNBCUCPList.gNBId}
-},
-"NRCellCU": [
-{
-"idNRCellCU": ${tmp.cellLocalId},
-"attributes": {
-"cellLocalId": ${tmp.cellLocalId}
-"pLMNInfoList":[
-{
+"idNearRTRIC": ${tmp.nearRTRICId},
 "mcc":${tmp.mcc},
 "mnc":${tmp.mnc},
+"idGNBCUCPFunction":${tmp.gNBCUCPList.gNBCUName},
+"idNRCellCU":${tmp.cellCULocalId}
+},
+"payload":{
 "sNSSAIList":[
 {
 "sNssai":${tmp.payload.sNSSAI},
 "status":"ACTIVE",
 "configData": [
 {
-"configParameter":maxNumberOfConns,
+"configParameter":"maxNumberOfConns",
 "configValue":${tmp.maxNumberOfConns}
 }
 ]
 }
 ]
 }
-]
-}
-}
-]
-}
-]
 }
-}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbcuupfunction.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbcuupfunction.json
index 7a9139f3..5a968d0b 100644
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbcuupfunction.json
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbcuupfunction.json
@@ -1,34 +1,22 @@
 {
 "inputParameters":{
-"idNearRTRIC": "11"
-},
-"payload":{
-"GNBCUUPFunction": [
-{
-"idGNBCUUPFunction": ${tmp.gNBCUUPList.gNBCUUPId},
-"attributes": {
-"gNBId": ${tmp.gNBCUUPList.gNBId},
-"gNBCUUPId": ${tmp.gNBCUUPList.gNBCUUPId},
-"pLMNInfoList":[
-{
+"idNearRTRIC": ${tmp.nearRTRICId},
 "mcc":${tmp.mcc},
 "mnc":${tmp.mnc},
+"idGNBCUUPFunction":${tmp.idGNBCUUPFunction}
+},
+"payload":{
 "sNSSAIList":[
 {
 "sNssai":${tmp.payload.sNSSAI},
 "status":"ACTIVE",
 "configData": [
 {
-"configParameter":maxNumberOfConns,
+"configParameter":"maxNumberOfConns",
 "configValue":${tmp.maxNumberOfConns}
 }
 ]
 }
 ]
 }
-]
-}
-}
-]
 }
-}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbdufunction.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbdufunction.json
index 059d2234..3195111d 100644
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbdufunction.json
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-gnbdufunction.json
@@ -1,47 +1,27 @@
 {
 "inputParameters":{
-"idNearRTRIC": ${tmp.nearRTRICId}
-},
-"payload":{
-"GNBDUFunction": [
-{
-"idGNBDUFunction": ${tmp.gNBDUList.gNBDUId},
-"attributes": {
-"gNBDUId": ${tmp.gNBDUList.gNBDUId},
-"gNBIdLength": ${tmp.gNBIdLength},
-"gNBId": ${tmp.gNBId}
-},
-"NRCellCU": [
-{
-"idNRCellCU": ${tmp.cellLocalId},
-"attributes": {
-"cellLocalId": ${tmp.cellLocalId}
-"pLMNInfoList":[
-{
+"idNearRTRIC": ${tmp.nearRTRICId},
 "mcc":${tmp.mcc},
 "mnc":${tmp.mnc},
+"idGNBDUFunction":${tmp.gNBDUList.gNBDUId},
+"idNRCellDU":${tmp.cellLocalId}
+},
+"payload":{
 "sNSSAIList":[
 {
 "sNssai":${tmp.payload.sNSSAI},
 "status":"ACTIVE",
 "configData": [
 {
-"configParameter":dLThptPerSlice,
+"configParameter":"dLThptPerSlice",
 "configValue":${tmp.dLThptPerSlice}
 },
 {
-"configParameter":uLThptPerSlice,
+"configParameter":"uLThptPerSlice",
 "configValue":${tmp.uLThptPerSlice}
 }
 ]
 }
 ]
 }
-]
-}
-}
-]
-}
-]
 }
-}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy-member.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy-member.json
new file mode 100644
index 00000000..33a8a7f3
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy-member.json
@@ -0,0 +1,18 @@
+{
+"inputParameters":{
+"idNearRTRIC": ${tmp.nearRTRICId},
+"idGNBCUCPFunction": ${tmp.CUCPName},
+"idNRCellCU": ${tmp.cellCULocalId},
+"id":${tmp.RRMPolicyRatio_id}
+},
+"payload":{
+"rRMPolicyMemberList":[
+{
+"idx":${tmp.RRMPolicyMember_id},
+"mcc":${tmp.mcc},
+"mnc":${tmp.mnc},
+"sNSSAI":${tmp.payload.sNSSAI}
+}
+]
+}
+}
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
new file mode 100644
index 00000000..9460e226
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy-ratio.json
@@ -0,0 +1,15 @@
+{
+"inputParameters":{
+"idNearRTRIC": ${tmp.nearRTRICId},
+"idGNBCUCPFunction": ${tmp.CUCPName},
+"idNRCellCU": ${tmp.cellCULocalId},
+"id":${tmp.RRMPolicyRatio_id}
+},
+"payload":{
+"attributes":{
+"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CellCU},
+"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CellCU},
+"rRMPolicyDedicatedRatio":${tmp.rRMPolicyDedicatedRatio.CellCU}
+                           }
+}
+}
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy.json
deleted file mode 100644
index efe55e26..00000000
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcellcu-rrm-policy.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-"inputParameters":{
-"idNearRTRIC": ${tmp.nearRTRICId},
-"idGNBCUCPFunction": ${tmp.CUCPName},
-"idNRCellCU": ${tmp.cellCULocalId}
-},
-"payload":{
-"GNBCUCPFunction": [
-{
-"idGNBCUCPFunction": ${tmp.CUCPName},
-"attributes": {
-"gNBCUName": ${tmp.CUCPName
-},
-"NRCellCU": [
-{
-"idNRCellCU": ${tmp.cellCULocalId},
-"attributes": {
-"cellLocalId": ${tmp.cellCULocalId},
-"RRMPolicyRatio":[
-"id":${tmp.RRMPolicyRatio_id},
-"attributes": {
-"resourceType":"RRC Connected Users",
-"quotaType":"STRICT",
-"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CellCU},
-"rRMPolicyMinRatio":${tmp.rRMPolicyDedicatedRatio.CellCU},
-"rRMPolicyDedicatedRatio":{tmp.rRMPolicyDedicatedRatio.CellCU},
-"rRMPolicyMemberList":[
-{
-"idx":${tmp.RRMPolicyMember_id},
-"mcc":${tmp.mcc},
-"mnc":${tmp.mnc},
-"sNSSAI":${tmp.payload.sNSSAI}
-}
-]
-}
-]
-}
-}
-]
-}
-]
-}
-}
\ No newline at end of file
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
new file mode 100644
index 00000000..d18ba3a6
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy-member.json
@@ -0,0 +1,19 @@
+{
+"inputParameters":{
+"idNearRTRIC": ${tmp.nearRTRICId},
+"idGNBDUFunction": ${tmp.GNBDUId},
+"idNRCellCU": ${tmp.cellDULocalId},
+"id":${tmp.RRMPolicyRatio_id}
+},
+"payload":{
+"rRMPolicyMemberList":[
+{
+"idx":${tmp.RRMPolicyMember_id},
+"mcc":${tmp.mcc},
+"mnc":${tmp.mnc},
+"sNSSAI":${tmp.payload.sNSSAI}
+}
+]
+
+}
+}
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
new file mode 100644
index 00000000..fabd0b98
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy-ratio.json
@@ -0,0 +1,15 @@
+{
+"inputParameters":{
+"idNearRTRIC": ${tmp.nearRTRICId},
+"idGNBDUFunction": ${tmp.GNBDUId},
+"idNRCellCU": ${tmp.cellDULocalId},
+"id":${tmp.RRMPolicyRatio_id}
+},
+"payload":{
+"attributes":{
+"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CellDU},
+"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CellDU},
+"rRMPolicyDedicatedRatio":${tmp.rRMPolicyDedicatedRatio.CellDU}
+                           }
+}
+}
diff --git a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy.json b/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy.json
deleted file mode 100644
index 79f0be52..00000000
--- a/platform-logic/restapi-templates/src/main/json/cps-templates/cps-put-nrcelldu-rrm-policy.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-"inputParameters":{
-"idNearRTRIC": ${tmp.nearRTRICId},
-"idGNBDUFunction": ${tmp.GNBDUId},
-"idNRCellCU": ${tmp.cellDULocalId}
-},
-"payload":{
-"GNBDUFunction": [
-{
-"idGNBDUFunction": ${tmp.GNBDUId},
-"attributes": {
-"gNBDUId": ${tmp.GNBDUId},
-},
-"NRCellDU": [
-{
-"idNRCellDU": ${tmp.cellDULocalId},
-"attributes": {
-"cellLocalId": ${tmp.cellDULocalId}
-"RRMPolicyRatio":[
-"id":${tmp.RRMPolicyRatio_id},
-"attributes": {
-"resourceType":"DRB",
-"quotaType":"STRICT",
-"rRMPolicyMaxRatio":${tmp.rRMPolicyDedicatedRatio.CellDU},
-"rRMPolicyMinRatio":${tmp.rRMPolicyDedicatedRatio.CellDU},
-"rRMPolicyDedicatedRatio":{tmp.rRMPolicyDedicatedRatio.CellDU},
-"rRMPolicyMemberList":[
-{
-"idx":${tmp.RRMPolicyMember_id},
-"mcc":${tmp.mcc},
-"mnc":${tmp.mnc},
-"sNSSAI":${tmp.payload.sNSSAI}}
-]
-}
-]
-}
-}
-]
-}
-]
-}
-}
\ No newline at end of file
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 45632ff2..52db8df3 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,5 +1,6 @@
 {
 "payload":{
+"ran-inventory":{
 "ran-slices":[
 {
 "rannfnssiid":${tmp.payload.RANNFNSSIId},
@@ -20,8 +21,9 @@
 }
 ],
 "subnetStatus":"ACTIVE",
-"sliceType":"eMBB"
+"slicetype":"eMBB"
 }
 ]
 }
-}
\ No newline at end of file
+}
+}
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
index 9296b7fb..9eb0723d 100644
--- 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
@@ -1,42 +1,30 @@
 {
+ "inputParameters":{
+   "idNearRTRIC":${tmp.nearRTRICId},
+   "mcc":${tmp.mcc},
+    "mnc":${tmp.mnc}
+   },
 "payload": {
-"NearRTRIC": [
-{
-"idNearRTRIC": ${tmp.nearRTRICId},
-"attributes":{
-"ranNFNSSIIdList":[
-${tmp.ranNFNSSIListEntry}
-],
-"pLMNInfoList":[
-{
-"mcc":${tmp.mcc},
-"mnc":${tmp.mnc},
 "sNSSAIList":[
 {
 "sNssai":${tmp.payload.sNSSAI},
 "status":"ACTIVE",
 "configData": [
 {
-"configParameter":dLThptPerSlice,
-"configValue":${tmp.dLThptPerSlice}
+"configParameter":"dLThptPerSlice",
+"configValue":${tmp.nearRTRIC.dLThptPerSlice}
 },
 {
-"configParameter":uLThptPerSlice,
-"configValue":${tmp.uLThptPerSlice}
+"configParameter":"uLThptPerSlice",
+"configValue":${tmp.nearRTRIC.uLThptPerSlice}
 },
 
 {
-"configParameter":maxNumberOfConns,
-"configValue":${tmp.maxNumberOfConns}
-}
-]
+"configParameter":"maxNumberOfConns",
+"configValue":${tmp.nearRTRIC.maxNumberOfConns}
 }
 ]
 }
 ]
 }
 }
-]
-}
-
-}
\ No newline at end of file