X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Ftrans_slicing%2FGENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml;h=88b7ddba505991d6f873991a3b4a732983b1b781;hb=8f77d7fe0dd148054ed048642bf87ee7724dc2be;hp=4c6b84b0d611f9340a28f6d2aeb713f6647a2c1d;hpb=5ccb63c95d1fc6b103801d728bf39c820eeff09f;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
index 4c6b84b0..88b7ddba 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
@@ -29,180 +29,182 @@
                 <!--	local-only="false"-->
                 <!--	force="true" pfx="tmp.aai.service-instance">-->
                 <outcome value='success'>
-                    <switch test='`$tmp.aai.service-instance.allotted-resources_length != 0`'>
+                    <switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>
                         <outcome value='false'></outcome>
                         <outcome value='true'>
                             <block>
-                                <set>
-                                    <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[0].id`" />
-                                </set>
-                                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                <!--	resource="allotted-resource"-->
-                                <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
-                                <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
-                                <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->
-                                <!--         AND allotted-resource.id = $allotted-resource-id'-->
-                                <!--	local-only="false"-->
-                                <!--	force="true" pfx="tmp.aai.allotted-resource">-->
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                              resource="allotted-resource"
-                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+                                <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
+                                    <set>
+                                        <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`" />
+                                    </set>
+                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                    <!--	resource="allotted-resource"-->
+                                    <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->
+                                    <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->
+                                    <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->
+                                    <!--         AND allotted-resource.id = $allotted-resource-id'-->
+                                    <!--	local-only="false"-->
+                                    <!--	force="true" pfx="tmp.aai.allotted-resource">-->
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="allotted-resource"
+                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
          AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
          AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
          AND allotted-resource.id = $allotted-resource-id'
-                                              local-only="false"
-                                              force="true" pfx="tmp.aai.allotted-resource">
-                                    <outcome value='not-found'>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                        </return>
-                                    </outcome>
-                                    <outcome value='failure'>
-                                        <return status='failure'>
-                                            <parameter name='error-code' value='' />
-                                            <parameter name='error-message' value='' />
-                                        </return>
-                                    </outcome>
-                                    <outcome value='success'>
-                                        <block atomic="true">
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                          resource="allotted-resource:relationship-list"
-                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+                                                  local-only="false"
+                                                  force="true" pfx="tmp.aai.allotted-resource">
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='' />
+                                                <parameter name='error-message' value='' />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <block atomic="true">
+                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                              resource="allotted-resource:relationship-list"
+                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
          AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
          AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
          AND allotted-resource.id = $allotted-resource-id'
-                                                          local-only="false"
-                                                          force="true" pfx="tmp.aai.allotted-resource.relationship-list">
-                                                <outcome value='not-found'>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='failure'>
-                                                    <return status='failure'>
-                                                        <parameter name='error-code' value='' />
-                                                        <parameter name='error-message' value='' />
-                                                    </return>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <block atomic="true">
-                                                        <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>
-                                                            <outcome value='false'></outcome>
-                                                            <outcome value='true'>
-                                                                <block atomic="true">
-                                                                    <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
-                                                                        <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
-                                                                            <outcome value='network-policy'>
-                                                                                <block atomic="true">
-                                                                                    <set>
-                                                                                        <parameter name='network-policy-id' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
-                                                                                    </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                  resource="network-policy"
-                                                                                                  key='network-policy.network-policy-id = $network-policy-id'
-                                                                                                  local-only="false"
-                                                                                                  force="true" pfx="tmp.aai.network-policy">
-                                                                                        <outcome value='not-found'>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                            </return>
-                                                                                        </outcome>
-                                                                                        <outcome value='failure'>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='error-code' value='' />
-                                                                                                <parameter name='error-message' value='' />
-                                                                                            </return>
-                                                                                        </outcome>
-                                                                                        <outcome value='success'>
-                                                                                            <block>
-                                                                                                <set>
-                                                                                                    <parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />
-                                                                                                    <parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
-                                                                                                </set>
-                                                                                                <set>
-                                                                                                    <parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
-                                                                                                </set>
-                                                                                            </block>
-                                                                                        </outcome>
-                                                                                    </get-resource>
-                                                                                </block>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                    </for>
-                                                                    <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
-                                                                        <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
-                                                                            <outcome value='logical-link'>
-                                                                                <block atomic="true">
-                                                                                    <set>
-                                                                                        <parameter name='logical-link-name' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
-                                                                                    </set>
-                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                  resource="logical-link"
-                                                                                                  key='logical-link.link-name = $logical-link-name'
-                                                                                                  local-only="false"
-                                                                                                  force="true" pfx="tmp.aai.logical-link">
-                                                                                        <outcome value='not-found'>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                <parameter name="error-code" value="500" />
-                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                            </return>
-                                                                                        </outcome>
-                                                                                        <outcome value='failure'>
-                                                                                            <return status='failure'>
-                                                                                                <parameter name='error-code' value='' />
-                                                                                                <parameter name='error-message' value='' />
-                                                                                            </return>
-                                                                                        </outcome>
-                                                                                        <outcome value='success'>
-                                                                                            <block>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                    <parameter name="ctx-destination" value="prop.ethernet-service-name"/>
-                                                                                                </execute>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                    <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
-                                                                                                </execute>
-                                                                                                <set>
-                                                                                                    <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />
-                                                                                                </set>
-                                                                                                <set>
-                                                                                                    <parameter name='network-route-B' value="`$tmp.aai.logical-link.link-name2`" />
-                                                                                                </set>
-                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                              resource="network-route"
-                                                                                                              key='network-route.route-id = $network-route-A'
-                                                                                                              local-only="false"
-                                                                                                              force="true" pfx="tmp.aai.network-route-A">
-                                                                                                    <outcome value='not-found'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='error-code' value='' />
-                                                                                                            <parameter name='error-message' value='' />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block atomic="true">
-                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-A.next-hop`'/>
-                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                <parameter name="regex" value="[-]+"/>
-                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainA-pnfName"/>
-                                                                                                                <outcome value='success'>
-                                                                                                                    <block atomic="true">
-                                                                                                                        <set>
-                                                                                                                            <parameter name='tmp.src.domainA.pnf-name' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                              local-only="false"
+                                                              force="true" pfx="tmp.aai.allotted-resource.relationship-list">
+                                                    <outcome value='not-found'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='error-code' value='' />
+                                                            <parameter name='error-message' value='' />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='success'>
+                                                        <block atomic="true">
+                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>
+                                                                <outcome value='false'></outcome>
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                                <outcome value='network-policy'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='network-policy-id' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="network-policy"
+                                                                                                      key='network-policy.network-policy-id = $network-policy-id'
+                                                                                                      local-only="false"
+                                                                                                      force="true" pfx="tmp.aai.network-policy">
+                                                                                            <outcome value='not-found'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='failure'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='error-code' value='' />
+                                                                                                    <parameter name='error-message' value='' />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <set>
+                                                                                                        <parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />
+                                                                                                        <parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+                                                                                                    </set>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
+                                                                        <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                                <outcome value='logical-link'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='logical-link-name' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="logical-link"
+                                                                                                      key='logical-link.link-name = $logical-link-name'
+                                                                                                      local-only="false"
+                                                                                                      force="true" pfx="tmp.aai.logical-link">
+                                                                                            <outcome value='not-found'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='failure'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='error-code' value='' />
+                                                                                                    <parameter name='error-message' value='' />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                        <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />-->
+                                                                                                        <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-id`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='network-route-B' value="`$tmp.aai.logical-link.link-name2`" />
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-A'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-A">
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-A.next-hop`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainA-pnfName"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.src.domainA.pnf-name' value="`$param-prefix-domainA-pnfName[0] + '-' +
                                                    $param-prefix-domainA-pnfName[1] + '-' +
                                                    $param-prefix-domainA-pnfName[2] + '-' +
                                                    $param-prefix-domainA-pnfName[3] + '-' +
