From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 26 Feb 2021 22:22:57 +0000 (+0000)
Subject: Bug fixing to support more than two domains for Transport Slicing.
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=efe3d21392ff65f3b281c1b3ba0b1f492c713d5b

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

Issue-ID: SDNC-1487
Change-Id: I472e84b064649eec7c39e3672e487b40d6925b1b
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
---

diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
index 4fe850a3..bc919426 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
@@ -946,17 +946,6 @@
         "z": "97fec48c.8eada",
         "wires": []
     },
-    {
-        "id": "c1945a01.da39d8",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 3605.9998779296875,
-        "y": 270,
-        "z": "97fec48c.8eada",
-        "wires": []
-    },
     {
         "id": "daf680e0.e985f",
         "type": "block",
@@ -1678,34 +1667,6 @@
             ]
         ]
     },
-    {
-        "id": "f7b52e29.d7e28",
-        "type": "outcome",
-        "name": "otn-oof.start-node",
-        "xml": "<outcome value='`$otn-oof.start-node`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3255.9998779296875,
-        "y": 169,
-        "z": "97fec48c.8eada",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fcffac67.9ba8e",
-        "type": "outcome",
-        "name": "otn-oof.end-node",
-        "xml": "<outcome value='`$otn-oof.end-node`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3258.9998779296875,
-        "y": 388,
-        "z": "97fec48c.8eada",
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "edb2a900.9a7b1",
         "type": "block",
@@ -1733,17 +1694,6 @@
         "z": "97fec48c.8eada",
         "wires": []
     },
-    {
-        "id": "4fb57d55.78b35c",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 3613.9998779296875,
-        "y": 364,
-        "z": "97fec48c.8eada",
-        "wires": []
-    },
     {
         "id": "7a290eee.406588",
         "type": "block",
@@ -1830,98 +1780,6 @@
         "z": "97fec48c.8eada",
         "wires": []
     },
-    {
-        "id": "b9740a82.273f8",
-        "type": "switchNode",
-        "name": "test $vidx == first",
-        "xml": "<switch test='`$vidx == 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2366,
-        "y": 100,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "fac1138.38454f",
-                "4fd6928.61fb8ec"
-            ]
-        ]
-    },
-    {
-        "id": "fac1138.38454f",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2550,
-        "y": 62,
-        "z": "97fec48c.8eada",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4fd6928.61fb8ec",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2548,
-        "y": 131,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "49bef92e.99a498"
-            ]
-        ]
-    },
-    {
-        "id": "49bef92e.99a498",
-        "type": "switchNode",
-        "name": "test $vidx == last",
-        "xml": "<switch test='`$vidx == $otn-oof.solutions_length - 1`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2729,
-        "y": 128,
-        "z": "97fec48c.8eada",
-        "wires": [
-            [
-                "4a491f2.2eab56",
-                "98392658.063f78"
-            ]
-        ]
-    },
-    {
-        "id": "98392658.063f78",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2895,
-        "y": 167,
-        "z": "97fec48c.8eada",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4a491f2.2eab56",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2897,
-        "y": 93,
-        "z": "97fec48c.8eada",
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "3d2e0b8f.457abc",
         "type": "set",
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
index b1d61faf..158e8174 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
@@ -236,9 +236,9 @@
         "wires": [
             [
                 "2dfd81e1.a251ae",
-                "bc1d9c19.8a817",
                 "d0adb7e4.435f98",
-                "bf30e0be.23b998"
+                "bf30e0be.23b998",
+                "bc1d9c19.8a817"
             ]
         ]
     },
@@ -459,8 +459,6 @@
                 "c57ab47a.d333d8",
                 "10cbf4f3.49fe3b",
                 "49d3005f.62282",
-                "15e0419f.a2cb36",
-                "e6402796.6c8a4",
                 "1f03402a.5db7",
                 "56710693.e24068",
                 "84b0870f.4db1e",
@@ -1193,36 +1191,6 @@
         "z": "b31344e1.6b9228",
         "wires": []
     },
-    {
-        "id": "65916227.3c1154",
-        "type": "save",
-        "name": "save vpn-binding A resource (aka. OTN domainA) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<parameter name='access-provider-id' value='`$domain-A.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-A.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='src-access-ltp-id' value='' />\n<parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\n<parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2796,
-        "y": 2831,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "17bd32c6.c38a7d"
-            ]
-        ]
-    },
-    {
-        "id": "fa5ee7b8.d80d3",
-        "type": "save",
-        "name": "save connectivity-A relationship to vpn-binding-A, in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2787.5,
-        "y": 2880,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "7c2c78d5.f4945",
         "type": "save",
@@ -1251,142 +1219,6 @@
             []
         ]
     },
