From 13267a899ccd06491f79f653caf1483957563149 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Mon, 22 Feb 2021 15:30:38 +0000
Subject: Supporting 3 or more network domains for Transport Slicing use case.
 Issue-ID: SDNC-1487

Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: Ia497741d70eff0f5fba12ad487f0f240709b5cb5

Former-commit-id: c2ff57f8ac2f830bb4709a29dca9644dd8d4c82d
---
 ...logy-operation-get-otn-tunnel-path-from-oof.xml |  34 ++
 ...vnf-topology-operation-trans-slice-activate.xml | 476 +++++++++------
 ...vnf-topology-operation-trans-slice-allocate.xml | 672 ++++++++++++++++-----
 ...f-topology-operation-trans-slice-deactivate.xml |  77 +--
 ...i-vnf-topology-operation-trans-slice-delete.xml |  51 +-
 5 files changed, 917 insertions(+), 393 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
index f6c1c6f8..9faaccd7 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
@@ -27,6 +27,10 @@
                     <block></block>
                 </outcome>
             </execute>
+            <set>
+                <parameter name='`tmp.otninfo.`' value='' />
+                <parameter name='`tmp.otninfo_length`' value='0' />
+            </set>
             <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
                 <block atomic="true">
                     <set>
@@ -60,6 +64,9 @@
                                                                         <set>
                                                                             <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
                                                                             <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-ltp-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />-->
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />-->
+                                                                            <!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />-->
                                                                         </set>
                                                                     </block>
                                                                 </outcome>
@@ -70,6 +77,9 @@
                                                                         <set>
                                                                             <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
                                                                             <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-ltp-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />-->
+                                                                            <!--<parameter name='`tmp.otninfo[$vidx+1].srcPort.src-access-node-id`' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />-->
+                                                                            <!--<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />-->
                                                                         </set>
                                                                     </block>
                                                                 </outcome>
@@ -99,6 +109,8 @@
                                                                                 <block atomic="true">
                                                                                     <set>
                                                                                         <parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />
+                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value="`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
                                                                                     </set>
                                                                                 </block>
                                                                             </outcome>
@@ -119,6 +131,8 @@
                                                                                     <set>
                                                                                         <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
                                                                                         <parameter name='domain-A.tpn' value='1' />
+                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
                                                                                     </set>
                                                                                     <for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
                                                                                         <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>
@@ -139,6 +153,12 @@
                                                                                                                 <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />
                                                                                                                 <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />
                                                                                                                 <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                                                <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
                                                                                                             </set>
                                                                                                         </outcome>
                                                                                                     </get-resource>
@@ -176,6 +196,8 @@
                                                                                 <block atomic="true">
                                                                                     <set>
                                                                                         <parameter name='domain-A.tunnel-tp-id' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
+                                                                                        <parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
                                                                                     </set>
                                                                                 </block>
                                                                             </outcome>
@@ -223,6 +245,8 @@
                                                                                 <block atomic="true">
                                                                                     <set>
                                                                                         <parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />
+                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value="`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
                                                                                     </set>
                                                                                 </block>
                                                                             </outcome>
@@ -243,6 +267,8 @@
                                                                                     <set>
                                                                                         <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
                                                                                         <parameter name='domain-B.tpn' value='1' />
+                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
                                                                                     </set>
                                                                                     <for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
                                                                                         <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>
@@ -263,6 +289,12 @@
                                                                                                                 <parameter name='domain-B.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />
                                                                                                                 <parameter name='domain-B.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
                                                                                                                 <parameter name='domain-B.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                                                                <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                                                <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
                                                                                                             </set>
                                                                                                         </outcome>
                                                                                                     </get-resource>
@@ -300,6 +332,8 @@
                                                                                 <block atomic="true">
                                                                                     <set>
                                                                                         <parameter name='domain-B.tunnel-tp-id' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
+                                                                                        <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
+                                                                                        <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
                                                                                     </set>
                                                                                 </block>
                                                                             </outcome>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
index 40906dad..34a70490 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
@@ -51,183 +51,315 @@
                                                                     </set>
                                                                     <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
                                                                         <outcome value='Other'>
