Completing the logic and the call flow for Transport Slicing operations:
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
index 0a853f1..2517645 100644 (file)
 <service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>\r
+        xmlns='http://www.onap.org/sdnc/svclogic'\r
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>\r
     <method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\r
         <block atomic="true">\r
-            <switch test='`$service-data.vnfs.vnf_length`'>\r
-                <outcome value='0'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='Other'>\r
-                    <block atomic="true">\r
-                        <for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\r
-                            <block>\r
-                                <switch test="`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">\r
-                                    <outcome value='true'>\r
-                                        <block atomic="true">\r
-                                            <set>\r
-                                                <parameter name='tmp.vidx' value='`$vidx`' />\r
-                                                <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\r
-                                            </set>\r
-                                        </block>\r
-                                    </outcome>\r
-                                </switch>\r
-                            </block>\r
-                        </for>\r
-                        <switch test="`$tmp.vidx`">\r
-                            <outcome value=''>\r
-                                <return status='failure'>\r
-                                    <parameter name='ack-final' value='Y'/>\r
-                                    <parameter name="error-code" value="500" />\r
-                                    <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />\r
-                                </return>\r
-                            </outcome>\r
-                        </switch>\r
-                    </block>\r
-                </outcome>\r
-            </switch>\r
-            <switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\r
-                <outcome value='Active'>\r
-                    <block atomic="true"></block>\r
-                </outcome>\r
-                <outcome value='Other'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
-            <set>\r
-                <!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\r
-            </set>\r
-            <set>\r
-                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
-                <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` " />\r
-            </set>\r
-            <set>\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\r
-                <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\r
-            </set>\r
-            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="generic-vnf"   \r
-               key="generic-vnf.vnf-id = $vnfId" >\r
-                <parameter name="orchestration-status" value="PendingDelete" />\r
-                <parameter name="vnf-type" value="some vnf-type" />\r
-            </update>\r
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="service-instance"\r
-       key='service-instance.service-instance-id = $service-data.service-information.service-instance-id\r
-         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \r
-         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'\r
-       local-only="false"\r
-       force="true" pfx="tmp.aai.service-instance">\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                <parameter name='contextPrefix' value='prop' />\r
+            </execute>\r
+            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->\r
+            <!--       resource="service-instance"-->\r
+            <!--       key='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\r
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\r
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\r
+            <!--       local-only="false"-->\r
+            <!--       force="true" pfx="tmp.aai.service-instance">-->\r
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                          resource="service-instance"\r
+                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
+                          local-only="false"\r
+                          force="true" pfx="tmp.aai.service-instance">\r
+                <!--vnf-topology-operation-input.service-information.service-instance-id-->\r
                 <outcome value='success'>\r
                     <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\r
                         <switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\r
                             <outcome value='connectivity'>\r
-                                <switch test="`$rel-index == 0`">\r
-                                    <outcome value='true'>\r
-                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="connectivity"\r
-           key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[0].relationship-data[0].relationship-value"\r
-               local-only="false" \r
-               pfx="tmp.aai.connectivityA" >\r
-                                            <outcome value='success'>\r
-                                                <block atomic="true">\r
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND \r
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                              resource="connectivity"\r
+                                              key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"\r
+                                              local-only="false"\r
+                                              pfx="tmp.aai.connectivity" >\r
+                                    <outcome value='success'>\r
+                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\r
+                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\r
+                                                <outcome value='vpn-binding'>\r
+                                                    <block atomic="true">\r
+                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                      resource="vpn-binding"\r
+                                                                      key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"\r
+                                                                      local-only="false"\r
+                                                                      pfx="tmp.aai.vpn-binding" >\r
+                                                            <outcome value='success'>\r
+                                                                <block atomic="true">\r
+                                                                    <set>\r
+                                                                        <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +\r
+                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\r
+                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\r
+                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\r
+                                                   $tmp.aai.vpn-binding.src-access-node-id`" />\r
+                                                                    </set>\r
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                  resource="pnf"\r
+                                                                                  key="pnf.pnf-name = $tmp.domain.pnf-name"\r
+                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >\r
+                                                                        <!--AND depth = '0'"-->\r
+                                                                        <outcome value='success'>\r
+                                                                            <block>\r
+                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\r
+                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\r
+                                                                                        <outcome value='esr-thirdparty-sdnc'>\r
+                                                                                            <block atomic="true">\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='tmp.domain.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />\r
+                                                                                                </set>\r
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                              resource="esr-thirdparty-sdnc"\r
+                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND\r
                     depth = '1'"\r
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
-                                                        <outcome value='success'>\r
-                                                            <set>\r
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
-                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
-                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
-                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
-                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
-                                                                <!--<parameter name="format" value="json"/>-->\r
-                                                                <!--<parameter name="httpMethod" value="get"/>-->\r
-                                                                <!--<parameter name="responsePrefix" value="topology"/>-->\r
-                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
-                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
-                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
-                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
-                                                            </set>\r
-                                                        </outcome>\r
-                                                        <outcome value='not-found'>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />\r
-                                                            </return>\r
-                                                        </outcome>\r
-                                                        <outcome value='Other'>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />\r
-                                                            </return>\r
-                                                        </outcome>\r
-                                                    </get-resource>\r
-                                                    <set>\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />\r
-                                                    </set>\r
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />\r
-                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />\r
-                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                                                        <parameter name="format" value="json"/>\r
-                                                        <parameter name="httpMethod" value="delete"/>\r
-                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
-                                                        <parameter name="responsePrefix" value="vpn-result"/>\r
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                        <outcome value='failure'>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />\r
-                                                            </return>\r
-                                                        </outcome>\r
-                                                        <outcome value='success'>\r
-                                                            <block atomic="true">\r
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \r
-      key='vpn-binding.vpn-id = $tmp.vpnName' >\r
-                                                                    <parameter name='vpn-id' value='`$tmp.vpnName`' />\r
-                                                                    <parameter name='vpn-name' value='`$tmp.vpnName`' />\r
-                                                                    <parameter name='operational-status' value='DeActivated' />\r
-                                                                </update>\r
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \r
-      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid'>\r
-                                                                    <parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\r
-                                                                    <parameter name='operational-status' value='DeActivated' />\r
-                                                                </update>\r
-                                                            </block>\r
-                                                        </outcome>\r
-                                                    </execute>\r
-                                                </block>\r
-                                            </outcome>\r
-                                            <outcome value='not-found'>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='ack-final' value='Y'/>\r
-                                                    <parameter name="error-code" value="500" />\r
-                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
-                                                </return>\r
-                                            </outcome>\r
-                                            <outcome value='failure'>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='error-code' value='' />\r
-                                                    <parameter name='error-message' value='' />\r
-                                                </return>\r
-                                            </outcome>\r
-                                        </get-resource>\r
+                                                                                                              pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >\r
+                                                                                                    <outcome value='success'>\r
+                                                                                                        <block>\r
+                                                                                                            <set>\r
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
+                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
+                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
+                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
+                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
+                                                                                                                <!--<parameter name="format" value="json"/>-->\r
+                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->\r
+                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->\r
+                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                                                                            </set>\r
+                                                                                                        </block>\r
+                                                                                                    </outcome>\r
+                                                                                                    <outcome value='not-found'>\r
+                                                                                                        <return status='failure'>\r
+                                                                                                            <parameter name='ack-final' value='Y'/>\r
+                                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                        </return>\r
+                                                                                                    </outcome>\r
+                                                                                                    <outcome value='Other'>\r
+                                                                                                        <return status='failure'>\r
+                                                                                                            <parameter name='ack-final' value='Y'/>\r
+                                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                        </return>\r
+                                                                                                    </outcome>\r
+                                                                                                </get-resource>\r
+                                                                                                <break/>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                </for>\r
+                                                                            </block>\r
+                                                                        </outcome>\r
+                                                                        <outcome value='not-found'>\r
+                                                                            <return status='failure'>\r
+                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                <parameter name="error-code" value="500" />\r
+                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                            </return>\r
+                                                                        </outcome>\r
+                                                                        <outcome value='Other'>\r
+                                                                            <return status='failure'>\r
+                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                <parameter name="error-code" value="500" />\r
+                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                            </return>\r
+                                                                        </outcome>\r
+                                                                    </get-resource>\r
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->\r
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`" />\r
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
+                                                                        <parameter name="format" value="json"/>\r
+                                                                        <parameter name="httpMethod" value="delete"/>\r
+                                                                        <parameter name="responsePrefix" value="otn-oof"/>\r
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                                        <outcome value='failure'>\r
+                                                                            <return status='failure'>\r
+                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                <parameter name="error-code" value="500" />\r
+                                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                                                            </return>\r
+                                                                        </outcome>\r
+                                                                        <outcome value='success'>\r
+                                                                            <block atomic="true"></block>\r
+                                                                        </outcome>\r
+                                                                    </execute>\r
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/eth-svc-instances=' + $tmp.aai.connectivity.connectivity-id`" />\r
+                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->\r
+                                                                        <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->\r
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />\r
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />\r
+                                                                        <parameter name="format" value="json"/>\r
+                                                                        <parameter name="httpMethod" value="delete"/>\r
+                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+                                                                        <parameter name="responsePrefix" value="vpn-result"/>\r
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                                        <outcome value='failure'>\r
+                                                                            <return status='failure'>\r
+                                                                                <parameter name='ack-final' value='Y'/>\r
+                                                                                <parameter name="error-code" value="500" />\r
+                                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                                                            </return>\r
+                                                                        </outcome>\r
+                                                                        <outcome value='success'>\r
+                                                                            <block atomic="true">\r
+                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\r
+                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\r
+                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-id`' />\r
+                                                                                    <parameter name='operational-status' value='Deactivated' />\r
+                                                                                </update>\r
+                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
+                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\r
+                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\r
+                                                                                    <parameter name='operational-status' value='Deactivated' />\r
+                                                                                </update>\r
+                                                                            </block>\r
+                                                                        </outcome>\r
+                                                                    </execute>\r
+                                                                </block>\r
+                                                            </outcome>\r
+                                                            <outcome value='not-found'>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                    <parameter name="error-code" value="500" />\r
+                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
+                                                                </return>\r
+                                                            </outcome>\r
+                                                            <outcome value='failure'>\r
+                                                                <return status='failure'>\r
+                                                                    <parameter name='error-code' value='' />\r
+                                                                    <parameter name='error-message' value='' />\r
+                                                                </return>\r
+                                                            </outcome>\r
+                                                        </get-resource>\r
+                                                    </block>\r
+                                                </outcome>\r
+                                            </switch>\r
+                                        </for>\r
                                     </outcome>\r
-                                    <outcome value='false'>\r
-                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-       resource="connectivity"\r
-           key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[1].relationship-data[0].relationship-value"\r
-               local-only="false" \r
-               pfx="tmp.aai.connectivityB" >\r
-                                            <outcome value='success'>\r
-                                                <block atomic="true">\r
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
-               resource="esr-thirdparty-sdnc" \r
-               key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND \r
-                    depth = '1'"\r
-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\r
-                                                        <outcome value='success'>\r
-                                                            <set>\r
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
-                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
-                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
-                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
-                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
-                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
-                                                                <!--<parameter name="format" value="json"/>-->\r
-                                                                <!--<parameter name="httpMethod" value="get"/>-->\r
-                                                                <!--<parameter name="responsePrefix" value="topology"/>-->\r
-                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
-                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
-                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
-                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
-                                                            </set>\r
-                                                        </outcome>\r
-                                                        <outcome value='not-found'>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />\r
-                                                            </return>\r
-                                                        </outcome>\r
-                                                        <outcome value='Other'>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />\r
-                                                            </return>\r
-                                                        </outcome>\r
-                                                    </get-resource>\r
-                                                    <set>\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\r
-                                                        <parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />\r
-                                                    </set>\r
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />\r
-                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />\r
-                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                                                        <parameter name="format" value="json"/>\r
-                                                        <parameter name="httpMethod" value="delete"/>\r
-                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
-                                                        <parameter name="responsePrefix" value="vpn-result"/>\r
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                        <outcome value='failure'>\r
-                                                            <return status='failure'>\r
-                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                <parameter name="error-code" value="500" />\r
-                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />\r
-                                                            </return>\r
-                                                        </outcome>\r
-                                                        <outcome value='success'>\r
-                                                            <block atomic="true">\r
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \r
-      key='vpn-binding.vpn-id = $tmp.vpnName' >\r
-                                                                    <parameter name='vpn-id' value='`$tmp.vpnName`' />\r
-                                                                    <parameter name='vpn-name' value='`$tmp.vpnName`' />\r
-                                                                    <parameter name='operational-status' value='DeActivated' />\r
-                                                                </update>\r
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \r
-      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid'>\r
-                                                                    <parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\r
-                                                                    <parameter name='operational-status' value='DeActivated' />\r
-                                                                </update>\r
-                                                            </block>\r
-                                                        </outcome>\r
-                                                    </execute>\r
-                                                </block>\r
-                                            </outcome>\r
-                                            <outcome value='not-found'>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='ack-final' value='Y'/>\r
-                                                    <parameter name="error-code" value="500" />\r
-                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
-                                                </return>\r
-                                            </outcome>\r
-                                            <outcome value='failure'>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='error-code' value='' />\r
-                                                    <parameter name='error-message' value='' />\r
-                                                </return>\r
-                                            </outcome>\r
-                                        </get-resource>\r
+                                    <outcome value='not-found'>\r
+                                        <return status='failure'>\r
+                                            <parameter name='ack-final' value='Y'/>\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
+                                        </return>\r
+                                    </outcome>\r
+                                    <outcome value='failure'>\r
+                                        <return status='failure'>\r
+                                            <parameter name='error-code' value='' />\r
+                                            <parameter name='error-message' value='' />\r
+                                        </return>\r
                                     </outcome>\r
-                                </switch>\r
+                                </get-resource>\r
                             </outcome>\r
                         </switch>\r
                     </for>\r