-    {
-        "id": "17bd32c6.c38a7d",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3082,
-        "y": 2838,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "20a19a36.cfd0d6"
-            ]
-        ]
-    },
-    {
-        "id": "20a19a36.cfd0d6",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3222.500244140625,
-        "y": 2839.25390625,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dba0a851.2f60f8",
-        "type": "comment",
-        "name": "TODO: FIXME: put proper values",
-        "info": "",
-        "comments": "",
-        "x": 2718,
-        "y": 2777,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "cb2d65a2.90a53",
-        "type": "save",
-        "name": "save vpn-binding B resource (aka. OTN domainB) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<parameter name='access-provider-id' value='`$domain-B.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-B.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$domain-B.node-id`' />\n<parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-access-ltp-id' value='' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2786,
-        "y": 3121,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "a71dc667.1e8b48"
-            ]
-        ]
-    },
-    {
-        "id": "c245f255.688bf",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3226.500244140625,
-        "y": 3121.25390625,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a71dc667.1e8b48",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3086,
-        "y": 3120,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "c245f255.688bf"
-            ]
-        ]
-    },
-    {
-        "id": "86719a40.1873b8",
-        "type": "comment",
-        "name": "TODO: FIXME: put proper values",
-        "info": "",
-        "comments": "",
-        "x": 2712,
-        "y": 3073,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "ca75e77c.cd7028",
-        "type": "save",
-        "name": "save connectivity-B relationship to vpn-binding-B, in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2784.5,
-        "y": 3161,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a23bd528.d58958",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "set attachment param and send request to NCE-T\nfor bandwidth matrix\nmay require a new template for JSON body",
-        "comments": "",
-        "x": 2593,
-        "y": 3241,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "15e0419f.a2cb36",
-        "type": "set",
-        "name": "set attachment_param domain A",
-        "xml": "<set>\n<!--<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />-->\n<!--<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='otn-dest-node' value='`$domain-A.node-id`' />-->\n<!--<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />-->\n<!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n\n\n\n<parameter name='`otn-tunnel-sliceA-list[$idx].request-id`' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].otn-dest-node`' value='`$domain-A.node-id`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceA-list[$idx].src-ttp-id`' value='' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].dst-ttp-id`' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-sliceA-list_length`' value='`$idx + 1`' />\n\n<!--otn-tunnel-slice-list[$idx]-->\n\n",
-        "comments": "",
-        "x": 2658,
-        "y": 3286,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
     {
         "id": "2d08c6.2cc1e73a",
         "type": "execute",
@@ -2057,34 +1889,6 @@
             []
         ]
     },
-    {
-        "id": "5f8f79a5.68d88",
-        "type": "execute",
-        "name": "execute UUID generator for vpn-binding domainA",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainA-uuid\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2771,
-        "y": 2745,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9fa3320.fe9395",
-        "type": "execute",
-        "name": "execute UUID generator for vpn-binding domainB",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainB-uuid\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2764,
-        "y": 3038,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "bb95643a.1dafd8",
         "type": "for",
@@ -2379,17 +2183,6 @@
         "z": "b31344e1.6b9228",
         "wires": []
     },
-    {
-        "id": "e6402796.6c8a4",
-        "type": "set",
-        "name": "set attachment_param domain B",
-        "xml": "<set>\n<!--<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />-->\n<!--<parameter name='otn-source-node' value='`$domain-B.node-id`' />-->\n<!--<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />-->\n<!--<parameter name='dst-ttp-id' value='' />-->\n<!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n\n<parameter name='`otn-tunnel-sliceB-list[$idx].request-id`' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-source-node`' value='`$domain-B.node-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceB-list[$idx].src-ttp-id`' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].dst-ttp-id`' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />\n",
-        "comments": "",
-        "x": 2653,
-        "y": 3661,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
     {
         "id": "300f312a.b253d6",
         "type": "get-resource",
@@ -2968,156 +2761,6 @@
         "z": "b31344e1.6b9228",
         "wires": []
     },
-    {
-        "id": "4197c53b.8564cc",
-        "type": "execute",
-        "name": "execute RestApiCallNode slice creation domainA",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceA-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2006,
-        "y": 4699,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "70c04755.d69dd8",
-                "d409404c.9b0598"
-            ]
-        ]
-    },
-    {
-        "id": "d409404c.9b0598",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2289,
-        "y": 4679,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "b37528b2.115b48"
-            ]
-        ]
-    },
-    {
-        "id": "70c04755.d69dd8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2290.000213623047,
-        "y": 4729.99990940094,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "31bb8bbe.1ece2c"
-            ]
-        ]
-    },
-    {
-        "id": "b37528b2.115b48",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain A\" />\n",
-        "comments": "",
-        "x": 2429.0002479553223,
-        "y": 4679.000000953674,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "31bb8bbe.1ece2c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2435.02725982666,
-        "y": 4727.745394706726,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c751bc62.d2e9d8",
-        "type": "execute",
-        "name": "execute RestApiCallNode slice creation domainB",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceB-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2002,
-        "y": 4868,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "9cb98bdf.eb0c38",
-                "32bfa672.12903a"
-            ]
-        ]
-    },
-    {
-        "id": "32bfa672.12903a",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2276,
-        "y": 4848,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "b28dd680.86b978"
-            ]
-        ]
-    },
-    {
-        "id": "9cb98bdf.eb0c38",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2277.000213623047,
-        "y": 4898.99990940094,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "2765f5a8.5ab652"
-            ]
-        ]
-    },
-    {
-        "id": "b28dd680.86b978",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain B\" />\n",
-        "comments": "",
-        "x": 2416.0002479553223,
-        "y": 4848.000000953674,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "2765f5a8.5ab652",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2422.02725982666,
-        "y": 4896.745394706726,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "33bd7ebe.34c502",
         "type": "block",
@@ -3253,156 +2896,6 @@
             ]
         ]
     },
