X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Ftrans_slicing%2FGENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json;h=8c72d0c8fa83449df75dd1c3e40401251b2d5ad7;hb=refs%2Fchanges%2F58%2F117258%2F1;hp=b9e4d5cadd790de7a733dd26adba4f727379c71d;hpb=5ccb63c95d1fc6b103801d728bf39c820eeff09f;p=sdnc%2Foam.git

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 b9e4d5ca..8c72d0c8 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
@@ -117,8 +117,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1361.490966796875,
-        "y": 176.57403564453125,
+        "x": 1347.490966796875,
+        "y": 203.57403564453125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -133,8 +133,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1350,
-        "y": 223,
+        "x": 1336,
+        "y": 250,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -146,7 +146,7 @@
         "id": "dfc9a5db.996c4",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
-        "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources_length != 0`'>\n",
+        "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1591,
@@ -165,8 +165,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1515.0623779296875,
-        "y": 179.85977172851562,
+        "x": 1501.0623779296875,
+        "y": 206.85977172851562,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -176,19 +176,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1519,
-        "y": 224,
-        "z": "4d37a11.42c136",
-        "wires": []
-    },
-    {
-        "id": "ca7ed950.c4257",
-        "type": "set",
-        "name": "set the 1st allotted-resource-id",
-        "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[0].id`\" />\n\n\n",
-        "comments": "",
-        "x": 1990,
-        "y": 198,
+        "x": 1505,
+        "y": 251,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -246,8 +235,9 @@
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "ca7ed950.c4257",
-                "78e29884.225c08"
+                "23c06925.0d2eb6",
+                "a5814717.4b953",
+                "39b144a2.fc3a7c"
             ]
         ]
     },
@@ -255,10 +245,10 @@
         "id": "50cd8b4c.3fbe34",
         "type": "set",
         "name": "set network-route-A",
-        "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
+        "xml": "<set>\n<!--<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
-        "x": 2370,
-        "y": 822,
+        "x": 2652,
+        "y": 843,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -268,8 +258,8 @@
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='network-route-B' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
-        "x": 2371,
-        "y": 877,
+        "x": 2653,
+        "y": 898,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -280,8 +270,8 @@
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1993,
-        "y": 273,
+        "x": 2275,
+        "y": 294,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -298,8 +288,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2209,
-        "y": 340,
+        "x": 2491,
+        "y": 361,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -314,8 +304,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2209.490966796875,
-        "y": 239.573974609375,
+        "x": 2491.490966796875,
+        "y": 260.573974609375,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -330,8 +320,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2205,
-        "y": 289,
+        "x": 2487,
+        "y": 310,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -345,8 +335,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2387.0625,
-        "y": 239.8597412109375,
+        "x": 2669.0625,
+        "y": 260.8597412109375,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -356,8 +346,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2387,
-        "y": 289,
+        "x": 2669,
+        "y": 310,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -368,14 +358,14 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
-        "x": 1728,
-        "y": 762,
+        "x": 2010,
+        "y": 783,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "a6a55952.b90f",
                 "4070a4d0.4176d4",
-                "60c71e39.2f942"
+                "60c71e39.2f942",
+                "a6a55952.b90f"
             ]
         ]
     },
@@ -386,8 +376,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2019.490966796875,
-        "y": 740.573974609375,
+        "x": 2301.490966796875,
+        "y": 761.573974609375,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -402,8 +392,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2008,
-        "y": 785,
+        "x": 2290,
+        "y": 806,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -417,8 +407,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2168.0625,
-        "y": 740.8597412109375,
+        "x": 2450.0625,
+        "y": 761.8597412109375,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -428,8 +418,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2167,
-        "y": 785,
+        "x": 2449,
+        "y": 806,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -440,8 +430,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2015,
-        "y": 864,
+        "x": 2297,
+        "y": 885,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -457,8 +447,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2154,
-        "y": 864,
+        "x": 2436,
+        "y": 885,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -475,13 +465,13 @@
                 "260f00b5.585908",
                 "134248ca.e0fa77",
                 "fc2a7bf0.e878b",
-                "a5814717.4b953",
                 "84749d0f.3038c8",
-                "39b144a2.fc3a7c",
                 "21292318.735edc",
                 "ce066c5d.e7734",
+                "e927f664.5c872",
+                "29397b6c.248454",
                 "c19c2198.0de5c",
-                "303c5717.c426f"
+                "488403ee.0379ac"
             ]
         ]
     },
@@ -492,8 +482,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-A'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-A\">",
         "comments": "",
         "outputs": 1,
