RanSlice DG, Templates - Integration Testing Fixes

Issue-ID: CCSDK-3314

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

15 files changed, 45 insertions, 45 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 3668ad5f..4c6f2c40 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
@@ -11,7 +11,7 @@
         "ran-network:rRMPolicyMemberList": [
           {
             "ran-network:idx": ${prop.ranNetwork.RRMPolicyRatioMemberID},
-            "ran-network:sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
+            "ran-network:sNSSAI": ${tmp.payload.sNSSAI},
             "ran-network:mcc": ${tmp.mcc},
             "ran-network:mnc": ${tmp.mnc}
           }
@@ -19,4 +19,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
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 a7e094be..a70b73bd 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
@@ -11,7 +11,7 @@
         "ran-network:rRMPolicyMemberList": [
           {
             "ran-network:idx": ${prop.ranNetwork.RRMPolicyRatioMemberID},
-            "ran-network:sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
+            "ran-network:sNSSAI": ${tmp.payload.sNSSAI},
             "ran-network:mcc": ${tmp.mcc},
             "ran-network:mnc": ${tmp.mnc}
           }
@@ -19,4 +19,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
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 6212f2a5..a8bc02e0 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
@@ -11,7 +11,7 @@
         "ran-network:rRMPolicyMemberList": [
           {
             "ran-network:idx": ${prop.ranNetwork.RRMPolicyRatioMemberID},
-            "ran-network:sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
+            "ran-network:sNSSAI": ${tmp.payload.sNSSAI},
             "ran-network:mcc": ${tmp.mcc},
             "ran-network:mnc": ${tmp.mnc}
           }
@@ -19,4 +19,4 @@
       }
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-GNBCUUPFn.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-GNBCUUPFn.json
index 625fe8d4..d4603c1f 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-GNBCUUPFn.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-GNBCUUPFn.json
@@ -5,7 +5,7 @@
       "mnc": ${tmp.mnc},
       "sNSSAIList": [
         {
-          "sNssai": ${payloadJson.input.sliceProfile.sNSSAI},
+          "sNssai": ${tmp.payload.sNSSAI},
           "status": "INACTIVE",
           "configData": [
             {
@@ -25,4 +25,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-NRCellCU.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-NRCellCU.json
index 625fe8d4..d4603c1f 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-NRCellCU.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-NRCellCU.json
@@ -5,7 +5,7 @@
       "mnc": ${tmp.mnc},
       "sNSSAIList": [
         {
-          "sNssai": ${payloadJson.input.sliceProfile.sNSSAI},
+          "sNssai": ${tmp.payload.sNSSAI},
           "status": "INACTIVE",
           "configData": [
             {
@@ -25,4 +25,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-NRCellDU.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-NRCellDU.json
index 625fe8d4..d4603c1f 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-NRCellDU.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-get-PLMNInfoListEntry-NRCellDU.json
@@ -5,7 +5,7 @@
       "mnc": ${tmp.mnc},
       "sNSSAIList": [
         {
-          "sNssai": ${payloadJson.input.sliceProfile.sNSSAI},
+          "sNssai": ${tmp.payload.sNSSAI},
           "status": "INACTIVE",
           "configData": [
             {
@@ -25,4 +25,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-GNBCUUPFn.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-GNBCUUPFn.json
index 3e66a3a3..284b99d3 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-GNBCUUPFn.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-GNBCUUPFn.json
@@ -1,7 +1,7 @@
 {
   "ran-network:sNSSAIList": [
     {
-      "ran-network:sNssai": ${payloadJson.input.sliceProfile.sNSSAI},
+      "ran-network:sNssai": ${tmp.payload.sNSSAI},
       "ran-network:status": "Active",
       "ran-network:configData": [
         {
@@ -19,4 +19,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-NRCellCU.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-NRCellCU.json
index 3e66a3a3..284b99d3 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-NRCellCU.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-NRCellCU.json
@@ -1,7 +1,7 @@
 {
   "ran-network:sNSSAIList": [
     {
-      "ran-network:sNssai": ${payloadJson.input.sliceProfile.sNSSAI},
+      "ran-network:sNssai": ${tmp.payload.sNSSAI},
       "ran-network:status": "Active",
       "ran-network:configData": [
         {
@@ -19,4 +19,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-NRCellDU.json b/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-NRCellDU.json
index 3e66a3a3..284b99d3 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-NRCellDU.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-add-nSSAIEntry-NRCellDU.json
@@ -1,7 +1,7 @@
 {
   "ran-network:sNSSAIList": [
     {
-      "ran-network:sNssai": ${payloadJson.input.sliceProfile.sNSSAI},
+      "ran-network:sNssai": ${tmp.payload.sNSSAI},
       "ran-network:status": "Active",
       "ran-network:configData": [
         {
@@ -19,4 +19,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
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 0d3fee36..8e1dd158 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
@@ -2,7 +2,7 @@
   "ran-network:sliceProfilesList": [
     {
       "ran-network:sliceProfileId": ${payloadJson.input.sliceProfile.sliceProfileId},
-      "ran-network:sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
+      "ran-network:sNSSAI": ${tmp.payload.sNSSAI},
       "ran-network:maxNumberofUEs": ${payloadJson.input.sliceProfile.maxNumberofUEs},
       "ran-network:latency": ${payloadJson.input.sliceProfile.latency},
       "ran-network:uLThptPerSlice": ${tmp.nearRTRIC.uLThptPerSlice},
@@ -15,4 +15,4 @@
       "ran-network:resourceSharingLevel": ${payloadJson.input.sliceProfile.resourceSharingLevel}
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUCP.json b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUCP.json
index 10ab5a39..e54bc953 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUCP.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUCP.json
@@ -5,17 +5,17 @@
       "pLMNInfoList": [
         {
           "pLMNId": ${tmp.payload.pLMNId},
-          "sNSSAI": {
-            "configData": {
+          "sNSSAI": [{
+            "configData":[ {
               "dLThptPerSlice": ${tmp.dLThptPerSlice},
               "maxNumberOfConns": ${tmp.maxNumberOfConns},
               "uLThptPerSlice": ${tmp.uLThptPerSlice}
-            },
+            }],
             "globalSubscriberId": "",
             "sNSSAI": ${tmp.payload.sNSSAI},
             "status": "ACTIVE",
             "subscriptionServiceType": ""
-          }
+          }]
         }
       ],
       "resourceType": "RRC Connected Users"
@@ -27,4 +27,4 @@
   "nFType": ${tmp.gNBCUCPList.nFType},
   "nearRTRICId": ${tmp.nearRTRICId},
   "pLMNId": ${tmp.payload.pLMNId}
-}
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUUP.json b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUUP.json
index ebadca4a..392475f1 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUUP.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUUP.json
@@ -6,18 +6,18 @@
   "pLMNInfoList": [
     {
       "pLMNId": ${tmp.payload.pLMNId},
-      "sNSSAI": {
-        "configData": {
+      "sNSSAI":[ {
+        "configData":[ {
           "dLThptPerSlice": ${tmp.dLThptPerSlice},
           "maxNumberOfConns": ${tmp.maxNumberOfConns},
           "uLThptPerSlice": ${tmp.uLThptPerSlice}
-        },
+        }],
         "globalSubscriberId": "",
         "sNSSAI": ${tmp.payload.sNSSAI},
         "status": "ACTIVE",
         "subscriptionServiceType": ""
-      }
+      }]
     }
   ],
   "resourceType": "DRB"
-}
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBDU.json b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBDU.json
index 4bfe52f8..cfce5690 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBDU.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBDU.json
@@ -5,17 +5,18 @@
       "pLMNInfoList": [
         {
           "pLMNId": ${tmp.pLMNId},
-          "sNSSAI": {
-            "configData": {
+          "sNSSAI":[ {
+            "configData": [{
               "dLThptPerSlice": ${tmp.dLThptPerSlice},
               "maxNumberOfConns": ${tmp.maxNumberOfConns},
               "uLThptPerSlice": ${tmp.uLThptPerSlice}
-            },
+            }],
             "globalSubscriberId": "",
             "sNSSAI": ${tmp.payload.sNSSAI},
             "status": "ACTIVE",
             "subscriptionServiceType": ""
           }
+         ]
         }
       ],
       "resourceType": "PRB"
@@ -27,4 +28,4 @@
   "gNBIdLength": ${tmp.gNBIdLength},
   "nearRTRICId": ${tmp.nearRTRICId},
   "pLMNId": ${tmp.pLMNId}
-}
+}
\ No newline at end of file
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 8b027529..01402db0 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
@@ -1,21 +1,22 @@
 {
-  "gNBId": ${tmp.gNBId},
+   "gNBId": ${tmp.gNBId},
   "nearRTRICId": ${tmp.nearRTRICId},
   "pLMNInfoList": [
     {
       "pLMNId": ${tmp.payload.pLMNId},
-      "sNSSAI": {
-        "configData":
+      "sNSSAI": [{
+        "configData": [
           {
             "dLThptPerSlice": ${tmp.nearRTRIC.dLThptPerSlice},
             "maxNumberOfConns": ${tmp.nearRTRIC.maxNumberOfConns},
             "uLThptPerSlice": ${tmp.nearRTRIC.uLThptPerSlice}
-          },
+          }],
         "globalSubscriberId": "",
-        "sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
+        "sNSSAI": ${tmp.payload.sNSSAI},
         "status": "ACTIVE",
         "subscriptionServiceType": ""
       }
+]
     }
   ],
   "ranNFNSSIList": [
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-so-response.json b/platform-logic/restapi-templates/src/main/json/ranSlice-so-response.json
index b2f0814e..28c32e37 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-so-response.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-so-response.json
@@ -1,13 +1,11 @@
 {
         "status": ${tmp.status},
-        "reason": {
-                ${tmp.reason}
-                },
+        "reason": {"message":${tmp.reason}},
         "requestId": ${tmp.requestID},
         "action": ${tmp.action},
         "nfIds": {
-                "CUCPs": ${tmp.CUCPList.response},
-                "CUUPs": ${tmp.CUUPList.response},
-                "DUs": ${tmp.DUList.response}
+                "CUCPs": ${tmp.CUCPList},
+                "CUUPs": ${tmp.CUUPList},
+                "DUs": ${tmp.DUList}
         }
 }
\ No newline at end of file