-    {
-        "id": "6b9897c8.516f28",
-        "type": "execute",
-        "name": "execute RestApiCallNode domainA UNI Coloring",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<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' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2718,
-        "y": 3473,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "423bbf1a.980188",
-                "5a878bc1.0c7c24"
-            ]
-        ]
-    },
-    {
-        "id": "5a878bc1.0c7c24",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2984,
-        "y": 3453,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "857ed73a.517d58"
-            ]
-        ]
-    },
-    {
-        "id": "423bbf1a.980188",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2985.000213623047,
-        "y": 3503.99990940094,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "c8157b69.44d2d"
-            ]
-        ]
-    },
-    {
-        "id": "857ed73a.517d58",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI Coloring for domain A\" />\n",
-        "comments": "",
-        "x": 3124.0002479553223,
-        "y": 3453.0000009536743,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "c8157b69.44d2d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3130.02725982666,
-        "y": 3501.745394706726,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1473b1fb.f66ede",
-        "type": "execute",
-        "name": "execute RestApiCallNode domainB UNI Coloring",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<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' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2718,
-        "y": 3839,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "8f6a2d0c.d8e1f8",
-                "9fe0565f.7886"
-            ]
-        ]
-    },
-    {
-        "id": "9fe0565f.7886",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2984,
-        "y": 3819,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "9f93d2ab.f5b508"
-            ]
-        ]
-    },
-    {
-        "id": "8f6a2d0c.d8e1f8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2985.000213623047,
-        "y": 3869.99990940094,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "c9ec128c.8a9e98"
-            ]
-        ]
-    },
-    {
-        "id": "9f93d2ab.f5b508",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",
-        "comments": "",
-        "x": 3124.0002479553223,
-        "y": 3819.0000009536743,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "c9ec128c.8a9e98",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3130.02725982666,
-        "y": 3867.745394706726,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "420f3616.2f701",
         "type": "set",
@@ -3519,98 +3012,6 @@
             ]
         ]
     },