-        "x": 2383,
-        "y": 945,
+        "x": 2665,
+        "y": 966,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -510,8 +500,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-B'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-B\">",
         "comments": "",
         "outputs": 1,
-        "x": 2362,
-        "y": 1546.9998779296875,
+        "x": 2644,
+        "y": 1567.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -528,8 +518,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2584,
-        "y": 829,
+        "x": 2866,
+        "y": 850,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -544,8 +534,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2579.509033203125,
-        "y": 878.426025390625,
+        "x": 2861.509033203125,
+        "y": 899.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -560,8 +550,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2583.509033203125,
-        "y": 929.426025390625,
+        "x": 2865.509033203125,
+        "y": 950.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -575,8 +565,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2732.571533203125,
-        "y": 828.2857666015625,
+        "x": 3014.571533203125,
+        "y": 849.2857666015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -586,8 +576,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2722.509033203125,
-        "y": 878.426025390625,
+        "x": 3004.509033203125,
+        "y": 899.426025390625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -598,8 +588,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2585,
-        "y": 1516.9998779296875,
+        "x": 2867,
+        "y": 1537.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -614,8 +604,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2580.509033203125,
-        "y": 1566.4259033203125,
+        "x": 2862.509033203125,
+        "y": 1587.4259033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -630,8 +620,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2584.509033203125,
-        "y": 1617.4259033203125,
+        "x": 2866.509033203125,
+        "y": 1638.4259033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -645,8 +635,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2733.571533203125,
-        "y": 1516.28564453125,
+        "x": 3015.571533203125,
+        "y": 1537.28564453125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -656,8 +646,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2723.509033203125,
-        "y": 1566.4259033203125,
+        "x": 3005.509033203125,
+        "y": 1587.4259033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -668,8 +658,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3397.66650390625,
-        "y": 973,
+        "x": 3679.66650390625,
+        "y": 994,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -688,8 +678,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3225,
-        "y": 974,
+        "x": 3507,
+        "y": 995,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -704,8 +694,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3234.490966796875,
-        "y": 1016.5740356445312,
+        "x": 3516.490966796875,
+        "y": 1037.5740356445312,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -720,8 +710,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3223,
-        "y": 1063,
+        "x": 3505,
+        "y": 1084,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -735,8 +725,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3388.0623779296875,
-        "y": 1019.8597717285156,
+        "x": 3670.0623779296875,
+        "y": 1040.8597717285156,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -746,8 +736,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3392,
-        "y": 1064,
+        "x": 3674,
+        "y": 1085,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -758,8 +748,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2745,
-        "y": 931,
+        "x": 3027,
+        "y": 952,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -775,8 +765,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2735,
-        "y": 1618.9998779296875,
+        "x": 3017,
+        "y": 1639.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -792,8 +782,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3365.66650390625,
-        "y": 1809,
+        "x": 3647.66650390625,
+        "y": 1830,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -812,8 +802,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3193,
-        "y": 1810,
+        "x": 3475,
+        "y": 1831,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -828,8 +818,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3202.490966796875,
-        "y": 1852.5740356445312,
+        "x": 3484.490966796875,
+        "y": 1873.5740356445312,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -844,8 +834,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3191,
-        "y": 1899,
+        "x": 3473,
+        "y": 1920,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -859,8 +849,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3356.0623779296875,
-        "y": 1855.8597717285156,
+        "x": 3638.0623779296875,
+        "y": 1876.8597717285156,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -870,8 +860,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3360,
-        "y": 1900,
+        "x": 3642,
+        "y": 1921,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -882,8 +872,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3662,
-        "y": 957,
+        "x": 3944,
+        "y": 978,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -899,8 +889,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3885,
-        "y": 912,
+        "x": 4167,
+        "y": 933,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -915,8 +905,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3887,
-        "y": 976,
+        "x": 4169,
+        "y": 997,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -930,8 +920,8 @@
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 4220,
-        "y": 870,
+        "x": 4502,
+        "y": 888,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -941,8 +931,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4049,
-        "y": 972,
+        "x": 4331,
+        "y": 993,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -953,8 +943,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4050,
-        "y": 909,
+        "x": 4332,
+        "y": 930,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -969,8 +959,8 @@
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
-        "x": 4221,
-        "y": 975,
+        "x": 4503,
+        "y": 996,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -980,8 +970,8 @@
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4222,
-        "y": 924,
+        "x": 4504,
+        "y": 945,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -992,8 +982,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\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<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3664,
-        "y": 1116,
+        "x": 3946,
+        "y": 1137,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1006,8 +996,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3709,
-        "y": 1026,
+        "x": 3991,
+        "y": 1047,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1019,8 +1009,8 @@
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3598,
-        "y": 1067,
+        "x": 3880,
+        "y": 1088,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1031,8 +1021,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3652,
-        "y": 1813.0001220703125,
+        "x": 3934,
+        "y": 1834.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1048,8 +1038,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3875,
-        "y": 1768.0001220703125,
+        "x": 4157,
+        "y": 1789.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1064,8 +1054,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3877,
-        "y": 1832.0001220703125,
+        "x": 4159,
+        "y": 1853.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1079,8 +1069,8 @@
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 4210,
-        "y": 1726.0001220703125,
+        "x": 4492,
+        "y": 1747.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1090,8 +1080,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4036,
-        "y": 1851.0001220703125,
+        "x": 4318,
+        "y": 1872.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1102,8 +1092,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4040,
-        "y": 1765.0001220703125,
+        "x": 4322,
+        "y": 1786.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1118,8 +1108,8 @@
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
-        "x": 4211,
-        "y": 1831.0001220703125,
+        "x": 4493,
+        "y": 1852.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1129,8 +1119,8 @@
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4206,
-        "y": 1780.0001220703125,
+        "x": 4488,
+        "y": 1801.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1141,8 +1131,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\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<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3654,
-        "y": 1972.0001220703125,
+        "x": 3936,
+        "y": 1993.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1155,8 +1145,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3699,
-        "y": 1882.0001220703125,
+        "x": 3981,
+        "y": 1903.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1168,8 +1158,8 @@
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3588,
-        "y": 1920.0001220703125,
+        "x": 3870,
+        "y": 1941.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1180,8 +1170,8 @@
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2563,
-        "y": 2047,
+        "x": 2845,
+        "y": 2068,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1193,8 +1183,8 @@
         "name": "set attachment_param",
         "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",
         "comments": "",
