X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Ftrans_slicing%2FGENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml;h=b01a60c908a924806dc2bce2f4f031c6a9653576;hb=2a546f93ac1c3686f099549fc88cd8bf2d39bd20;hp=34a70490e907f9325c6ecc8d84b3004fc9e0b758;hpb=32cd336379716eb9ca73b0ca67fb9fe1168149f4;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
index 34a70490..b01a60c9 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
@@ -44,528 +44,551 @@
                                                                       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='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='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />
-                                                                    </set>
-                                                                    <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
-                                                                        <outcome value='Other'>
-                                                                            <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
-                                                                                <outcome value=''>
-                                                                                    <block atomic="true">
-                                                                                        <set>
-                                                                                            <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
-                                                                                            <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
-                                                                                        </set>
-                                                                                        <set>
-                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />
-                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
-                                                                                            <!--<parameter name='dst-tpn-id' value='1' />-->
-                                                                                            <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />
-                                                                                            <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
-                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                            <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
-                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
-                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
-                                                                                        </set>
-                                                                                        <set>
-                                                                                            <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
+                                                                    <switch test="`$tmp.aai.vpn-binding.operational-status != 'Activated' `">
+                                                                        <outcome value='true'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />
+                                                                                </set>
+                                                                                <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
+                                                                                    <outcome value='Other'>
+                                                                                        <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
+                                                                                            <outcome value=''>
+                                                                                                <block atomic="true">
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                                        <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />
+                                                                                                        <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
+                                                                                                        <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                                                        <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />
+                                                                                                        <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
+                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                        <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                        <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
+                                                                                                        <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
+                                                                                                        <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-bindingA.src-access-node-id`" />
-                                                                                        </set>
-                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                      resource="pnf"
-                                                                                                      key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
-                                                                                                      pfx='tmp.aai.source-pnf' local-only='false' >
-                                                                                            <!--AND depth = '0'"-->
-                                                                                            <outcome value='success'>
-                                                                                                <block>
-                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
-                                                                                                        <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                                            <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                <block atomic="true">
-                                                                                                                    <set>
-                                                                                                                        <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                    </set>
-                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                  resource="esr-thirdparty-sdnc"
-                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
-		     depth = '1'"
-                                                                                                                                  pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                        <outcome value='success'>
-                                                                                                                            <block>
+                                                                                                    </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='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"/>-->
+                                                                                                                                    <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='not-found'>
-                                                                                                                            <return status='failure'>
-                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                            </return>
-                                                                                                                        </outcome>
-                                                                                                                        <outcome value='Other'>
-                                                                                                                            <return status='failure'>
-                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                            </return>
-                                                                                                                        </outcome>
-                                                                                                                    </get-resource>
-                                                                                                                </block>
-                                                                                                            </outcome>
-                                                                                                        </switch>
-                                                                                                    </for>
+                                                                                                                    </switch>
+                                                                                                                </for>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='Other'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />
+                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`" />
+                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                                        <parameter name="format" value="json"/>
+                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true"></block>
+                                                                                                        </outcome>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                                                        <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
+                                                                                                        <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                                                        <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
+                                                                                                        <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
+                                                                                                        <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
+                                                                                                        <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                        <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                                        <parameter name='index-number' value='0' />
+                                                                                                        <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
+                                                                                                        <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
+                                                                                                        <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                                        <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                                        <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
+                                                                                                    </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
+                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                                        <parameter name="format" value="json"/>
+                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                                        <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="Error executing Create ethernet service rest api" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
+                                                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
+                                                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                                    <parameter name='operational-status' value='Activated' />
+                                                                                                                </update>
+                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>
+                                                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                                                    <parameter name='operational-status' value='Activated' />
+                                                                                                                </update>
+                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+                                                                                                                        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'>
+                                                                                                                    <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                    <parameter name='orchestration-status' value='Activated' />
+                                                                                                                </update>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </execute>
                                                                                                 </block>
                                                                                             </outcome>