@@ -211,254 +213,254 @@
                                                    $param-prefix-domainA-pnfName[6] + '-' +
                                                    $param-prefix-domainA-pnfName[7] + '-' +
                                                    $param-prefix-domainA-pnfName[8]`" />
-                                                                                                                        </set>
-                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                      resource="pnf"
-                                                                                                                                      key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
-                                                                                                                                      pfx='tmp.aai.source-pnf' local-only='false' >
-                                                                                                                            <!--AND depth = '0'"-->
-                                                                                                                            <outcome value='success'>
-                                                                                                                                <block>
-                                                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
-                                                                                                                                        <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                                                                            <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                    </set>
-                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                                  resource="esr-thirdparty-sdnc"
-                                                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
+                                                                                                                            </set>
+                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                          resource="pnf"
+                                                                                                                                          key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
+                                                                                                                                          pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                                                                <!--AND depth = '0'"-->
+                                                                                                                                <outcome value='success'>
+                                                                                                                                    <block>
+                                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                                                                            <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                        </set>
+                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                      resource="esr-thirdparty-sdnc"
+                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                                                                                  pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                                        <outcome value='success'>
-                                                                                                                                                            <block>
-                                                                                                                                                                <set>
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                                    <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                </set>
-                                                                                                                                                            </block>
-                                                                                                                                                        </outcome>
-                                                                                                                                                        <outcome value='not-found'>
-                                                                                                                                                            <return status='failure'>
-                                                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                            </return>
-                                                                                                                                                        </outcome>
-                                                                                                                                                        <outcome value='Other'>
-                                                                                                                                                            <return status='failure'>
-                                                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                            </return>
-                                                                                                                                                        </outcome>
-                                                                                                                                                    </get-resource>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                            <outcome value='network-resource'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='tmp.domainA.eth-network-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                        </switch>
-                                                                                                                                    </for>
-                                                                                                                                </block>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='not-found'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='Other'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                        </get-resource>
-                                                                                                                    </block>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='failure'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='error-code' value='' />
-                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                            </execute>
-                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                          resource="p-interface"
-                                                                                                                          key="pnf.pnf-name = $tmp.src.domainA.pnf-name
+                                                                                                                                                                      pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                            <outcome value='success'>
+                                                                                                                                                                <block>
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                    </set>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='not-found'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                </return>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='Other'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                </return>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </get-resource>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='network-resource'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.domainA.eth-network-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                            </switch>
+                                                                                                                                        </for>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='not-found'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='Other'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                            </get-resource>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="p-interface"
+                                                                                                                              key="pnf.pnf-name = $tmp.src.domainA.pnf-name
 	        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop"
-                                                                                                                          local-only="false"
-                                                                                                                          pfx="tmp.aai.network-route-A.p-interface-src" >
-                                                                                                                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                                                                                                <!--	resource="p-interface"-->
-                                                                                                                <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
-                                                                                                                <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
-                                                                                                                <!--		local-only="false" -->
-                                                                                                                <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
-                                                                                                                <outcome value='success'>
-                                                                                                                    <block atomic="true">
-                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                            <parameter name="original_string" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>
-                                                                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                            <parameter name="regex" value="[-]+"/>
-                                                                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-domainA"/>
-                                                                                                                            <outcome value='success'>
-                                                                                                                                <block atomic="true">
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                                                    </set>
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                                                    </set>
-                                                                                                                                </block>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='failure'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='error-code' value='' />
-                                                                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                        </execute>
-                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                            <parameter name="ctx-destination" value="uuid.connectivity-domainA-uuid"/>
-                                                                                                                        </execute>
-                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                              key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
-                                                                                                                            <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
-                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
-                                                                                                                            <parameter name='operational-status' value='Created' />
-                                                                                                                            <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
-                                                                                                                            <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
-                                                                                                                            <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
-                                                                                                                            <parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                                            <parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                                            <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
-                                                                                                                            <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
-                                                                                                                            <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
-                                                                                                                            <parameter name='CIR' value='`$prop.sotn.cir`' />
-                                                                                                                            <parameter name='EIR' value='`$prop.sotn.eir`' />
-                                                                                                                            <parameter name='CBS' value='`$prop.sotn.cbs`' />
-                                                                                                                            <parameter name='EBS' value='`$prop.sotn.ebs`' />
-                                                                                                                            <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
-                                                                                                                            <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
-                                                                                                                            <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                                            <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/'` " />
-                                                                                                                        </save>
-                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
-                                                                                                                              force="true" pfx="tmp.AnAI-data">
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
-                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                                        </save>
-                                                                                                                        <for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >
-                                                                                                                            <switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>
-                                                                                                                                <outcome value='tunnel-termination-point'>
+                                                                                                                              local-only="false"
+                                                                                                                              pfx="tmp.aai.network-route-A.p-interface-src" >
+                                                                                                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                                    <!--	resource="p-interface"-->
+                                                                                                                    <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                                    <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                                    <!--		local-only="false" -->
+                                                                                                                    <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>
+                                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                                <parameter name="regex" value="[-]+"/>
+                                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainA"/>
+                                                                                                                                <outcome value='success'>
                                                                                                                                     <block atomic="true">
                                                                                                                                         <set>
-                                                                                                                                            <parameter name='tmp.source.ttp-id' value="`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`" />
+                                                                                                                                            <parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                                        </set>
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
                                                                                                                                         </set>
-                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                      resource="tunnel-termination-point"
-                                                                                                                                                      key="tunnel-termination-point.ttp-id = $tmp.source.ttp-id
-		AND depth = '0'"
-                                                                                                                                                      pfx='tmp.aai.source-ttp' local-only='false' >
-                                                                                                                                            <outcome value='success'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='source.tunnel-tp-id' value="`$tmp.aai.source-ttp.tunnel-tp-id`" />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                        </get-resource>
-                                                                                                                                        <break/>
                                                                                                                                     </block>
                                                                                                                                 </outcome>