-    {
-        "id": "1e2e68c3.addf6f",
-        "type": "switchNode",
-        "name": "switch srcPort == NULL",
-        "xml": "<switch test='`length($tmp.otninfo[$otnidx].srcPort) == 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2936,
-        "y": 2353,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "2e3585b0.01a1f2",
-                "eadfc48d.7db62"
-            ]
-        ]
-    },
-    {
-        "id": "2e3585b0.01a1f2",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3153,
-        "y": 2330,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "eadfc48d.7db62",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3153,
-        "y": 2377,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "91bb64fe.b40488"
-            ]
-        ]
-    },
-    {
-        "id": "91bb64fe.b40488",
-        "type": "switchNode",
-        "name": "switch srcPort == NULL",
-        "xml": "<switch test='`length($tmp.otninfo[$otnidx].dstPort) == 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3356,
-        "y": 2376,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "ecd0f109.dbad88",
-                "fd54750b.bb4c08"
-            ]
-        ]
-    },
-    {
-        "id": "fd54750b.bb4c08",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3551,
-        "y": 2330,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ecd0f109.dbad88",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3549,
-        "y": 2370,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
     {
         "id": "647d2436.140504",
         "type": "save",
@@ -3618,8 +3019,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3788,
-        "y": 2951,
+        "x": 3789,
+        "y": 2919,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -3648,8 +3049,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4094,
-        "y": 2950,
+        "x": 4095,
+        "y": 2918,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -3665,11 +3066,13 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4303.5,
-        "y": 2950.25390625,
+        "x": 4304.5,
+        "y": 2918.25390625,
         "z": "b31344e1.6b9228",
         "wires": [
-            []
+            [
+                "b41cf773.b97ef"
+            ]
         ]
     },
     {
@@ -3913,7 +3316,7 @@
         "id": "2e1edee2.ee8112",
         "type": "set",
         "name": "set attachment_param domain A",
-        "xml": "<set>\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-dest-node`' value='`$tmp.otninfo[0].dstPort.dst-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].src-ttp-id`' value='' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[0].dstPort.dst-tunnel-tp-id`' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list_length`' value='`$idx + 1`' />-->\n\n\n",
+        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",
         "comments": "",
         "x": 4286,
         "y": 3080,
@@ -4037,7 +3440,7 @@
         "id": "1cf9708b.795d07",
         "type": "set",
         "name": "set attachment_param domain B",
-        "xml": "<set>\n\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\n\n",
+        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
         "comments": "",
         "x": 4586,
         "y": 3310,
@@ -4123,99 +3526,13 @@
         "id": "ebae712b.9f6bf8",
         "type": "set",
         "name": "set attachment_param domain otnidx",
-        "xml": "<set>\n\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\n",
+        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
         "x": 4683,
         "y": 3784,
         "z": "b31344e1.6b9228",
         "wires": []
     },
-    {
-        "id": "b29e7a1b.0bb9",
-        "type": "execute",
-        "name": "execute RestApiCallNode domainB UNI Coloring",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<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' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 4727,
-        "y": 3902,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "b649c2ac.1863c8",
-                "5df7a032.7812b8"
-            ]
-        ]
-    },
-    {
-        "id": "5df7a032.7812b8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4971,
-        "y": 3881,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "5f52118f.5992f"
-            ]
-        ]
-    },
-    {
-        "id": "b649c2ac.1863c8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4976,
-        "y": 3938,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "d6363d68.6bc1d"
-            ]
-        ]
-    },
-    {
-        "id": "5f52118f.5992f",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",
-        "comments": "",
-        "x": 5111.000247955322,
-        "y": 3881.0000009536743,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "d6363d68.6bc1d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 5121.027046203613,
-        "y": 3935.745485305786,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ff94df56.8391f8",
-        "type": "comment",
-        "name": "find domain-otnidx URL info from either src or dst pnf (src-access-node-id). However, eth network id is hard to find, unless hard code topology id 2",
-        "info": "",
-        "comments": "",
-        "x": 4931,
-        "y": 3844,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
     {
         "id": "bc1d9c19.8a817",
         "type": "save",
@@ -4223,8 +3540,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1986,
-        "y": 4143,
+        "x": 2002,
+        "y": 4131,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4241,8 +3558,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2197,
-        "y": 4145,
+        "x": 2190,
+        "y": 4144,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4257,8 +3574,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2197.490966796875,
-        "y": 4190.574035644531,
+        "x": 2190.490966796875,
+        "y": 4189.574035644531,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4273,8 +3590,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2195,
-        "y": 4234,
+        "x": 2188,
+        "y": 4233,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4289,8 +3606,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2370,
-        "y": 4143,
+        "x": 2363,
+        "y": 4142,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4304,8 +3621,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2360.0623779296875,
-        "y": 4190.859771728516,
+        "x": 2353.0623779296875,
+        "y": 4189.859771728516,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -4315,8 +3632,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2362,
-        "y": 4233,
+        "x": 2355,
+        "y": 4232,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -4375,8 +3692,8 @@
         "name": "set providerValue",
         "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",
         "comments": "",
-        "x": 3003,
-        "y": 4085,
+        "x": 3693,
+        "y": 4089,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -4413,7 +3730,7 @@
         "id": "d0adb7e4.435f98",
         "type": "set",
         "name": "set tmp.arr",
-        "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n\n\n",
+        "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<parameter name='tmp.slicevpns' value='' />\n<parameter name='tmp.slicevpns_length' value='0' />\n\n<parameter name='tmp.slicevpnuuids' value='' />\n<parameter name='tmp.slicevpnuuids.' value='' />\n\n\n",
         "comments": "",
         "x": 1954,
         "y": 170,
@@ -4427,8 +3744,8 @@
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2611,
-        "y": 4145,
+        "x": 2592,
+        "y": 4143,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4444,13 +3761,12 @@
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2823,
-        "y": 4143,
+        "x": 2807,
+        "y": 4144,
         "z": "b31344e1.6b9228",
         "wires": [
             [
-                "ce29a297.cf1cb8",
-                "72392f69.a40338"
+                "9baaaca4.d54a4"
             ]
         ]
     },
@@ -4461,8 +3777,8 @@
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3588,
-        "y": 4060,
+        "x": 4260,
+        "y": 4064,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4477,8 +3793,8 @@
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3054,
-        "y": 4140,
+        "x": 3726,
+        "y": 4144,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4494,8 +3810,8 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3250,
-        "y": 4110,
+        "x": 3922,
+        "y": 4114,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4510,8 +3826,8 @@
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3251,
-        "y": 4181,
+        "x": 3923,
+        "y": 4185,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4527,8 +3843,8 @@
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3401,
-        "y": 4108,
+        "x": 4073,
+        "y": 4112,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4544,8 +3860,8 @@
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3879,
-        "y": 4060,
+        "x": 4551,
+        "y": 4064,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4561,8 +3877,8 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4154,
-        "y": 4029,
+        "x": 4826,
+        "y": 4033,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4577,8 +3893,8 @@
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4155,
-        "y": 4100,
+        "x": 4827,
+        "y": 4104,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4594,8 +3910,8 @@
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4305,
-        "y": 4027,
+        "x": 4977,
+        "y": 4031,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4613,8 +3929,8 @@
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 4486,
-        "y": 3988,
+        "x": 5165,
+        "y": 3991,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -4625,8 +3941,8 @@
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4565,
-        "y": 4032,
+        "x": 5237,
+        "y": 4036,
         "z": "b31344e1.6b9228",
         "wires": [
             []
@@ -4638,8 +3954,8 @@
         "name": "set twoD arr",
         "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",
         "comments": "",
-        "x": 4489,
-        "y": 4188,
+        "x": 5152,
+        "y": 4163,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -4649,83 +3965,8 @@
         "name": "set sizeOfSliceList",
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
         "comments": "",
-        "x": 4510,
-        "y": 4124,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "171513de.343584",
-        "type": "switchNode",
-        "name": "switch $otn-tunnel-slice_length == 0",
-        "xml": "<switch test='`$otn-tunnel-slice_length == 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4668,
-        "y": 4078,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "e6552b83.2df3a",
-                "b95e5493.31a9b"
-            ]
-        ]
-    },
-    {
-        "id": "e6552b83.2df3a",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4900,
-        "y": 4041,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "9402566e.5ec598"
-            ]
-        ]
-    },
-    {
-        "id": "b95e5493.31a9b",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4901,
-        "y": 4089,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9402566e.5ec598",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 5051,
-        "y": 4039,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "b29e36f1.f6f35"
-            ]
-        ]
-    },
-    {
-        "id": "b29e36f1.f6f35",
-        "type": "set",
-        "name": "set sizeOfSliceList",
-        "xml": "<set>\n<!--<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />-->\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />\n<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[$arridx].list_length' value='1' />",
-        "comments": "",
-        "x": 5253,
-        "y": 4035,
+        "x": 5173,
+        "y": 4099,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -4737,8 +3978,8 @@
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3403,
-        "y": 4181,
+        "x": 4075,
+        "y": 4185,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4754,8 +3995,8 @@
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3658,
-        "y": 4174,
+        "x": 4330,
+        "y": 4178,
         "z": "b31344e1.6b9228",
         "wires": [
             []
@@ -4767,8 +4008,8 @@
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",
         "comments": "",
-        "x": 3586,
-        "y": 4221,
+        "x": 4258,
+        "y": 4225,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -4779,8 +4020,8 @@
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3579,
-        "y": 4105,
+        "x": 4251,
+        "y": 4109,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4796,8 +4037,8 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3739,
-        "y": 4097,
+        "x": 4411,
+        "y": 4101,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4812,8 +4053,8 @@
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3737,
-        "y": 4134,
+        "x": 4409,
+        "y": 4138,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4829,8 +4070,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3864,
-        "y": 4097,
+        "x": 4536,
+        "y": 4101,
         "z": "b31344e1.6b9228",
         "wires": [
             []
@@ -4843,8 +4084,8 @@
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4171,
-        "y": 4155,
+        "x": 4843,
+        "y": 4159,
         "z": "b31344e1.6b9228",
         "wires": [
             []
@@ -4858,8 +4099,8 @@
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3897,
-        "y": 4142,
+        "x": 4569,
+        "y": 4146,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -4874,8 +4115,8 @@
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<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`' />\n<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`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<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`' />\n<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`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",
         "comments": "",
-        "x": 4088,
-        "y": 4201,
+        "x": 4760,
+        "y": 4205,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -4887,8 +4128,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4288,
-        "y": 4099,
+        "x": 4960,
+        "y": 4103,
         "z": "b31344e1.6b9228",
         "wires": [
             []
@@ -4900,8 +4141,8 @@
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4468,
-        "y": 4255,
+        "x": 5131,
+        "y": 4230,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -4982,8 +4223,8 @@
         "name": "set attachment_param sliceG",
         "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",
         "comments": "",
-        "x": 3128,
-        "y": 4440,
+        "x": 3054,
+        "y": 4320,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -4994,8 +4235,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2714,
-        "y": 4534,
+        "x": 2639,
+        "y": 4428,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -5011,8 +4252,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2997,
-        "y": 4514,
+        "x": 2922,
+        "y": 4408,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -5027,8 +4268,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2998.000213623047,
-        "y": 4564.99990940094,
+        "x": 2923.000213623047,
+        "y": 4458.99990940094,
         "z": "b31344e1.6b9228",
         "wires": [
             [
@@ -5042,8 +4283,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain A\" />\n",
         "comments": "",
-        "x": 3137.0002479553223,
-        "y": 4514.000000953674,
+        "x": 3062.0002479553223,
+        "y": 4408.000000953674,
         "z": "b31344e1.6b9228",
         "wires": []
     },
@@ -5055,8 +4296,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3143.02725982666,
-        "y": 4562.745394706726,
+        "x": 3068.02725982666,
+        "y": 4456.745394706726,
         "z": "b31344e1.6b9228",
         "wires": [
             []
@@ -5389,265 +4630,210 @@
         ]
     },
     {
-        "id": "4ba5097d.b20fe",
+        "id": "f5263d8c.0dd66",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
-        "xml": "<switch test='`$dmnsidx == 0`'>\n",
+        "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3112,
-        "y": 4307,
+        "x": 3726,
+        "y": 2779,
         "z": "b31344e1.6b9228",
         "wires": [
             [
-                "dbd9c4f1.fac738",
-                "119d0f31.7b8509"
+                "cb45f40e.c4e9f",
+                "686c2e71.b364f8"
             ]
         ]
     },
     {
-        "id": "dbd9c4f1.fac738",
+        "id": "cb45f40e.c4e9f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3313,
-        "y": 4305,
+        "x": 3927,
+        "y": 2777,
         "z": "b31344e1.6b9228",
         "wires": [
             [
-                "4fe6e9a2.ce8d7"
+                "906b7761.ec3cf"
             ]
         ]
     },
     {
-        "id": "4fe6e9a2.ce8d7",
+        "id": "906b7761.ec3cf",
         "type": "set",
         "name": "set attachment_param domain A",
-        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 3527,
-        "y": 4307,
+        "x": 4141,
+        "y": 2779,
         "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "fd470af3.59fcc",
+        "id": "bb50949c.2c4e68",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
-        "xml": "<switch test='`$dmnsidx == $otn-tunnel-slice_length - 1`'>\n",
+        "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3530,
-        "y": 4356,
+        "x": 4144,
+        "y": 2828,
         "z": "b31344e1.6b9228",
         "wires": [
             [
-                "ddf1f941.709858",
-                "2f7e38f0.34a468"
+                "f9f184f6.8f0c58",
+                "b1eb5cf.84b33a"
             ]
         ]
     },
     {
-        "id": "ddf1f941.709858",
+        "id": "f9f184f6.8f0c58",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3731,
-        "y": 4354,
+        "x": 4374,
+        "y": 2824,
         "z": "b31344e1.6b9228",
         "wires": [
             [
-                "5c127cf0.9c2d34"
+                "ea46128e.0ba028"
             ]
         ]
     },
     {
-        "id": "5c127cf0.9c2d34",
+        "id": "ea46128e.0ba028",
         "type": "set",
         "name": "set attachment_param domain B",
-        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 3945,
-        "y": 4356,
+        "x": 4588,
+        "y": 2827,
         "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "119d0f31.7b8509",
+        "id": "686c2e71.b364f8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3313,
-        "y": 4354,
+        "x": 3927,
+        "y": 2826,
         "z": "b31344e1.6b9228",
         "wires": [
             [
-                "fd470af3.59fcc"
+                "bb50949c.2c4e68"
             ]
         ]
     },
     {
-        "id": "2f7e38f0.34a468",
+        "id": "b1eb5cf.84b33a",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3732,
-        "y": 4400,
+        "x": 4375,
+        "y": 2870,
         "z": "b31344e1.6b9228",
         "wires": [
             [
-                "4e4fdb4.a02e5a4"
+                "591dd2d5.72937c"
             ]
         ]
     },
     {
-        "id": "4e4fdb4.a02e5a4",
+        "id": "591dd2d5.72937c",
         "type": "set",
         "name": "set attachment_param domain G",
-        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 3946,
-        "y": 4399,
+        "x": 4589,
+        "y": 2870,
         "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "f5263d8c.0dd66",
-        "type": "switchNode",
-        "name": "switch dmnsidx == 0 (domainA)",
-        "xml": "<switch test='`$otnidx == 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3726,
-        "y": 2779,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "cb45f40e.c4e9f",
-                "686c2e71.b364f8"
-            ]
-        ]
-    },
-    {
-        "id": "cb45f40e.c4e9f",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3927,
-        "y": 2777,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "906b7761.ec3cf"
-            ]
-        ]
-    },
-    {
-        "id": "906b7761.ec3cf",
+        "id": "b41cf773.b97ef",
         "type": "set",
-        "name": "set attachment_param domain A",
-        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
+        "name": "set tmp.slicevpns",
+        "xml": "<set>\n<parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n<parameter name='tmp.slicevpns_length' value=\"`$tmp.slicevpns_length + 1`\" />\n\n<parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n\n",
         "comments": "",
-        "x": 4141,
-        "y": 2779,
+        "x": 4487,
+        "y": 2919,
         "z": "b31344e1.6b9228",
         "wires": []
     },
     {
-        "id": "bb50949c.2c4e68",
+        "id": "9baaaca4.d54a4",
         "type": "switchNode",
-        "name": "switch dmnsidx == last (domainB)",
-        "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
+        "name": "switch vpnuuid is for this slice",
+        "xml": "<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 4144,
-        "y": 2828,
+        "x": 3051,
+        "y": 4143,
         "z": "b31344e1.6b9228",
         "wires": [
             [
-                "f9f184f6.8f0c58",
-                "b1eb5cf.84b33a"
+                "cb64ffb8.43ead",
+                "d4b6930e.5ef778"
             ]
         ]
     },
     {
-        "id": "f9f184f6.8f0c58",
+        "id": "cb64ffb8.43ead",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4374,
-        "y": 2824,
+        "x": 3268,
+        "y": 4122,
         "z": "b31344e1.6b9228",
         "wires": [
             [
-                "ea46128e.0ba028"
+                "2504214d.099dbe"
             ]
         ]
     },
     {
-        "id": "ea46128e.0ba028",
-        "type": "set",
-        "name": "set attachment_param domain B",
-        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
-        "comments": "",
-        "x": 4588,
-        "y": 2827,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "686c2e71.b364f8",
+        "id": "d4b6930e.5ef778",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3927,
-        "y": 2826,
+        "x": 3268,
+        "y": 4171,
         "z": "b31344e1.6b9228",
         "wires": [
-            [
-                "bb50949c.2c4e68"
-            ]
+            []
         ]
     },
     {
-        "id": "b1eb5cf.84b33a",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "2504214d.099dbe",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4375,
-        "y": 2870,
+        "x": 3436,
+        "y": 4122,
         "z": "b31344e1.6b9228",
         "wires": [
             [
-                "591dd2d5.72937c"
+                "ce29a297.cf1cb8",
+                "72392f69.a40338"
             ]
         ]
-    },
-    {
-        "id": "591dd2d5.72937c",
-        "type": "set",
-        "name": "set attachment_param domain G",
-        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
-        "comments": "",
-        "x": 4589,
-        "y": 2870,
-        "z": "b31344e1.6b9228",
-        "wires": []
     }
 ]
