Some bug fixing for E-Line based Cloud Leased-Line service support in CCVPN use-case.
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / p2p_eline / GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.xml
index bc0505d..f1c90ec 100644 (file)
@@ -1,7 +1,7 @@
 <service-logic\r
         xmlns='http://www.onap.org/sdnc/svclogic'\r
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>\r
-    <method rpc='tsli-vnf-topology-operation-trans-slice-modify' mode='sync'>\r
+    <method rpc='p2p-vnf-topology-operation-p2p-modify' mode='sync'>\r
         <block atomic="true">\r
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
                                                                                                         <parameter name="filename" value="`$filenamemm`" />\r
                                                                                                     </execute>\r
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>\r
-                                                                                                    <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >\r
-                                                                                                        <block atomic='true'>\r
-                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
-                                                                                                                <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>\r
-                                                                                                            </execute>\r
-                                                                                                            <switch test="`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`">\r
-                                                                                                                <outcome value='true'>\r
-                                                                                                                    <set>\r
-                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\r
-                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\r
-                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\r
-                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
-                                                                                                                    </set>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='false'>\r
-                                                                                                                    <set>\r
-                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\r
-                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\r
-                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\r
-                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
-                                                                                                                    </set>\r
-                                                                                                                </outcome>\r
-                                                                                                            </switch>\r
-                                                                                                            <set>\r
-                                                                                                                <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +\r
+                                                                                                    <switch test="`$param-prefix-domainA[$param-prefix-domainA_length -9] == $param-prefix-domainB[$param-prefix-domainB_length -9]`">\r
+\r
+                                                                                                        `\r
+\r
+\r
+                                                                                                        <outcome value='false'>\r
+                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\r
+                                                                                                                <block atomic='true'>\r
+                                                                                                                    <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >\r
+                                                                                                                        <block atomic='true'>\r
+                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                                                <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>\r
+                                                                                                                            </execute>\r
+                                                                                                                            <switch test="`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`">\r
+                                                                                                                                <outcome value='true'>\r
+                                                                                                                                    <set>\r
+                                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\r
+                                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\r
+                                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\r
+                                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
+                                                                                                                                    </set>\r
+                                                                                                                                </outcome>\r
+                                                                                                                                <outcome value='false'>\r
+                                                                                                                                    <set>\r
+                                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\r
+                                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\r
+                                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\r
+                                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
+                                                                                                                                    </set>\r
+                                                                                                                                </outcome>\r
+                                                                                                                            </switch>\r
+                                                                                                                            <set>\r
+                                                                                                                                <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +\r
                                              $tmp.access-provider-id + '-clientId-' +\r
                                              $tmp.access-client-id + '-topologyId-' +\r
                                              $tmp.access-topology-id + '-nodeId-' +\r
                                              $tmp.srcdstpnf-id`" />\r
-                                                                                                            </set>\r
-                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                                                                          resource="pnf"\r
-                                                                                                                          key="pnf.pnf-name = $tmp.srcdstpnf-name"\r
-                                                                                                                          pfx='tmp.aai.srcdst-pnf' local-only='false' >\r
-                                                                                                                <!--AND depth = '0'"-->\r
-                                                                                                                <outcome value='success'>\r
-                                                                                                                    <block>\r
-                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\r
-                                                                                                                            <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\r
-                                                                                                                                <outcome value='esr-thirdparty-sdnc'>\r
-                                                                                                                                    <block atomic="true">\r
+                                                                                                                            </set>\r
+                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                                                          resource="pnf"\r
+                                                                                                                                          key="pnf.pnf-name = $tmp.srcdstpnf-name"\r
+                                                                                                                                          pfx='tmp.aai.srcdst-pnf' local-only='false' >\r
+                                                                                                                                <!--AND depth = '0'"-->\r
+                                                                                                                                <outcome value='success'>\r
+                                                                                                                                    <block>\r
+                                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\r
+                                                                                                                                            <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\r
+                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>\r
+                                                                                                                                                    <block atomic="true">\r
+                                                                                                                                                        <set>\r
+                                                                                                                                                            <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />\r
+                                                                                                                                                        </set>\r
+                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                                                                                      resource="esr-thirdparty-sdnc"\r
+                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND\r
+                    depth = '1'"\r
+                                                                                                                                                                      pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >\r
+                                                                                                                                                            <outcome value='success'>\r
+                                                                                                                                                                <block>\r
+                                                                                                                                                                    <set>\r
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
+                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
+                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
+                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
+                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
+                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->\r
+                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->\r
+                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->\r
+                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                                                    </set>\r
+                                                                                                                                                                </block>\r
+                                                                                                                                                            </outcome>\r
+                                                                                                                                                            <outcome value='not-found'>\r
+                                                                                                                                                                <return status='failure'>\r
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                                                                </return>\r
+                                                                                                                                                            </outcome>\r
+                                                                                                                                                            <outcome value='Other'>\r
+                                                                                                                                                                <return status='failure'>\r
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                                                    <parameter name="error-code" value="500" />\r
+                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                                                                </return>\r
+                                                                                                                                                            </outcome>\r
+                                                                                                                                                        </get-resource>\r
+                                                                                                                                                    </block>\r
+                                                                                                                                                </outcome>\r
+                                                                                                                                            </switch>\r
+                                                                                                                                        </for>\r
+                                                                                                                                    </block>\r
+                                                                                                                                </outcome>\r
+                                                                                                                                <outcome value='not-found'>\r
+                                                                                                                                    <return status='failure'>\r
+                                                                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                                    </return>\r
+                                                                                                                                </outcome>\r
+                                                                                                                                <outcome value='Other'>\r
+                                                                                                                                    <return status='failure'>\r
+                                                                                                                                        <parameter name='ack-final' value='Y'/>\r
+                                                                                                                                        <parameter name="error-code" value="500" />\r
+                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
+                                                                                                                                    </return>\r
+                                                                                                                                </outcome>\r
+                                                                                                                            </get-resource>\r
+                                                                                                                            <switch test='`$otnidx == 0`'>\r
+                                                                                                                                <outcome value='true'>\r
+                                                                                                                                    <set>\r
+                                                                                                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
+                                                                                                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
+                                                                                                                                    </set>\r
+                                                                                                                                </outcome>\r
+                                                                                                                                <outcome value='false'>\r
+                                                                                                                                    <switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
+                                                                                                                                        <outcome value='true'>\r
+                                                                                                                                            <set>\r
+                                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
+                                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
+                                                                                                                                            </set>\r
+                                                                                                                                        </outcome>\r
+                                                                                                                                        <outcome value='false'>\r
+                                                                                                                                            <set>\r
+                                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
+                                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
+                                                                                                                                            </set>\r
+                                                                                                                                        </outcome>\r
+                                                                                                                                    </switch>\r
+                                                                                                                                </outcome>\r
+                                                                                                                            </switch>\r
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\r
+                                                                                                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\r
+                                                                                                                                <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
+                                                                                                                                <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\r
+                                                                                                                                <parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\r
+                                                                                                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
+                                                                                                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\r
+                                                                                                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
+                                                                                                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />\r
+                                                                                                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
+                                                                                                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\r
+                                                                                                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
+                                                                                                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\r
+                                                                                                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\r
+                                                                                                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\r
+                                                                                                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\r
+                                                                                                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\r
+                                                                                                                                <parameter name='route-distinguisher' value='`$gfp`' />\r
+                                                                                                                                <parameter name='operational-status' value='Created' />\r
+                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\r
+                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\r
+                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\r
+                                                                                                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\r
+                                                                                                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\r
+                                                                                                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\r
+                                                                                                                                <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\r
+                                                                                                                                <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                                <outcome value='success'>\r
+                                                                                                                                    <block></block>\r
+                                                                                                                                </outcome>\r
+                                                                                                                            </save>\r
+                                                                                                                            <switch test='`$otnidx == 0`'>\r
+                                                                                                                                <outcome value='true'>\r
+                                                                                                                                    <block>\r
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                                              key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />\r
+                                                                                                                                        </save>\r
                                                                                                                                         <set>\r