-                                                                                                                            </switch>
-                                                                                                                        </for>
-                                                                                                                    </block>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='not-found'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='failure'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='error-code' value='' />
-                                                                                                                        <parameter name='error-message' value='' />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                            </get-resource>
-                                                                                                        </block>
-                                                                                                    </outcome>
-                                                                                                </get-resource>
-                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                              resource="network-route"
-                                                                                                              key='network-route.route-id = $network-route-B'
-                                                                                                              local-only="false"
-                                                                                                              force="true" pfx="tmp.aai.network-route-B">
-                                                                                                    <outcome value='not-found'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='error-code' value='' />
-                                                                                                            <parameter name='error-message' value='' />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block atomic="true">
-                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-B.next-hop`'/>
-                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                <parameter name="regex" value="[-]+"/>
-                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainB-pnfName"/>
-                                                                                                                <outcome value='success'>
-                                                                                                                    <block atomic="true">
-                                                                                                                        <set>
-                                                                                                                            <parameter name='tmp.dst.domainB.pnf-name' value="`$param-prefix-domainB-pnfName[0] + '-' +
+                                                                                                                                <outcome value='failure'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                            </execute>
+                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                                <parameter name="ctx-destination" value="uuid.connectivity-domainA-uuid"/>
+                                                                                                                            </execute>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                  key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
+                                                                                                                                <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+                                                                                                                                <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                                                                                                                <parameter name='operational-status' value='Created' />
+                                                                                                                                <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                                                <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
+                                                                                                                                <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
+                                                                                                                                <parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                                <parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                                <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                                <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
+                                                                                                                                <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
+                                                                                                                                <parameter name='CIR' value='`$prop.sotn.cir`' />
+                                                                                                                                <parameter name='EIR' value='`$prop.sotn.eir`' />
+                                                                                                                                <parameter name='CBS' value='`$prop.sotn.cbs`' />
+                                                                                                                                <parameter name='EBS' value='`$prop.sotn.ebs`' />
+                                                                                                                                <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
+                                                                                                                                <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
+                                                                                                                                <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                <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/'` " />
+                                                                                                                            </save>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                  force="true" pfx="tmp.AnAI-data">
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
+                                                                                                                                <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                            </save>
+                                                                                                                            <for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>
+                                                                                                                                    <outcome value='tunnel-termination-point'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.source.ttp-id' value="`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="tunnel-termination-point"
+                                                                                                                                                          key="tunnel-termination-point.ttp-id = $tmp.source.ttp-id
+		AND depth = '0'"
+                                                                                                                                                          pfx='tmp.aai.source-ttp' local-only='false' >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='source.tunnel-tp-id' value="`$tmp.aai.source-ttp.tunnel-tp-id`" />
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                            <break/>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value='' />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-B'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-B">
+                                                                                                        <outcome value='not-found'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-B.next-hop`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainB-pnfName"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst.domainB.pnf-name' value="`$param-prefix-domainB-pnfName[0] + '-' +
                                                    $param-prefix-domainB-pnfName[1] + '-' +
                                                    $param-prefix-domainB-pnfName[2] + '-' +
                                                    $param-prefix-domainB-pnfName[3] + '-' +
@@ -467,448 +469,500 @@
                                                    $param-prefix-domainB-pnfName[6] + '-' +
                                                    $param-prefix-domainB-pnfName[7] + '-' +
                                                    $param-prefix-domainB-pnfName[8]`" />
-                                                                                                                        </set>
-                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                      resource="pnf"
-                                                                                                                                      key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
-                                                                                                                                      pfx='tmp.aai.destination-pnf' local-only='false' >
-                                                                                                                            <!--AND depth = '0'"-->
-                                                                                                                            <outcome value='success'>
-                                                                                                                                <block>
-                                                                                                                                    <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
-                                                                                                                                        <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
-                                                                                                                                            <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                    </set>
-                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                                  resource="esr-thirdparty-sdnc"
-                                                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
+                                                                                                                            </set>
+                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                          resource="pnf"
+                                                                                                                                          key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
+                                                                                                                                          pfx='tmp.aai.destination-pnf' local-only='false' >
+                                                                                                                                <!--AND depth = '0'"-->
+                                                                                                                                <outcome value='success'>
+                                                                                                                                    <block>
+                                                                                                                                        <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
+                                                                                                                                            <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                        </set>
+                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                      resource="esr-thirdparty-sdnc"
+                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                                                                                  pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                                        <outcome value='success'>
-                                                                                                                                                            <block>
-                                                                                                                                                                <set>
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                                    <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                </set>
-                                                                                                                                                            </block>
-                                                                                                                                                        </outcome>
-                                                                                                                                                        <outcome value='not-found'>
-                                                                                                                                                            <return status='failure'>
-                                                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                            </return>
-                                                                                                                                                        </outcome>
-                                                                                                                                                        <outcome value='Other'>
-                                                                                                                                                            <return status='failure'>
-                                                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                            </return>
-                                                                                                                                                        </outcome>
-                                                                                                                                                    </get-resource>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                            <outcome value='network-resource'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='tmp.domainB.eth-network-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                        </switch>
-                                                                                                                                    </for>
-                                                                                                                                </block>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='not-found'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='Other'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                        </get-resource>
-                                                                                                                    </block>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='failure'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='error-code' value='' />
-                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                            </execute>
-                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                          resource="p-interface"
-                                                                                                                          key="pnf.pnf-name = $tmp.dst.domainB.pnf-name
+                                                                                                                                                                      pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                            <outcome value='success'>
+                                                                                                                                                                <block>
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                    </set>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='not-found'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                </return>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='Other'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                </return>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </get-resource>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='network-resource'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.domainB.eth-network-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                            </switch>
+                                                                                                                                        </for>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='not-found'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='Other'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                            </get-resource>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="p-interface"
+                                                                                                                              key="pnf.pnf-name = $tmp.dst.domainB.pnf-name
 	        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop"
-                                                                                                                          local-only="false"
-                                                                                                                          pfx="tmp.aai.network-route-B.p-interface-dst" >
-                                                                                                                <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                                                                                                <!--	resource="p-interface"-->
-                                                                                                                <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
-                                                                                                                <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
-                                                                                                                <!--		local-only="false" -->
-                                                                                                                <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
-                                                                                                                <outcome value='success'>
-                                                                                                                    <block atomic="true">
-                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                            <parameter name="original_string" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>
-                                                                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                            <parameter name="regex" value="[-]+"/>
-                                                                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-domainB"/>
-                                                                                                                            <outcome value='success'>
-                                                                                                                                <block atomic="true">
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                                                    </set>
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                                    </set>
-                                                                                                                                </block>
-                                                                                                                            </outcome>
-                                                                                                                            <outcome value='failure'>
-                                                                                                                                <return status='failure'>
-                                                                                                                                    <parameter name='error-code' value='' />
-                                                                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                                </return>
-                                                                                                                            </outcome>
-                                                                                                                        </execute>
-                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                            <parameter name="ctx-destination" value="prop.connectivity-domainB-uuid"/>
-                                                                                                                        </execute>
-                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                              key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
-                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
-                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
-                                                                                                                            <parameter name='operational-status' value='Created' />
-                                                                                                                            <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
-                                                                                                                            <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
-                                                                                                                            <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
-                                                                                                                            <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                            <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                                            <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
-                                                                                                                            <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
-                                                                                                                            <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
-                                                                                                                            <parameter name='CIR' value='`$prop.sotn.cir`' />
-                                                                                                                            <parameter name='EIR' value='`$prop.sotn.eir`' />
-                                                                                                                            <parameter name='CBS' value='`$prop.sotn.cbs`' />
-                                                                                                                            <parameter name='EBS' value='`$prop.sotn.ebs`' />
-                                                                                                                            <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
-                                                                                                                            <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
-                                                                                                                            <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                                            <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/'` " />
-                                                                                                                        </save>
-                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
-                                                                                                                              force="true" pfx="tmp.AnAI-data">
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
-                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                                        </save>
-                                                                                                                        <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >
-                                                                                                                            <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
-                                                                                                                                <outcome value='tunnel-termination-point'>
+                                                                                                                              local-only="false"
+                                                                                                                              pfx="tmp.aai.network-route-B.p-interface-dst" >
+                                                                                                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                                    <!--	resource="p-interface"-->
+                                                                                                                    <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                                    <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                                    <!--		local-only="false" -->
+                                                                                                                    <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>
+                                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                                <parameter name="regex" value="[-]+"/>
+                                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainB"/>
+                                                                                                                                <outcome value='success'>
                                                                                                                                     <block atomic="true">
                                                                                                                                         <set>