\ No newline at end of file
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 2cd9b56e..b2bf06ce 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
@@ -39,6 +39,10 @@
                                     <parameter name='tmp.arr_length' value='0' />
                                     <parameter name='otn-tunnel-slice' value='' />
                                     <parameter name='otn-tunnel-slice_length' value='0' />
+                                    <parameter name='tmp.slicevpns' value='' />
+                                    <parameter name='tmp.slicevpns_length' value='0' />
+                                    <parameter name='tmp.slicevpnuuids' value='' />
+                                    <parameter name='tmp.slicevpnuuids.' value='' />
                                 </set>
                                 <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
                                     <set>
@@ -872,7 +876,13 @@
                                                                                                                 <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                                                                                                 <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
                                                                                                                 <outcome value='success'>
-                                                                                                                    <block></block>
+                                                                                                                    <block>
+                                                                                                                        <set>
+                                                                                                                            <parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value="`$prop.vpn-binding-otnidx-uuid`" />
+                                                                                                                            <parameter name='tmp.slicevpns_length' value="`$tmp.slicevpns_length + 1`" />
+                                                                                                                            <parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value="`$prop.vpn-binding-otnidx-uuid`" />
+                                                                                                                        </set>
+                                                                                                                    </block>
                                                                                                                 </outcome>
                                                                                                             </save>
                                                                                                             <switch test='`$otnidx == 0`'>