-                                                                                                                                            <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />\r
+                                                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
                                                                                                                                         </set>\r
-                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                                                                                                      resource="esr-thirdparty-sdnc"\r
-                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND\r
-                    depth = '1'"\r
-                                                                                                                                                      pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >\r
-                                                                                                                                            <outcome value='success'>\r
+                                                                                                                                    </block>\r
+                                                                                                                                </outcome>\r
+                                                                                                                                <outcome value='false'>\r
+                                                                                                                                    <block>\r
+                                                                                                                                        <set>\r
+                                                                                                                                            <parameter name='testingvalue' value='$tmp.otninfo_length -1' />\r
+                                                                                                                                        </set>\r
+                                                                                                                                        <switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
+                                                                                                                                            <outcome value='true'>\r
                                                                                                                                                 <block>\r
+                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
+                                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />\r
+                                                                                                                                                    </save>\r
                                                                                                                                                     <set>\r
-                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />\r
-                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />\r
-                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />\r
-                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\r
-                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->\r
-                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->\r
-                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->\r
-                                                                                                                                                        <!--<parameter name="format" value="json"/>-->\r
-                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->\r
-                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->\r
-                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
-                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
-                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
-                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
                                                                                                                                                     </set>\r
                                                                                                                                                 </block>\r
                                                                                                                                             </outcome>\r
-                                                                                                                                            <outcome value='not-found'>\r
-                                                                                                                                                <return status='failure'>\r
-                                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                                                                                    <parameter name="error-code" value="500" />\r
-                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                                                                </return>\r
-                                                                                                                                            </outcome>\r
-                                                                                                                                            <outcome value='Other'>\r
-                                                                                                                                                <return status='failure'>\r
-                                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                                                                                    <parameter name="error-code" value="500" />\r
-                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                                                                </return>\r
+                                                                                                                                            <outcome value='false'>\r
+                                                                                                                                                <block atomic='true'>\r
+                                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                                                                        <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>\r
+                                                                                                                                                    </execute>\r
+                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
+                                                                                                                                                          key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\r
+                                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\r
+                                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\r
+                                                                                                                                                        <parameter name='operational-status' value='Created' />\r
+                                                                                                                                                        <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
+                                                                                                                                                        <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
+                                                                                                                                                        <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
+                                                                                                                                                        <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
+                                                                                                                                                        <!--<parameter name='access-ltp-id' value='``' />-->\r
+                                                                                                                                                        <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\r
+                                                                                                                                                        <parameter name='bandwidth-profile-name' value='`$gfp`' />\r
+                                                                                                                                                        <parameter name='vpn-type' value='dummy' />\r
+                                                                                                                                                        <parameter name='cir' value='`$gfp *1000000`' />\r
+                                                                                                                                                        <parameter name='eir' value='`$gfp *1000000`' />\r
+                                                                                                                                                        <!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->\r
+                                                                                                                                                        <!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->\r
+                                                                                                                                                        <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
+                                                                                                                                                        <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
+                                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
+                                                                                                                                                        <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\r
+                                                                                                                                                        <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\r
+                                                                                                                                                        <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\r
+                                                                                                                                                        <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />\r
+                                                                                                                                                    </save>\r
+                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
+                                                                                                                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
+                                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\r
+                                                                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
+                                                                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\r
+                                                                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\r
+                                                                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->\r
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->\r
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->\r
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->\r
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->\r
+                                                                                                                                                    </save>\r
+                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
+                                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
+                                                                                                                                                    </save>\r
+                                                                                                                                                    <set>\r
+                                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                                                    </set>\r
+                                                                                                                                                </block>\r
                                                                                                                                             </outcome>\r
-                                                                                                                                        </get-resource>\r
+                                                                                                                                        </switch>\r
                                                                                                                                     </block>\r
                                                                                                                                 </outcome>\r
                                                                                                                             </switch>\r
