1 files changed, 49 insertions, 37 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 4527b788..c6505ad1 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
@@ -3,27 +3,34 @@
     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}'>
     <method rpc='sotn-create-otn-tunnel' mode='sync'>
         <block atomic="true">
-            <switch test='`$oof.vpn.access-provider-id`'>
-                <outcome value='`$domain-A.provider-id`'>
-
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+                <parameter name='source' value='`$oof.vpn.tp-id`' />
+                <parameter name='target' value='`$domain-A.network-id`' />
+                <outcome value='true'>
                     <block atomic="true">
                         <set>
-                            <parameter name='tmp.otn-domain.' value='`$domain-A.`' />
+                            <parameter name='otn-domain.' value='`$domain-A.`' />
                         </set>
                     </block>
                 </outcome>
-                <outcome value='`$domain-B.provider-id`'>
-
-                    <block atomic="true">
-                        <set>
-                            <parameter name='$tmp.otn-domain.' value='`$domain-B.`' />
-                        </set>
-                    </block>
+                <outcome value='false'>
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+                        <parameter name='source' value='`$oof.vpn.tp-id`' />
+                        <parameter name='target' value='`$domain-B.network-id`' />
+                        <outcome value='true'>
+                            <block atomic="true">
+                                <set>
+                                    <parameter name='$otn-domain.' value='`$domain-B.`' />
+                                </set>
+                            </block>
+                        </outcome>
+                    </execute>
                 </outcome>
-            </switch>
-            <switch test='`$oof.vpn.access-node-id`'>
-                <outcome value='`$oof.vpns[0].access-node-id`'>
-
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+                <parameter name='source' value='`$oof.vpn.tp-id`' />
+                <parameter name='target' value='`$tmp.oofsolutions-first-src-pnf-name`' />
+                <outcome value='true'>
                     <block atomic="true">
                         <set>
                             <parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$oof.vpn.access-node-id`' />
@@ -44,29 +51,34 @@
                         </set>
                     </block>
                 </outcome>
-                <outcome value='`$oof.vpns[$oof.vpns_length].access-node-id`'>
-
-                    <block atomic="true">
-                        <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 value='false'>
+                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+                        <parameter name='source' value='`$oof.vpn.tp-id`' />
+                        <parameter name='target' value='`$tmp.oofsolutions-last-dst-pnf-name`' />
+                        <outcome value='true'>
+                            <block atomic="true">
+                                <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>
+                    </execute>
                 </outcome>
-            </switch>
+            </execute>
             <switch test="`$prop.sdncRestApi.token_id`">
                 <outcome value=''>
                     <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >