From 2c4d878572be86786419130d35da41e58593be8c Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 29 Sep 2021 17:20:32 -0400
Subject: Support individual CLL deletion, and UNI removal from Ethernet
 Service, and adjusting the bandwidth of OTN tunnels and UNIs accordingly.

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

Former-commit-id: 68c418849f4636b0e960a80fa3604519723167cf
---
 ...E-API_cll-vnf-topology-operation-cll-delete.xml | 1828 +++++++++++++++++---
 1 file changed, 1624 insertions(+), 204 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml')

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 4f92df4f..91889bb4 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
@@ -9,9 +9,9 @@
             </execute>
             <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
             <!--	resource="service-instance"-->
-            <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->
-            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->
-            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->
+            <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->
             <!--	local-only="false"-->
             <!--	force="true" pfx="tmp.aai.service-instance">-->
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
@@ -21,217 +21,1637 @@
          AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
                           local-only="false"
                           force="true" pfx="tmp.aai.service-instance">
-                <!--vnf-topology-operation-input.service-information.service-instance-id-->
+                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                <!--	resource="service-instance"-->
+                <!--	key='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->
+                <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+                <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->
+                <!--	local-only="false"-->
+                <!--	force="true" pfx="tmp.aai.service-instance">-->
                 <outcome value='success'>
-                    <switch test="`$tmp.aai.service-instance.relationship-list.relationship_length != ''`">
+                    <switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>
+                        <outcome value='false'></outcome>
                         <outcome value='true'>