-                                                                                            <outcome value='not-found'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                </return>
-                                                                                            </outcome>
                                                                                             <outcome value='Other'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                        </get-resource>
-                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />
-                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`" />
-                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                            <parameter name="format" value="json"/>
-                                                                                            <parameter name="httpMethod" value="patch"/>
-                                                                                            <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                            <outcome value='failure'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                            <outcome value='success'>
-                                                                                                <block atomic="true"></block>
-                                                                                            </outcome>
-                                                                                        </execute>
-                                                                                        <set>
-                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
-                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
-                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
-                                                                                            <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
-                                                                                            <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
-                                                                                            <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
-                                                                                            <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                            <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
-                                                                                            <parameter name='index-number' value='0' />
-                                                                                            <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
-                                                                                            <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
-                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
-                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
-                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
-                                                                                        </set>
-                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
-                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                            <parameter name="format" value="json"/>
-                                                                                            <parameter name="httpMethod" value="patch"/>
-                                                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                                            <parameter name="responsePrefix" value="vpn-result"/>
-                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                            <outcome value='failure'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="Error executing Create ethernet service rest api" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                            <outcome value='success'>
                                                                                                 <block atomic="true">
-                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
-                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
-                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                                        <parameter name='operational-status' value='Activated' />
-                                                                                                    </update>
-                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>
-                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
-                                                                                                        <parameter name='operational-status' value='Activated' />
-                                                                                                    </update>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                        </execute>
-                                                                                    </block>
-                                                                                </outcome>
-                                                                                <outcome value='Other'>
-                                                                                    <block atomic="true">
-                                                                                        <set>
-                                                                                            <parameter name='tmp.aai.vpn-bindingG.' value="`$tmp.aai.vpn-binding.`" />
-                                                                                            <parameter name='tmp.aai.connectivityG.' value="`$tmp.aai.connectivity.`" />
-                                                                                        </set>
-                                                                                        <set>
-                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />
-                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />
-                                                                                            <!--<parameter name='dst-tpn-id' value='1' />-->
-                                                                                            <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
-                                                                                            <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
-                                                                                            <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />
-                                                                                            <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />
-                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                            <parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />
-                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />
-                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />
-                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />
-                                                                                        </set>
-                                                                                        <set>
-                                                                                            <parameter name='tmp.domainG.pnf-name' value="`'networkId-providerId-' +
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.aai.vpn-bindingG.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                                        <parameter name='tmp.aai.connectivityG.' value="`$tmp.aai.connectivity.`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />
+                                                                                                        <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />
+                                                                                                        <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                                                        <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
+                                                                                                        <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
+                                                                                                        <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />
+                                                                                                        <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />
+                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                        <parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />
+                                                                                                        <parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />
+                                                                                                        <parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />
+                                                                                                        <parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.domainG.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-bindingG.src-access-node-id`" />
-                                                                                        </set>
-                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                      resource="pnf"
-                                                                                                      key="pnf.pnf-name = $tmp.domainG.pnf-name"
-                                                                                                      pfx='tmp.aai.domainG-pnf' local-only='false' >
-                                                                                            <!--AND depth = '0'"-->
-                                                                                            <outcome value='success'>
-                                                                                                <block>
-                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >
-                                                                                                        <switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                                            <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                <block atomic="true">
-                                                                                                                    <set>
-                                                                                                                        <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                    </set>
-                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                  resource="esr-thirdparty-sdnc"
-                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
-		     depth = '1'"
-                                                                                                                                  pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                        <outcome value='success'>
-                                                                                                                            <block>
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="pnf"
+                                                                                                                  key="pnf.pnf-name = $tmp.domainG.pnf-name"
+                                                                                                                  pfx='tmp.aai.domainG-pnf' local-only='false' >
+                                                                                                        <!--AND depth = '0'"-->
+                                                                                                        <outcome value='success'>
+                                                                                                            <block>
+                                                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                        <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                            <block atomic="true">
                                                                                                                                 <set>
-                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                    <!--<parameter name="format" value="json"/>-->
-                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                    <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
                                                                                                                                 </set>
+                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                              resource="esr-thirdparty-sdnc"
+                                                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                              pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                    <outcome value='success'>
+                                                                                                                                        <block>
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                    <outcome value='not-found'>
+                                                                                                                                        <return status='failure'>
+                                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                        </return>
+                                                                                                                                    </outcome>
+                                                                                                                                    <outcome value='Other'>
+                                                                                                                                        <return status='failure'>
+                                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                        </return>
+                                                                                                                                    </outcome>
+                                                                                                                                </get-resource>
                                                                                                                             </block>
                                                                                                                         </outcome>
-                                                                                                                        <outcome value='not-found'>
-                                                                                                                            <return status='failure'>
-                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                            </return>
-                                                                                                                        </outcome>
-                                                                                                                        <outcome value='Other'>
-                                                                                                                            <return status='failure'>
-                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                            </return>
-                                                                                                                        </outcome>
-                                                                                                                    </get-resource>
-                                                                                                                </block>
-                                                                                                            </outcome>
-                                                                                                        </switch>
-                                                                                                    </for>
+                                                                                                                    </switch>
+                                                                                                                </for>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='Other'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`" />
+                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`" />
+                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
+                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />
+                                                                                                        <parameter name="format" value="json"/>
+                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true"></block>
+                                                                                                        </outcome>
+                                                                                                    </execute>
                                                                                                 </block>
                                                                                             </outcome>
-                                                                                            <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>
+                                                                                        </switch>
+                                                                                    </outcome>
+                                                                                    <outcome value=''>
+                                                                                        <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
                                                                                             <outcome value='Other'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                        </get-resource>
-                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`" />
-                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`" />
-                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
-                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />
-                                                                                            <parameter name="format" value="json"/>
-                                                                                            <parameter name="httpMethod" value="patch"/>
-                                                                                            <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                            <outcome value='failure'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                            <outcome value='success'>
-                                                                                                <block atomic="true"></block>
-                                                                                            </outcome>
-                                                                                        </execute>
-                                                                                    </block>
-                                                                                </outcome>
-                                                                            </switch>
-                                                                        </outcome>
-                                                                        <outcome value=''>
-                                                                            <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
-                                                                                <outcome value='Other'>
-                                                                                    <block atomic="true">
-                                                                                        <set>
-                                                                                            <parameter name='tmp.aai.vpn-bindingB.' value="`$tmp.aai.vpn-binding.`" />
-                                                                                            <parameter name='tmp.aai.connectivityB.' value="`$tmp.aai.connectivity.`" />
-                                                                                        </set>
-                                                                                        <set>
-                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />
-                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
-                                                                                            <!--<parameter name='src-tpn-id' value='1' />-->
-                                                                                            <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />
-                                                                                            <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />
-                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                            <parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
-                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
-                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
-                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
-                                                                                        </set>
-                                                                                        <set>
-                                                                                            <parameter name='tmp.dst.domainB.pnf-name' value="`'networkId-providerId-' +
+                                                                                                <block atomic="true">
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.aai.vpn-bindingB.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                                        <parameter name='tmp.aai.connectivityB.' value="`$tmp.aai.connectivity.`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />
+                                                                                                        <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
+                                                                                                        <!--<parameter name='src-tpn-id' value='1' />-->
+                                                                                                        <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />
+                                                                                                        <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />
+                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                        <parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                                                        <parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
+                                                                                                        <parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
+                                                                                                        <parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.dst.domainB.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-bindingB.dst-access-node-id`" />
-                                                                                        </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>
+                                                                                                    <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='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"/>-->
+                                                                                                                                    <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='not-found'>
-                                                                                                                            <return status='failure'>
-                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                            </return>
-                                                                                                                        </outcome>
-                                                                                                                        <outcome value='Other'>
-                                                                                                                            <return status='failure'>
-                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                            </return>
-                                                                                                                        </outcome>
-                                                                                                                    </get-resource>
-                                                                                                                </block>
-                                                                                                            </outcome>
-                                                                                                        </switch>
-                                                                                                    </for>
+                                                                                                                    </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-dst-domain-creation.templatefile`" />
+                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`" />
+                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                                                        <parameter name="format" value="json"/>
+                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true"></block>
+                                                                                                        </outcome>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->
+                                                                                                        <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />
+                                                                                                        <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                                                        <parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />
+                                                                                                        <parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />
+                                                                                                        <parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />
+                                                                                                        <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                                                        <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />
+                                                                                                        <parameter name='index-number' value='0' />
+                                                                                                        <parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />
+                                                                                                        <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />
+                                                                                                        <parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
+                                                                                                        <parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
+                                                                                                        <parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />
+                                                                                                    </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
+                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                                                        <parameter name="format" value="json"/>
+                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                                        <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="Error executing Create ethernet service rest api" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >
+                                                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
+                                                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                                                                    <parameter name='operational-status' value='Activated' />
+                                                                                                                </update>
+                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>
+                                                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />
+                                                                                                                    <parameter name='operational-status' value='Activated' />
+                                                                                                                </update>
+                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+                                                                                                                        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'>
+                                                                                                                    <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                    <parameter name='orchestration-status' value='Activated' />
+                                                                                                                </update>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </execute>
                                                                                                 </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'>
+                                                                                            <outcome value=''>
                                                                                                 <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`" />
