From bbc2c4acd22b12cb1fe3fc31bb71e7bc7a6d7e19 Mon Sep 17 00:00:00 2001
From: "ramu.n" <ramu.n@huawei.com>
Date: Tue, 31 Oct 2017 21:37:42 +0530
Subject: Add VoLTE json templates

VoLTE JSON templated need to put in sdnc/oam/platform-logic/restapi-templates module, so that they will copied into sdnc_controller_container

Change-Id: I593da4567724b0be5bdd757b01ba6653eab129a2
Issue-Id: SDNC-159
Signed-off-by: Ramu N <ramu.n@huawei.com>

Former-commit-id: 3616a2ecd88f9b0d558eaa2208f17c2e9876229d
---
 .../GENERIC-RESOURCE-API_network-topology-operation-delete.xml   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
index d4d41943..87deaa5d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
@@ -85,7 +85,6 @@
                 <outcome value="success">
                     <set>
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].serviceUrl`" />
-                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
                     </set>
@@ -105,11 +104,15 @@
                     </return>
                 </outcome>
             </get-resource>
+            <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">
+                <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties" />
+                <parameter name="contextPrefix" value="prop" />
+            </execute>
             <switch test="`$prop.l3vpn.service-type`">
                 <outcome value="l3vpn-ipwan">
                     <block atomic="true">
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir + '/actokentemplate.json'`" />
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
                             <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
                             <parameter name="format" value="json" />
                             <parameter name="httpMethod" value="post" />
@@ -128,7 +131,7 @@
                             </outcome>
                         </execute>
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'`" />
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3smvpntemplate.json'`" />
                             <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice=' + $prop.l3vpn.name`" />
                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-- 
cgit 1.2.3-korg