-                            <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >
-                                <switch test='`$tmp.aai.service-instance.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 = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
-                                                      local-only="false"
-                                                      pfx="tmp.aai.connectivity" >
-                                            <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">
-                                                                                <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' >
-                                                                                                                <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>
-                                                                                <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>
-                                                                                <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"/>
+                            <block>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="pnfs"
+                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'"
+                                              local-only="false"
+                                              pfx="ccsdkTopopnfs" ></get-resource>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="logical-links"
+                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'"
+                                              local-only="false"
+                                              pfx="ccsdkTopologicalLinks" ></get-resource>
+                                <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' />
+                                    <!--<parameter name='tmp.slicevpns' value='' />-->
+                                    <!--<parameter name='tmp.slicevpns_length' value='0' />-->
+                                    <!--<parameter name='tmp.slicevpnuuids' value='' />-->
+                                    <!--<parameter name='tmp.slicevpnuuids.' value='' />-->
+                                </set>
+                                <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                        <parameter name="ctx-destination" value="prop.ethernet-service-name"/>
+                                    </execute>
+                                    <set>
+                                        <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->
+                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />
+                                    </set>
+                                    <set>
+                                        <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`" />
+                                    </set>
+                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                    <!--	resource="allotted-resource"-->
+                                    <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
+                                    <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+                                    <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->
+                                    <!--         AND allotted-resource.id = $allotted-resource-id'-->
+                                    <!--	local-only="false"-->
+                                    <!--	force="true" pfx="tmp.aai.allotted-resource">-->
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="allotted-resource"
+                                                  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
+         AND allotted-resource.id = $allotted-resource-id'
+                                                  local-only="false"
+                                                  force="true" pfx="tmp.aai.allotted-resource">
+                                        <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>
+                                        <outcome value='success'>
+                                            <block atomic="true">
+                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                              resource="allotted-resource: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
+         AND allotted-resource.id = $allotted-resource-id'
+                                                              local-only="false"
+                                                              force="true" pfx="tmp.aai.allotted-resource.relationship-list">
+                                                    <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>
+                                                    <outcome value='success'>
+                                                        <block atomic="true">
+                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>
+                                                                <outcome value='false'></outcome>
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                                <outcome value='network-policy'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='network-policy-id' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="network-policy"
+                                                                                                      key='network-policy.network-policy-id = $network-policy-id'
+                                                                                                      local-only="false"
+                                                                                                      force="true" pfx="tmp.aai.network-policy">
+                                                                                            <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>
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <set>
+                                                                                                        <parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />
+                                                                                                        <parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                    </set>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
+                                                                        <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                                <outcome value='logical-link'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='logical-link-name' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="logical-link"
+                                                                                                      key='logical-link.link-name = $logical-link-name'
+                                                                                                      local-only="false"
+                                                                                                      force="true" pfx="tmp.aai.logical-link">
+                                                                                            <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 delete ethernet service rest api" />
+                                                                                                    <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>
                                                                                             <outcome value='success'>
-                                                                                                <block atomic="true"></block>
+                                                                                                <block>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                        <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->
+                                                                                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='network-route-one' value="`$tmp.aai.logical-link.link-name`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='network-route-two' value="`$tmp.aai.logical-link.link-name2`" />
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-one'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-one">
+                                                                                                        <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>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <switch test='`$tmp.aai.network-route-one.type`'>
+                                                                                                                    <outcome value='ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-ROOT.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-B.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='LEAF'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-LEAF.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-A.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-two'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-two">
+                                                                                                        <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>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <switch test='`$tmp.aai.network-route-two.type`'>
+                                                                                                                    <outcome value='ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-ROOT.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-B.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='LEAF'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-LEAF.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-A.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                        <parameter name="original_string" value='`$tmp.aai.network-route-A.next-hop`'/>
+                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                        <parameter name="regex" value="[-]+"/>
+                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainA-pnfName"/>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.src.domainA.pnf-name' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $param-prefix-domainA-pnfName[6] + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                                </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>
+                                                                                                                                    <outcome value='network-resource'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainA.eth-network-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                        </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>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </execute>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="p-interface"
+                                                                                                                  key="pnf.pnf-name = $tmp.src.domainA.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.network-route-A.p-interface-src" >
+                                                                                                        <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                        <!--	resource="p-interface"-->
+                                                                                                        <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                        <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                        <!--		local-only="false" -->
+                                                                                                        <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainA"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>
+                                                                                                                        <outcome value='tunnel-termination-point'>
+                                                                                                                            <block atomic="true">
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.source.ttp-id' value="`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`" />
+                                                                                                                                </set>
+                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                              resource="tunnel-termination-point"
+                                                                                                                                              key="tunnel-termination-point.ttp-id = $tmp.source.ttp-id
+		AND depth = '0'"
+                                                                                                                                              pfx='tmp.aai.source-ttp' local-only='false' >
+                                                                                                                                    <outcome value='success'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='source.tunnel-tp-id' value="`$tmp.aai.source-ttp.tunnel-tp-id`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </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.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>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.LEAF.pnf-name-long' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $param-prefix-domainA-pnfName[6] + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                        <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->
+                                                                                                        <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />
+                                                                                                    </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                        <parameter name="original_string" value='`$tmp.aai.network-route-B.next-hop`'/>
+                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                        <parameter name="regex" value="[-]+"/>
+                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainB-pnfName"/>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.dst.domainB.pnf-name' value="`$param-prefix-domainB-pnfName[0] + '-' +
+                                                   $param-prefix-domainB-pnfName[1] + '-' +
+                                                   $param-prefix-domainB-pnfName[2] + '-' +
+                                                   $param-prefix-domainB-pnfName[3] + '-' +
+                                                   $param-prefix-domainB-pnfName[4] + '-' +
+                                                   $param-prefix-domainB-pnfName[5] + '-' +
+                                                   $param-prefix-domainB-pnfName[6] + '-' +
+                                                   $param-prefix-domainB-pnfName[7] + '-' +
+                                                   $param-prefix-domainB-pnfName[8]`" />
+                                                                                                                </set>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="pnf"
+                                                                                                                              key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
+                                                                                                                              pfx='tmp.aai.destination-pnf' local-only='false' >
+                                                                                                                    <!--AND depth = '0'"-->
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block>
+                                                                                                                            <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                                                                    <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].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.domainB.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                          pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block>
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.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>
+                                                                                                                                    <outcome value='network-resource'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainB.eth-network-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                        </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>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </execute>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="p-interface"
+                                                                                                                  key="pnf.pnf-name = $tmp.dst.domainB.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.network-route-B.p-interface-dst" >
+                                                                                                        <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                        <!--	resource="p-interface"-->
+                                                                                                        <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                        <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                        <!--		local-only="false" -->
+                                                                                                        <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainB"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
+                                                                                                                        <outcome value='tunnel-termination-point'>
+                                                                                                                            <block atomic="true">
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`" />
+                                                                                                                                </set>
+                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                              resource="tunnel-termination-point"
+                                                                                                                                              key="tunnel-termination-point.ttp-id = $tmp.destination.ttp-id
+		AND depth = '0'"
+                                                                                                                                              pfx='tmp.aai.destination-ttp' local-only='false' >
+                                                                                                                                    <outcome value='success'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </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.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>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.ROOT.pnf-name-long' value="`$param-prefix-domainB-pnfName[0] + '-' +
+                                                   $param-prefix-domainB-pnfName[1] + '-' +
+                                                   $param-prefix-domainB-pnfName[2] + '-' +
+                                                   $param-prefix-domainB-pnfName[3] + '-' +
+                                                   $param-prefix-domainB-pnfName[4] + '-' +
+                                                   $param-prefix-domainB-pnfName[5] + '-' +
+                                                   $param-prefix-domainB-pnfName[6] + '-' +
+                                                   $param-prefix-domainB-pnfName[7] + '-' +
+                                                   $param-prefix-domainB-pnfName[8]`" />
+                                                                                                        <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
+                                                                                                        <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="uni"
+                                                                                                                  key="uni.id = $tmp.LEAF.uni-p-interface-long"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.leafuni" >
+                                                                                                        <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>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic='true'>
+                                                                                                                <set>
+                                                                                                                    <parameter name='bwToBeDecreased' value="`$tmp.aai.leafuni.data-source`" />
+                                                                                                                    <parameter name='tpid' value='`$tmp.aai.leafuni.tp-id`' />
+                                                                                                                    <parameter name='cvlan' value='`$tmp.aai.leafuni.cvlan`' />
+                                                                                                                </set>
+                                                                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                        key='uni.id = $tmp.LEAF.uni-p-interface-long'></delete>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="uni"
+                                                                                                                              key="uni.id = $tmp.ROOT.uni-p-interface-long"
+                                                                                                                              local-only="false"
+                                                                                                                              pfx="tmp.aai.rootuni" >
+                                                                                                                    <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>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />
+                                                                                                                            </set>
+                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                    key='uni.id = $tmp.ROOT.uni-p-interface-long'>
+                                                                                                                                <parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />
+                                                                                                                                <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                            </update>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>
+                                                                                                    <switch test='`$found-middle-man`'>
+                                                                                                        <outcome value='false'>
+                                                                                                            <block atomic='true'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="LEAF CONN DOES NOT EXIST BUT IT SHOULD BE." />
+                                                                                                                </return>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='true'>
+                                                                                                            <block atomic='true'>
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.MMonlyHasROOT' value='true' />
+                                                                                                                </set>
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.MMstillHasUni' value='false' />
+                                                                                                                </set>
+                                                                                                                <for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>
+                                                                                                                        <outcome value='uni'>
+                                                                                                                            <block>
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />
+                                                                                                                                </set>
+                                                                                                                                <switch test="`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`">
+                                                                                                                                    <outcome value='false'>
+                                                                                                                                        <block></block>
+                                                                                                                                    </outcome>
+                                                                                                                                    <outcome value='true'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.MMonlyHasROOT' value='false' />
+                                                                                                                                            </set>
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.MMstillHasUni' value='true' />
+                                                                                                                                            </set>
+                                                                                                                                            <break/>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </for>
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                                    <parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
+                                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
+                                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
+                                                                                                                    <!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
+                                                                                                                    <!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->
+                                                                                                                    <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->
+                                                                                                                </set>
+                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' ></call>
+                                                                                                                <switch test="`$found-connectivity`">
+                                                                                                                    <outcome value='false'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="LEAF CONN DOES NOT EXIST BUT IT SHOULD BE." />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <block atomic='true'>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.stillHasUni' value='false' />
+                                                                                                                                <parameter name='tmp.keepVPNBs' value='false' />
+                                                                                                                            </set>
+                                                                                                                            <for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                                                                                    <outcome value='uni'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="uni"
+                                                                                                                                                          key="uni.id = $tmp.uni.id"
+                                                                                                                                                          local-only="false"
+                                                                                                                                                          pfx="tmp.aai.uni" >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                                                            <parameter name="original_string" value='`$tmp.aai.uni.id`'/>
+                                                                                                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                                                            <parameter name="regex" value="[-]+"/>
+                                                                                                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-uni-pnfName"/>
+                                                                                                                                                            <outcome value='success'>
+                                                                                                                                                                <block atomic="true">
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='tmp.uni.pnf-name' value="`$param-prefix-uni-pnfName[0] + '-' +
+                                                   $param-prefix-uni-pnfName[1] + '-' +
+                                                   $param-prefix-uni-pnfName[2] + '-' +
+                                                   $param-prefix-uni-pnfName[3] + '-' +
+                                                   $param-prefix-uni-pnfName[4] + '-' +
+                                                   $param-prefix-uni-pnfName[5] + '-' +
+                                                   $param-prefix-uni-pnfName[6] + '-' +
+                                                   $param-prefix-uni-pnfName[7] + '-' +
+                                                   $param-prefix-uni-pnfName[8]`" />
+                                                                                                                                                                    </set>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='failure'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='error-code' value='' />
+                                                                                                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                                                                </return>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </execute>
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.stillHasUni' value='true' />
+                                                                                                                                                        </set>
+                                                                                                                                                        <switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>
+                                                                                                                                                            <outcome value='false'>
+                                                                                                                                                                <block></block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                <block atomic='true'>
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='no-pce-call' value="true" />
+                                                                                                                                                                    </set>
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='tmp.stillHasUni' value='true' />
+                                                                                                                                                                        <parameter name='tmp.keepVPNBs' value='true' />
+                                                                                                                                                                    </set>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </switch>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='not-found'></outcome>
+                                                                                                                                                <outcome value='failure'></outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                            <switch test="`$tmp.keepVPNBs`">
+                                                                                                                                <outcome value='true'>
+                                                                                                                                    <block>
+                                                                                                                                        <block>
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='allNetworksList.' value='' />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="network-resources"
+                                                                                                                                                          key="selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'"
+                                                                                                                                                          local-only="false"
+                                                                                                                                                          pfx="allNetworksList" >
+                                                                                                                                                <outcome value='success'></outcome>
+                                                                                                                                                <outcome value='Other'></outcome>
+                                                                                                                                                <outcome value='not-found'></outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                            <for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >
+                                                                                                                                                <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>
+                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                        <switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>
+                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                <set>
+                                                                                                                                                                    <parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                                                                                                                                </set>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </switch>
+                                                                                                                                                    </outcome>
+                                                                                                                                                </switch>
+                                                                                                                                            </for>
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.pce-src-node.' value='' />
+                                                                                                                                            </set>
+                                                                                                                                            <set>
+                                                                                                                                                <!--<parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->
+                                                                                                                                                <!--                                                   1 + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->
+                                                                                                                                                <!--                                                   $param-prefix-domainA-pnfName[8]`" />-->
+                                                                                                                                                <parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $otnTopoIdSrc + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                                                            </set>
+                                                                                                                                            <set>
+                                                                                                                                                <!--<parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node + '-' + -->
+                                                                                                                                                <!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->
+                                                                                                                                                <!--                                             $tmp.source.ttp-id`" />-->
+                                                                                                                                                <parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node`" />
+                                                                                                                                            </set>
+                                                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>
+                                                                                                                                        </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.the-vpn-binding.' value="" />
+                                                                                                                                                                        </set>
+                                                                                                                                                                        <set>
+                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                        </set>
+                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />
+                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                        </update>
+                                                                                                                                                                    </block>
+                                                                                                                                                                </outcome>
+                                                                                                                                                                <outcome value='false'></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="`'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>
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />
+                                                                                                                                        </set>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.leafconn.access-provider-id + '-clientId-' +
+                                                   $tmp.leafconn.access-client-id + '-topologyId-' +
+                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +
+                                                   $tmp.leafconn.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>
+                                                                                                                                        </block>
+                                                                                                                                        <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 + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`" />
+                                                                                                                                            <!--<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'>
+                                                                                                                                                <block atomic='true'>
+                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                            key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>
+                                                                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />
+                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                    </update>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='false'>
+                                                                                                                                                <return status='failure'>
+                                                                                                                                                    <parameter name='error-code' value='' />
+                                                                                                                                                    <parameter name='error-message' value='Root Connectivity was not found' />
+                                                                                                                                                </return>
+                                                                                                                                            </outcome>
+                                                                                                                                        </switch>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='false'>
+                                                                                                                                    <switch test="`$tmp.stillHasUni`">
+                                                                                                                                        <outcome value='true'>
+                                                                                                                                            <block>
+                                                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' ></call>
+                                                                                                                                                <block>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />
+                                                                                                                                                    </set>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.leafconn.access-provider-id + '-clientId-' +
+                                                   $tmp.leafconn.access-client-id + '-topologyId-' +
+                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +
+                                                   $tmp.leafconn.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>
+                                                                                                                                                    </block>
+                                                                                                                                                    <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 + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`" />
+                                                                                                                                                        <!--<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'>
+                                                                                                                                                            <block atomic='true'>
+                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                        key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>
+                                                                                                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />
+                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                </update>
+                                                                                                                                                            </block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='false'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                                                                <parameter name='error-message' value='Root Connectivity was not found' />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </switch>
+                                                                                                                                                </block>
+                                                                                                                                            </block>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='false'>
+                                                                                                                                            <block>
+                                                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' ></call>
+                                                                                                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                        key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'></delete>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.the-connectivity.access-provider-id + '-clientId-' +
+                                                   $tmp.the-connectivity.access-client-id + '-topologyId-' +
+                                                   $tmp.the-connectivity.access-topology-id + '-nodeId-' +
+                                                   $tmp.the-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>
+                                                                                                                                                    <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.the-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>
+                                                                                                                                                </block>
+                                                                                                                                                <switch test="`$tmp.MMstillHasUni`">
+                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                        <block>
+                                                                                                                                                            <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'>
+                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>
+                                                                                                                                                                            <parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />
+                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                        </update>
+                                                                                                                                                                    </block>
+                                                                                                                                                                </outcome>
+                                                                                                                                                                <outcome value='false'>
+                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                                                        <parameter name='error-message' value='Root Connectivity was not found' />
+                                                                                                                                                                    </return>
+                                                                                                                                                                </outcome>
+                                                                                                                                                            </switch>
+                                                                                                                                                        </block>
+                                                                                                                                                    </outcome>
+                                                                                                                                                    <outcome value='false'>
+                                                                                                                                                        <block>
+                                                                                                                                                            <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">
+                                                                                                                                                                                                                <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' >
+                                                                                                                                                                                                                                                <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>
+                                                                                                                                                                                                                <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>
+                                                                                                                                                                                                                <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>
+                                                                                                                                                                                                                <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='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>
+                                                                                                                                                                                            <outcome value='uni'>
+                                                                                                                                                                                                <block atomic="true">
+                                                                                                                                                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                                                                            key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'></delete>
+                                                                                                                                                                                                </block>
+                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                        </switch>
+                                                                                                                                                                                    </for>
+                                                                                                                                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
+                                                                                                                                                                                </block>
+                                                                                                                                                                            </outcome>
+                                                                                                                                                                        </get-resource>
+                                                                                                                                                                    </outcome>
+                                                                                                                                                                </switch>
+                                                                                                                                                            </for>
+                                                                                                                                                            <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                    key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'></delete>
+                                                                                                                                                        </block>
+                                                                                                                                                    </outcome>
+                                                                                                                                                </switch>
+                                                                                                                                            </block>
+                                                                                                                                        </outcome>
+                                                                                                                                    </switch>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </switch>
+                                                                                                </block>
                                                                                             </outcome>
-                                                                                        </execute>
-                                                                                    </outcome>
-                                                                                    <outcome value=''></outcome>
-                                                                                </switch>
-                                                                                <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='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>
-                                                            <outcome value='uni'>
-                                                                <block atomic="true">
-                                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
-                                                                            key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'></delete>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
-                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                            key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
-                                                </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>
-                                </switch>
-                            </for>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </block>
+                                                    </outcome>
+                                                </get-resource>
+                                            </block>
+                                        </outcome>
+                                    </get-resource>
+                                </for>
+                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' ></call>
+                            </block>
                         </outcome>
                     </switch>
                 </outcome>
-- 
cgit 1.2.3-korg