@@ -887,15 +897,7 @@
                                                                                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
                                                                                                                         </save>
                                                                                                                         <set>
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-dest-node`' value='`$tmp.otninfo[0].dstPort.dst-access-node-id`' />-->
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].src-ttp-id`' value='' />-->
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[0].dstPort.dst-tunnel-tp-id`' />-->
                                                                                                                             <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->
-                                                                                                                            <!--<parameter name='`otn-tunnel-slice[10].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`" />
@@ -940,15 +942,7 @@
                                                                                                                                         <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
                                                                                                                                     </save>
                                                                                                                                     <set>
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='' />-->
                                                                                                                                         <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].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`" />
@@ -1034,15 +1028,7 @@
                                                                                                                                         <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
                                                                                                                                     </save>
                                                                                                                                     <set>
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value="`'0,' + $gfp`" />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->
                                                                                                                                         <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->
-                                                                                                                                        <!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->
                                                                                                                                     </set>
                                                                                                                                 </block>
                                                                                                                             </outcome>
@@ -1052,40 +1038,6 @@
                                                                                                             </switch>
                                                                                                         </block>
                                                                                                     </for>
-                                                                                                    <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>
-                                                                                                    <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>
                                                                                                     <set>
                                                                                                         <parameter name='domain-A.tunnel-tp-id' value='' />
                                                                                                         <parameter name='domain-A.node-id' value='' />