-                                                                            <block atomic="true">
-                                                                                <set>
-                                                                                    <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
-                                                                                    <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />
-                                                                                    <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
-                                                                                    <!--<parameter name='dst-tpn-id' value='1' />-->
-                                                                                    <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />
-                                                                                    <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
-                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                    <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                    <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
-                                                                                    <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
-                                                                                    <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
+                                                                            <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
+                                                                                <outcome value=''>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                            <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
+                                                                                        </set>
+                                                                                        <set>
+                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />
+                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
+                                                                                            <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                                            <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />
+                                                                                            <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
+                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                            <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
+                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
+                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
+                                                                                        </set>
+                                                                                        <set>
+                                                                                            <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-bindingA.src-access-node-id`" />
-                                                                                </set>
-                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                              resource="pnf"
-                                                                                              key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
-                                                                                              pfx='tmp.aai.source-pnf' local-only='false' >
-                                                                                    <!--AND depth = '0'"-->
-                                                                                    <outcome value='success'>
-                                                                                        <block>
-                                                                                            <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
-                                                                                                <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                                    <outcome value='esr-thirdparty-sdnc'>
-                                                                                                        <block atomic="true">
-                                                                                                            <set>
-                                                                                                                <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                            </set>
-                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                          resource="esr-thirdparty-sdnc"
-                                                                                                                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="pnf"
+                                                                                                      key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
+                                                                                                      pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                            <!--AND depth = '0'"-->
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                                        <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                <block atomic="true">
+                                                                                                                    <set>
+                                                                                                                        <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                    </set>
+                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                  resource="esr-thirdparty-sdnc"
+                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                  pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                        <outcome value='success'>
+                                                                                                                            <block>
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                    <!--<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="get"/>-->
+                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                </set>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                        <outcome value='not-found'>
+                                                                                                                            <return status='failure'>
+                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                            </return>
+                                                                                                                        </outcome>
+                                                                                                                        <outcome value='Other'>
+                                                                                                                            <return status='failure'>
+                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                            </return>
+                                                                                                                        </outcome>
+                                                                                                                    </get-resource>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                        </switch>
+                                                                                                    </for>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                            <outcome value='not-found'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='Other'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`" />
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                            <parameter name="format" value="json"/>
+                                                                                            <parameter name="httpMethod" value="patch"/>
+                                                                                            <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                            <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 Create OTN tunnel rest api" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block atomic="true"></block>
+                                                                                            </outcome>
+                                                                                        </execute>
+                                                                                        <set>
+                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
+                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                                            <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
+                                                                                            <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
+                                                                                            <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
+                                                                                            <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                            <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                            <parameter name='index-number' value='0' />
+                                                                                            <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
+                                                                                            <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
+                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
+                                                                                        </set>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                            <parameter name="format" value="json"/>
+                                                                                            <parameter name="httpMethod" value="patch"/>
+                                                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/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"/>
+                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                            <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 Create ethernet service rest api" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block atomic="true">
+                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
+                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
+                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                    </update>
+                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>
+                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                    </update>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </execute>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                                <outcome value='Other'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='tmp.aai.vpn-bindingG.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                            <parameter name='tmp.aai.connectivityG.' value="`$tmp.aai.connectivity.`" />
+                                                                                        </set>
+                                                                                        <set>
+                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />
+                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />
+                                                                                            <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                                            <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
+                                                                                            <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
+                                                                                            <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />
+                                                                                            <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />
+                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                            <parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />
+                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />
+                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />
+                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />
+                                                                                        </set>
+                                                                                        <set>
+                                                                                            <parameter name='tmp.domainG.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-bindingG.src-access-node-id`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="pnf"
+                                                                                                      key="pnf.pnf-name = $tmp.domainG.pnf-name"
+                                                                                                      pfx='tmp.aai.domainG-pnf' local-only='false' >
+                                                                                            <!--AND depth = '0'"-->
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >
+                                                                                                        <switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                <block atomic="true">
+                                                                                                                    <set>
+                                                                                                                        <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                    </set>
+                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                  resource="esr-thirdparty-sdnc"
+                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                                          pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                <outcome value='success'>
-                                                                                                                    <block>
-                                                                                                                        <set>
-                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                            <!--<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="get"/>-->
-                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                        </set>
-                                                                                                                    </block>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='not-found'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='Other'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                            </get-resource>
-                                                                                                        </block>
-                                                                                                    </outcome>
-                                                                                                </switch>
-                                                                                            </for>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='not-found'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                            <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='Other'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                            <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                </get-resource>
-                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />
-                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`" />
-                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                    <parameter name="format" value="json"/>
-                                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                    <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 Create OTN tunnel rest api" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='success'>
-                                                                                        <block atomic="true"></block>
-                                                                                    </outcome>
-                                                                                </execute>
-                                                                                <set>
-                                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
-                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
-                                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
-                                                                                    <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
-                                                                                    <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
-                                                                                    <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
-                                                                                    <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                    <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
-                                                                                    <parameter name='index-number' value='0' />
-                                                                                    <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
-                                                                                    <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
-                                                                                    <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
-                                                                                    <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
-                                                                                    <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
-                                                                                </set>
-                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
-                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                    <parameter name="format" value="json"/>
-                                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/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"/>
-                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                    <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 Create ethernet service rest api" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='success'>
-                                                                                        <block atomic="true">
-                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
-                                                                                                <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
-                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                                <parameter name='operational-status' value='Activated' />
-                                                                                            </update>
-                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                    key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>
-                                                                                                <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
-                                                                                                <parameter name='operational-status' value='Activated' />
-                                                                                            </update>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                </execute>
-                                                                            </block>
+                                                                                                                                  pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                        <outcome value='success'>
+                                                                                                                            <block>
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                    <!--<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="get"/>-->
+                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                </set>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                        <outcome value='not-found'>
+                                                                                                                            <return status='failure'>
+                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                            </return>
+                                                                                                                        </outcome>
+                                                                                                                        <outcome value='Other'>
+                                                                                                                            <return status='failure'>
+                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                            </return>
+                                                                                                                        </outcome>
+                                                                                                                    </get-resource>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                        </switch>
+                                                                                                    </for>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                            <outcome value='not-found'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='Other'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`" />
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`" />
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />
+                                                                                            <parameter name="format" value="json"/>
+                                                                                            <parameter name="httpMethod" value="patch"/>
+                                                                                            <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                            <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 Create OTN tunnel rest api" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block atomic="true"></block>
+                                                                                            </outcome>
+                                                                                        </execute>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
                                                                         </outcome>
                                                                         <outcome value=''>
                                                                             <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
index 88b7ddba..2cd9b56e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
@@ -33,6 +33,13 @@
                         <outcome value='false'></outcome>
                         <outcome value='true'>
                             <block>
+                                <set>
+                                    <parameter name='tmp.arr' value='' />
+                                    <parameter name='tmp.arridx' value='0' />
+                                    <parameter name='tmp.arr_length' value='0' />
+                                    <parameter name='otn-tunnel-slice' value='' />
+                                    <parameter name='otn-tunnel-slice_length' value='0' />
+                                </set>
                                 <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
                                     <set>
                                         <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`" />