-                                                                                                                                            <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`" />
+                                                                                                                                            <parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                                        </set>
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
                                                                                                                                         </set>
-                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                      resource="tunnel-termination-point"
-                                                                                                                                                      key="tunnel-termination-point.ttp-id = $tmp.destination.ttp-id
-		AND depth = '0'"
-                                                                                                                                                      pfx='tmp.aai.destination-ttp' local-only='false' >
-                                                                                                                                            <outcome value='success'>
-                                                                                                                                                <block atomic="true">
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                        </get-resource>
-                                                                                                                                        <break/>
                                                                                                                                     </block>
                                                                                                                                 </outcome>
-                                                                                                                            </switch>
-                                                                                                                        </for>
-                                                                                                                    </block>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='not-found'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                                <outcome value='failure'>
-                                                                                                                    <return status='failure'>
-                                                                                                                        <parameter name='error-code' value='' />
-                                                                                                                        <parameter name='error-message' value='' />
-                                                                                                                    </return>
-                                                                                                                </outcome>
-                                                                                                            </get-resource>
-                                                                                                        </block>
-                                                                                                    </outcome>
-                                                                                                </get-resource>
-                                                                                                <set>
-                                                                                                    <parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
-                                                                                                    <parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
-                                                                                                    <parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
-                                                                                                    <parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                    <parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                    <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
-                                                                                                    <parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
-                                                                                                    <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
-                                                                                                    <parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                    <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->
-                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->
-                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->
-                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->
-                                                                                                    <!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->
-                                                                                                </set>
-                                                                                                <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                    <parameter name="ctx-destination" value="prop.vpn-binding-domainA-uuid"/>
-                                                                                                </execute>
-                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >
-                                                                                                    <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />
-                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
-                                                                                                    <parameter name='access-provider-id' value='`$domain-A.provider-id`' />
-                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
-                                                                                                    <parameter name='access-client-id' value='`$domain-A.client-id`' />
-                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
-                                                                                                    <parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />
-                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
-                                                                                                    <parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                    <!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->
-                                                                                                    <parameter name='src-access-ltp-id' value='' />
-                                                                                                    <parameter name='dst-access-node-id' value='`$domain-A.node-id`' />
-                                                                                                    <parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />
-                                                                                                    <parameter name='route-distinguisher' value='`$gfp`' />
-                                                                                                    <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
-                                                                                                    <parameter name='operational-status' value='Created' />
-                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </save>
-                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid'
-                                                                                                      force="true" pfx="tmp.AnAI-data">
-                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
-                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
-                                                                                                </save>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                    <parameter name="ctx-destination" value="prop.vpn-binding-domainB-uuid"/>
-                                                                                                </execute>
-                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >
-                                                                                                    <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />
-                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
-                                                                                                    <parameter name='access-provider-id' value='`$domain-B.provider-id`' />
-                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->
-                                                                                                    <parameter name='access-client-id' value='`$domain-B.client-id`' />
-                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->
-                                                                                                    <parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />
-                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->
-                                                                                                    <parameter name='src-access-node-id' value='`$domain-B.node-id`' />
-                                                                                                    <parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />
-                                                                                                    <parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                    <!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->
-                                                                                                    <parameter name='dst-access-ltp-id' value='' />
-                                                                                                    <parameter name='route-distinguisher' value='`$gfp`' />
-                                                                                                    <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
-                                                                                                    <parameter name='operational-status' value='Created' />
-                                                                                                    <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                    <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                    <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </save>
-                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid'
-                                                                                                      force="true" pfx="tmp.AnAI-data">
-                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
-                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
-                                                                                                </save>
-                                                                                                <set>
-                                                                                                    <parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />
-                                                                                                    <parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                    <parameter name='otn-dest-node' value='`$domain-A.node-id`' />
-                                                                                                    <parameter name='bw-odu' value="`'0,' + $gfp`" />
-                                                                                                    <!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->
-                                                                                                    <parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />
-                                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                </set>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`" />
-                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
-                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                                    <parameter name="format" value="json"/>
-                                                                                                    <parameter name="httpMethod" value="post"/>
-                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing slice creation api for domain A" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </execute>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
-                                                                                                    <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' `" />
-                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                                    <parameter name="format" value="json"/>
-                                                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing UNI Coloring for domain A" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </execute>
-                                                                                                <set>
-                                                                                                    <parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />
-                                                                                                    <parameter name='otn-source-node' value='`$domain-B.node-id`' />
-                                                                                                    <parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                    <!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->
-                                                                                                    <parameter name='bw-odu' value="`'0,' + $gfp`" />
-                                                                                                    <parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />
-                                                                                                    <!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->
-                                                                                                    <parameter name='dst-ttp-id' value='' />
-                                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                </set>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`" />
-                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
-                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
-                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
-                                                                                                    <parameter name="format" value="json"/>
-                                                                                                    <parameter name="httpMethod" value="post"/>
-                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing slice creation api for domain B" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </execute>
-                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
-                                                                                                    <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' `" />
-                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
-                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
-                                                                                                    <parameter name="format" value="json"/>
-                                                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                    <outcome value='failure'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="Error executing UNI coloring for domain B" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='success'>
-                                                                                                        <block></block>
-                                                                                                    </outcome>
-                                                                                                </execute>
-                                                                                            </block>
-                                                                                        </outcome>
-                                                                                    </get-resource>
-                                                                                </block>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                    </for>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </block>
-                                                </outcome>
-                                            </get-resource>
-                                        </block>
+                                                                                                                                <outcome value='failure'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                            </execute>
+                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                                <parameter name="ctx-destination" value="prop.connectivity-domainB-uuid"/>
+                                                                                                                            </execute>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                  key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
+                                                                                                                                <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+                                                                                                                                <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                                                                                                                <parameter name='operational-status' value='Created' />
+                                                                                                                                <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
+                                                                                                                                <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
+                                                                                                                                <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
+                                                                                                                                <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                                <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                                <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
+                                                                                                                                <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
+                                                                                                                                <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
+                                                                                                                                <parameter name='CIR' value='`$prop.sotn.cir`' />
+                                                                                                                                <parameter name='EIR' value='`$prop.sotn.eir`' />
+                                                                                                                                <parameter name='CBS' value='`$prop.sotn.cbs`' />
+                                                                                                                                <parameter name='EBS' value='`$prop.sotn.ebs`' />
+                                                                                                                                <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
+                                                                                                                                <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
+                                                                                                                                <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                <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/'` " />
+                                                                                                                            </save>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                  force="true" pfx="tmp.AnAI-data">
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
+                                                                                                                                <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                            </save>
+                                                                                                                            <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
+                                                                                                                                    <outcome value='tunnel-termination-point'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="tunnel-termination-point"
+                                                                                                                                                          key="tunnel-termination-point.ttp-id = $tmp.destination.ttp-id
+		AND depth = '0'"
+                                                                                                                                                          pfx='tmp.aai.destination-ttp' local-only='false' >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block atomic="true">
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                            <break/>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value='' />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <set>
+                                                                                                        <parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                        <parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
+                                                                                                        <parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
+                                                                                                        <parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                        <parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                        <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
+                                                                                                        <parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
+                                                                                                        <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
+                                                                                                        <parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                        <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->
+                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->
+                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->
+                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->
+                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='prop.ethsrvType' value='`$network-route-A`' />
+                                                                                                    </set>
+                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                        <parameter name="ctx-destination" value="prop.vpn-binding-domainA-uuid"/>
+                                                                                                    </execute>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >
+                                                                                                        <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />
+                                                                                                        <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
+                                                                                                        <parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />
+                                                                                                        <parameter name='access-provider-id' value='`$domain-A.provider-id`' />
+                                                                                                        <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
+                                                                                                        <parameter name='access-client-id' value='`$domain-A.client-id`' />
+                                                                                                        <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
+                                                                                                        <parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />
+                                                                                                        <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
+                                                                                                        <parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                        <!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->
+                                                                                                        <parameter name='src-access-ltp-id' value='' />
+                                                                                                        <parameter name='dst-access-node-id' value='`$domain-A.node-id`' />
+                                                                                                        <parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />
+                                                                                                        <parameter name='route-distinguisher' value='`$gfp`' />
+                                                                                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
+                                                                                                        <parameter name='operational-status' value='Created' />
+                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                        <outcome value='success'>
+                                                                                                            <block></block>
+                                                                                                        </outcome>
+                                                                                                    </save>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid'
+                                                                                                          force="true" pfx="tmp.AnAI-data">
+                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
+                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
+                                                                                                    </save>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                        <parameter name="ctx-destination" value="prop.vpn-binding-domainB-uuid"/>
+                                                                                                    </execute>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >
+                                                                                                        <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />
+                                                                                                        <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
+                                                                                                        <parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />
+                                                                                                        <parameter name='access-provider-id' value='`$domain-B.provider-id`' />
+                                                                                                        <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->
+                                                                                                        <parameter name='access-client-id' value='`$domain-B.client-id`' />
+                                                                                                        <!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->
+                                                                                                        <parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />
+                                                                                                        <!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->
+                                                                                                        <parameter name='src-access-node-id' value='`$domain-B.node-id`' />
+                                                                                                        <parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />
+                                                                                                        <parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                        <!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->
+                                                                                                        <parameter name='dst-access-ltp-id' value='' />
+                                                                                                        <parameter name='route-distinguisher' value='`$gfp`' />
+                                                                                                        <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
+                                                                                                        <parameter name='operational-status' value='Created' />
+                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                        <outcome value='success'>
+                                                                                                            <block></block>
+                                                                                                        </outcome>
+                                                                                                    </save>
+                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid'
+                                                                                                          force="true" pfx="tmp.AnAI-data">
+                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
+                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
+                                                                                                    </save>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />-->
+                                                                                                        <!--<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
+                                                                                                        <!--<parameter name='otn-dest-node' value='`$domain-A.node-id`' />-->
+                                                                                                        <!--<parameter name='bw-odu' value="`'0,' + $gfp`" />-->
+                                                                                                        <!--<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />-->
+                                                                                                        <!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].request-id`' value='`$prop.vpn-binding-domainA-uuid`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].otn-dest-node`' value='`$domain-A.node-id`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].src-ttp-id`' value='' />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].dst-ttp-id`' value='`$domain-A.tunnel-tp-id`' />
+                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceA-list_length`' value='`$idx + 1`' />
+                                                                                                        <!--otn-tunnel-slice-list[$idx]-->
+                                                                                                    </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
+                                                                                                        <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' `" />
+                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                                        <parameter name="format" value="json"/>
+                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="Error executing UNI Coloring for domain A" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block></block>
+                                                                                                        </outcome>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />-->
+                                                                                                        <!--<parameter name='otn-source-node' value='`$domain-B.node-id`' />-->
+                                                                                                        <!--<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->
+                                                                                                        <!--<parameter name='bw-odu' value="`'0,' + $gfp`" />-->
+                                                                                                        <!--<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />-->
+                                                                                                        <!--<parameter name='dst-ttp-id' value='' />-->
+                                                                                                        <!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].request-id`' value='`$prop.vpn-binding-domainB-uuid`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].otn-source-node`' value='`$domain-B.node-id`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].src-ttp-id`' value='`$domain-B.tunnel-tp-id`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].dst-ttp-id`' value='' />
+                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                        <parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />
+                                                                                                    </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
+                                                                                                        <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' `" />
+                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                                                        <parameter name="format" value="json"/>
+                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                <parameter name="error-message" value="Error executing UNI coloring for domain B" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block></block>
+                                                                                                        </outcome>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <parameter name='domain-A.tunnel-tp-id' value='' />
+                                                                                                        <parameter name='domain-A.node-id' value='' />
+                                                                                                        <parameter name='domain-A.network-id' value="" />
+                                                                                                        <parameter name='domain-A.provider-id' value="" />
+                                                                                                        <parameter name='domain-A.client-id' value="" />
+                                                                                                        <parameter name='domain-A.te-topo-id' value="" />
+                                                                                                        <parameter name='domain-A.network-type' value="" />
+                                                                                                        <parameter name='domain-A.ltpId' value="" />
+                                                                                                        <parameter name='tmp.domain-A.network-id' value="" />
+                                                                                                        <parameter name='tmp.domain-A.ttp-id' value="" />
+                                                                                                        <parameter name='network-route-A' value="" />
+                                                                                                        <!--<parameter name='domain-A.' value="" />-->
+                                                                                                        <parameter name='request-id' value='' />
+                                                                                                        <parameter name='otn-source-node' value='' />
+                                                                                                        <parameter name='otn-dest-node' value='' />
+                                                                                                        <parameter name='bw-odu' value="" />
+                                                                                                        <parameter name='src-ttp-id' value='' />
+                                                                                                        <parameter name='dst-ttp-id' value='' />
+                                                                                                        <parameter name='domain-B.tunnel-tp-id' value='' />
+                                                                                                        <parameter name='domain-B.node-id' value='' />
+                                                                                                        <parameter name='domain-B.network-id' value="" />
+                                                                                                        <parameter name='domain-B.provider-id' value="" />
+                                                                                                        <parameter name='domain-B.client-id' value="" />
+                                                                                                        <parameter name='domain-B.te-topo-id' value="" />
+                                                                                                        <parameter name='domain-B.network-type' value="" />
+                                                                                                        <parameter name='domain-B.ltpId' value="" />
+                                                                                                        <parameter name='tmp.domain-B.network-id' value="" />
+                                                                                                        <parameter name='tmp.domain-B.ttp-id' value="" />
+                                                                                                        <parameter name='network-route-B' value="" />
+                                                                                                        <!--<parameter name='domain-B.' value="" />-->
+                                                                                                    </set>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </block>
+                                                    </outcome>
+                                                </get-resource>
+                                            </block>
+                                        </outcome>
+                                    </get-resource>
+                                </for>
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceA-list-creation.templatefile`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                    <parameter name="format" value="json"/>
+                                    <parameter name="httpMethod" value="post"/>
+                                    <parameter name="responsePrefix" value="otn-oof"/>
+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                    <outcome value='failure'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error executing slice creation api for domain A" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='success'>
+                                        <block></block>
+                                    </outcome>
+                                </execute>
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceB-list-creation.templatefile`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`" />
+                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                    <parameter name="format" value="json"/>
+                                    <parameter name="httpMethod" value="post"/>
+                                    <parameter name="responsePrefix" value="otn-oof"/>
+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                    <outcome value='failure'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error executing slice creation api for domain B" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='success'>
+                                        <block></block>
                                     </outcome>
-                                </get-resource>
+                                </execute>
                             </block>
                         </outcome>
                     </switch>