-        "x": 2357,
-        "y": 1987,
+        "x": 2639,
+        "y": 1969,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1204,8 +1194,8 @@
         "name": "TODO: FIXME",
         "info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",
         "comments": "",
-        "x": 2331,
-        "y": 1940,
+        "x": 2613,
+        "y": 1922,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1213,11 +1203,11 @@
         "id": "7ca2c5af.473d34",
         "type": "save",
         "name": "save vpn-binding A resource (aka. OTN domainA) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<parameter name='access-provider-id' value='`$domain-A.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-A.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='src-access-ltp-id' value='' />\n<parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\n<parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2439,
-        "y": 2206,
+        "x": 2721,
+        "y": 2227,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1232,8 +1222,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2442.5,
-        "y": 2276,
+        "x": 2724.5,
+        "y": 2297,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1246,8 +1236,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3090.5,
-        "y": 2195,
+        "x": 3372.5,
+        "y": 2216,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1260,8 +1250,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3092.5,
-        "y": 2234,
+        "x": 3374.5,
+        "y": 2255,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1274,8 +1264,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \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`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\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.sotn.network-id`\" />-->\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.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 3792,
-        "y": 1164,
+        "x": 4074,
+        "y": 1185,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1288,8 +1278,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \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`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\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.sotn.network-id`\" />-->\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.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 3781,
-        "y": 2037.0001220703125,
+        "x": 4063,
+        "y": 2058.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1302,8 +1292,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2739,
-        "y": 2213,
+        "x": 3021,
+        "y": 2234,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1319,8 +1309,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2879.500244140625,
-        "y": 2214.25390625,
+        "x": 3161.500244140625,
+        "y": 2235.25390625,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1332,8 +1322,8 @@
         "name": "TODO: FIXME: do we need this relationship?",
         "info": "",
         "comments": "",
-        "x": 3127,
-        "y": 2154,
+        "x": 3409,
+        "y": 2175,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1343,8 +1333,8 @@
         "name": "TODO: FIXME: put proper values",
         "info": "",
         "comments": "",
-        "x": 2406,
-        "y": 2166,
+        "x": 2688,
+        "y": 2187,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1352,11 +1342,11 @@
         "id": "b46ca414.99697",
         "type": "save",
         "name": "save vpn-binding B resource (aka. OTN domainB) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<parameter name='access-provider-id' value='`$domain-B.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-B.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$domain-B.node-id`' />\n<parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-access-ltp-id' value='' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2442,
-        "y": 2494,
+        "x": 2724,
+        "y": 2515,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1370,8 +1360,8 @@
         "name": "TODO: FIXME: do we need this relationship?",
         "info": "",
         "comments": "",
