Merge "RAN Slice DG - Bug fixes"

7 files changed, 66 insertions, 43 deletions

diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-closed-loop-nearRTRIC-config-patch.json b/platform-logic/restapi-templates/src/main/json/ranSlice-closed-loop-nearRTRIC-config-patch.json
new file mode 100644
index 00000000..d03fff30
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-closed-loop-nearRTRIC-config-patch.json
@@ -0,0 +1,33 @@
+{
+        "ietf-yang-patch:yang-patch": {
+                "patch-id": "ClosedLoopPatch1",
+                "comment": "patch for configuring NearRTRIC SliceProfile ",
+                "edit": [{
+                        "edit-id": "edit1",
+                        "operation": "merge",
+                        "target": "/ran-network:sNSSAIList[ran-network:sNssai='${"tmp.payload.sNSSAI}']",
+                        "value": {
+  "ran-network:sNSSAIList": [
+    {
+      "ran-network:sNssai": ${tmp.payload.sNSSAI},
+      "ran-network:status": "INACTIVE",
+      "ran-network:configData": [
+        {
+          "ran-network:configParameter": "uLThptPerSlice",
+          "ran-network:configValue": ${tmp.uLThptPerSlice}
+        },
+        {
+          "ran-network:configParameter": "dLThptPerSlice",
+          "ran-network:configValue": ${tmp.dLThptPerSlice}
+        },
+	  {
+          "ran-network:configParameter": ${tmp.cellLocalId},
+          "ran-network:configValue": ${tmp.predictedMaxNumberofConns}
+        }
+      ]
+    }
+  ]
+}
+                }]
+        }
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRANSliceInventory.json b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRANSliceInventory.json
index 0a455167..2ae982db 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRANSliceInventory.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRANSliceInventory.json
@@ -1,31 +1,19 @@
 {
-  "isShareable": "string",
-  "nSSAIList": [
-    "string"
-  ],
-  "nsstId": "string",
-  "ranNFNSSIId": "string",
-  "ranNSSIList": [
-    "string"
-  ],
-  "sliceProfilesList": [
-    {
-      "coverageAreaList": [
-        "string"
-      ],
-      "dLThptPerSlice": 0,
-      "latency": 0,
-      "maxNumberofConns": 0,
-      "maxNumberofUEs": 0,
-      "pLMNIdList": "string",
-      "resourceSharingLevel": "string",
-      "sNSSAI": "string",
-      "sliceProfileId": "string",
-      "uEMobilityLevel": "string",
-      "uLThptPerSlice": 0
-    }
-  ],
-  "sliceType": "string",
-  "subnetStatus": "string",
-  "trackingAreaList": "string"
+    "ranNFNSSIId":${tmp.payload.RANNFNSSIId},
+    "nSSAIList":[
+        ${tmp.payload.sNSSAI}
+    ],
+    "sliceProfilesList":[
+        {
+            "sliceProfileId": ${tmp.payload.sliceProfileId},
+            "dLThptPerSlice": ${tmp.dLThptPerSlice},
+            "uLThptPerSlice": ${tmp.uLThptPerSlice},
+            "maxNumberofConns":${tmp.maxNumberOfConns},
+            "sNSSAI":${tmp.payload.sNSSAI},
+            "pLMNIdList":${tmp.payload.pLMNId}
+        }
+    ],
+    "trackingAreaList":${tmp.payload.trackingArea},
+    "subnetStatus":"ACTIVE",
+    "isShareable":${tmp.payload.resourceSharingLevel}
 }
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUCP.json b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUCP.json
index f7f84399..810bf249 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUCP.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUCP.json
@@ -9,7 +9,7 @@
     }
   ],
   "rRMPolicyMinRatio": 0,
-  "resourceID": "",
+  "resourceID": ${tmp.resourceID},
   "resourceType": "RRC Connected Users",
   "rrmPolicyID": ${prop.configDB.rrmPolicyID},
   "sliceType": "eMBB"
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUUP.json b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUUP.json
index d3e777b7..7d0169a7 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUUP.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUUP.json
@@ -9,7 +9,7 @@
     }
   ],
   "rRMPolicyMinRatio": 0,
-  "resourceID": "",
+  "resourceID": ${tmp.resourceID},
   "resourceType": "DRB",
   "rrmPolicyID": ${prop.configDB.rrmPolicyID},
   "sliceType": "eMBB"
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-DU.json b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-DU.json
index 7eedf444..efc6d2b6 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-DU.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-DU.json
@@ -9,7 +9,7 @@
     }
   ],
   "rRMPolicyMinRatio": 0,
-  "resourceID": ${tmp.cellDULocalId},
+  "resourceID": ${tmp.resourceID},
   "resourceType": "PRB",
   "rrmPolicyID": ${prop.configDB.rrmPolicyID},
   "sliceType": "eMBB"
diff --git a/platform-logic/restapi-templates/src/main/json/ranSlice-patch-sNSSAI-status.json b/platform-logic/restapi-templates/src/main/json/ranSlice-patch-sNSSAI-status.json
index 7854e1c2..c3e9fbbd 100644
--- a/platform-logic/restapi-templates/src/main/json/ranSlice-patch-sNSSAI-status.json
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-patch-sNSSAI-status.json
@@ -11,7 +11,7 @@
       "ran-network:sNSSAIList": [
         {
           "ran-network:sNssai": ${tmp.sNSSAI},
-          "ran-network:status": "INACTIVE"
+          "ran-network:status": ${tmp.status}
         }
       ]
 }
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 a3456e59..b2f0814e 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,11 +1,13 @@
 {
-	"status": ${tmp.status},
-	"reason": ${tmp.reason},
-	"requestId": ${tmp.requestID},
-	"action": ${tmp.action},
-	"nfIds": {
-		"CUCPs": ${tmp.CUCPList},
-		"CUUPs": ${tmp.CUUPList},
-		"DUs": ${tmp.DUList}
-	}
-}
+        "status": ${tmp.status},
+        "reason": {
+                ${tmp.reason}
+                },
+        "requestId": ${tmp.requestID},
+        "action": ${tmp.action},
+        "nfIds": {
+                "CUCPs": ${tmp.CUCPList.response},
+                "CUUPs": ${tmp.CUUPList.response},
+                "DUs": ${tmp.DUList.response}
+        }
+}
\ No newline at end of file