@@ -709,80 +716,342 @@
                                                                                                         <parameter name='prop.ethsrvType' value='`$network-route-A`' />
                                                                                                     </set>
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                        <parameter name="ctx-destination" value="prop.vpn-binding-domainA-uuid"/>
-                                                                                                    </execute>
-                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >
-                                                                                                        <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />
-                                                                                                        <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
-                                                                                                        <parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />
-                                                                                                        <parameter name='access-provider-id' value='`$domain-A.provider-id`' />
-                                                                                                        <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
-                                                                                                        <parameter name='access-client-id' value='`$domain-A.client-id`' />
-                                                                                                        <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
-                                                                                                        <parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />
-                                                                                                        <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
-                                                                                                        <parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                        <!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->
-                                                                                                        <parameter name='src-access-ltp-id' value='' />
-                                                                                                        <parameter name='dst-access-node-id' value='`$domain-A.node-id`' />
-                                                                                                        <parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />
-                                                                                                        <parameter name='route-distinguisher' value='`$gfp`' />
-                                                                                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
-                                                                                                        <parameter name='operational-status' value='Created' />
-                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                        <outcome value='success'>
-                                                                                                            <block></block>
-                                                                                                        </outcome>
-                                                                                                    </save>
-                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid'
-                                                                                                          force="true" pfx="tmp.AnAI-data">
-                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
-                                                                                                    </save>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                        <parameter name="ctx-destination" value="prop.vpn-binding-domainB-uuid"/>
-                                                                                                    </execute>
-                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >
-                                                                                                        <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />
-                                                                                                        <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
-                                                                                                        <parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />
-                                                                                                        <parameter name='access-provider-id' value='`$domain-B.provider-id`' />
-                                                                                                        <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->
-                                                                                                        <parameter name='access-client-id' value='`$domain-B.client-id`' />
-                                                                                                        <!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->
-                                                                                                        <parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />
-                                                                                                        <!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->
-                                                                                                        <parameter name='src-access-node-id' value='`$domain-B.node-id`' />
-                                                                                                        <parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />
-                                                                                                        <parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                        <!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->
-                                                                                                        <parameter name='dst-access-ltp-id' value='' />
-                                                                                                        <parameter name='route-distinguisher' value='`$gfp`' />
-                                                                                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
-                                                                                                        <parameter name='operational-status' value='Created' />
-                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                        <outcome value='success'>
-                                                                                                            <block></block>
-                                                                                                        </outcome>
-                                                                                                    </save>
-                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid'
-                                                                                                          force="true" pfx="tmp.AnAI-data">
-                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
-                                                                                                    </save>
+                                                                                                    <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >
+                                                                                                        <block atomic='true'>
+                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>
+                                                                                                            </execute>
+                                                                                                            <switch test="`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`">
+                                                                                                                <outcome value='true'>
+                                                                                                                    <set>
+                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />
+                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />
+                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />
+                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
+                                                                                                                    </set>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='false'>
+                                                                                                                    <set>
+                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />
+                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />
+                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />
+                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
+                                                                                                                    </set>
+                                                                                                                </outcome>
+                                                                                                            </switch>
+                                                                                                            <set>
+                                                                                                                <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +
+                                             $tmp.access-provider-id + '-clientId-' +
+                                             $tmp.access-client-id + '-topologyId-' +
+                                             $tmp.access-topology-id + '-nodeId-' +
+                                             $tmp.srcdstpnf-id`" />
+                                                                                                            </set>
+                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                          resource="pnf"
+                                                                                                                          key="pnf.pnf-name = $tmp.srcdstpnf-name"
+                                                                                                                          pfx='tmp.aai.srcdst-pnf' local-only='false' >
+                                                                                                                <!--AND depth = '0'"-->
+                                                                                                                <outcome value='success'>
+                                                                                                                    <block>
+                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >
+                                                                                                                            <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                    <block atomic="true">
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                        </set>
+                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                      resource="esr-thirdparty-sdnc"
+                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                      pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                            <outcome value='success'>
+                                                                                                                                                <block>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                        <!--<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="get"/>-->
+                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                    </set>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='not-found'>
+                                                                                                                                                <return status='failure'>
+                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                </return>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='Other'>
+                                                                                                                                                <return status='failure'>
+                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                </return>
+                                                                                                                                            </outcome>
+                                                                                                                                        </get-resource>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                        </for>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='not-found'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='Other'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                            </get-resource>
+                                                                                                            <switch test='`$otnidx == 0`'>
+                                                                                                                <outcome value='true'>
+                                                                                                                    <set>
+                                                                                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
+                                                                                                                    </set>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='false'>
+                                                                                                                    <switch test='`$otnidx == $tmp.otninfo_length - 1`'>
+                                                                                                                        <outcome value='true'>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
+                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                            </set>
+                                                                                                                        </outcome>
+                                                                                                                        <outcome value='false'>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
+                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
+                                                                                                                            </set>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </outcome>
+                                                                                                            </switch>
+                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >
+                                                                                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />
+                                                                                                                <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
+                                                                                                                <parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />
+                                                                                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
+                                                                                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />
+                                                                                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
+                                                                                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />
+                                                                                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
+                                                                                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />
+                                                                                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                                                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />
+                                                                                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />
+                                                                                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
+                                                                                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />
+                                                                                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
+                                                                                                                <parameter name='route-distinguisher' value='`$gfp`' />
+                                                                                                                <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
+                                                                                                                <parameter name='operational-status' value='Created' />
+                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
+                                                                                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
+                                                                                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
+                                                                                                                <outcome value='success'>
+                                                                                                                    <block></block>
+                                                                                                                </outcome>
+                                                                                                            </save>
+                                                                                                            <switch test='`$otnidx == 0`'>
+                                                                                                                <outcome value='true'>
+                                                                                                                    <block>
+                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                                              key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
+                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
+                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
+                                                                                                                        </save>
+                                                                                                                        <set>
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-dest-node`' value='`$tmp.otninfo[0].dstPort.dst-access-node-id`' />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].src-ttp-id`' value='' />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[0].dstPort.dst-tunnel-tp-id`' />-->
+                                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->
+                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list_length`' value='`$idx + 1`' />-->
+                                                                                                                        </set>
+                                                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
+                                                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `" />
+                                                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                                                            <parameter name="format" value="json"/>
+                                                                                                                            <parameter name="httpMethod" value="patch"/>
+                                                                                                                            <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                                            <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 UNI Coloring for domain A" />
+                                                                                                                                </return>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='success'>
+                                                                                                                                <block></block>
+                                                                                                                            </outcome>
+                                                                                                                        </execute>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='false'>
+                                                                                                                    <block>
+                                                                                                                        <set>
+                                                                                                                            <parameter name='testingvalue' value='$tmp.otninfo_length -1' />
+                                                                                                                        </set>
+                                                                                                                        <switch test='`$otnidx == $tmp.otninfo_length - 1`'>
+                                                                                                                            <outcome value='true'>
+                                                                                                                                <block>
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
+                                                                                                                                          force="true" pfx="tmp.AnAI-data">
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
+                                                                                                                                    </save>
+                                                                                                                                    <set>
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='' />-->
+                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->
+                                                                                                                                    </set>
+                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
+                                                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `" />
+                                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                                                                                        <parameter name="format" value="json"/>
+                                                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                                                        <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 UNI coloring for domain B" />
+                                                                                                                                            </return>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='success'>
+                                                                                                                                            <block></block>
+                                                                                                                                        </outcome>
+                                                                                                                                    </execute>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='false'>
+                                                                                                                                <block atomic='true'>
+                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                                        <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>
+                                                                                                                                    </execute>
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                          key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>
+                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />
+                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->
+                                                                                                                                        <parameter name='operational-status' value='Created' />
+                                                                                                                                        <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
+                                                                                                                                        <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
+                                                                                                                                        <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
+                                                                                                                                        <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                                                                                                        <!--<parameter name='access-ltp-id' value='``' />-->
+                                                                                                                                        <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->
+                                                                                                                                        <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
+                                                                                                                                        <parameter name='vpn-type' value='dummy' />
+                                                                                                                                        <!--<parameter name='CIR' value='`$prop.sotn.cir`' />-->
+                                                                                                                                        <!--<parameter name='EIR' value='`$prop.sotn.eir`' />-->
+                                                                                                                                        <!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->
+                                                                                                                                        <!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->
+                                                                                                                                        <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
+                                                                                                                                        <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
+                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                        <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                                                                                                                    </save>
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                          force="true" pfx="tmp.AnAI-data">
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
+                                                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                                    </save>
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
+                                                                                                                                          force="true" pfx="tmp.AnAI-data">
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
+                                                                                                                                    </save>
+                                                                                                                                    <set>
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->
+                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->
+                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->
+                                                                                                                                    </set>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                        </switch>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                            </switch>
+                                                                                                        </block>
+                                                                                                    </for>
                                                                                                     <set>
                                                                                                         <!--<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />-->
                                                                                                         <!--<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