-        "x": 3130,
-        "y": 2434,
+        "x": 3412,
+        "y": 2455,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1382,8 +1372,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3093.5,
-        "y": 2475,
+        "x": 3375.5,
+        "y": 2496,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1396,8 +1386,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3095.5,
-        "y": 2514,
+        "x": 3377.5,
+        "y": 2535,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1411,8 +1401,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2882.500244140625,
-        "y": 2494.25390625,
+        "x": 3164.500244140625,
+        "y": 2515.25390625,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1425,8 +1415,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2742,
-        "y": 2493,
+        "x": 3024,
+        "y": 2514,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1440,8 +1430,8 @@
         "name": "TODO: FIXME: put proper values",
         "info": "",
         "comments": "",
-        "x": 2422,
-        "y": 2454,
+        "x": 2704,
+        "y": 2475,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1452,8 +1442,8 @@
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2440.5,
-        "y": 2534,
+        "x": 2722.5,
+        "y": 2555,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1465,8 +1455,8 @@
         "name": "TODO: FIXME:",
         "info": "set attachment param and send request to NCE-T\nfor bandwidth matrix\nmay require a new template for JSON body",
         "comments": "",
-        "x": 2314,
-        "y": 2617,
+        "x": 2596,
+        "y": 2638,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1474,10 +1464,10 @@
         "id": "fc2a7bf0.e878b",
         "type": "set",
         "name": "set attachment_param domain A",
-        "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='otn-dest-node' value='`$domain-A.node-id`' />\n<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />\n<!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->\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",
+        "xml": "<set>\n<!--<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />-->\n<!--<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='otn-dest-node' value='`$domain-A.node-id`' />-->\n<!--<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />-->\n<!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n\n\n\n<parameter name='`otn-tunnel-sliceA-list[$idx].request-id`' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].otn-dest-node`' value='`$domain-A.node-id`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceA-list[$idx].src-ttp-id`' value='' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].dst-ttp-id`' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-sliceA-list_length`' value='`$idx + 1`' />\n\n<!--otn-tunnel-slice-list[$idx]-->\n\n",
         "comments": "",
