xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>\r
<method rpc='sotn-create-otn-tunnel' mode='sync'>\r
<block atomic="true">\r
- <switch test='`$oof.vpn.access-provider-id`'>\r
- <outcome value='`$domain-A.provider-id`'>\r
-\ 1\r
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\r
+ <parameter name='source' value='`$oof.vpn.tp-id`' />\r
+ <parameter name='target' value='`$domain-A.network-id`' />\r
+ <outcome value='true'>\r
<block atomic="true">\r
<set>\r
- <parameter name='tmp.otn-domain.' value='`$domain-A.`' />\r
+ <parameter name='otn-domain.' value='`$domain-A.`' />\r
</set>\r
</block>\r
</outcome>\r
- <outcome value='`$domain-B.provider-id`'>\r
-\ 1\r
- <block atomic="true">\r
- <set>\r
- <parameter name='$tmp.otn-domain.' value='`$domain-B.`' />\r
- </set>\r
- </block>\r
+ <outcome value='false'>\r
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\r
+ <parameter name='source' value='`$oof.vpn.tp-id`' />\r
+ <parameter name='target' value='`$domain-B.network-id`' />\r
+ <outcome value='true'>\r
+ <block atomic="true">\r
+ <set>\r
+ <parameter name='$otn-domain.' value='`$domain-B.`' />\r
+ </set>\r
+ </block>\r
+ </outcome>\r
+ </execute>\r
</outcome>\r
- </switch>\r
- <switch test='`$oof.vpn.access-node-id`'>\r
- <outcome value='`$oof.vpns[0].access-node-id`'>\r
-\ 1\r
+ </execute>\r
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\r
+ <parameter name='source' value='`$oof.vpn.tp-id`' />\r
+ <parameter name='target' value='`$tmp.oofsolutions-first-src-pnf-name`' />\r
+ <outcome value='true'>\r
<block atomic="true">\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[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
- <outcome value='`$oof.vpns[$oof.vpns_length].access-node-id`'>\r
-\ 1\r
- <block atomic="true">\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 value='false'>\r
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >\r
+ <parameter name='source' value='`$oof.vpn.tp-id`' />\r
+ <parameter name='target' value='`$tmp.oofsolutions-last-dst-pnf-name`' />\r
+ <outcome value='true'>\r
+ <block atomic="true">\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
+ <!--<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
+ </execute>\r
</outcome>\r
- </switch>\r
+ </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
</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