Adding local-link-connectivity-list (llcl) information to match ttp and tp locally...

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / sotn_nni / GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml

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 c6505ad..96f3843 100644 (file)
--- 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`' />\r
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\r
                             <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />\r
+                            <!--<set>-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$otn-domain.node-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$otn-domain.ttp-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='`$otn-domain.tpn`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$oof.vpn.access-node-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$otn-domain.node-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->\r
+                            <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->\r
                         </set>\r
                     </block>\r
                 </outcome>\r
@@ -73,6 +89,22 @@
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />\r
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />\r
                                     <parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />\r
+                                    <!--<set>-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$oof.vpn.access-node-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$otn-domain.node-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].src-ttp-id' value='`$otn-domain.ttp-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_src-tpn' value='`$otn-domain.tpn`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='otntunnel-22' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$otn-domain.client-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$otn-domain.provider-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$otn-domain.te-topo-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$oof.vpn.access-node-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$otn-domain.node-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='otntunnel-22' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$oof.vpn.access-client-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$oof.vpn.access-provider-id`' />-->\r
+                                    <!--<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$oof.vpn.access-topology-id`' />-->\r
                                 </set>\r
                             </block>\r
                         </outcome>\r
@@ -81,13 +113,15 @@
             </execute>\r
             <switch test="`$prop.sdncRestApi.token_id`">\r
                 <outcome value=''>\r
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\r
+                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />\r
                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />\r
                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                         <parameter name="format" value="json"/>\r
                         <parameter name="httpMethod" value="patch"/>\r
-                        <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />\r
+                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+                        <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->\r
                         <parameter name="responsePrefix" value="vpn-result"/>\r
                         <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                         <parameter name="trustStorePassword" value="adminadmin"/>\r
@@ -106,13 +140,15 @@
                     </execute>\r
                 </outcome>\r
                 <outcome value='Other'>\r
-                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\r
+                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`" />\r
                         <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`" />\r
                         <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                         <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
                         <parameter name="format" value="json"/>\r
                         <parameter name="httpMethod" value="patch"/>\r
-                        <parameter name='dirPath' value="/opt/sdnc/restapi/yang" />\r
+                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+                        <!--<parameter name='dirPath' value="/opt/sdnc/restapi/yang" />-->\r
                         <parameter name="responsePrefix" value="vpn-result"/>\r
                         <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                         <parameter name="trustStorePassword" value="adminadmin"/>\r