Bug fixing to support more than two domains for Transport Slicing.

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml

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 2cd9b56..b2bf06c 100644 (file)
--- 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
@@ -39,6 +39,10 @@
                                     <parameter name='tmp.arr_length' value='0' />\r
                                     <parameter name='otn-tunnel-slice' value='' />\r
                                     <parameter name='otn-tunnel-slice_length' value='0' />\r
+                                    <parameter name='tmp.slicevpns' value='' />\r
+                                    <parameter name='tmp.slicevpns_length' value='0' />\r
+                                    <parameter name='tmp.slicevpnuuids' value='' />\r
+                                    <parameter name='tmp.slicevpnuuids.' value='' />\r
                                 </set>\r
                                 <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\r
                                     <set>\r
@@ -872,7 +876,13 @@
                                                                                                                 <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\r
                                                                                                                 <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\r
                                                                                                                 <outcome value='success'>\r
-                                                                                                                    <block></block>\r
+                                                                                                                    <block>\r
+                                                                                                                        <set>\r
+                                                                                                                            <parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value="`$prop.vpn-binding-otnidx-uuid`" />\r
+                                                                                                                            <parameter name='tmp.slicevpns_length' value="`$tmp.slicevpns_length + 1`" />\r
+                                                                                                                            <parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value="`$prop.vpn-binding-otnidx-uuid`" />\r
+                                                                                                                        </set>\r
+                                                                                                                    </block>\r
                                                                                                                 </outcome>\r
                                                                                                             </save>\r
                                                                                                             <switch test='`$otnidx == 0`'>\r
@@ -887,15 +897,7 @@
                                                                                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />\r
                                                                                                                         </save>\r
                                                                                                                         <set>\r
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\r
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\r
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-dest-node`' value='`$tmp.otninfo[0].dstPort.dst-access-node-id`' />-->\r
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->\r
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].src-ttp-id`' value='' />-->\r
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[0].dstPort.dst-tunnel-tp-id`' />-->\r
                                                                                                                             <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\r
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list_length`' value='`$idx + 1`' />-->\r
                                                                                                                         </set>\r
                                                                                                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                                                                             <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />\r
@@ -940,15 +942,7 @@
                                                                                                                                         <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />\r
                                                                                                                                     </save>\r
                                                                                                                                     <set>\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='' />-->\r
                                                                                                                                         <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\r
                                                                                                                                     </set>\r
                                                                                                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                                                                                         <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />\r
@@ -1034,15 +1028,7 @@
                                                                                                                                         <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />\r
                                                                                                                                     </save>\r
                                                                                                                                     <set>\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->\r
                                                                                                                                         <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\r
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\r
                                                                                                                                     </set>\r
                                                                                                                                 </block>\r
                                                                                                                             </outcome>\r
@@ -1052,40 +1038,6 @@
                                                                                                             </switch>\r
                                                                                                         </block>\r
                                                                                                     </for>\r