-                                                                                                                        </for>\r
-                                                                                                                    </block>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='not-found'>\r
-                                                                                                                    <return status='failure'>\r
-                                                                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                                                                        <parameter name="error-code" value="500" />\r
-                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                                    </return>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='Other'>\r
-                                                                                                                    <return status='failure'>\r
-                                                                                                                        <parameter name='ack-final' value='Y'/>\r
-                                                                                                                        <parameter name="error-code" value="500" />\r
-                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />\r
-                                                                                                                    </return>\r
-                                                                                                                </outcome>\r
-                                                                                                            </get-resource>\r
-                                                                                                            <switch test='`$otnidx == 0`'>\r
-                                                                                                                <outcome value='true'>\r
-                                                                                                                    <set>\r
-                                                                                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
-                                                                                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
-                                                                                                                    </set>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='false'>\r
-                                                                                                                    <switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
-                                                                                                                        <outcome value='true'>\r
-                                                                                                                            <set>\r
-                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
-                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
-                                                                                                                            </set>\r
-                                                                                                                        </outcome>\r
-                                                                                                                        <outcome value='false'>\r
-                                                                                                                            <set>\r
-                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
-                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
-                                                                                                                            </set>\r
-                                                                                                                        </outcome>\r
-                                                                                                                    </switch>\r
-                                                                                                                </outcome>\r
-                                                                                                            </switch>\r
-                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\r
-                                                                                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\r
-                                                                                                                <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
-                                                                                                                <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\r
-                                                                                                                <parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\r
-                                                                                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
-                                                                                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\r
-                                                                                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
-                                                                                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />\r
-                                                                                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
-                                                                                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\r
-                                                                                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
-                                                                                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\r
-                                                                                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\r
-                                                                                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\r
-                                                                                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\r
-                                                                                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\r
-                                                                                                                <parameter name='route-distinguisher' value='`$gfp`' />\r
-                                                                                                                <parameter name='operational-status' value='Created' />\r
-                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\r
-                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\r
-                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\r
-                                                                                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\r
-                                                                                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\r
-                                                                                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\r
-                                                                                                                <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\r
-                                                                                                                <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                <outcome value='success'>\r
-                                                                                                                    <block></block>\r
-                                                                                                                </outcome>\r
-                                                                                                            </save>\r
-                                                                                                            <switch test='`$otnidx == 0`'>\r
-                                                                                                                <outcome value='true'>\r
-                                                                                                                    <block>\r
-                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
-                                                                                                                              key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
-                                                                                                                              force="true" pfx="tmp.AnAI-data">\r
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />\r
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />\r
-                                                                                                                        </save>\r
-                                                                                                                        <set>\r
-                                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                        </set>\r
-                                                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />\r
-                                                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `" />\r
-                                                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
-                                                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
-                                                                                                                            <parameter name="format" value="json"/>\r
-                                                                                                                            <parameter name="httpMethod" value="patch"/>\r
-                                                                                                                            <parameter name="responsePrefix" value="otn-oof"/>\r
-                                                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                                                                                            <outcome value='failure'>\r
-                                                                                                                                <return status='failure'>\r
-                                                                                                                                    <parameter name='ack-final' value='Y'/>\r
-                                                                                                                                    <parameter name="error-code" value="500" />\r
-                                                                                                                                    <parameter name="error-message" value="Error executing UNI Coloring for domain A" />\r
-                                                                                                                                </return>\r
-                                                                                                                            </outcome>\r
-                                                                                                                            <outcome value='success'>\r
-                                                                                                                                <block></block>\r
-                                                                                                                            </outcome>\r
-                                                                                                                        </execute>\r
-                                                                                                                    </block>\r
-                                                                                                                </outcome>\r
-                                                                                                                <outcome value='false'>\r
-                                                                                                                    <block>\r
-                                                                                                                        <set>\r
-                                                                                                                            <parameter name='testingvalue' value='$tmp.otninfo_length -1' />\r
-                                                                                                                        </set>\r
-                                                                                                                        <switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
-                                                                                                                            <outcome value='true'>\r
-                                                                                                                                <block>\r
-                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
-                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
-                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />\r
-                                                                                                                                    </save>\r
-                                                                                                                                    <set>\r
-                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                                    </set>\r
-                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />\r
-                                                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `" />\r
-                                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />\r
-                                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />\r
-                                                                                                                                        <parameter name="format" value="json"/>\r
-                                                                                                                                        <parameter name="httpMethod" value="patch"/>\r
-                                                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>\r
-                                                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                                                                                                                        <outcome value='failure'>\r
-                                                                                                                                            <return status='failure'>\r
-                                                                                                                                                <parameter name='ack-final' value='Y'/>\r
-                                                                                                                                                <parameter name="error-code" value="500" />\r
-                                                                                                                                                <parameter name="error-message" value="Error executing UNI coloring for domain B" />\r
-                                                                                                                                            </return>\r
-                                                                                                                                        </outcome>\r
-                                                                                                                                        <outcome value='success'>\r
-                                                                                                                                            <block></block>\r
-                                                                                                                                        </outcome>\r
-                                                                                                                                    </execute>\r
-                                                                                                                                </block>\r
-                                                                                                                            </outcome>\r
-                                                                                                                            <outcome value='false'>\r
-                                                                                                                                <block atomic='true'>\r
-                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
-                                                                                                                                        <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>\r
-                                                                                                                                    </execute>\r
-                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
-                                                                                                                                          key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\r
-                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\r
-                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\r
-                                                                                                                                        <parameter name='operational-status' value='Created' />\r
-                                                                                                                                        <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
-                                                                                                                                        <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
-                                                                                                                                        <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
-                                                                                                                                        <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
-                                                                                                                                        <!--<parameter name='access-ltp-id' value='``' />-->\r
-                                                                                                                                        <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\r
-                                                                                                                                        <parameter name='bandwidth-profile-name' value='`$gfp`' />\r
-                                                                                                                                        <parameter name='vpn-type' value='dummy' />\r
-                                                                                                                                        <parameter name='cir' value='`$gfp *1000000`' />\r
-                                                                                                                                        <parameter name='eir' value='`$gfp *1000000`' />\r
-                                                                                                                                        <!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->\r
-                                                                                                                                        <!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->\r
-                                                                                                                                        <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
-                                                                                                                                        <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
-                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
-                                                                                                                                        <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\r
-                                                                                                                                        <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\r
-                                                                                                                                        <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\r
-                                                                                                                                        <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />\r
-                                                                                                                                    </save>\r
-                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
-                                                                                                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
-                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
-                                                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\r
-                                                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
-                                                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\r
-                                                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\r
-                                                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->\r
-                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->\r
-                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->\r
-                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->\r
-                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->\r
-                                                                                                                                    </save>\r
-                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
-                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'\r
-                                                                                                                                          force="true" pfx="tmp.AnAI-data">\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
-                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
-                                                                                                                                    </save>\r
-                                                                                                                                    <set>\r
-                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                                    </set>\r
-                                                                                                                                </block>\r
-                                                                                                                            </outcome>\r
-                                                                                                                        </switch>\r
-                                                                                                                    </block>\r
-                                                                                                                </outcome>\r
-                                                                                                            </switch>\r
-                                                                                                        </block>\r
-                                                                                                    </for>\r
+                                                                                                                        </block>\r
+                                                                                                                    </for>\r
+                                                                                                                </block>\r
+                                                                                                            </call>\r
+                                                                                                        </outcome>\r
+                                                                                                        <outcome value='true'>\r
+                                                                                                            <block>\r
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                                    <parameter name="ctx-destination" value="prop.vpn-binding-samedomain-uuid"/>\r
+                                                                                                                </execute>\r
+                                                                                                                <set>\r
+                                                                                                                    <parameter name='tmp.sameDomain-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
+                                                                                                                    <parameter name='tmp.sameDomain-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
+                                                                                                                </set>\r
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-samedomain-uuid' >\r
+                                                                                                                    <parameter name='vpn-id' value='`$prop.vpn-binding-samedomain-uuid`' />\r
+                                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
+                                                                                                                    <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\r
+                                                                                                                    <parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\r
+                                                                                                                    <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\r
+                                                                                                                    <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\r
+                                                                                                                    <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\r
+                                                                                                                    <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\r
+                                                                                                                    <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\r
+                                                                                                                    <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\r
+                                                                                                                    <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
+                                                                                                                    <parameter name='src-access-node-id' value='`$tmp.sameDomain-src-access-node-id`' />\r
+                                                                                                                    <!--<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\r
+                                                                                                                    <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\r
+                                                                                                                    <parameter name='dst-access-node-id' value='`$tmp.sameDomain-dst-access-node-id`' />\r
+                                                                                                                    <!--<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->\r
+                                                                                                                    <parameter name='route-distinguisher' value='`$gfp`' />\r
+                                                                                                                    <parameter name='operational-status' value='Created' />\r
+                                                                                                                    <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\r
+                                                                                                                    <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\r
+                                                                                                                    <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\r
+                                                                                                                    <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\r
+                                                                                                                    <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\r
+                                                                                                                    <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\r
+                                                                                                                    <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\r
+                                                                                                                    <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                    <outcome value='success'>\r
+                                                                                                                        <block></block>\r
+                                                                                                                    </outcome>\r
+                                                                                                                </save>\r
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'\r
+                                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-samedomain-uuid'\r
+                                                                                                                      force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />\r
+                                                                                                                </save>\r
+                                                                                                            </block>\r
+                                                                                                        </outcome>\r
+                                                                                                    </switch>\r
                                                                                                     <set>\r
                                                                                                         <parameter name='domain-A.tunnel-tp-id' value='' />\r
                                                                                                         <parameter name='domain-A.node-id' value='' />\r
                                         </outcome>\r
                                     </get-resource>\r
                                 </for>\r
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                              resource="vpn-bindings"\r
-                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings"\r
-                                              local-only="false"\r
-                                              pfx="tmp.aai.all-vpn-bindings" >\r
-                                    <outcome value='success'>\r
-                                        <block atomic="true">\r
-                                            <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\r
-                                                <block atomic='true'>\r
-                                                    <!--<switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">-->\r
-                                                    <!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\r
-                                                    <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.aai.service-instance.service-instance-id `">\r
-                                                        <outcome value='true'>\r
-                                                            <block atomic='true'>\r
-                                                                <set>\r
-                                                                    <parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\r
-                                                                    <parameter name='found' value='false' />\r
-                                                                </set>\r
-                                                                <switch test='`$tmp.arr_length != 0`'>\r
-                                                                    <outcome value='true'>\r
-                                                                        <block atomic='true'>\r
-                                                                            <for index='arridx' start='0' end='`$tmp.arr_length`' >\r
-                                                                                <switch test='`$tmp.arr[$arridx] == $providerValue`'>\r
-                                                                                    <outcome value='true'>\r
-                                                                                        <block atomic='true'>\r
-                                                                                            <set>\r
-                                                                                                <parameter name='found' value='true' />\r
-                                                                                            </set>\r
-                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
-                                                                                                <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                                <parameter name='vpn-type' value='`$arridx`' />\r
-                                                                                            </update>\r
-                                                                                            <set>\r
-                                                                                                <parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\r
-                                                                                            </set>\r
-                                                                                            <set>\r
-                                                                                                <!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\r
-                                                                                                <!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
-                                                                                                <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
-                                                                                                <!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\r
-                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\r
-                                                                                            </set>\r
-                                                                                            <break/>\r
-                                                                                        </block>\r
-                                                                                    </outcome>\r
-                                                                                    <outcome value='false'>\r
-                                                                                        <block></block>\r
-                                                                                    </outcome>\r
-                                                                                </switch>\r
-                                                                            </for>\r
-                                                                            <switch test='`$found`'>\r
-                                                                                <outcome value='true'>\r
-                                                                                    <block></block>\r
-                                                                                </outcome>\r
-                                                                                <outcome value='false'>\r
-                                                                                    <block atomic='true'>\r
-                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                                key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
-                                                                                            <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                            <parameter name='vpn-type' value='`$arridx + 1`' />\r
-                                                                                        </update>\r
-                                                                                        <set>\r
-                                                                                            <parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\r
-                                                                                            <parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
-                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
-                                                                                            <parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\r
-                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\r
-                                                                                        </set>\r
-                                                                                    </block>\r
-                                                                                </outcome>\r
-                                                                            </switch>\r
-                                                                        </block>\r
-                                                                    </outcome>\r
-                                                                    <outcome value='false'>\r
-                                                                        <block atomic='true'>\r
-                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                    key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
-                                                                                <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                <parameter name='vpn-type' value='0' />\r
-                                                                            </update>\r
-                                                                            <set>\r
-                                                                                <parameter name='tmp.arr[0]' value='`$providerValue`' />\r
-                                                                                <parameter name='tmp.arr_length' value='1' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
-                                                                                <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
-                                                                                <parameter name='otn-tunnel-slice_length' value='1' />\r
-                                                                                <parameter name='otn-tunnel-slice[0].list_length' value='1' />\r
-                                                                            </set>\r
-                                                                        </block>\r
-                                                                    </outcome>\r
-                                                                </switch>\r
-                                                            </block>\r
-                                                        </outcome>\r
-                                                        <outcome value='false'></outcome>\r
-                                                    </switch>\r
-                                                </block>\r
-                                            </for>\r
-                                        </block>\r
-                                    </outcome>\r
-                                    <outcome value='not-found'>\r
-                                        <return status='failure'>\r
-                                            <parameter name='ack-final' value='Y'/>\r
-                                            <parameter name="error-code" value="500" />\r
-                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
-                                        </return>\r
-                                    </outcome>\r
-                                    <outcome value='failure'>\r
-                                        <return status='failure'>\r
-                                            <parameter name='error-code' value='' />\r
-                                            <parameter name='error-message' value='' />\r
-                                        </return>\r
-                                    </outcome>\r
-                                </get-resource>\r
-                                <for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\r
-                                    <block atomic='true'>\r
-                                        <for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\r
-                                            <block atomic='true'>\r
-                                                <set>\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`" />\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\r
-                                                    <parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\r
-                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                    <parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\r
-                                                    <parameter name="tmp.domainG.restapiUrl" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`" />\r
-                                                    <parameter name="tmp.domainG.restapiUser" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`" />\r
-                                                    <parameter name="tmp.domainG.restapiPassword" value="`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`" />\r
-                                                </set>\r
-                                            </block>\r
-                                        </for>\r
-                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`" />\r
-                                            <parameter name="restapiUrl" value="`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />\r
-                                            <parameter name="restapiUser" value="`$tmp.domainG.restapiUser`" />\r
-                                            <parameter name="restapiPassword" value="`tmp.domainG.restapiPassword`" />\r
-                                            <parameter name="format" value="json"/>\r
-                                            <parameter name="httpMethod" value="post"/>\r
-                                            <parameter name="responsePrefix" value="otn-oof"/>\r
-                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                            <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                            <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                                            <outcome value='failure'>\r
-                                                <return status='failure'>\r
-                                                    <parameter name='ack-final' value='Y'/>\r
-                                                    <parameter name="error-code" value="500" />\r
-                                                    <parameter name="error-message" value="Error executing slice creation api for domain A" />\r
-                                                </return>\r
-                                            </outcome>\r
-                                            <outcome value='success'>\r
-                                                <block></block>\r
-                                            </outcome>\r
-                                        </execute>\r
-                                    </block>\r
-                                </for>\r
                             </block>\r
                         </outcome>\r
                     </switch>\r