summaryrefslogtreecommitdiffstats
path: root/platform-logic/restapi-templates/src/main
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2021-01-25 15:12:08 +0000
committerGerrit Code Review <gerrit@onap.org>2021-01-25 15:12:08 +0000
commitda0df10fe48ab21a8b4523225ce0fb02acd4c44d (patch)
treefd3253dc5817c7e0a04cf652304f20e27cbcf821 /platform-logic/restapi-templates/src/main
parent133593ad30f5eaa8bddca89c191e334b5d7e8bbd (diff)
parentf28520bb7e8ad6ca22d433c03c57212b2eb4bac5 (diff)
Merge "DG Update and Templates for ranSlice feature"
Diffstat (limited to 'platform-logic/restapi-templates/src/main')
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-GNBCUUPFn.json4
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRCellCU.json4
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRCellDU.json4
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-add-RRMPolicyRatio-NRRIC.json4
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUCP.json16
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUUP.json16
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-DU.json16
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUCP.json30
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUUP.json23
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBDU.json30
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updatenearRTRIC.json27
-rw-r--r--platform-logic/restapi-templates/src/main/json/ranSlice-so-response.json11
12 files changed, 177 insertions, 8 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 12c9aa4b..01defe85 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
@@ -1,7 +1,7 @@
{
"ran-network:RRMPolicyRatio": [
{
- "ran-network:id": "0",
+ "ran-network:id": ${tmp.RRMPolicyRatioID.GNBCUUPFunction},
"ran-network:attributes": {
"ran-network:quotaType": "STRICT",
"ran-network:rRMPolicyMaxRatio": "0",
@@ -10,7 +10,7 @@
"ran-network:resourceType": "DRB",
"ran-network:rRMPolicyMemberList": [
{
- "ran-network:idx": "0",
+ "ran-network:idx": ${prop.ranNetwork.RRMPolicyRatioMemberID},
"ran-network:sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
"ran-network:mcc": ${tmp.mcc},
"ran-network:mnc": ${tmp.mnc}
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 edfac668..df6b7ba0 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
@@ -1,7 +1,7 @@
{
"ran-network:RRMPolicyRatio": [
{
- "ran-network:id": "0",
+ "ran-network:id": ${tmp.RRMPolicyRatioID.NRCellCU},
"ran-network:attributes": {
"ran-network:quotaType": "STRICT",
"ran-network:rRMPolicyMaxRatio": "0",
@@ -10,7 +10,7 @@
"ran-network:resourceType": "RRC Connected Users",
"ran-network:rRMPolicyMemberList": [
{
- "ran-network:idx": "0",
+ "ran-network:idx": ${prop.ranNetwork.RRMPolicyRatioMemberID},
"ran-network:sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
"ran-network:mcc": ${tmp.mcc},
"ran-network:mnc": ${tmp.mnc}
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 c1a219b8..fde85bed 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
@@ -1,7 +1,7 @@
{
"ran-network:RRMPolicyRatio": [
{
- "ran-network:id": "0",
+ "ran-network:id": ${tmp.RRMPolicyRatioID.NRCellDU},
"ran-network:attributes": {
"ran-network:quotaType": "STRICT",
"ran-network:rRMPolicyMaxRatio": "0",
@@ -10,7 +10,7 @@
"ran-network:resourceType": "PRB",
"ran-network:rRMPolicyMemberList": [
{
- "ran-network:idx": "0",
+ "ran-network:idx": ${prop.ranNetwork.RRMPolicyRatioMemberID},
"ran-network:sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
"ran-network:mcc": ${tmp.mcc},
"ran-network:mnc": ${tmp.mnc}
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 8f7de779..ea8c8e5c 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
@@ -1,7 +1,7 @@
{
"ran-network:RRMPolicyRatio": [
{
- "ran-network:id": "0",
+ "ran-network:id": ${tmp.RRMPolicyRatioID.NearRTRIC},
"ran-network:attributes": {
"ran-network:quotaType": "STRICT",
"ran-network:rRMPolicyMaxRatio": "0",
@@ -10,7 +10,7 @@
"ran-network:resourceType": "NRRIC",
"ran-network:rRMPolicyMemberList": [
{
- "ran-network:idx": "0",
+ "ran-network:idx": ${prop.ranNetwork.RRMPolicyRatioMemberID},
"ran-network:sNSSAI": ${payloadJson.input.sliceProfile.sNSSAI},
"ran-network:mcc": ${tmp.mcc},
"ran-network:mnc": ${tmp.mnc}
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
new file mode 100644
index 00000000..f7f84399
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUCP.json
@@ -0,0 +1,16 @@
+{
+ "quotaType": "STRICT",
+ "rRMPolicyDedicatedRatio": ${tmp.rRMPolicyDedicatedRatio.CellCU},
+ "rRMPolicyMaxRatio": 0,
+ "rRMPolicyMemberList": [
+ {
+ "pLMNId": ${tmp.payload.pLMNId},
+ "sNSSAI": ${tmp.payload.sNSSAI}
+ }
+ ],
+ "rRMPolicyMinRatio": 0,
+ "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
new file mode 100644
index 00000000..d3e777b7
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-CUUP.json
@@ -0,0 +1,16 @@
+{
+ "quotaType": "STRICT",
+ "rRMPolicyDedicatedRatio": ${tmp.rRMPolicyDedicatedRatio.CUUP},
+ "rRMPolicyMaxRatio": 0,
+ "rRMPolicyMemberList": [
+ {
+ "pLMNId": ${tmp.payload.pLMNId},
+ "sNSSAI": ${tmp.payload.sNSSAI}
+ }
+ ],
+ "rRMPolicyMinRatio": 0,
+ "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
new file mode 100644
index 00000000..42d66089
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updateRRMPolicy-DU.json
@@ -0,0 +1,16 @@
+{
+ "quotaType": "STRICT",
+ "rRMPolicyDedicatedRatio": ${tmp.rRMPolicyDedicatedRatio.CellDU},
+ "rRMPolicyMaxRatio": 0,
+ "rRMPolicyMemberList": [
+ {
+ "pLMNId": ${tmp.payload.pLMNId},
+ "sNSSAI": ${tmp.payload.sNSSAI}
+ }
+ ],
+ "rRMPolicyMinRatio": 0,
+ "resourceID": "",
+ "resourceType": "PRB",
+ "rrmPolicyID": ${prop.configDB.rrmPolicyID},
+ "sliceType": "eMBB"
+}
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
new file mode 100644
index 00000000..10ab5a39
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUCP.json
@@ -0,0 +1,30 @@
+{
+ "cellCUList": [
+ {
+ "cellLocalId": ${tmp.cellLocalId},
+ "pLMNInfoList": [
+ {
+ "pLMNId": ${tmp.payload.pLMNId},
+ "sNSSAI": {
+ "configData": {
+ "dLThptPerSlice": ${tmp.dLThptPerSlice},
+ "maxNumberOfConns": ${tmp.maxNumberOfConns},
+ "uLThptPerSlice": ${tmp.uLThptPerSlice}
+ },
+ "globalSubscriberId": "",
+ "sNSSAI": ${tmp.payload.sNSSAI},
+ "status": "ACTIVE",
+ "subscriptionServiceType": ""
+ }
+ }
+ ],
+ "resourceType": "RRC Connected Users"
+ }
+ ],
+ "gNBCUName": ${tmp.gNBCUCPList.gNBCUName},
+ "gNBId": ${tmp.gNBCUCPList.gNBId0},
+ "gNBIdLength": ${tmp.gNBCUCPList.gNBIdLength},
+ "nFType": ${tmp.gNBCUCPList.nFType},
+ "nearRTRICId": ${tmp.nearRTRICId},
+ "pLMNId": ${tmp.payload.pLMNId}
+}
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
new file mode 100644
index 00000000..ebadca4a
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBCUUP.json
@@ -0,0 +1,23 @@
+{
+ "gNBCUUPId": ${tmp.gNBCUUPList.gNBCUUPId},
+ "gNBId": ${tmp.gNBCUUPList.gNBId},
+ "gNBIdLength": ${tmp.gNBCUUPList.gNBIdLength},
+ "nearRTRICId": ${tmp.nearRTRICId},
+ "pLMNInfoList": [
+ {
+ "pLMNId": ${tmp.payload.pLMNId},
+ "sNSSAI": {
+ "configData": {
+ "dLThptPerSlice": ${tmp.dLThptPerSlice},
+ "maxNumberOfConns": ${tmp.maxNumberOfConns},
+ "uLThptPerSlice": ${tmp.uLThptPerSlice}
+ },
+ "globalSubscriberId": "",
+ "sNSSAI": ${tmp.payload.sNSSAI},
+ "status": "ACTIVE",
+ "subscriptionServiceType": ""
+ }
+ }
+ ],
+ "resourceType": "DRB"
+}
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
new file mode 100644
index 00000000..4bfe52f8
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updategNBDU.json
@@ -0,0 +1,30 @@
+{
+ "cellDUList": [
+ {
+ "cellLocalId": ${tmp.cellLocalId},
+ "pLMNInfoList": [
+ {
+ "pLMNId": ${tmp.pLMNId},
+ "sNSSAI": {
+ "configData": {
+ "dLThptPerSlice": ${tmp.dLThptPerSlice},
+ "maxNumberOfConns": ${tmp.maxNumberOfConns},
+ "uLThptPerSlice": ${tmp.uLThptPerSlice}
+ },
+ "globalSubscriberId": "",
+ "sNSSAI": ${tmp.payload.sNSSAI},
+ "status": "ACTIVE",
+ "subscriptionServiceType": ""
+ }
+ }
+ ],
+ "resourceType": "PRB"
+ }
+ ],
+ "gNBDUId": ${tmp.gNBDUList.gNBDUId},
+ "gNBDUName": ${tmp.gNBDUName},
+ "gNBId": ${tmp.gNBId},
+ "gNBIdLength": ${tmp.gNBIdLength},
+ "nearRTRICId": ${tmp.nearRTRICId},
+ "pLMNId": ${tmp.pLMNId}
+}
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
new file mode 100644
index 00000000..7f1eb941
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-configDB-updatenearRTRIC.json
@@ -0,0 +1,27 @@
+{
+ "gNBId": ${tmp.gNBId},
+ "nearRTRICId": ${tmp.nearRTRICId},
+ "pLMNInfoList": [
+ {
+ "pLMNId": ${tmp.payload.pLMNId},
+ "sNSSAI": {
+ "configData": {
+ "dLThptPerSlice": ${tmp.nearRTRIC.dLThptPerSlice},
+ "maxNumberOfConns": ${tmp.nearRTRIC.maxNumberOfConns},
+ "uLThptPerSlice": ${tmp.nearRTRIC.uLThptPerSlice}
+ },
+ "globalSubscriberId": "",
+ "sNSSAI": ${tmp.payload.sNSSAI},
+ "status": "ACTIVE",
+ "subscriptionServiceType": ""
+ }
+ }
+ ],
+ "ranNFNSSIList": [
+ ${tmp.ranNFNSSIListEntry}
+ ],
+ "resourceType": "NearRTRIC",
+ "trackingArea": [
+ ${tmp.payload.trackingArea}
+ ]
+}
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
new file mode 100644
index 00000000..a3456e59
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/ranSlice-so-response.json
@@ -0,0 +1,11 @@
+{
+ "status": ${tmp.status},
+ "reason": ${tmp.reason},
+ "requestId": ${tmp.requestID},
+ "action": ${tmp.action},
+ "nfIds": {
+ "CUCPs": ${tmp.CUCPList},
+ "CUUPs": ${tmp.CUUPList},
+ "DUs": ${tmp.DUList}
+ }
+}