-        "x": 2379,
-        "y": 2662,
+        "x": 2661,
+        "y": 2683,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1488,8 +1478,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4836,
-        "y": 684,
+        "x": 5118,
+        "y": 705,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1506,8 +1496,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2389,
-        "y": 340,
+        "x": 2671,
+        "y": 361,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1522,8 +1512,8 @@
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1319.0001220703125,
-        "y": 757.0001220703125,
+        "x": 1601.0001220703125,
+        "y": 778.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1538,8 +1528,8 @@
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2057,
-        "y": 463,
+        "x": 2339,
+        "y": 484,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1555,8 +1545,8 @@
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2367,
-        "y": 470,
+        "x": 2649,
+        "y": 491,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -1569,8 +1559,8 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2366,
-        "y": 524,
+        "x": 2648,
+        "y": 545,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1581,11 +1571,11 @@
     {
         "id": "badc6972.d68008",
         "type": "set",
-        "name": "set the 1st logical-link-name",
+        "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 1739,
-        "y": 707,
+        "x": 2021,
+        "y": 728,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1596,8 +1586,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1496,
-        "y": 750,
+        "x": 1778,
+        "y": 771,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1612,8 +1602,8 @@
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 2925,
-        "y": 936,
+        "x": 3207,
+        "y": 957,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1624,8 +1614,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 2968,
-        "y": 1001,
+        "x": 3250,
+        "y": 1022,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1642,8 +1632,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 2965,
-        "y": 1845,
+        "x": 3247,
+        "y": 1866,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1659,8 +1649,8 @@
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 2926,
-        "y": 1789,
+        "x": 3208,
+        "y": 1810,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1671,8 +1661,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2682,
-        "y": 287,
+        "x": 2964,
+        "y": 308,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1689,8 +1679,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2955.490966796875,
-        "y": 179.573974609375,
+        "x": 3237.490966796875,
+        "y": 200.573974609375,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1704,8 +1694,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3133.0625,
-        "y": 179.8597412109375,
+        "x": 3415.0625,
+        "y": 200.8597412109375,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1716,8 +1706,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2951,
-        "y": 229,
+        "x": 3233,
+        "y": 250,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1731,8 +1721,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3133,
-        "y": 229,
+        "x": 3415,
+        "y": 250,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1743,8 +1733,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2955,
-        "y": 280,
+        "x": 3237,
+        "y": 301,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1759,8 +1749,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3135,
-        "y": 280,
+        "x": 3417,
+        "y": 301,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1775,8 +1765,8 @@
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2626,
-        "y": 504,
+        "x": 2908,
+        "y": 525,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1791,8 +1781,8 @@
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2906,
-        "y": 504,
+        "x": 3188,
+        "y": 525,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1807,8 +1797,8 @@
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3111,
-        "y": 478,
+        "x": 3393,
+        "y": 499,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1823,8 +1813,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3287.9998779296875,
-        "y": 470.9998779296875,
+        "x": 3569.9998779296875,
+        "y": 491.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1839,8 +1829,8 @@
         "name": "set the 1st network-policy-id",
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 3530.9998779296875,
-        "y": 427.9998779296875,
+        "x": 3812.9998779296875,
+        "y": 448.9998779296875,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1851,8 +1841,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
         "comments": "",
         "outputs": 1,
-        "x": 3519.9998779296875,
-        "y": 482.9998779296875,
+        "x": 3801.9998779296875,
+        "y": 503.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1869,8 +1859,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3773,
-        "y": 369,
+        "x": 4055,
+        "y": 390,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1884,8 +1874,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3921.571533203125,
-        "y": 369.2857666015625,
+        "x": 4203.571533203125,
+        "y": 390.2857666015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1895,8 +1885,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3920.509033203125,
-        "y": 413.426025390625,
+        "x": 4202.509033203125,
+        "y": 434.426025390625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1907,8 +1897,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3761.509033203125,
-        "y": 413.426025390625,
+        "x": 4043.509033203125,
+        "y": 434.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1923,8 +1913,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3768.509033203125,
-        "y": 492.426025390625,
+        "x": 4050.509033203125,
+        "y": 513.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1940,8 +1930,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3907.509033203125,
-        "y": 492.426025390625,
+        "x": 4189.509033203125,
+        "y": 513.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1956,8 +1946,8 @@
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4113,
-        "y": 490,
+        "x": 4395,
+        "y": 511,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -1968,8 +1958,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2969,
-        "y": 671,
+        "x": 3251,
+        "y": 692,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -1985,8 +1975,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3192,
-        "y": 657,
+        "x": 3474,
+        "y": 678,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2001,8 +1991,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3194,
-        "y": 690,
+        "x": 3476,
+        "y": 711,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2016,8 +2006,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3337,
-        "y": 687,
+        "x": 3619,
+        "y": 708,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2028,8 +2018,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3340,
-        "y": 650,
+        "x": 3622,
+        "y": 671,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2044,8 +2034,8 @@
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3502,
-        "y": 645,
+        "x": 3784,
+        "y": 666,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2056,8 +2046,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2983,
-        "y": 1507.9998779296875,
+        "x": 3265,
+        "y": 1528.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2073,8 +2063,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3206,
-        "y": 1493.9998779296875,
+        "x": 3488,
+        "y": 1514.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2089,8 +2079,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3208,
-        "y": 1526.9998779296875,
+        "x": 3490,
+        "y": 1547.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2104,8 +2094,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3351,
-        "y": 1523.9998779296875,
+        "x": 3633,
+        "y": 1544.9998779296875,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2116,8 +2106,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3354,
-        "y": 1486.9998779296875,
+        "x": 3636,
+        "y": 1507.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2132,8 +2122,8 @@
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3548,
-        "y": 1490,
+        "x": 3830,
+        "y": 1511,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2158,8 +2148,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2445,
-        "y": 2128,
+        "x": 2727,
+        "y": 2149,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -2172,8 +2162,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2443,
-        "y": 2416,
+        "x": 2725,
+        "y": 2437,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -2186,8 +2176,8 @@
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3616,
-        "y": 1241,
+        "x": 3898,
+        "y": 1262,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2202,8 +2192,8 @@
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3822,
-        "y": 1241,
+        "x": 4104,
+        "y": 1262,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2218,8 +2208,8 @@
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4037.28564453125,
-        "y": 1240.82177734375,
+        "x": 4319.28564453125,
+        "y": 1261.82177734375,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2234,8 +2224,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4244.1171875,
-        "y": 1241.34033203125,
+        "x": 4526.1171875,
+        "y": 1262.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2251,8 +2241,8 @@
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4459.1171875,
-        "y": 1203.34033203125,
+        "x": 4741.1171875,
+        "y": 1224.34033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2263,8 +2253,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4456.1171875,
-        "y": 1242.34033203125,
+        "x": 4738.1171875,
+        "y": 1263.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2278,8 +2268,8 @@
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4411.6171875,
-        "y": 1284.34033203125,
+        "x": 4693.6171875,
+        "y": 1305.34033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2290,8 +2280,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4636.6171875,
-        "y": 1241.34033203125,
+        "x": 4918.6171875,
+        "y": 1262.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2306,8 +2296,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4794.6171875,
-        "y": 1241.34033203125,
+        "x": 5076.6171875,
+        "y": 1262.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2321,8 +2311,8 @@
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5001.6171875,
-        "y": 1241.34033203125,
+        "x": 5283.6171875,
+        "y": 1262.34033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2333,8 +2323,8 @@
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3613,
-        "y": 2110.0001220703125,
+        "x": 3895,
+        "y": 2131.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2349,8 +2339,8 @@
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3819,
-        "y": 2110.0001220703125,
+        "x": 4101,
+        "y": 2131.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2365,8 +2355,8 @@
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4034.28564453125,
-        "y": 2109.8218994140625,
+        "x": 4316.28564453125,
+        "y": 2130.8218994140625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2381,8 +2371,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4241.1171875,
-        "y": 2110.3404541015625,
+        "x": 4523.1171875,
+        "y": 2131.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2398,8 +2388,8 @@
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4456.1171875,
-        "y": 2072.3404541015625,
+        "x": 4738.1171875,
+        "y": 2093.3404541015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2410,8 +2400,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4453.1171875,
-        "y": 2111.3404541015625,
+        "x": 4735.1171875,
+        "y": 2132.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2425,8 +2415,8 @@
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4408.6171875,
-        "y": 2153.3404541015625,
+        "x": 4690.6171875,
+        "y": 2174.3404541015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2437,8 +2427,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4633.6171875,
-        "y": 2110.3404541015625,
+        "x": 4915.6171875,
+        "y": 2131.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2453,8 +2443,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4791.6171875,
-        "y": 2110.3404541015625,
+        "x": 5073.6171875,
+        "y": 2131.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2468,8 +2458,8 @@
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 4998.6171875,
-        "y": 2110.3404541015625,
+        "x": 5280.6171875,
+        "y": 2131.3404541015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2477,10 +2467,10 @@
         "id": "84749d0f.3038c8",
         "type": "set",
         "name": "set attachment_param domain B",
-        "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='otn-source-node' value='`$domain-B.node-id`' />\n<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->\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='`$destination.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",
+        "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\n<parameter name='`otn-tunnel-sliceB-list[$idx].request-id`' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-source-node`' value='`$domain-B.node-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceB-list[$idx].src-ttp-id`' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].dst-ttp-id`' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />\n",
         "comments": "",
-        "x": 2374,
-        "y": 3037,
+        "x": 2656,
+        "y": 3058,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2491,8 +2481,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3529,
-        "y": 717,
+        "x": 3811,
+        "y": 738,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2509,8 +2499,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3724.5001220703125,
-        "y": 669,
+        "x": 4006.5001220703125,
+        "y": 690,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2525,8 +2515,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3716.5001220703125,
-        "y": 724,
+        "x": 3998.5001220703125,
+        "y": 745,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2541,8 +2531,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3721.5001220703125,
-        "y": 781,
+        "x": 4003.5001220703125,
+        "y": 802,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2556,8 +2546,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3873.5001220703125,
-        "y": 782,
+        "x": 4155.5001220703125,
+        "y": 803,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2567,8 +2557,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3884.5001220703125,
-        "y": 727,
+        "x": 4166.5001220703125,
+        "y": 748,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2580,8 +2570,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3868.8824462890625,
-        "y": 666.6556701660156,
+        "x": 4150.8824462890625,
+        "y": 687.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2596,8 +2586,8 @@
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4451,
-        "y": 685,
+        "x": 4733,
+        "y": 706,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2612,8 +2602,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4628,
-        "y": 677,
+        "x": 4910,
+        "y": 698,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2629,8 +2619,8 @@
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4053,
-        "y": 681,
+        "x": 4335,
+        "y": 702,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2645,8 +2635,8 @@
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4248,
-        "y": 681,
+        "x": 4530,
+        "y": 702,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2661,8 +2651,8 @@
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4866,
-        "y": 632,
+        "x": 5148,
+        "y": 653,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2673,8 +2663,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5046,
-        "y": 675,
+        "x": 5328,
+        "y": 696,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2689,8 +2679,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5038,
-        "y": 730,
+        "x": 5320,
+        "y": 751,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2705,8 +2695,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5043,
-        "y": 787,
+        "x": 5325,
+        "y": 808,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2720,8 +2710,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5195,
-        "y": 788,
+        "x": 5477,
+        "y": 809,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2731,8 +2721,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5206,
-        "y": 733,
+        "x": 5488,
+        "y": 754,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2744,8 +2734,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5190.38232421875,
-        "y": 672.6556701660156,
+        "x": 5472.38232421875,
+        "y": 693.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2759,8 +2749,8 @@
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\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",
         "comments": "",
-        "x": 5405,
-        "y": 669,
+        "x": 5687,
+        "y": 690,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2771,8 +2761,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3570,
-        "y": 1558,
+        "x": 3852,
+        "y": 1579,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2789,8 +2779,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3765.5001220703125,
-        "y": 1510,
+        "x": 4047.5001220703125,
+        "y": 1531,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2805,8 +2795,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3757.5001220703125,
-        "y": 1565,
+        "x": 4039.5001220703125,
+        "y": 1586,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2821,8 +2811,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3762.5001220703125,
-        "y": 1622,
+        "x": 4044.5001220703125,
+        "y": 1643,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2836,8 +2826,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3914.5001220703125,
-        "y": 1623,
+        "x": 4196.5001220703125,
+        "y": 1644,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2847,8 +2837,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3925.5001220703125,
-        "y": 1568,
+        "x": 4207.5001220703125,
+        "y": 1589,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2860,8 +2850,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3909.8824462890625,
-        "y": 1507.6556701660156,
+        "x": 4191.8824462890625,
+        "y": 1528.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2876,8 +2866,8 @@
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4492,
-        "y": 1526,
+        "x": 4774,
+        "y": 1547,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2892,8 +2882,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4669,
-        "y": 1518,
+        "x": 4951,
+        "y": 1539,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2909,8 +2899,8 @@
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4094,
-        "y": 1522,
+        "x": 4376,
+        "y": 1543,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2925,8 +2915,8 @@
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4289,
-        "y": 1522,
+        "x": 4571,
+        "y": 1543,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2942,8 +2932,8 @@
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4877,
-        "y": 1525,
+        "x": 5159,
+        "y": 1546,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2959,8 +2949,8 @@
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4907,
-        "y": 1473,
+        "x": 5189,
+        "y": 1494,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -2971,8 +2961,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5087,
-        "y": 1516,
+        "x": 5369,
+        "y": 1537,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -2987,8 +2977,8 @@
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5079,
-        "y": 1571,
+        "x": 5361,
+        "y": 1592,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3003,8 +2993,8 @@
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5084,
-        "y": 1628,
+        "x": 5366,
+        "y": 1649,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3018,8 +3008,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5236,
-        "y": 1629,
+        "x": 5518,
+        "y": 1650,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3029,8 +3019,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5247,
-        "y": 1574,
+        "x": 5529,
+        "y": 1595,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3042,8 +3032,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5231.38232421875,
-        "y": 1513.6556701660156,
+        "x": 5513.38232421875,
+        "y": 1534.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3057,8 +3047,8 @@
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\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",
         "comments": "",
-        "x": 5446,
-        "y": 1510,
+        "x": 5728,
+        "y": 1531,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3066,11 +3056,11 @@
         "id": "a5814717.4b953",
         "type": "execute",
         "name": "execute RestApiCallNode slice creation domainA",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-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`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceA-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2425,
-        "y": 2720,
+        "x": 1959,
+        "y": 2744,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3086,8 +3076,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2691,
-        "y": 2700,
+        "x": 2242,
+        "y": 2724,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3102,8 +3092,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2692.000213623047,
-        "y": 2750.99990940094,
+        "x": 2243.000213623047,
+        "y": 2774.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3117,8 +3107,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain A\" />\n",
         "comments": "",
-        "x": 2831.0002479553223,
-        "y": 2700.0000009536743,
+        "x": 2382.0002479553223,
+        "y": 2724.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3130,8 +3120,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2837.02725982666,
-        "y": 2748.745394706726,
+        "x": 2388.02725982666,
+        "y": 2772.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -3141,11 +3131,11 @@
         "id": "39b144a2.fc3a7c",
         "type": "execute",
         "name": "execute RestApiCallNode slice creation domainB",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-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`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceB-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2425,
-        "y": 3092,
+        "x": 1959,
+        "y": 3110,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3161,8 +3151,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2691,
-        "y": 3072,
+        "x": 2233,
+        "y": 3090,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3177,8 +3167,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2692.000213623047,
-        "y": 3122.99990940094,
+        "x": 2234.000213623047,
+        "y": 3140.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3192,8 +3182,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain B\" />\n",
         "comments": "",
-        "x": 2831.0002479553223,
-        "y": 3072.0000009536743,
+        "x": 2373.0002479553223,
+        "y": 3090.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3205,8 +3195,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2837.02725982666,
-        "y": 3120.745394706726,
+        "x": 2379.02725982666,
+        "y": 3138.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -3219,8 +3209,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2530,
-        "y": 450,
+        "x": 2812,
+        "y": 471,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3236,8 +3226,8 @@
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2811,
-        "y": 406,
+        "x": 3093,
+        "y": 427,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3252,8 +3242,8 @@
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3073,
-        "y": 406,
+        "x": 3355,
+        "y": 427,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3268,8 +3258,8 @@
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4454,
-        "y": 759,
+        "x": 4736,
+        "y": 780,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3284,8 +3274,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4631,
-        "y": 751,
+        "x": 4913,
+        "y": 772,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3299,8 +3289,8 @@
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4866,
-        "y": 875,
+        "x": 5148,
+        "y": 896,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3310,8 +3300,8 @@
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4906,
-        "y": 1715,
+        "x": 5188,
+        "y": 1736,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3322,8 +3312,8 @@
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4671,
-        "y": 1591,
+        "x": 4953,
+        "y": 1612,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3338,8 +3328,8 @@
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4494,
-        "y": 1599,
+        "x": 4776,
+        "y": 1620,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3354,8 +3344,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2427,
-        "y": 2853,
+        "x": 2721,
+        "y": 2870,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3371,8 +3361,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2693,
-        "y": 2833,
+        "x": 2987,
+        "y": 2850,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3387,8 +3377,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2694.000213623047,
-        "y": 2883.99990940094,
+        "x": 2988.000213623047,
+        "y": 2900.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3402,8 +3392,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI Coloring for domain A\" />\n",
         "comments": "",
-        "x": 2833.0002479553223,
-        "y": 2833.0000009536743,
+        "x": 3127.0002479553223,
+        "y": 2850.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3415,8 +3405,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2839.02725982666,
-        "y": 2881.745394706726,
+        "x": 3133.02725982666,
+        "y": 2898.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -3429,8 +3419,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2427,
-        "y": 3219,
+        "x": 2721,
+        "y": 3236,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3446,8 +3436,8 @@
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2693,
-        "y": 3199,
+        "x": 2987,
+        "y": 3216,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3462,8 +3452,8 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2694.000213623047,
-        "y": 3249.99990940094,
+        "x": 2988.000213623047,
+        "y": 3266.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
@@ -3477,8 +3467,8 @@
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",
         "comments": "",
-        "x": 2833.0002479553223,
-        "y": 3199.0000009536743,
+        "x": 3127.0002479553223,
+        "y": 3216.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3490,8 +3480,8 @@
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2839.02725982666,
-        "y": 3247.745394706726,
+        "x": 3133.02725982666,
+        "y": 3264.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -3503,8 +3493,8 @@
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4112,
-        "y": 536,
+        "x": 4394,
+        "y": 557,
         "z": "4d37a11.42c136",
         "wires": []
     },
