Merge "DG's, templates, properties for ranSlice feature"

1 files changed, 55 insertions, 56 deletions

diff --git a/odlsli/src/main/properties/ran-slice-api-dg.properties b/odlsli/src/main/properties/ran-slice-api-dg.properties
index dfdc831b..74aaf57b 100644
--- a/odlsli/src/main/properties/ran-slice-api-dg.properties
+++ b/odlsli/src/main/properties/ran-slice-api-dg.properties
@@ -1,9 +1,9 @@
 restapi.templateDir=/opt/onap/ccsdk/restapi/templates
-controller.url=http://sdnc.onap:8282
+controller.url=http://sdnc-oam.onap:8282
 controller.user=admin
 controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 ransim-mounted=false
-configdb-deployed=false
+configdb-deployed=true
 
 restapi.trustStoreFileName=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks
 restapi.trustStorePassword=adminadmin
@@ -27,65 +27,64 @@ ranSlice.terminateRANSliceInstance.target=
 ranSlice.determineRANSliceResources.target=
 ranSlice.configNotification.target=
 
-# Templates TO BE FINALIZED
-restapi.configureNearRTRIC.templatefile=ranSlice-configureNearRTRIC.json
-restapi.instantiateRANSlice.templatefile=ranSlice-instantiateRANSlice.json
-restapi.configureRANSliceInstance.templatefile=ranSlice-configureRANSliceInstance.json
-restapi.configureCU.templatefile=ranSlice-configureCU.json
-restapi.configureDU.templatefile=ranSlice-configureDU.json
-restapi.activateRANSliceInstance.templatefile=ranSlice-activateRANSliceInstance.json
-restapi.deactivateRANSliceInstance.templatefile=ranSlice-deactivateRANSliceInstance.json
-restapi.terminateRANSliceInstance.templatefile=ranSlice-terminateRANSliceInstance.json
-restapi.determineRANSliceResources.templatefile=ranSlice-determineRANSliceResources.json
-restapi.configNotification.templatefile=ranSlice-configNotification.json
+# Restconf Templates TO BE FINALIZED
 
-restapi.dmaap-publish.templatefile=ranSlice-dmaap-publish-template.json
-restapi.dmaap-publish-config-response.template=ranSlice-dmaap-publish-config-response-template.json
-restapi.dmaap-publish-modifyconfig-payload.template=ranSlice-dmaap-publish-modifyconfig-resp-payload-template.json
-restapi.dmaap-publish-modifyconfiganr-payload.template=ranSlice-dmaap-publish-modifyconfiganr-resp-payload-template.json
+restapi.ranSlice.AddGet.PLMNInfoListEntry.GNBCUUPFn.templatefile=ranSlice-add-get-PLMNInfoListEntry-GNBCUUPFn.json
+restapi.ranSlice.AddGet.PLMNInfoListEntry.NRCellCU.templatefile=ranSlice-add-get-PLMNInfoListEntry-NRCellCU.json
+restapi.ranSlice.AddGet.PLMNInfoListEntry.NRCellDU.templatefile=ranSlice-add-get-PLMNInfoListEntry-NRCellDU.json
+restapi.ranSlice.add.nSSAIEntry.GNBCUUPFn.template=ranSlice-add-nSSAIEntry-GNBCUUPFn.json
+restapi.ranSlice.add.nSSAIEntry.NRCellCU.template=ranSlice-add-nSSAIEntry-NRCellCU.json
+restapi.ranSlice.add.nSSAIEntry.NRCellDU.template=ranSlice-add-nSSAIEntry-NRCellDU.json
+restapi.ranSlice.add.RRMPolicyRatio.GNBCUUPFn.template==ranSlice-add-RRMPolicyRatio-GNBCUUPFn.json
+restapi.ranSlice.add.RRMPolicyRatio.NRCellCU.template=ranSlice-add-RRMPolicyRatio-NRCellCU.json
+restapi.ranSlice.add.RRMPolicyRatio.NRCellDU.template=ranSlice-add-RRMPolicyRatio-NRCellDU.json
+restapi.ranSlice.add.RRMPolicyRatio.NRRIC.template=ranSlice-add-RRMPolicyRatio-NRRIC.json
+restapi.ranSlice.add.sliceProfile.NRRIC.template=ranSlice-add-sliceProfile-NRRIC.json
+restapi.ranSlice.configDB.updateRANSliceInventory.template=ranSlice-configDB-updateRANSliceInventory.json
 
-# URLs without Netconf Mount of Ran Simulator TO BE FINALIZED
+
+# Restconf URLs without Netconf Mount of Ran Simulator TO BE FINALIZED
 restapi.config=/restconf/config