@@ -800,30 +1069,6 @@
                                                                                                         <parameter name='`otn-tunnel-sliceA-list_length`' value='`$idx + 1`' />
                                                                                                         <!--otn-tunnel-slice-list[$idx]-->
                                                                                                     </set>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
-                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `" />
-                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                                        <parameter name="format" value="json"/>
-                                                                                                        <parameter name="httpMethod" value="patch"/>
-                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                        <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 UNI Coloring for domain A" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block></block>
-                                                                                                        </outcome>
-                                                                                                    </execute>
                                                                                                     <set>
                                                                                                         <!--<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />-->
                                                                                                         <!--<parameter name='otn-source-node' value='`$domain-B.node-id`' />-->
@@ -841,30 +1086,6 @@
                                                                                                         <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
                                                                                                         <parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />
                                                                                                     </set>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
-                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `" />
-                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
-                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
-                                                                                                        <parameter name="format" value="json"/>
-                                                                                                        <parameter name="httpMethod" value="patch"/>
-                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                        <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 UNI coloring for domain B" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block></block>
-                                                                                                        </outcome>
-                                                                                                    </execute>
                                                                                                     <set>
                                                                                                         <parameter name='domain-A.tunnel-tp-id' value='' />
                                                                                                         <parameter name='domain-A.node-id' value='' />
