Support for proper deletion of vpn-bindings when there are multiple CLLs and multiple clouds.

Issue-ID: SDNC-1594
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: Iae468575a26b45efa069e87814f41739c9e7563b

Former-commit-id: 904f8819208b26f7a6b715540319d076d3819cb7

2 files changed, 278 insertions, 124 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml
index a155f743..2e224beb 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete-VPNBs.xml
@@ -57,72 +57,101 @@
                 <!--                                             $tmp.source.ttp-id`" />-->
                 <parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node`" />
             </set>
-            <block>
-                <set>
-                    <parameter name='tmp.aai.all-vpn-bindings.' value='' />
-                </set>
-                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                              resource="vpn-bindings"
-                              key="selflink = 'https://aai.onap:8443/aai/v24/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'>
-                                    <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `">
-                                        <outcome value='true'>
-                                            <block atomic="true">
-                                                <set>
-                                                    <parameter name='tmp.aai.vpn-binding.' value="" />
-                                                </set>
-                                                <set>
-                                                    <parameter name='tmp.aai.vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                                </set>
-                                                <set>
-                                                    <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+            <for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >
+                <switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>
+                    <outcome value='connectivity'>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                      resource="connectivity"
+                                      key="connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
+                                      local-only="false"
+                                      pfx="tmp.aai.connectivity" >
+                            <outcome value='not-found'></outcome>
+                            <outcome value='failure'></outcome>
+                            <outcome value='success'>
+                                <block>
+                                    <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                        <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                            <outcome value='vpn-binding'>
+                                                <block atomic="true">
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                  resource="vpn-binding"
+                                                                  key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                  local-only="false"
+                                                                  pfx="tmp.aai.vpn-binding" >
+                                                        <outcome value='success'>
+                                                            <block atomic='true'>
+                                                                <switch test="`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `">
+                                                                    <outcome value='true'>
+                                                                        <block atomic="true">
+                                                                            <set>
+                                                                                <parameter name='tmp.underlayOTN' value="`$tmp.aai.vpn-binding.vpn-name`" />
+                                                                            </set>
+                                                                            <set>
+                                                                                <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-binding.src-access-node-id`" />
-                                                </set>
-                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                              resource="pnf"
-                                                              key="pnf.pnf-name = $tmp.domain.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.domain.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.domain.esr-thirdparty-id AND
-		     depth = '1'"
-                                                                                          pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                          resource="pnf"
+                                                                                          key="pnf.pnf-name = $tmp.domain.pnf-name"
+                                                                                          pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                <!--AND depth = '0'"-->
                                                                                 <outcome value='success'>
                                                                                     <block>
-                                                                                        <set>
-                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.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>
+                                                                                        <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.domain.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.domain.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                      pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                            <outcome value='success'>
+                                                                                                                <block>
+                                                                                                                    <set>
+                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.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>
+                                                                                                        <break/>
+                                                                                                    </block>
+                                                                                                </outcome>
+                                                                                            </switch>
+                                                                                        </for>
                                                                                     </block>
                                                                                 </outcome>
                                                                                 <outcome value='not-found'>
@@ -140,77 +169,62 @@
                                                                                     </return>
                                                                                 </outcome>
                                                                             </get-resource>
-                                                                            <break/>
+                                                                            <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.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
+                                                                                <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='success'>
+                                                                                    <block atomic="true"></block>
+                                                                                </outcome>
+                                                                                <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 OTN tunnel rest api" />
+                                                                                    </return>
+                                                                                </outcome>
+                                                                            </execute>
+                                                                            <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                    key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
                                                                         </block>
                                                                     </outcome>
+                                                                    <outcome value='false'></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.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
-                                                    <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 delete OTN tunnel rest api" />
-                                                        </return>
-                                                    </outcome>
-                                                    <outcome value='success'>
-                                                        <block atomic="true"></block>
-                                                    </outcome>
-                                                </execute>
-                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
-                                            </block>
-                                        </outcome>
-                                        <outcome value='false'></outcome>
-                                    </switch>
+                                                            </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.l3vpn.pe1_id`" />
+                                                            </return>
+                                                        </outcome>
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='error-code' value='' />
+                                                                <parameter name='error-message' value='' />
+                                                            </return>
+                                                        </outcome>
+                                                    </get-resource>
+                                                </block>
+                                            </outcome>
+                                        </switch>
+                                    </for>
                                 </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="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                        </return>
-                    </outcome>
-                    <outcome value='failure'>
-                        <return status='failure'>
-                            <parameter name='error-code' value='' />
-                            <parameter name='error-message' value='' />
-                        </return>
+                            </outcome>
+                        </get-resource>
                     </outcome>
-                </get-resource>
-            </block>
+                </switch>
+            </for>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
index 91889bb4..dcc3d696 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
@@ -1260,6 +1260,31 @@
                                                                                                                                                             <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.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`" />
+                                                                                                                                                        <!--<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"></block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </execute>
                                                                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' ></call>
                                                                                                                                                     <switch test="`$found-root-connectivity`">
                                                                                                                                                         <outcome value='true'>
@@ -1609,6 +1634,121 @@
                                                                                                                                                                                             </outcome>
                                                                                                                                                                                         </switch>
                                                                                                                                                                                     </for>
+                                                                                                                                                                                    <block atomic="true">
+                                                                                                                                                                                        <set>
+                                                                                                                                                                                            <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.connectivity.access-node-id`" />
+                                                                                                                                                                                        </set>
+                                                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                                                      resource="pnf"
+                                                                                                                                                                                                      key="pnf.pnf-name = $tmp.domain.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.domain.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.domain.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                                                                                                  pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                                                                                        <outcome value='success'>
+                                                                                                                                                                                                                            <block>
+                                                                                                                                                                                                                                <set>
+                                                                                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.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>
+                                                                                                                                                                                                                    <break/>
+                                                                                                                                                                                                                </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='`$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"></block>
+                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                </execute>
+                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                            <outcome value=''></outcome>
+                                                                                                                                                                                        </switch>
+                                                                                                                                                                                    </block>
                                                                                                                                                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                                                                                                                                             key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
                                                                                                                                                                                 </block>