-                                                                                                    <set>\r
-                                                                                                        <!--<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />-->\r
-                                                                                                        <!--<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\r
-                                                                                                        <!--<parameter name='otn-dest-node' value='`$domain-A.node-id`' />-->\r
-                                                                                                        <!--<parameter name='bw-odu' value="`'0,' + $gfp`" />-->\r
-                                                                                                        <!--<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />-->\r
-                                                                                                        <!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\r
-                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].request-id`' value='`$prop.vpn-binding-domainA-uuid`' />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].otn-dest-node`' value='`$domain-A.node-id`' />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].src-ttp-id`' value='' />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceA-list[$idx].dst-ttp-id`' value='`$domain-A.tunnel-tp-id`' />\r
-                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceA-list_length`' value='`$idx + 1`' />\r
-                                                                                                        <!--otn-tunnel-slice-list[$idx]-->\r
-                                                                                                    </set>\r
-                                                                                                    <set>\r
-                                                                                                        <!--<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />-->\r
-                                                                                                        <!--<parameter name='otn-source-node' value='`$domain-B.node-id`' />-->\r
-                                                                                                        <!--<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\r
-                                                                                                        <!--<parameter name='bw-odu' value="`'0,' + $gfp`" />-->\r
-                                                                                                        <!--<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />-->\r
-                                                                                                        <!--<parameter name='dst-ttp-id' value='' />-->\r
-                                                                                                        <!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\r
-                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].request-id`' value='`$prop.vpn-binding-domainB-uuid`' />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].otn-source-node`' value='`$domain-B.node-id`' />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].src-ttp-id`' value='`$domain-B.tunnel-tp-id`' />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceB-list[$idx].dst-ttp-id`' value='' />\r
-                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                                        <parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />\r
-                                                                                                    </set>\r
                                                                                                     <set>\r
                                                                                                         <parameter name='domain-A.tunnel-tp-id' value='' />\r
                                                                                                         <parameter name='domain-A.node-id' value='' />\r
@@ -1144,109 +1096,116 @@
                                         <block atomic="true">\r
                                             <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\r
                                                 <block atomic='true'>\r
-                                                    <set>\r
-                                                        <parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\r
-                                                        <parameter name='found' value='false' />\r
-                                                    </set>\r
-                                                    <switch test='`$tmp.arr_length != 0`'>\r
+                                                    <switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">\r
                                                         <outcome value='true'>\r
                                                             <block atomic='true'>\r
-                                                                <for index='arridx' start='0' end='`$tmp.arr_length`' >\r
-                                                                    <switch test='`$tmp.arr[$arridx] == $providerValue`'>\r
-                                                                        <outcome value='true'>\r
-                                                                            <block atomic='true'>\r
-                                                                                <set>\r
-                                                                                    <parameter name='found' value='true' />\r
-                                                                                </set>\r
-                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                        key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
-                                                                                    <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                    <parameter name='vpn-type' value='`$arridx`' />\r
-                                                                                </update>\r
-                                                                                <set>\r
-                                                                                    <parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\r
-                                                                                </set>\r
-                                                                                <set>\r
-                                                                                    <!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\r
-                                                                                    <!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\r
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
-                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
-                                                                                    <!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\r
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\r
-                                                                                </set>\r
-                                                                                <break/>\r
-                                                                            </block>\r
-                                                                        </outcome>\r
-                                                                        <outcome value='false'>\r
-                                                                            <block></block>\r
-                                                                        </outcome>\r
-                                                                    </switch>\r
-                                                                </for>\r
-                                                                <switch test='`$found`'>\r
+                                                                <set>\r
+                                                                    <parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\r
+                                                                    <parameter name='found' value='false' />\r
+                                                                </set>\r
+                                                                <switch test='`$tmp.arr_length != 0`'>\r
                                                                     <outcome value='true'>\r
-                                                                        <block></block>\r
+                                                                        <block atomic='true'>\r
+                                                                            <for index='arridx' start='0' end='`$tmp.arr_length`' >\r
+                                                                                <switch test='`$tmp.arr[$arridx] == $providerValue`'>\r
+                                                                                    <outcome value='true'>\r
+                                                                                        <block atomic='true'>\r
+                                                                                            <set>\r
+                                                                                                <parameter name='found' value='true' />\r
+                                                                                            </set>\r
+                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
+                                                                                                <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                                                <parameter name='vpn-type' value='`$arridx`' />\r
+                                                                                            </update>\r
+                                                                                            <set>\r
+                                                                                                <parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\r
+                                                                                            </set>\r
+                                                                                            <set>\r
+                                                                                                <!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\r
+                                                                                                <!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\r
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value="`'0,' + $gfp`" />\r
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
+                                                                                                <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
+                                                                                                <!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\r
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\r
+                                                                                            </set>\r
+                                                                                            <break/>\r
+                                                                                        </block>\r
+                                                                                    </outcome>\r
+                                                                                    <outcome value='false'>\r
+                                                                                        <block></block>\r
+                                                                                    </outcome>\r
+                                                                                </switch>\r
+                                                                            </for>\r
+                                                                            <switch test='`$found`'>\r
+                                                                                <outcome value='true'>\r
+                                                                                    <block></block>\r
+                                                                                </outcome>\r
+                                                                                <outcome value='false'>\r
+                                                                                    <block atomic='true'>\r
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
+                                                                                            <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                                            <parameter name='vpn-type' value='`$arridx + 1`' />\r
+                                                                                        </update>\r
+                                                                                        <set>\r
+                                                                                            <parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\r
+                                                                                            <parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\r
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value="`'0,' + $gfp`" />\r
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
+                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
+                                                                                            <parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\r
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\r
+                                                                                        </set>\r
+                                                                                    </block>\r
+                                                                                </outcome>\r
+                                                                            </switch>\r
+                                                                        </block>\r
                                                                     </outcome>\r
                                                                     <outcome value='false'>\r
                                                                         <block atomic='true'>\r
                                                                             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                     key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
                                                                                 <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                <parameter name='vpn-type' value='`$arridx + 1`' />\r
+                                                                                <parameter name='vpn-type' value='0' />\r
                                                                             </update>\r
                                                                             <set>\r
-                                                                                <parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\r
-                                                                                <parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
+                                                                                <parameter name='tmp.arr[0]' value='`$providerValue`' />\r
+                                                                                <parameter name='tmp.arr_length' value='1' />\r
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value="`'0,' + $gfp`" />\r
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
                                                                                 <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
-                                                                                <parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\r
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\r
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
+                                                                                <parameter name='otn-tunnel-slice_length' value='1' />\r
+                                                                                <parameter name='otn-tunnel-slice[0].list_length' value='1' />\r
                                                                             </set>\r
                                                                         </block>\r
                                                                     </outcome>\r
                                                                 </switch>\r
                                                             </block>\r
                                                         </outcome>\r
-                                                        <outcome value='false'>\r
-                                                            <block atomic='true'>\r
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                        key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\r
-                                                                    <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                    <parameter name='vpn-type' value='0' />\r
-                                                                </update>\r
-                                                                <set>\r
-                                                                    <parameter name='tmp.arr[0]' value='`$providerValue`' />\r
-                                                                    <parameter name='tmp.arr_length' value='1' />\r
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\r
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\r
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\r
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value="`'0,' + $gfp`" />\r
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\r
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\r
-                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />\r
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\r
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\r
-                                                                    <parameter name='otn-tunnel-slice_length' value='1' />\r
-                                                                    <parameter name='otn-tunnel-slice[0].list_length' value='1' />\r
-                                                                </set>\r
-                                                            </block>\r
-                                                        </outcome>\r
+                                                        <outcome value='false'></outcome>\r
                                                     </switch>\r
                                                 </block>\r
                                             </for>\r