@@ -914,55 +1135,182 @@
                                         </outcome>
                                     </get-resource>
                                 </for>
-                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceA-list-creation.templatefile`" />
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
-                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                    <parameter name="format" value="json"/>
-                                    <parameter name="httpMethod" value="post"/>
-                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                    <outcome value='failure'>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="vpn-bindings"
+                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings"
+                                              local-only="false"
+                                              pfx="tmp.aai.all-vpn-bindings" >
+                                    <outcome value='success'>
+                                        <block atomic="true">
+                                            <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />
+                                                        <parameter name='found' value='false' />
+                                                    </set>
+                                                    <switch test='`$tmp.arr_length != 0`'>
+                                                        <outcome value='true'>
+                                                            <block atomic='true'>
+                                                                <for index='arridx' start='0' end='`$tmp.arr_length`' >
+                                                                    <switch test='`$tmp.arr[$arridx] == $providerValue`'>
+                                                                        <outcome value='true'>
+                                                                            <block atomic='true'>
+                                                                                <set>
+                                                                                    <parameter name='found' value='true' />
+                                                                                </set>
+                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                        key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
+                                                                                    <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                    <parameter name='vpn-type' value='`$arridx`' />
+                                                                                </update>
+                                                                                <set>
+                                                                                    <parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->
+                                                                                    <!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />
+                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
+                                                                                    <!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->
+                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />
+                                                                                </set>
+                                                                                <break/>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='false'>
+                                                                            <block></block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <switch test='`$found`'>
+                                                                    <outcome value='true'>
+                                                                        <block></block>
+                                                                    </outcome>
+                                                                    <outcome value='false'>
+                                                                        <block atomic='true'>
+                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                    key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
+                                                                                <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                <parameter name='vpn-type' value='`$arridx + 1`' />
+                                                                            </update>
+                                                                            <set>
+                                                                                <parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />
+                                                                                <parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />
+                                                                                <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
+                                                                                <parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />
+                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='false'>
+                                                            <block atomic='true'>
+                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                        key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
+                                                                    <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                    <parameter name='vpn-type' value='0' />
+                                                                </update>
+                                                                <set>
+                                                                    <parameter name='tmp.arr[0]' value='`$providerValue`' />
+                                                                    <parameter name='tmp.arr_length' value='1' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value="`'0,' + $gfp`" />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />
+                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
+                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
+                                                                    <parameter name='otn-tunnel-slice_length' value='1' />
+                                                                    <parameter name='otn-tunnel-slice[0].list_length' value='1' />
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </block>
+                                            </for>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='not-found'>
                                         <return status='failure'>
                                             <parameter name='ack-final' value='Y'/>
                                             <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="Error executing slice creation api for domain A" />
+                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
                                         </return>
                                     </outcome>
-                                    <outcome value='success'>
-                                        <block></block>
-                                    </outcome>
-                                </execute>
-                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceB-list-creation.templatefile`" />
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
-                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
-                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
-                                    <parameter name="format" value="json"/>
-                                    <parameter name="httpMethod" value="post"/>
-                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                                     <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 slice creation api for domain B" />
+                                            <parameter name='error-code' value='' />
+                                            <parameter name='error-message' value='' />
                                         </return>
                                     </outcome>