-restapi.radio-access=/restconf/config/ranSlice:radio-access
-restapi.fap-service=/restconf/config/ranSlice:radio-access/fap-service/{alias}
-restapi.x-005b9-lte=/restconf/config/ranSlice:radio-access/fap-service/{alias}/x-0005b9-lte
-restapi.lte-ran-neighbor-list-in-use=/restconf/config/ranSlice:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use
-restapi.lte-ran-neighbor-in-use=/restconf/config/ranSlice:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use/lte-ran-neighbor-list-in-use-lte-cell/{plmnid}/{cid}
+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}
+restapi.addPLMNInfoListEntry.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/pLMNInfoList/{mcc}/{mnc}
+restapi.getPLMNInfoListEntry.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/pLMNInfoList/{mcc}/{mnc}
+restapi.addnSSAIEntry.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
+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}
+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}
+restapi.addnSSAIEntry.ToNRCellCU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBCUCPFunction/{idGNBCUCPFunction}/NRCellCU/{idNRCellCU}/attributes/pLMNInfoList/{mcc}/{mnc}/sNSSAIList/{sNssai}
 
-# URLs with Netconf Mount of Ran Simulator TO BE FINALIZED
-restapi.config.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/
-restapi.radio-access.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/ranSlice:radio-access
-restapi.fap-service.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/ranSlice:radio-access/fap-service/{alias}
-restapi.x-005b9-lte.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/ranSlice:radio-access/fap-service/{alias}/x-0005b9-lte
-restapi.lte-ran-neighbor-list-in-use.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/ranSlice:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use
-restapi.lte-ran-neighbor-in-use.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{pnf-name}/yang-ext:mount/ranSlice:radio-access/fap-service/{alias}/cell-config/lte/lte-ran/lte-ran-neighbor-list-in-use/lte-ran-neighbor-list-in-use-lte-cell/{plmnid}/{cid}
 
-#URLs for ConfigDB TO BE FINALIZED
-restapi.configdb.add-nbrlist-change-per-notif=/createNbr/{cellId}
-configdb.url=http://10.31.3.18:8080/api/sdnc-config-db/v3
-restapi.configdb.patch-pci-for-cell=/modifyPci/{cellId}
-restapi.configdb.patch-ho-for-nbr=/modifyNbrHO/{cellId}/{targetCellId}
+# Restconf URLs with Netconf Mount of Ran Simulator TO BE FINALIZED
 
-#DMAAP Publish TO BE FINALIZED
-dmaap-message-router.url=http://message-router.onap:3904/events
-ranSlice-dmaap.nbrlist-change.topic=/PCI-NOTIF-TOPIC-NGHBR-LIST-CHANGE-INFO
-ranSlice-dmaap-configuration-response.topic=SDNR-CL-RSP
+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}
+restapi.addPLMNInfoListEntry.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.getPLMNInfoListEntry.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.addnSSAIEntry.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.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}
+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}
+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}
 
-ranSlice-dmaap.requestID=9d2d790e-a5f0-11e8-98d0-529269fb1459
-ranSlice-dmaap.aai=
-ranSlice-dmaap.version=1.0.2
-ranSlice-dmaap.nbrlistchange.action=NeighborListModified
+#URLs for ConfigDB TO BE FINALIZED
+configdb.url=http://10.12.5.120:8080/api/sdnc-config-db/v4
+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
 
-ranSlice-dmaap-config-resp.timestamp=2018-09-10T07:10:05.614Z
-ranSlice-dmaap-config-resp.apiver=1.0
-ranSlice-dmaap-config-resp.requestID=722ee65a-8afd-48df-bf57-c152ae45bacc
-ranSlice-dmaap-config-resp.subrequestID=1
-ranSlice-dmaap-config-resp.requesttrack=no
-ranSlice-dmaap-config-resp.flags=none
-ranSlice-dmaap-config-resp.version=1.0
-ranSlice-dmaap-config-resp.rpc-name.modifyconfiganr=modifyconfiganr
-ranSlice-dmaap-config-resp.rpc-name.modifyconfig=modifyconfig
-ranSlice-dmaap-config-resp.correlationID=722ee65a-8afd-48df-bf57-c152ae45bacc-1
-ranSlice-dmaap-config-resp.type=response
-ranSlice-dmaap-config-resp.status-code=200
-ranSlice-dmaap-config-resp.status-value=SUCCESS
+#ConfigDB Templates for RestAPI calls against ConfigDB
+restapi.configDB.updateRANSliceInventory.templatefile=ranSlice-configDB-updateRANSliceInventory.json