Additional DG Updates Bug fixes RANSlice feature

DG updates and bug fixes for RANSlice feature

Issue-ID: CCSDK-3112
SIgned-off-by: SandeepLinux <Sandeep.Shah@ibm.com>
Change-Id: I7d06fa0e27c64723ee51b1ab9b7679e2f36f91ce

8 files changed, 85 insertions, 23 deletions

diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-GNBCUUPFn.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-GNBCUUPFn.json
index 01defe85..3668ad5f 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-GNBCUUPFn.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-GNBCUUPFn.json
@@ -4,8 +4,8 @@
       "ran-network:id": ${tmp.RRMPolicyRatioID.GNBCUUPFunction},
       "ran-network:attributes": {
         "ran-network:quotaType": "STRICT",
-        "ran-network:rRMPolicyMaxRatio": "0",
-        "ran-network:rRMPolicyMinRatio": "0",
+        "ran-network:rRMPolicyMaxRatio": ${tmp.rRMPolicyDedicatedRatio.CUUP},
+        "ran-network:rRMPolicyMinRatio": ${tmp.rRMPolicyDedicatedRatio.CUUP},
         "ran-network:rRMPolicyDedicatedRatio": ${tmp.rRMPolicyDedicatedRatio.CUUP},
         "ran-network:resourceType": "DRB",
         "ran-network:rRMPolicyMemberList": [
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRCellCU.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRCellCU.json
index df6b7ba0..a7e094be 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRCellCU.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRCellCU.json
@@ -4,8 +4,8 @@
       "ran-network:id": ${tmp.RRMPolicyRatioID.NRCellCU},
       "ran-network:attributes": {
         "ran-network:quotaType": "STRICT",
-        "ran-network:rRMPolicyMaxRatio": "0",
-        "ran-network:rRMPolicyMinRatio": "0",
+        "ran-network:rRMPolicyMaxRatio": ${tmp.rRMPolicyDedicatedRatio.CUUP},
+        "ran-network:rRMPolicyMinRatio": ${tmp.rRMPolicyDedicatedRatio.CUUP},
         "ran-network:rRMPolicyDedicatedRatio": ${tmp.rRMPolicyDedicatedRatio.CellCU},
         "ran-network:resourceType": "RRC Connected Users",
         "ran-network:rRMPolicyMemberList": [
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRCellDU.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRCellDU.json
index fde85bed..6212f2a5 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRCellDU.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRCellDU.json
@@ -4,8 +4,8 @@
       "ran-network:id": ${tmp.RRMPolicyRatioID.NRCellDU},
       "ran-network:attributes": {
         "ran-network:quotaType": "STRICT",
-        "ran-network:rRMPolicyMaxRatio": "0",
-        "ran-network:rRMPolicyMinRatio": "0",
+        "ran-network:rRMPolicyMaxRatio": ${tmp.rRMPolicyDedicatedRatio.CUUP},
+        "ran-network:rRMPolicyMinRatio": ${tmp.rRMPolicyDedicatedRatio.CUUP},
         "ran-network:rRMPolicyDedicatedRatio": ${tmp.rRMPolicyDedicatedRatio.CellDU},
         "ran-network:resourceType": "PRB",
         "ran-network:rRMPolicyMemberList": [
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRRIC.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRRIC.json
index ea8c8e5c..54e9e3cb 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRRIC.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRRIC.json
@@ -4,8 +4,8 @@
       "ran-network:id": ${tmp.RRMPolicyRatioID.NearRTRIC},
       "ran-network:attributes": {
         "ran-network:quotaType": "STRICT",
-        "ran-network:rRMPolicyMaxRatio": "0",
-        "ran-network:rRMPolicyMinRatio": "0",
+        "ran-network:rRMPolicyMaxRatio": ${tmp.rRMPolicyDedicatedRatio.CUUP},
+        "ran-network:rRMPolicyMinRatio": ${tmp.rRMPolicyDedicatedRatio.CUUP},
         "ran-network:rRMPolicyDedicatedRatio": ${tmp.rRMPolicyDedicatedRatio.CellDU},
         "ran-network:resourceType": "NRRIC",
         "ran-network:rRMPolicyMemberList": [
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-sliceProfile-NRRIC.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-sliceProfile-NRRIC.json
index 3997af76..0d3fee36 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-sliceProfile-NRRIC.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-sliceProfile-NRRIC.json
@@ -1,18 +1,18 @@
 {
   "ran-network:sliceProfilesList": [
     {
-      "ran-network:sliceProfileId": ${tmp.sliceProfileId},
-      "ran-network:sNSSAI": ${tmp.sNSSAI},
-      "ran-network:maxNumberofUEs": ${tmp.maxNumberofUEs},
-      "ran-network:latency": ${tmp.latency},
-      "ran-network:uLThptPerSlice": ${tmp.uLThptPerSlice},
-      "ran-network:dLThptPerSlice": ${tmp.dLThptPerSlice},
-      "ran-network:maxNumberofConns": ${tmp.maxNumberofConns},
-      "ran-network:uEMobilityLevel": ${tmp.uEMobilityLevel},
+      "ran-network:sliceProfileId": ${payloadJson.input.sliceProfile.sliceProfileId},
+      "ran-network:sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
+      "ran-network:maxNumberofUEs": ${payloadJson.input.sliceProfile.maxNumberofUEs},
+      "ran-network:latency": ${payloadJson.input.sliceProfile.latency},
+      "ran-network:uLThptPerSlice": ${tmp.nearRTRIC.uLThptPerSlice},
+      "ran-network:dLThptPerSlice": ${tmp.nearRTRIC.dLThptPerSlice},
+      "ran-network:maxNumberofConns": ${tmp.nearRTRIC.maxNumberOfConns},
+      "ran-network:uEMobilityLevel": ${payloadJson.input.sliceProfile.uEMobilityLevel},
       "ran-network:coverageAreaList": [
         ${tmp.trackingArea}
       ],
-      "ran-network:resourceSharingLevel": ${tmp.resourceSharingLevel}
+      "ran-network:resourceSharingLevel": ${payloadJson.input.sliceProfile.resourceSharingLevel}
     }
   ]
 }
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updatenearRTRIC.json b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updatenearRTRIC.json
index 7f1eb941..b3dd73d9 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updatenearRTRIC.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updatenearRTRIC.json
@@ -5,13 +5,15 @@
     {
       "pLMNId": ${tmp.payload.pLMNId},
       "sNSSAI": {
-        "configData": {
-          "dLThptPerSlice": ${tmp.nearRTRIC.dLThptPerSlice},
-          "maxNumberOfConns": ${tmp.nearRTRIC.maxNumberOfConns},
-          "uLThptPerSlice": ${tmp.nearRTRIC.uLThptPerSlice}
-        },
+        "configData": [
+          {
+            "dLThptPerSlice": ${tmp.nearRTRIC.dLThptPerSlice},
+            "maxNumberOfConns": ${tmp.nearRTRIC.maxNumberOfConns},
+            "uLThptPerSlice": ${tmp.nearRTRIC.uLThptPerSlice}
+          },
+        ],
         "globalSubscriberId": "",
-        "sNSSAI": ${tmp.payload.sNSSAI},
+        "sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
         "status": "ACTIVE",
         "subscriptionServiceType": ""
       }
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-intelligent-update-nSSAIEntry-CUUPFunction.json b/platform-logic/restapi-templates/src/main/json/ranSlice-intelligent-update-nSSAIEntry-CUUPFunction.json
new file mode 100644
index 00000000..c28a9149
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-intelligent-update-nSSAIEntry-CUUPFunction.json
@@ -0,0 +1,30 @@
+{
+  "ran-network:sNSSAIList": [
+    {
+      "ran-network:sNssai": ${payloadJson.input.sliceProfile.sNSSAI},
+      "ran-network:status": "Active",
+      "ran-network:configData": [
+        {
+          "ran-network:configParameter": "maxNumberOfConns",
+          "ran-network:configValue": ${tmp.maxNumberOfConns}
+        },
+        {
+          "ran-network:configParameter": "uLThptPerSlice",
+          "ran-network:configValue": ""
+        },
+        {
+          "ran-network:configParameter": "dLThptPerSlice",
+          "ran-network:configValue": ""
+        },
+        {
+          "ran-network:configParameter": "predictedMaxNumberofConns",
+          "ran-network:configValue": ${tmp.predictedMaxNumberofConns}
+        },
+        {
+          "ran-network:configParameter": "lastUpdatedTS",
+          "ran-network:configValue": ${tmp.lastUpdatedTS}
+        }
+      ]
+    }
+  ]
+}
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-intelligent-update-nSSAIEntry-NRCellCU.json b/platform-logic/restapi-templates/src/main/json/ranSlice-intelligent-update-nSSAIEntry-NRCellCU.json
new file mode 100644
index 00000000..c28a9149
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-intelligent-update-nSSAIEntry-NRCellCU.json
@@ -0,0 +1,30 @@
+{
+  "ran-network:sNSSAIList": [
+    {
+      "ran-network:sNssai": ${payloadJson.input.sliceProfile.sNSSAI},
+      "ran-network:status": "Active",
+      "ran-network:configData": [
+        {
+          "ran-network:configParameter": "maxNumberOfConns",
+          "ran-network:configValue": ${tmp.maxNumberOfConns}
+        },
+        {
+          "ran-network:configParameter": "uLThptPerSlice",
+          "ran-network:configValue": ""
+        },
+        {
+          "ran-network:configParameter": "dLThptPerSlice",
+          "ran-network:configValue": ""
+        },
+        {
+          "ran-network:configParameter": "predictedMaxNumberofConns",
+          "ran-network:configValue": ${tmp.predictedMaxNumberofConns}
+        },
+        {
+          "ran-network:configParameter": "lastUpdatedTS",
+          "ran-network:configValue": ${tmp.lastUpdatedTS}
+        }
+      ]
+    }
+  ]
+}