+                                                                                                    <parameter name='error-code' value='' />
+                                                                                                    <parameter name='error-message' value='' />
                                                                                                 </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-dst-domain-creation.templatefile`" />
-                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`" />
-                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
-                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
-                                                                                            <parameter name="format" value="json"/>
-                                                                                            <parameter name="httpMethod" value="patch"/>
-                                                                                            <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                            <outcome value='failure'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                            <outcome value='success'>
-                                                                                                <block atomic="true"></block>
-                                                                                            </outcome>
-                                                                                        </execute>
-                                                                                        <set>
-                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->
-                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />
-                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
-                                                                                            <parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />
-                                                                                            <parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />
-                                                                                            <parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />
-                                                                                            <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
-                                                                                            <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />
-                                                                                            <parameter name='index-number' value='0' />
-                                                                                            <parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />
-                                                                                            <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />
-                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
-                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
-                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />
-                                                                                        </set>
-                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
-                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
-                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
-                                                                                            <parameter name="format" value="json"/>
-                                                                                            <parameter name="httpMethod" value="patch"/>
-                                                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                                            <parameter name="responsePrefix" value="vpn-result"/>
-                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                            <outcome value='failure'>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                    <parameter name="error-message" value="Error executing Create ethernet service rest api" />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                            <outcome value='success'>
-                                                                                                <block atomic="true">
-                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >
-                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
-                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
-                                                                                                        <parameter name='operational-status' value='Activated' />
-                                                                                                    </update>
-                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>
-                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />
-                                                                                                        <parameter name='operational-status' value='Activated' />
-                                                                                                    </update>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                        </execute>
-                                                                                    </block>
-                                                                                </outcome>
-                                                                                <outcome value=''>
-                                                                                    <return status='failure'>
-                                                                                        <parameter name='error-code' value='' />
-                                                                                        <parameter name='error-message' value='' />
-                                                                                    </return>
-                                                                                </outcome>
-                                                                            </switch>
+                                                                                        </switch>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='false'>
+                                                                            <block></block>
                                                                         </outcome>
                                                                     </switch>
                                                                 </block>
                                                             </outcome>
-                                                            <outcome value='not-found'>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                </return>
-                                                            </outcome>
-                                                            <outcome value='failure'>
-                                                                <return status='failure'>
-                                                                    <parameter name='error-code' value='' />
-                                                                    <parameter name='error-message' value='' />
-                                                                </return>
-                                                            </outcome>
                                                         </get-resource>
                                                     </block>
                                                 </outcome>