RANSlice - allocate modify : CPS Integration

Tested against CPS-TBDMT for an anchor

Issue-ID: CCSDK-3340

Signed-off-by: Ahila <ahila.pandaram@wipro.com>
Change-Id: I8f8c22cbfb70433dcae126d24817b549a9793d4e

1 files changed, 11 insertions, 15 deletions

diff --git a/odlsli/src/main/properties/ran-slice-api-dg.properties b/odlsli/src/main/properties/ran-slice-api-dg.properties
index 7dba4d85..76287068 100644
--- a/odlsli/src/main/properties/ran-slice-api-dg.properties
+++ b/odlsli/src/main/properties/ran-slice-api-dg.properties
@@ -3,7 +3,7 @@ controller.url=http://sdnc-oam.onap:8282
 controller.user=admin
 controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 ransim-mounted=false
-configdb-deployed=true
+configdb-deployed=false
 cps-deployed=true
 
 restapi.trustStoreFileName=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks
@@ -155,7 +155,7 @@ restapi.removeRRMPolicyMember.ToNRCellDU.ransim-mounted=/restconf/config/network
 restapi.nearrtric.removeSliceProfile.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}
 
 #URLs for ConfigDB TO BE FINALIZED
-configdb.url=http://10.31.4.14:8086/api/sdnc-config-db/v4
+configdb.url=${CONFIG_DB_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}
@@ -194,8 +194,12 @@ restapi.configDB.updategNBDU.templatefile=ranSlice-configDB-updategNBDU.json
 #RRMPolicyID to be incremented by 1, anytime neew RRMPolicy is added
 configDB.rrmPolicyID=1
 
+#CPS endpoint to fetch the anchors
+restapi.cps.anchors.endpoint=${CPS_URL:-http://10.31.4.14:8883}/cps/api/v1/dataspaces/E2EDemo/anchors
+
 #CPS-TBDMT Details
-#restapi.cps.tbdmt.execute.endpoint=http://10.31.4.14:8081/execute/{schemaSet}/{templateId}
+restapi.cps.tbdmt.execute.endpoint=${CPS_TBDMT_URL:-http://10.31.4.14:8081}/execute/{schemaSet}/{templateId}
+
 
 #Schemasets
 rannetwork.schemaset=ran-network
@@ -208,25 +212,18 @@ inventory.schemaset=ran-inventory
 tbdmt.template.get-nearrtric-by-rannfnssi=get-nearrtric-by-rannfnssi
 tbdmt.template.get-cells-list=get-cells-list
 tbdmt.template.put-nearrtric=put-nearrtric
-tbdmt.template.put-gnbcucpfunction=put-gnbcucpfunction
+tbdmt.template.put-nrcellcu=put-nrcellcu
 tbdmt.template.put-gnbcuupfunction=put-gnbcuupfunction
-itbdmt.template.put-gnbdufunction=put-gnbdufunction
+tbdmt.template.put-nrcelldu=put-nrcelldu
 tbdmt.template.put-nrcellcu-rrm-policy=put-nrcellcu-rrm-policy
+tbdmt.template.get-nrcellcu-rrm-policy=get-nrcellcu-rrm-policy
 tbdmt.template.put-cuup-rrm-policy=put-cuup-rrm-policy
 tbdmt.template.put-nrcelldu-rrm-policy=put-nrcelldu-rrm-policy
 tbdmt.template.update-ran-inventory=update-ran-inventory
-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
+tbdmt.template.get-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
@@ -249,4 +246,3 @@ restapi.so.password=password1$
 a1.requestid=9d2d790e-a5f0-11e8-98d0-529269fb1459
 a1.version=1.0
 a1.action=putA1Policy
-