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
---
 ...onnects-network-topology-operation-activate.xml | 60 +++++++++++++++++++---
 ...nects-network-topology-operation-deactivate.xml | 50 ++++++++++++++++++
 ...OURCE-API_network-topology-operation-create.xml | 21 ++++----
 ...OURCE-API_network-topology-operation-delete.xml |  9 ++--
 4 files changed, 122 insertions(+), 18 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index 7f4eb8ff..c0046db3 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -153,7 +153,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].service-url`" />
-                                    <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>
@@ -171,6 +170,10 @@
                                 </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>
                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                             <parameter name="logger" value="message-log" />
                             <parameter name="field1" value="__TIMESTAMP__" />
@@ -184,27 +187,48 @@
                             <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
                             <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
                         </record>
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                            <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" />
+                            <parameter name="responsePrefix" value="token-result" />
+                            <outcome value="success">
+                                <set>
+                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />
+                                </set>
+                            </outcome>
+                            <outcome value="failure">
+                                <return status="failure">
+                                    <parameter name="ack-final" value="Y" />
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error executing get token rest api" />
+                                </return>
+                            </outcome>
+                        </execute>
                         <switch test="`$prop.dci-connects.tunnelType`">
                             <outcome value="L3-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3-dci-connects-template.json'`" />
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
+                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                                 </execute>
                             </outcome>
                             <outcome value="L2-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l2-dci-connects-template.json'`" />
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
+                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                                 </execute>
                             </outcome>
                         </switch>
@@ -350,7 +374,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].service-url`" />
-                                    <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>
@@ -368,6 +391,10 @@
                                 </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>
                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                             <parameter name="logger" value="message-log" />
                             <parameter name="field1" value="__TIMESTAMP__" />
@@ -381,27 +408,48 @@
                             <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
                             <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
                         </record>
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                            <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" />
+                            <parameter name="responsePrefix" value="token-result" />
+                            <outcome value="success">
+                                <set>
+                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />
+                                </set>
+                            </outcome>
+                            <outcome value="failure">
+                                <return status="failure">
+                                    <parameter name="ack-final" value="Y" />
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error executing get token rest api" />
+                                </return>
+                            </outcome>
+                        </execute>
                         <switch test="`$prop.dci-connects.tunnelType`">
                             <outcome value="L3-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3-dci-connects-template.json'`" />
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
+                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                                 </execute>
                             </outcome>
                             <outcome value="L2-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l2-dci-connects-template.json'`" />
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
+                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                                 </execute>
                             </outcome>
                         </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
index 251f1b40..1883baf8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
@@ -45,6 +45,10 @@
                      </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>
                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                   <parameter name="logger" value="message-log" />
                   <parameter name="field1" value="__TIMESTAMP__" />
@@ -58,6 +62,25 @@
                   <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
                   <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
                </record>
+               <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                  <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" />
+                  <parameter name="responsePrefix" value="token-result" />
+                  <outcome value="success">
+                     <set>
+                        <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />
+                     </set>
+                  </outcome>
+                  <outcome value="failure">
+                     <return status="failure">
+                        <parameter name="ack-final" value="Y" />
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error executing get token rest api" />
+                     </return>
+                  </outcome>
+               </execute>
                <switch test="`$prop.dci-connects.tunnelType`">
                   <outcome value="L3-DCI">
                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
@@ -67,6 +90,7 @@
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
+                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                      </execute>
                   </outcome>
                   <outcome value="L2-DCI">
@@ -77,6 +101,7 @@
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
+                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                      </execute>
                   </outcome>
                </switch>
@@ -117,6 +142,10 @@
                      </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>
                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                   <parameter name="logger" value="message-log" />
                   <parameter name="field1" value="__TIMESTAMP__" />
@@ -130,6 +159,25 @@
                   <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
                   <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
                </record>
+               <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                  <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" />
+                  <parameter name="responsePrefix" value="token-result" />
+                  <outcome value="success">
+                     <set>
+                        <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />
+                     </set>
+                  </outcome>
+                  <outcome value="failure">
+                     <return status="failure">
+                        <parameter name="ack-final" value="Y" />
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error executing get token rest api" />
+                     </return>
+                  </outcome>
+               </execute>
                <switch test="`$prop.dci-connects.tunnelType`">
                   <outcome value="L3-DCI">
                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
@@ -139,6 +187,7 @@
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
+                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                      </execute>
                   </outcome>
                   <outcome value="L2-DCI">
@@ -149,6 +198,7 @@
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
+                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                      </execute>
                   </outcome>
                </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
index a04d924a..76a52b58 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
@@ -247,7 +247,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].service-url`" />
-                        <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>
@@ -394,11 +393,15 @@
                 <parameter name="field68" value="`l3vpn.af_type`" />
                 <parameter name="field69" value="`$prop.l3vpn.af_type`" />
             </record>
+            <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" />
@@ -417,7 +420,7 @@
                             </outcome>
                         </execute>
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir + '/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'`" />
                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
@@ -435,13 +438,13 @@
                             </outcome>
                         </execute>
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'`" />
-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`" />
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3smvrftemplate.json'`" />
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`" />
                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                             <parameter name="format" value="json" />
                             <parameter name="httpMethod" value="post" />
-                            <parameter name="responsePrefix" value="site-result" />
+                            <parameter name="responsePrefix" value="vrf-result" />
                             <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                             <outcome value="success" />
                             <outcome value="failure">
@@ -453,13 +456,13 @@
                             </outcome>
                         </execute>
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3smvrftemplate.json'`" />
-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`" />
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3smsitetemplate.json'`" />
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`" />
                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                             <parameter name="format" value="json" />
                             <parameter name="httpMethod" value="post" />
-                            <parameter name="responsePrefix" value="vrf-result" />
+                            <parameter name="responsePrefix" value="site-result" />
                             <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                             <outcome value="success" />
                             <outcome value="failure">
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