-                                    <outcome value='success'>
-                                        <block></block>
-                                    </outcome>
-                                </execute>
+                                </get-resource>
+                                <for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >
+                                    <block atomic='true'>
+                                        <for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >
+                                            <block atomic='true'>
+                                                <set>
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`" />
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />
+                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />
+                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                    <parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />
+                                                    <parameter name="tmp.domainG.restapiUrl" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`" />
+                                                    <parameter name="tmp.domainG.restapiUser" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`" />
+                                                    <parameter name="tmp.domainG.restapiPassword" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`" />
+                                                </set>
+                                            </block>
+                                        </for>
+                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`" />
+                                            <parameter name="restapiUrl" value="`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
+                                            <parameter name="restapiUser" value="`$tmp.domainG.restapiUser`" />
+                                            <parameter name="restapiPassword" value="`tmp.domainG.restapiPassword`" />
+                                            <parameter name="format" value="json"/>
+                                            <parameter name="httpMethod" value="post"/>
+                                            <parameter name="responsePrefix" value="otn-oof"/>
+                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                            <parameter name="trustStorePassword" value="adminadmin"/>
+                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                            <parameter name="keyStorePassword" value="adminadmin"/>
+                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                            <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 slice creation api for domain A" />
+                                                </return>
+                                            </outcome>
+                                            <outcome value='success'>
+                                                <block></block>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </for>
                             </block>
                         </outcome>
                     </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
