1 files changed, 40 insertions, 4 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
index c6505ad1..96f3843f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml
@@ -48,6 +48,22 @@
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />
+                            <!--<set>-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->
                         </set>
                     </block>
                 </outcome>
@@ -73,6 +89,22 @@
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />
+                                    <!--<set>-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->
                                 </set>
                             </block>
                         </outcome>
@@ -81,13 +113,15 @@
             </execute>
             <switch test="`$prop.sdncRestApi.token_id`">
                 <outcome value=''>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />
                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />
                         <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="patch"/>
-                        <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
+                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                        <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->
                         <parameter name="responsePrefix" value="vpn-result"/>
                         <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                         <parameter name="trustStorePassword" value="adminadmin"/>
@@ -106,13 +140,15 @@
                     </execute>
                 </outcome>
                 <outcome value='Other'>
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />
                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />
                         <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="patch"/>
-                        <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />
+                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                        <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->
                         <parameter name="responsePrefix" value="vpn-result"/>
                         <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                         <parameter name="trustStorePassword" value="adminadmin"/>