@@ -3515,8 +3505,8 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2468,
-        "y": 730,
+        "x": 2750,
+        "y": 691,
         "z": "4d37a11.42c136",
         "wires": [
             []
@@ -3529,11 +3519,72 @@
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2448,
-        "y": 770,
+        "x": 2731,
+        "y": 741,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "23c06925.0d2eb6",
+        "type": "for",
+        "name": "for each allotted-resource",
+        "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1988,
+        "y": 243,
+        "z": "4d37a11.42c136",
+        "wires": [
+            [
+                "f805b6b.c60f548",
+                "78e29884.225c08"
+            ]
+        ]
+    },
+    {
+        "id": "f805b6b.c60f548",
+        "type": "set",
+        "name": "set the current allotted-resource-id",
+        "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
+        "comments": "",
+        "x": 2272,
+        "y": 213,
+        "z": "4d37a11.42c136",
+        "wires": []
+    },
+    {
+        "id": "e927f664.5c872",
+        "type": "set",
+        "name": "set query_param",
+        "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
+        "comments": "",
+        "x": 2628,
+        "y": 2021,
+        "z": "4d37a11.42c136",
+        "wires": []
+    },
+    {
+        "id": "29397b6c.248454",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",
+        "comments": "",
+        "x": 2618,
+        "y": 3327,
+        "z": "4d37a11.42c136",
+        "wires": []
+    },
+    {
+        "id": "488403ee.0379ac",
+        "type": "set",
+        "name": "set new ethernet-service-name",
+        "xml": "<set>\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
+        "comments": "",
+        "x": 2688,
+        "y": 786,
+        "z": "4d37a11.42c136",
+        "wires": []
     }
 ]
\ No newline at end of file