index 214debf8..6f263361 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
@@ -150,43 +150,48 @@
                                                                             <block atomic="true"></block>
                                                                         </outcome>
                                                                     </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
-                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
-                                                                        <parameter name="format" value="json"/>
-                                                                        <parameter name="httpMethod" value="delete"/>
-                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/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"/>
-                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                        <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 delete ethernet service rest api" />
-                                                                            </return>
-                                                                        </outcome>
-                                                                        <outcome value='success'>
-                                                                            <block atomic="true">
-                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
-                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
-                                                                                    <parameter name='operational-status' value='Deactivated' />
-                                                                                </update>
-                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
-                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
-                                                                                    <parameter name='operational-status' value='Deactivated' />
-                                                                                </update>
-                                                                            </block>
+                                                                    <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
+                                                                        <outcome value='Other'>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="delete"/>
+                                                                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/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"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                <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 delete ethernet service rest api" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                                <outcome value='success'>
+                                                                                    <block atomic="true">
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
+                                                                                            <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                            <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                            <parameter name='operational-status' value='Deactivated' />
+                                                                                        </update>
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
+                                                                                            <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
+                                                                                            <parameter name='operational-status' value='Deactivated' />
+                                                                                        </update>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </execute>
                                                                         </outcome>
-                                                                    </execute>
+                                                                        <outcome value=''></outcome>
+                                                                    </switch>
                                                                 </block>
                                                             </outcome>
                                                             <outcome value='not-found'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml
index b6ddc9ad..7c6e65ff 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml
@@ -153,30 +153,35 @@
                                                                             <block atomic="true"></block>
                                                                         </outcome>
                                                                     </execute>
-                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />-->
-                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />
-                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
-                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
-                                                                        <parameter name="format" value="json"/>
-                                                                        <parameter name="httpMethod" value="delete"/>
-                                                                        <parameter name="responsePrefix" value="otn-oof"/>
-                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                        <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 decoloring UNI rest api" />
-                                                                            </return>
-                                                                        </outcome>
-                                                                        <outcome value='success'>
-                                                                            <block></block>
+                                                                    <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
+                                                                        <outcome value='Other'>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />-->
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="delete"/>
+                                                                                <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                <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 decoloring UNI rest api" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                                <outcome value='success'>
+                                                                                    <block></block>
+                                                                                </outcome>
+                                                                            </execute>
                                                                         </outcome>
-                                                                    </execute>
+                                                                        <outcome value=''></outcome>
+                                                                    </switch>
                                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                             key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
                                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-- 
cgit 1.2.3-korg