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

author Hesam Rahimi <hesam.rahimi@huawei.com>

Fri, 26 Feb 2021 22:22:57 +0000 (22:22 +0000)

committer Hesam Rahimi <hesam.rahimi@huawei.com>

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