Merge "RAN Slice DG - Bug fixes"

1 files changed, 34 insertions, 6 deletions

diff --git a/odlsli/src/main/properties/ran-slice-api-dg.properties b/odlsli/src/main/properties/ran-slice-api-dg.properties
index 76f34c31..7b4eac44 100644
--- a/odlsli/src/main/properties/ran-slice-api-dg.properties
+++ b/odlsli/src/main/properties/ran-slice-api-dg.properties
@@ -14,6 +14,31 @@ naming.gen-name.url=http://neng-serv:8080
 naming.gen-name.user=ccsdkapps
 naming.gen-name.pwd=ccsdkapps
 
+#
+# Configuration file for A&AI Client
+#
+
+#
+# Certificate keystore and truststore
+#
+org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/ccsdk/data/stores/truststore.onap.client.jks
+org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin
+org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
+
+org.onap.ccsdk.sli.adaptors.aai.client.name=AAI
+org.onap.ccsdk.sli.adaptors.aai.client.psswd=AAI
+
+org.onap.ccsdk.sli.adaptors.aai.application=AAI
+#
+# Configuration for A&AI Client
+#
+org.onap.ccsdk.sli.adaptors.aai.uri=https://10.31.4.57:30233/aai/v21
+connection.timeout=60000
+read.timeout=60000
+
+#AAI APIs
+restapi.aai.fetchSliceProfile=/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/slice-profiles/slice-profile/{profile-id}
+
 
 #Patch Targets TO BE FINALIZED
 ranSlice.configureNearRTRIC.target=
@@ -47,6 +72,7 @@ restapi.ranSlice.configDB.updateRANSliceInventory.template=ranSlice-configDB-upd
 restapi.config=/restconf/config
 
 # Also to be used for closed loop slicing
+restapi.addnSSAIEntry.ToNearRTRIC=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/attributes/pLMNInfoList/{mcc}/{mnc}
 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}
@@ -66,7 +92,7 @@ restapi.addnSSAIEntry.ToNRCellCU=/restconf/config/ran-network:ran-network/NearRT
 
 #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.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}
@@ -87,6 +113,7 @@ restapi.removeRRMPolicyMember.ToNRCellDU=/restconf/config/ran-network:ran-networ
 # Restconf URLs with Netconf Mount of Ran Simulator TO BE FINALIZED
 
 # Also to be used for closed loop slicing
+restapi.addnSSAIEntry.ToNearRTRIC.ransim-mounted=/restconf/config/network-topology:network-topology/topology/topology-netconf/node/{mountName}/yang-ext:mount/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/attributes/pLMNInfoList/{mcc}/{mnc}
 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}
@@ -104,7 +131,7 @@ restapi.getPLMNInfoListEntry.ToNRCellCU.ransim-mounted=/restconf/config/network-
 # 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 
+#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}
@@ -112,7 +139,7 @@ restapi.RRMPolicyRatioEntry.ToGNBCUUP.ransim-mounted=/restconf/config/network-to
 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 
+#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}
@@ -125,7 +152,7 @@ restapi.removeRRMPolicyRatio.ToNRCellDU.ransim-mounted=/restconf/config/network-
 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.31.4.44:8080/api/sdnc-config-db/v4
+configdb.url=http://10.31.4.15: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}
@@ -138,8 +165,9 @@ restapi.configdb.updategNBCUUP=/gNBCUUP
 restapi.configdb.updategNBDU=/gNBDU
 restapi.configdb.getplmn=/plmn/{sliceProfileId}
 
-restapi.configdb.getNearRTRICByNSSI=/nearRTRICByNSSI/{ranNFNSSIId}
-restapi.configdb.getNearRTRICById=/nearRTRICById/{nearRTRICId}
+restapi.configdb.getNearRTRICByNSSI=/nearrtric/{ranNFNSSIId}
+restapi.configdb.getNearRTRICById=/nearRTRIC/{nearRTRICId}
+restapi.configdb.getRRMPolicyRatio=/rrmPolicy/{resourceType}/{resourceId}
 
 #ConfigDB Templates for RestAPI calls against ConfigDB
 restapi.configDB.updateRANSliceInventory.templatefile=ranSlice-configDB-updateRANSliceInventory.json