@@ -1144,109 +1096,116 @@
                                         <block atomic="true">
                                             <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >
                                                 <block atomic='true'>
-                                                    <set>
-                                                        <parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />
-                                                        <parameter name='found' value='false' />
-                                                    </set>
-                                                    <switch test='`$tmp.arr_length != 0`'>
+                                                    <switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">
                                                         <outcome value='true'>
                                                             <block atomic='true'>
-                                                                <for index='arridx' start='0' end='`$tmp.arr_length`' >
-                                                                    <switch test='`$tmp.arr[$arridx] == $providerValue`'>
-                                                                        <outcome value='true'>
-                                                                            <block atomic='true'>
-                                                                                <set>
-                                                                                    <parameter name='found' value='true' />
-                                                                                </set>
-                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                        key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
-                                                                                    <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
-                                                                                    <parameter name='vpn-type' value='`$arridx`' />
-                                                                                </update>
-                                                                                <set>
-                                                                                    <parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->
-                                                                                    <!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value="`'0,' + $gfp`" />
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />
-                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
-                                                                                    <!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->
-                                                                                    <parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />
-                                                                                </set>
-                                                                                <break/>
-                                                                            </block>
-                                                                        </outcome>
-                                                                        <outcome value='false'>
-                                                                            <block></block>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </for>
-                                                                <switch test='`$found`'>
+                                                                <set>
+                                                                    <parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />
+                                                                    <parameter name='found' value='false' />
+                                                                </set>
+                                                                <switch test='`$tmp.arr_length != 0`'>
                                                                     <outcome value='true'>
