Fix underlay DG testing issues

*Fix json template context variable name
*Add customHttpHeaders

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

Former-commit-id: 9ea126b1bfbf0908e45eaf52d61b6b2032fc1b23

2 files changed, 94 insertions, 18 deletions

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 bc167e8f..d8c4a960 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
@@ -361,41 +361,87 @@
                 <parameter name="vrf2-id" value="`$prop.l3vpn.vrf2-id`" />

                 <parameter name="af_type" value="`$prop.l3vpn.af_type`" />

             </record>

-            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">

+            <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.tempDir + '/l3smvpntemplate.json'`" />

+                            <parameter name="templateFileName" value="`$prop.sdncRestApi.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>

+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

+                            <parameter name="templateFileName" value="`$prop.sdncRestApi.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`" />

                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

-                            <parameter name="responsePrefix" value="restapi-result" />

+                            <parameter name="responsePrefix" value="vpn-result" />

+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

+                            <outcome value="success" />

+                            <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 3rd party controller rest api" />

+                                </return>

+                            </outcome>

                         </execute>

                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3smsitetemplate.json'`" />

+                            <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="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="responsePrefix" value="site-result" />

+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

+                            <outcome value="success" />

+                            <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 3rd party controller rest api" />

+                                </return>

+                            </outcome>

                         </execute>

                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3smvrftemplate.json'`" />

+                            <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="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="responsePrefix" value="vrf-result" />

+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

+                            <outcome value="success" />

+                            <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 3rd party controller rest api" />

+                                </return>

+                            </outcome>

                         </execute>

                     </block>

                 </outcome>

-                <outcome value="true">

+                <outcome value="l3vpn-sptn">

                     <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                        <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3smsitetemplate.json'" />

+                        <parameter name="templateFileName" value="$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'" />

                         <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url" />

                         <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />

                         <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />

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 54082d5a..d4d41943 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
@@ -107,15 +107,45 @@
             </get-resource>

             <switch test="`$prop.l3vpn.service-type`">

                 <outcome value="l3vpn-ipwan">

-                    <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                        <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/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`" />

-                        <parameter name="format" value="json" />

-                        <parameter name="httpMethod" value="delete" />

-                        <parameter name="responsePrefix" value="restapi-result" />

-                    </execute>

+                    <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="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>

+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

+                            <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/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`" />

+                            <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`" />

+                            <outcome value="success" />

+                            <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 3rd party controller rest api" />

+                                </return>

+                            </outcome>

+                        </execute>

+                    </block>

                 </outcome>

             </switch>

             <block atomic="true">