RAN Slice - Termination testing

Issue-ID: CCSDK-3393
Change-Id: I6b99330eb7869fbca6c840fc994fb12131f3420a
Signed-off-by: Hariharan <rh20085046@wipro.com>

1 files changed, 22 insertions, 5 deletions

diff --git a/odlsli/src/main/properties/ran-slice-api-dg.properties b/odlsli/src/main/properties/ran-slice-api-dg.properties
index 318cb8f6..293d375b 100644
--- a/odlsli/src/main/properties/ran-slice-api-dg.properties
+++ b/odlsli/src/main/properties/ran-slice-api-dg.properties
@@ -4,7 +4,7 @@ controller.user=admin
 controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 ransim-mounted=false
 configdb-deployed=true
-cps-deployed=false
+cps-deployed=true
 
 restapi.trustStoreFileName=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks
 restapi.trustStorePassword=adminadmin
@@ -107,7 +107,7 @@ restapi.terminateSNSSAIEntry.ToCUUP=/restconf/config/ran-network:ran-network/Nea
 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.removeRRMPolicyRatio.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/NRCellDU/{idNRCellDU}/attributes/RRMPolicyRatio/{id}
 restapi.removeRRMPolicyMember.ToNRCellDU=/restconf/config/ran-network:ran-network/NearRTRIC/{idNearRTRIC}/GNBDUFunction/{idGNBDUFunction}/attributes/RRMPolicyRatio/{id}/attributes/rRMPolicyMemberList/{idx}
 
 
@@ -153,7 +153,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=${CONFIG_DB_URL:-http://10.31.4.15:8080/api/sdnc-config-db/v4}
+configdb.url=http://10.31.4.14:8086/api/sdnc-config-db/v4
 restapi.configdb.getNearRTRICsFromTrackingArea=/nearrtric-list/{trackingArea}
 restapi.configdb.getListOfCells=/cell-list/{trackingArea}
 restapi.configdb.getCUCellsOfRIC=/cu-cell-list/{nearRTRICId}
@@ -174,6 +174,8 @@ restapi.configdb.removenSSAINearRTRIC=/nearrtric/{nearRTRICId}/{sNSSAI}
 restapi.configdb.removenSSAINRCellDU=/nrcelldu/{idNRCellDU}/{sNSSAI}
 restapi.configdb.removenSSAINRCellCU=/nrcellcu/{idNRCellCU}/{sNSSAI}
 restapi.configdb.removenSSAICUUP=/gnbcuup/{gnbCUUPId}/{sNSSAI}
+restapi.configdb.removenSSAICUUPRRMPOLICY=/gnbcuup/rrm/{gnbCUUPId}/{resourcetype}/{sNSSAI}
+
 
 #ConfigDB Templates for RestAPI calls against ConfigDB
 restapi.configDB.updateRANSliceInventory.templatefile=ranSlice-configDB-updateRANSliceInventory.json
@@ -191,7 +193,7 @@ restapi.configDB.updategNBDU.templatefile=ranSlice-configDB-updategNBDU.json
 configDB.rrmPolicyID=1
 
 #CPS-TBDMT Details
-restapi.cps.tbdmt.execute.endpoint=${CPS_URL:-http://10.31.4.14:8080}/execute/{schemaSet}/{templateId}
+#restapi.cps.tbdmt.execute.endpoint=http://10.31.4.14:8081/execute/{schemaSet}/{templateId}
 
 #Schemasets
 rannetwork.schemaset=ran-network
@@ -206,7 +208,7 @@ tbdmt.template.get-cells-list=get-cells-list
 tbdmt.template.put-nearrtric=put-nearrtric
 tbdmt.template.put-gnbcucpfunction=put-gnbcucpfunction
 tbdmt.template.put-gnbcuupfunction=put-gnbcuupfunction
-tbdmt.template.put-gnbdufunction=put-gnbdufunction
+itbdmt.template.put-gnbdufunction=put-gnbdufunction
 tbdmt.template.put-nrcellcu-rrm-policy=put-nrcellcu-rrm-policy
 tbdmt.template.put-cuup-rrm-policy=put-cuup-rrm-policy
 tbdmt.template.put-nrcelldu-rrm-policy=put-nrcelldu-rrm-policy
@@ -215,6 +217,14 @@ tbdmt.template.get-nrcellcu-rrm-policy=get-nrcellcu-rrm-policy
 tbdmt.template.get-cuup-rrm-policy=get-cuup-rrm-policy
 tbdmt.template.gett-nrcelldu-rrm-policy=get-nrcelldu-rrm-policy
 
+
+#CPS-TDMT payload templates
+
+#modify-allocate
+restapi.tbdmt.payload.get-nearrtric-by-rannfnssi=cps-get-nearrtric-by-rannfnssi.json
+restapi.tbdmt.payload.get-cells-list=cps-get-cells-list.json
+restapi.tbdmt.payload.put-nearrtric=cps-put-nearrtric.json
+
 #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
@@ -231,3 +241,10 @@ restapi.so.callbackURL=http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/AsyncS
 restapi.so.authorization=YXBpaEJwbW46cGFzc3dvcmQxJA==
 restapi.so.user=mso_admin
 restapi.so.password=password1$
+
+
+#POLICYTYPE
+a1.requestid=9d2d790e-a5f0-11e8-98d0-529269fb1459
+a1.version=1.0
+a1.action=putA1Policy
+