X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fsrc%2Fmain%2Fproperties%2Fran-slice-api-dg.properties;h=76f34c31af4cfa8d69e9ee535c0bf453ca6b80c4;hb=2b91b0229dce35744d0604fdd129d4adff3637aa;hp=74aaf57b94abd45957145122b689d7d1abf43e3b;hpb=aef48f9b29b90e5d9ee35fc0c2527af8375fdcc8;p=ccsdk%2Fdistribution.git

diff --git a/odlsli/src/main/properties/ran-slice-api-dg.properties b/odlsli/src/main/properties/ran-slice-api-dg.properties
index 74aaf57b..76f34c31 100644
--- a/odlsli/src/main/properties/ran-slice-api-dg.properties
+++ b/odlsli/src/main/properties/ran-slice-api-dg.properties
@@ -45,6 +45,8 @@ restapi.ranSlice.configDB.updateRANSliceInventory.template=ranSlice-configDB-upd
 
 # Restconf URLs without Netconf Mount of Ran Simulator TO BE FINALIZED
 restapi.config=/restconf/config
+
+# Also to be used for closed loop slicing
 restapi.addSliceProfile.ToNearRTRIC=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/attributes/sliceProfilesList/{sliceProfileId}
 restapi.addRRMPolicyRatio.ToNearRTRIC=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/attributes/RRMPolicyRatio/{id}
 restapi.addRRMPolicyRatio.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/RRMPolicyRatio/{id}
@@ -54,15 +56,37 @@ restapi.addnSSAIEntry.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRT
 restapi.addRRMPolicyRatio.ToGNBCUUPFn=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/RRMPolicyRatio/{id}
 restapi.addPLMNInfoListEntry.ToGNBCUUPFn=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/pLMNInfoList/{mcc}/{mnc}
 restapi.getPLMNInfoListEntry.ToGNBCUUPFn=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/pLMNInfoList/{mcc}/{mnc}
+# for Intelligent slicing
 restapi.addnSSAIEntry.ToGNBCUUPFn=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
 restapi.addRRMPolicyRatio.ToNRCellCU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/RRMPolicyRatio/{id}
 restapi.addPLMNInfoListEntry.ToNRCellCU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}
 restapi.getPLMNInfoListEntry.ToNRCellCU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}
+# Use also for Intelligent Slicing
 restapi.addnSSAIEntry.ToNRCellCU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
 
+#Patch RAN Slice APIs
+restapi.patchPLMNInfoListEntry.ToNRCellCU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}
+restapi.RRMPolicyRatioEntry.ToNRCellCU=restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/
+restapi.patchPLMNInfoListEntry.ToGNBCUUP=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/pLMNInfoList/{mcc}/{mnc}
+restapi.RRMPolicyRatioEntry.ToGNBCUUP=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes
+restapi.patchPLMNInfoListEntry.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/pLMNInfoList/{mcc}/{mnc}
+restapi.RRMPolicyRatioEntry.ToGNBDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes
+
+#Terminate RAN Slice APIs
+restapi.terminateSNSSAIEntry.ToNRCellCU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
+restapi.removeRRMPolicyRatio.ToNRCellCU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/RRMPolicyRatio/{id}
+restapi.removeRRMPolicyMember.ToNRCellCU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/RRMPolicyRatio/{id}/attributes/rRMPolicyMemberList/{idx}
+restapi.terminateSNSSAIEntry.ToCUUP=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
+restapi.removeRRMPolicyRatio.ToCUUP=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/RRMPolicyRatio/{id}
+restapi.removeRRMPolicyMember.ToCUUP=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/RRMPolicyRatio/{id}/attributes/rRMPolicyMemberList/{idx}
+restapi.terminateSNSSAIEntry.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
+restapi.removeRRMPolicyRatio.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/attributes/RRMPolicyRatio/{id}
+restapi.removeRRMPolicyMember.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/attributes/RRMPolicyRatio/{id}/attributes/rRMPolicyMemberList/{idx}
+
 
 # Restconf URLs with Netconf Mount of Ran Simulator TO BE FINALIZED
 
+# Also to be used for closed loop slicing
 restapi.addSliceProfile.ToNearRTRIC.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/attributes/sliceProfilesList/{sliceProfileId}
 restapi.addRRMPolicyRatio.ToNearRTRIC.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/attributes/RRMPolicyRatio/{id}
 restapi.addRRMPolicyRatio.ToNRCellDU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/RRMPolicyRatio/{id}
@@ -72,19 +96,79 @@ restapi.addnSSAIEntry.ToNRCellDU.ransim-mounted=/restconf/config/network-topolog
 restapi.addRRMPolicyRatio.ToGNBCUUPFn.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/RRMPolicyRatio/{id}
 restapi.addPLMNInfoListEntry.ToGNBCUUPFn.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/pLMNInfoList/{mcc}/{mnc}
 restapi.getPLMNInfoListEntry.ToGNBCUUPFn.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/pLMNInfoList/{mcc}/{mnc}
+# for Intelligent slicing
 restapi.addnSSAIEntry.ToGNBCUUPFn.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
 restapi.addRRMPolicyRatio.ToNRCellCU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/RRMPolicyRatio/{id}
 restapi.addPLMNInfoListEntry.ToNRCellCU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}
 restapi.getPLMNInfoListEntry.ToNRCellCU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}