-                                                                        <block></block>
+                                                                        <block atomic='true'>
+                                                                            <for index='arridx' start='0' end='`$tmp.arr_length`' >
+                                                                                <switch test='`$tmp.arr[$arridx] == $providerValue`'>
+                                                                                    <outcome value='true'>
+                                                                                        <block atomic='true'>
+                                                                                            <set>
+                                                                                                <parameter name='found' value='true' />
+                                                                                            </set>
+                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
+                                                                                                <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                                <parameter name='vpn-type' value='`$arridx`' />
+                                                                                            </update>
+                                                                                            <set>
+                                                                                                <parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />
+                                                                                            </set>
+                                                                                            <set>
+                                                                                                <!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->
+                                                                                                <!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />
+                                                                                                <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
+                                                                                                <!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->
+                                                                                                <parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />
+                                                                                            </set>
+                                                                                            <break/>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='false'>
+                                                                                        <block></block>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </for>
+                                                                            <switch test='`$found`'>
+                                                                                <outcome value='true'>
+                                                                                    <block></block>
+                                                                                </outcome>
+                                                                                <outcome value='false'>
+                                                                                    <block atomic='true'>
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
+                                                                                            <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                            <parameter name='vpn-type' value='`$arridx + 1`' />
+                                                                                        </update>
+                                                                                        <set>
+                                                                                            <parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />
+                                                                                            <parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                            <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`' />
+                                                                                            <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`' />
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                            <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`' />
+                                                                                            <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`' />
+                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
+                                                                                            <parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />
+                                                                                            <parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />
+                                                                                        </set>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </block>
                                                                     </outcome>
                                                                     <outcome value='false'>
                                                                         <block atomic='true'>
                                                                             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                     key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
                                                                                 <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
-                                                                                <parameter name='vpn-type' value='`$arridx + 1`' />
+                                                                                <parameter name='vpn-type' value='0' />
                                                                             </update>
                                                                             <set>
-                                                                                <parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />
-                                                                                <parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
-                                                                                <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`' />
-                                                                                <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`' />
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value="`'0,' + $gfp`" />
-                                                                                <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`' />
-                                                                                <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`' />
+                                                                                <parameter name='tmp.arr[0]' value='`$providerValue`' />
+                                                                                <parameter name='tmp.arr_length' value='1' />
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value="`'0,' + $gfp`" />
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />
                                                                                 <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
-                                                                                <parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />
-                                                                                <parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
+                                                                                <parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
+                                                                                <parameter name='otn-tunnel-slice_length' value='1' />
+                                                                                <parameter name='otn-tunnel-slice[0].list_length' value='1' />
                                                                             </set>
                                                                         </block>
                                                                     </outcome>
                                                                 </switch>
                                                             </block>
                                                         </outcome>
-                                                        <outcome value='false'>
-                                                            <block atomic='true'>
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                        key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >
-                                                                    <parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
-                                                                    <parameter name='vpn-type' value='0' />
-                                                                </update>
-                                                                <set>
-                                                                    <parameter name='tmp.arr[0]' value='`$providerValue`' />
-                                                                    <parameter name='tmp.arr_length' value='1' />
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value="`'0,' + $gfp`" />
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />
-                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`" />
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />
-                                                                    <parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />
-                                                                    <parameter name='otn-tunnel-slice_length' value='1' />
-                                                                    <parameter name='otn-tunnel-slice[0].list_length' value='1' />
-                                                                </set>
-                                                            </block>
-                                                        </outcome>
+                                                        <outcome value='false'></outcome>
                                                     </switch>
                                                 </block>
                                             </for>