+# Use also for Intelligent Slicing
 restapi.addnSSAIEntry.ToNRCellCU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
 
+#Patch APIs - with Netconf Mount of Ran Simulator 
+restapi.patchPLMNInfoListEntry.ToNRCellCU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}
+restapi.RRMPolicyRatioEntry.ToNRCellCU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes
+restapi.patchPLMNInfoListEntry.ToGNBCUUP.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/pLMNInfoList/{mcc}/{mnc}
+restapi.RRMPolicyRatioEntry.ToGNBCUUP.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes
+restapi.patchPLMNInfoListEntry.ToNRCellDU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/pLMNInfoList/{mcc}/{mnc}
+restapi.RRMPolicyRatioEntry.ToGNBDU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes
+
+#Terminate RAN Slice - with Netconf Mount of Ran Simulator 
+
+restapi.terminateSNSSAIEntry.ToNRCellCU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
+restapi.removeRRMPolicyRatio.ToNRCellCU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/RRMPolicyRatio/{id}
+restapi.removeRRMPolicyMember.ToNRCellCU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/11/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/RRMPolicyRatio/{id}/attributes/rRMPolicyMemberList/{idx}
+restapi.terminateSNSSAIEntry.ToCUUP.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
+restapi.removeRRMPolicyRatio.ToCUUP.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/RRMPolicyRatio/{id}
+restapi.removeRRMPolicyMember.ToCUUP.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUUPFunction/{idGNBCUUPFunction}/attributes/RRMPolicyRatio/{id}/attributes/rRMPolicyMemberList/{idx}
+restapi.terminateSNSSAIEntry.ToNRCellDU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
+restapi.removeRRMPolicyRatio.ToNRCellDU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/RRMPolicyRatio/{id}
+restapi.removeRRMPolicyMember.ToNRCellDU.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/RRMPolicyRatio/{id}/attributes/rRMPolicyMemberList/{idx}
+
 #URLs for ConfigDB TO BE FINALIZED
-configdb.url=http://10.12.5.120:8080/api/sdnc-config-db/v4
+configdb.url=http://10.31.4.44:8080/api/sdnc-config-db/v4
+restapi.configdb.getNearRTRICsFromTrackingArea=/nearrtric-list/{trackingArea}
 restapi.configdb.getListOfCells=/cell-list/{trackingArea}
 restapi.configdb.getCUCellsOfRIC=/cu-cell-list/{nearRTRICId}
 restapi.configdb.getDUCellsOfRIC=/du-cell-list/{nearRTRICId}
-restapi.configdb.getNearRTRICsFromTrackingArea=/nearrtric-list/{trackingArea}
 restapi.configdb.updateRANSliceInventory=/ranslice-details
+restapi.configdb.updateRRMPolicy=/rrmPolicy
+restapi.configdb.updatenearRTRIC=/nearRTRIC
+restapi.configdb.updategNBCUCP=/gNBCUCP
+restapi.configdb.updategNBCUUP=/gNBCUUP
+restapi.configdb.updategNBDU=/gNBDU
+restapi.configdb.getplmn=/plmn/{sliceProfileId}
+
+restapi.configdb.getNearRTRICByNSSI=/nearRTRICByNSSI/{ranNFNSSIId}
+restapi.configdb.getNearRTRICById=/nearRTRICById/{nearRTRICId}
 
 #ConfigDB Templates for RestAPI calls against ConfigDB
 restapi.configDB.updateRANSliceInventory.templatefile=ranSlice-configDB-updateRANSliceInventory.json
+restapi.configDB.updateRRMPolicy.CUCP.templatefile=ranSlice-configDB-updateRRMPolicy-CUCP.json
+restapi.configDB.updateRRMPolicy.CUUP.templatefile=ranSlice-configDB-updateRRMPolicy-CUUP.json
+restapi.configDB.updateRRMPolicy.DU.templatefile=ranSlice-configDB-updateRRMPolicy-DU.json
+restapi.configDB.updatenearRTRIC.templatefile=ranSlice-configDB-updatenearRTRIC.json
+restapi.configDB.updategNBCUCP.templatefile=ranSlice-configDB-updategNBCUCP.json
+restapi.configDB.updategNBCUUP.templatefile=ranSlice-configDB-updategNBCUUP.json
+restapi.configDB.updategNBDU.templatefile=ranSlice-configDB-updategNBDU.json
+
+
+#ConfigDB Related Properties
+#RRMPolicyID to be incremented by 1, anytime neew RRMPolicy is added
+configDB.rrmPolicyID=1
+
+#RAN Simulator Related Properties
+#The below RRMPolicy and PolicyMemberList ID's to be incremented by 1
+#anytime new RRMPolicy or PolicyMember is added to the list
+ranNetwork.RRMPolicyRatioMemberID=1
+
+#RANSlice Related Properties
+nrcelldu.TotalPRBsPerCell=10240
+nrcellcu.maxNumberOfConnsPerCell=5120
+cuupfunction.DRBFactor=0.6
+cuupfunction.maxNumberOfDRBsPerCUUP=10240
+
+#SO Callback URLs
+restapi.so.callbackURL=http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/AsyncSdnrResponse/{requestId}
+restapi.so.authorization=YXBpaEJwbW46cGFzc3dvcmQxJA==
+restapi.so.user=mso_admin
+restapi.so.password=password1$