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=9904f4df57abe16b9b34e89d1cae97a2eb964b04;hb=7231f26f523c65f8fa12d0ddc36c7988dacda8a2;hp=b1d61faf13e91d110585ea47bc881d2d18b8a439;hpb=32cd336379716eb9ca73b0ca67fb9fe1168149f4;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 b1d61faf..9904f4df 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
@@ -1,20 +1,20 @@
 [
     {
-        "id": "df3491bc.625428",
+        "id": "6fd18371.ab4fc4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 128,
-        "y": 113,
-        "z": "b31344e1.6b9228",
+        "x": 138.56666564941406,
+        "y": 144.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f93a4fe6.087538"
+                "f71dc579.359058"
             ]
         ]
     },
     {
-        "id": "f93a4fe6.087538",
+        "id": "f71dc579.359058",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,5632 +22,4965 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 412.2856903076172,
-        "y": 174.23810863494873,
-        "z": "b31344e1.6b9228",
+        "x": 422.85235595703125,
+        "y": 205.8047742843628,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3a78d95d.5e3c5e"
+                "c0146243.1b894"
             ]
         ]
     },
     {
-        "id": "3a78d95d.5e3c5e",
+        "id": "c0146243.1b894",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-allocate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-allocate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 418.42860412597656,
-        "y": 259.0000305175781,
-        "z": "b31344e1.6b9228",
+        "x": 428.9952697753906,
+        "y": 290.5666961669922,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "35ecb5b7.3f1b02"
+                "8f2a1d48.4d5c1"
             ]
         ]
     },
     {
-        "id": "35ecb5b7.3f1b02",
+        "id": "8f2a1d48.4d5c1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 788.238037109375,
-        "y": 283.66668701171875,
-        "z": "b31344e1.6b9228",
+        "x": 798.8047027587891,
+        "y": 315.2333526611328,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a99ea7b2.f5e618",
-                "183025fe.418fa2",
-                "d352d101.d008a8"
+                "aba9a33d.b56118",
+                "b34cfae3.a993d8",
+                "195092e3.943c55"
             ]
         ]
     },
     {
-        "id": "a99ea7b2.f5e618",
+        "id": "aba9a33d.b56118",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1089.571533203125,
-        "y": 554.5969848632812,
-        "z": "b31344e1.6b9228",
+        "x": 1100.138198852539,
+        "y": 586.1636505126953,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "183025fe.418fa2",
+        "id": "b34cfae3.a993d8",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\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<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\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\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-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<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
         "comments": "",
         "outputs": 1,
-        "x": 1111,
-        "y": 257,
-        "z": "b31344e1.6b9228",
+        "x": 1121.566665649414,
+        "y": 288.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "47f816cc.c0286",
-                "318d2442.efdd34",
-                "4265fd48.9eb024"
+                "689fbe64.b269",
+                "60b4e331.4ab1b4",
+                "69c448c.334a3b8"
             ]
         ]
     },
     {
-        "id": "47f816cc.c0286",
+        "id": "689fbe64.b269",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1336,
-        "y": 115,
-        "z": "b31344e1.6b9228",
+        "x": 1346.566665649414,
+        "y": 146.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6fd78e9c.961b2"
+                "fead0819.21d2e8"
             ]
         ]
     },
     {
-        "id": "318d2442.efdd34",
+        "id": "60b4e331.4ab1b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1331.490966796875,
-        "y": 184.57403564453125,
-        "z": "b31344e1.6b9228",
+        "x": 1342.057632446289,
+        "y": 216.1407012939453,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "aa8b68cf.4936c"
+                "ad666133.38332"
             ]
         ]
     },
     {
-        "id": "4265fd48.9eb024",
+        "id": "69c448c.334a3b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1320,
-        "y": 231,
-        "z": "b31344e1.6b9228",
+        "x": 1330.566665649414,
+        "y": 262.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ea9381a6.8a9938"
+                "be5632ce.888008"
             ]
         ]
     },
     {
-        "id": "6fd78e9c.961b2",
+        "id": "fead0819.21d2e8",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1575,
-        "y": 112,
-        "z": "b31344e1.6b9228",
+        "x": 1585.566665649414,
+        "y": 143.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a9515923.c68db8",
-                "3b6a0136.f8dee6"
+                "79e1f5a9.abc0fc",
+                "628b0c00.38066c"
             ]
         ]
     },
     {
-        "id": "aa8b68cf.4936c",
+        "id": "ad666133.38332",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1485.0623779296875,
-        "y": 187.85977172851562,
-        "z": "b31344e1.6b9228",
+        "x": 1495.6290435791016,
+        "y": 219.4264373779297,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ea9381a6.8a9938",
+        "id": "be5632ce.888008",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1489,
-        "y": 232,
-        "z": "b31344e1.6b9228",
+        "x": 1499.566665649414,
+        "y": 263.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "a9515923.c68db8",
+        "id": "79e1f5a9.abc0fc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1788,
-        "y": 136,
-        "z": "b31344e1.6b9228",
+        "x": 1798.566665649414,
+        "y": 167.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8d77a4c9.47348"
+                "affa73a3.ee8208"
             ]
         ]
     },
     {
-        "id": "3b6a0136.f8dee6",
+        "id": "628b0c00.38066c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1790,
-        "y": 76,
-        "z": "b31344e1.6b9228",
+        "x": 1800.566665649414,
+        "y": 107.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b9472b2.e91dbe",
+        "id": "13f096c3.155339",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1090,
-        "y": 145,
-        "z": "b31344e1.6b9228",
+        "x": 1100.566665649414,
+        "y": 176.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "8d77a4c9.47348",
+        "id": "affa73a3.ee8208",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1773,
-        "y": 224,
-        "z": "b31344e1.6b9228",
+        "x": 1783.566665649414,
+        "y": 255.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2dfd81e1.a251ae",
-                "bc1d9c19.8a817",
-                "d0adb7e4.435f98",
-                "bf30e0be.23b998"
+                "48ff46b8.d3629",
+                "782b021e.0fd0fc",
+                "bb7c148d.8dd4d8",
+                "6e431d76.be632c",
+                "29e9cbd2.ce75c4",
+                "d12bfd13.8bf75"
             ]
         ]
     },
     {
-        "id": "4b515bec.7b07fc",
+        "id": "bc7152e2.d9d418",
         "type": "set",
         "name": "set network-route-A",
-        "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",
+        "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": 2636,
-        "y": 824,
-        "z": "b31344e1.6b9228",
+        "x": 2646.566665649414,
+        "y": 855.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "1fb3da4d.f9823e",
+        "id": "c38cb4ff.6bd5e",
         "type": "set",
         "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": 2637,
-        "y": 879,
-        "z": "b31344e1.6b9228",
+        "x": 2647.566665649414,
+        "y": 910.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "1fed210d.6adb97",
+        "id": "91e3d9ca.33dbb",
         "type": "save",
         "name": "get allotted-resource from aai",
         "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": 2259,
-        "y": 275,
-        "z": "b31344e1.6b9228",
+        "x": 2269.566665649414,
+        "y": 306.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "1d390c60.f37264",
-                "828d1344.2eeb18",
-                "35c0fff4.63034"
+                "5160a5be.66b9fc",
+                "bc755c97.0130a8",
+                "8c53c9d8.1845d8"
             ]
         ]
     },
     {
-        "id": "1d390c60.f37264",
+        "id": "5160a5be.66b9fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2475,
-        "y": 342,
-        "z": "b31344e1.6b9228",
+        "x": 2485.566665649414,
+        "y": 373.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "1dfc0585.305702"
+                "d72f2b29.b29698"
             ]
         ]
     },
     {
-        "id": "828d1344.2eeb18",
+        "id": "bc755c97.0130a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2475.490966796875,
-        "y": 241.573974609375,
-        "z": "b31344e1.6b9228",
+        "x": 2486.057632446289,
+        "y": 273.14064025878906,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "899f4256.fc61"
+                "9c5f6654.ebe11"
             ]
         ]
     },
     {
-        "id": "35c0fff4.63034",
+        "id": "8c53c9d8.1845d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2471,
-        "y": 291,
-        "z": "b31344e1.6b9228",
+        "x": 2481.566665649414,
+        "y": 322.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5b10d117.cfe6d8"
+                "3ae07ef4.fec912"
             ]
         ]
     },
     {
-        "id": "899f4256.fc61",
+        "id": "9c5f6654.ebe11",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2653.0625,
-        "y": 241.8597412109375,
-        "z": "b31344e1.6b9228",
+        "x": 2663.629165649414,
+        "y": 273.42640686035156,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "5b10d117.cfe6d8",
+        "id": "3ae07ef4.fec912",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2653,
-        "y": 291,
-        "z": "b31344e1.6b9228",
+        "x": 2663.566665649414,
+        "y": 322.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e459bf6d.9da9d8",
+        "id": "cb7d8033.d10ca8",
         "type": "save",
         "name": "get logical-link from aai",
         "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": 1994,
-        "y": 764,
-        "z": "b31344e1.6b9228",
+        "x": 2004.566665649414,
+        "y": 795.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f5d3816e.ab2828",
-                "4956f23f.0bb47c",
-                "fe0f59f6.d97868"
+                "2b85dd7e.f02352",
+                "1b3631c4.5fdf36",
+                "233346f1.01fed2"
             ]
         ]
     },
     {
-        "id": "f5d3816e.ab2828",
+        "id": "2b85dd7e.f02352",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2285.490966796875,
-        "y": 742.573974609375,
-        "z": "b31344e1.6b9228",
+        "x": 2296.057632446289,
+        "y": 774.1406402587891,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "9822556a.f611a"
+                "2de91143.9e84c6"
             ]
         ]
     },
     {
-        "id": "4956f23f.0bb47c",
+        "id": "1b3631c4.5fdf36",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2274,
-        "y": 787,
-        "z": "b31344e1.6b9228",
+        "x": 2284.566665649414,
+        "y": 818.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6c100a4d.9d821c"
+                "f3744c4d.35627"
             ]
         ]
     },
     {
-        "id": "9822556a.f611a",
+        "id": "2de91143.9e84c6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2434.0625,
-        "y": 742.8597412109375,
-        "z": "b31344e1.6b9228",
+        "x": 2444.629165649414,
+        "y": 774.4264068603516,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "6c100a4d.9d821c",
+        "id": "f3744c4d.35627",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2433,
-        "y": 787,
-        "z": "b31344e1.6b9228",
+        "x": 2443.566665649414,
+        "y": 818.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "fe0f59f6.d97868",
+        "id": "233346f1.01fed2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2281,
-        "y": 866,
-        "z": "b31344e1.6b9228",
+        "x": 2291.566665649414,
+        "y": 897.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6d1afb47.ab3814"
+                "14e4e24b.240d3e"
             ]
         ]
     },
     {
-        "id": "6d1afb47.ab3814",
+        "id": "14e4e24b.240d3e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2420,
-        "y": 866,
-        "z": "b31344e1.6b9228",
+        "x": 2430.566665649414,
+        "y": 897.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4b515bec.7b07fc",
-                "1fb3da4d.f9823e",
-                "97eccb48.84f6c",
-                "c57ab47a.d333d8",
-                "10cbf4f3.49fe3b",
-                "49d3005f.62282",
-                "15e0419f.a2cb36",
-                "e6402796.6c8a4",
-                "1f03402a.5db7",
-                "56710693.e24068",
-                "84b0870f.4db1e",
-                "3323f682.f60c3a",
-                "13ac3dbd.1f366a"
+                "bc7152e2.d9d418",
+                "c38cb4ff.6bd5e",
+                "6b90e6dc.1a4938",
+                "f826c02e.b2d98",
+                "d4510409.d18f8",
+                "f73397ef.aaf4c",
+                "f8f7fd3.b9ae18",
+                "eb24a93a.96e538",
+                "5ea4cfd5.51261",
+                "e11f1e73.f567a8",
+                "9c7b5506.97a75",
+                "3add3536.bf190a",
+                "33633691.1ec92a"
             ]
         ]
     },
     {
-        "id": "97eccb48.84f6c",
+        "id": "6b90e6dc.1a4938",
         "type": "save",
         "name": "get network-route-A from aai",
         "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": 2649,
-        "y": 947,
-        "z": "b31344e1.6b9228",
+        "x": 2659.566665649414,
+        "y": 978.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8c8a4891.ac867",
-                "8506ad3d.b7e4c",
-                "a3b6635c.c539f8"
+                "1d7d57d5.4b528",
+                "d18df8cc.ecc03",
+                "cbd2b797.9f07e8"
             ]
         ]
     },
     {
-        "id": "c57ab47a.d333d8",
+        "id": "f826c02e.b2d98",
         "type": "save",
         "name": "get network-route-B from aai",
         "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": 2628,
-        "y": 1548.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 2638.566665649414,
+        "y": 1580.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "506562cd.b8f74c",
-                "8d73f82f.8988f8",
-                "24728d1d.df92ba"
+                "6cc847e1.0c4c8",
+                "9bc40e0b.3e66b8",
+                "4130e8fa.6dc708"
             ]
         ]
     },
     {
-        "id": "8c8a4891.ac867",
+        "id": "1d7d57d5.4b528",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2850,
-        "y": 831,
-        "z": "b31344e1.6b9228",
+        "x": 2860.566665649414,
+        "y": 862.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "40f9d3c1.86e1ec"
+                "9adb7053.6193c"
             ]
         ]
     },
     {
-        "id": "8506ad3d.b7e4c",
+        "id": "d18df8cc.ecc03",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2845.509033203125,
-        "y": 880.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 2856.075698852539,
+        "y": 911.9926910400391,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6f975963.47cb7"
+                "bc31bdd5.70d25"
             ]
         ]
     },
     {
-        "id": "a3b6635c.c539f8",
+        "id": "cbd2b797.9f07e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2849.509033203125,
-        "y": 931.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 2860.075698852539,
+        "y": 962.9926910400391,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "61bb235e.2775f4"
+                "fa5d0125.b00d78"
             ]
         ]
     },
     {
-        "id": "40f9d3c1.86e1ec",
+        "id": "9adb7053.6193c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2998.571533203125,
-        "y": 830.2857666015625,
-        "z": "b31344e1.6b9228",
+        "x": 3009.138198852539,
+        "y": 861.8524322509766,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "6f975963.47cb7",
+        "id": "bc31bdd5.70d25",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2988.509033203125,
-        "y": 880.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 2999.075698852539,
+        "y": 911.9926910400391,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "506562cd.b8f74c",
+        "id": "6cc847e1.0c4c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2851,
-        "y": 1518.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 2861.566665649414,
+        "y": 1550.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7f769faa.864248"
+                "9ebfd12f.98fe08"
             ]
         ]
     },
     {
-        "id": "8d73f82f.8988f8",
+        "id": "9bc40e0b.3e66b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2846.509033203125,
-        "y": 1568.4259033203125,
-        "z": "b31344e1.6b9228",
+        "x": 2857.075698852539,
+        "y": 1599.9925689697266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "cc9ee8f2.77fda8"
+                "e2a53907.ab9ce8"
             ]
         ]
     },
     {
-        "id": "24728d1d.df92ba",
+        "id": "4130e8fa.6dc708",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2850.509033203125,
-        "y": 1619.4259033203125,
-        "z": "b31344e1.6b9228",
+        "x": 2861.075698852539,
+        "y": 1650.9925689697266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8a29f509.d58fe8"
+                "dd04bd6b.572858"
             ]
         ]
     },
     {
-        "id": "7f769faa.864248",
+        "id": "9ebfd12f.98fe08",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2999.571533203125,
-        "y": 1518.28564453125,
-        "z": "b31344e1.6b9228",
+        "x": 3010.138198852539,
+        "y": 1549.852310180664,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "cc9ee8f2.77fda8",
+        "id": "e2a53907.ab9ce8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2989.509033203125,
-        "y": 1568.4259033203125,
-        "z": "b31344e1.6b9228",
+        "x": 3000.075698852539,
+        "y": 1599.9925689697266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "b720785b.7c7",
+        "id": "eabcf699.92546",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3663.66650390625,
-        "y": 975,
-        "z": "b31344e1.6b9228",
+        "x": 3674.233169555664,
+        "y": 1006.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f3775fbc.163688",
-                "77e2870c.e28a38",
-                "ac8bf04e.ff247",
-                "7c2c78d5.f4945",
-                "bb95643a.1dafd8"
+                "ff0400bb.e98958",
+                "2638e2e.143761e",
+                "1c74c2ea.33d395",
+                "3078ca2b.4c72c6",
+                "81305781.090ed8"
             ]
         ]
     },
     {
-        "id": "669f51ab.4dcf7",
+        "id": "89cd3be0.fed2e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3491,
-        "y": 976,
-        "z": "b31344e1.6b9228",
+        "x": 3501.566665649414,
+        "y": 1007.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b720785b.7c7"
+                "eabcf699.92546"
             ]
         ]
     },
     {
-        "id": "bfa60b88.954ac8",
+        "id": "6ce22fa5.148738",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3500.490966796875,
-        "y": 1018.5740356445312,
-        "z": "b31344e1.6b9228",
+        "x": 3511.057632446289,
+        "y": 1050.1407012939453,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f78f70ff.0f2c38"
+                "6f858024.73295"
             ]
         ]
     },
     {
-        "id": "83a912b8.5c33b",
+        "id": "316c237c.fde964",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3489,
-        "y": 1065,
-        "z": "b31344e1.6b9228",
+        "x": 3499.566665649414,
+        "y": 1096.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d7142401.9476c"
+                "7e23353f.01fac4"
             ]
         ]
     },
     {
-        "id": "f78f70ff.0f2c38",
+        "id": "6f858024.73295",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3654.0623779296875,
-        "y": 1021.8597717285156,
-        "z": "b31344e1.6b9228",
+        "x": 3664.6290435791016,
+        "y": 1053.4264373779297,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "d7142401.9476c",
+        "id": "7e23353f.01fac4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3658,
-        "y": 1066,
-        "z": "b31344e1.6b9228",
+        "x": 3668.566665649414,
+        "y": 1097.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "61bb235e.2775f4",
+        "id": "fa5d0125.b00d78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3011,
-        "y": 933,
-        "z": "b31344e1.6b9228",
+        "x": 3021.566665649414,
+        "y": 964.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4914fb6.031ad84",
-                "4835023e.e8e8cc"
+                "670222f1.9217fc",
+                "82e83a40.d9e3c"
             ]
         ]
     },
     {
-        "id": "8a29f509.d58fe8",
+        "id": "dd04bd6b.572858",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3001,
-        "y": 1620.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3011.566665649414,
+        "y": 1652.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "33a198b5.ec1ae",
-                "684cf1ab.a79f48"
+                "b42a18a6.f5c9c",
+                "ccfa8314.375c3"
             ]
         ]
     },
     {
-        "id": "d9ace0a0.b4a76",
+        "id": "9231955e.3e12f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3631.66650390625,
-        "y": 1811,
-        "z": "b31344e1.6b9228",
+        "x": 3642.233169555664,
+        "y": 1842.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a2003991.03fd4",
-                "52dfb8b2.652278",
-                "22f952b9.882086",
-                "eb4dde28.2b2138",
-                "60f3b421.08732c"
+                "834482bc.da8c9",
+                "713b2333.204aec",
+                "359ab66.2c0144a",
+                "2cc88657.e87afa",
+                "5952bd35.50a834"
             ]
         ]
     },
     {
-        "id": "cc45c64e.73066",
+        "id": "e0e6a71d.ebb61",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3459,
-        "y": 1812,
-        "z": "b31344e1.6b9228",
+        "x": 3469.566665649414,
+        "y": 1843.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d9ace0a0.b4a76"
+                "9231955e.3e12f8"
             ]
         ]
     },
     {
-        "id": "33759aa.996c566",
+        "id": "20818b75.1274cc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3468.490966796875,
-        "y": 1854.5740356445312,
-        "z": "b31344e1.6b9228",
+        "x": 3479.057632446289,
+        "y": 1886.1407012939453,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "28b2902a.f0c46"
+                "729c480a.b2455"
             ]
         ]
     },
     {
-        "id": "fff61c46.59cf58",
+        "id": "ef5e9023.0ffb1",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3457,
-        "y": 1901,
-        "z": "b31344e1.6b9228",
+        "x": 3467.566665649414,
+        "y": 1932.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c4e6ae73.bdead"
+                "76e8a026.d94a18"
             ]
         ]
     },
     {
-        "id": "28b2902a.f0c46",
+        "id": "729c480a.b2455",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3622.0623779296875,
-        "y": 1857.8597717285156,
-        "z": "b31344e1.6b9228",
+        "x": 3632.6290435791016,
+        "y": 1889.4264373779297,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "c4e6ae73.bdead",
+        "id": "76e8a026.d94a18",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3626,
-        "y": 1902,
-        "z": "b31344e1.6b9228",
+        "x": 3636.566665649414,
+        "y": 1933.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "f3775fbc.163688",
+        "id": "ff0400bb.e98958",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "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": 3928,
-        "y": 959,
-        "z": "b31344e1.6b9228",
+        "x": 3938.566665649414,
+        "y": 990.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "17df8b10.734cad",
-                "e9e72181.7c2d78"
+                "1b7a2eba.962ee9",
+                "7716f28b.4501a4"
             ]
         ]
     },
     {
-        "id": "e9e72181.7c2d78",
+        "id": "7716f28b.4501a4",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4151,
-        "y": 914,
-        "z": "b31344e1.6b9228",
+        "x": 4161.566665649414,
+        "y": 945.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c8b8d5f9.b22ca8"
+                "22cc4911.ba723e"
             ]
         ]
     },
     {
-        "id": "17df8b10.734cad",
+        "id": "1b7a2eba.962ee9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4153,
-        "y": 978,
-        "z": "b31344e1.6b9228",
+        "x": 4163.566665649414,
+        "y": 1009.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "59177303.95ce1c"
+                "b1d0addd.f89fe8"
             ]
         ]
     },
     {
-        "id": "e95ea736.29045",
+        "id": "690a2492.cfb0bc",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 4486,
-        "y": 869,
-        "z": "b31344e1.6b9228",
+        "x": 4496.566665649414,
+        "y": 900.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "59177303.95ce1c",
+        "id": "b1d0addd.f89fe8",
         "type": "returnFailure",
         "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": 4315,
-        "y": 974,
-        "z": "b31344e1.6b9228",
+        "x": 4325.566665649414,
+        "y": 1005.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "c8b8d5f9.b22ca8",
+        "id": "22cc4911.ba723e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4316,
-        "y": 911,
-        "z": "b31344e1.6b9228",
+        "x": 4326.566665649414,
+        "y": 942.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f09148e0.5a878",
-                "e95ea736.29045"
+                "86327d08.aa9fb8",
+                "690a2492.cfb0bc"
             ]
         ]
     },
     {
-        "id": "f09148e0.5a878",
+        "id": "86327d08.aa9fb8",
         "type": "set",
         "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": 4487,
-        "y": 977,
-        "z": "b31344e1.6b9228",
+        "x": 4497.566665649414,
+        "y": 1008.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "2c408fec.1a81a",
+        "id": "cde2aa0c.c7d71",
         "type": "comment",
         "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": 4488,
-        "y": 926,
-        "z": "b31344e1.6b9228",
+        "x": 4498.566665649414,
+        "y": 957.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ac8bf04e.ff247",
+        "id": "1c74c2ea.33d395",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "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",
+        "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='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\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": 3930,
-        "y": 1118,
-        "z": "b31344e1.6b9228",
+        "x": 3940.566665649414,
+        "y": 1149.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "77e2870c.e28a38",
+        "id": "2638e2e.143761e",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainA",
         "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": 3975,
-        "y": 1028,
-        "z": "b31344e1.6b9228",
+        "x": 3985.566665649414,
+        "y": 1059.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "936488c4.d6b8e",
+        "id": "5d159096.a0e35",
         "type": "comment",
         "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": 3864,
-        "y": 1069,
-        "z": "b31344e1.6b9228",
+        "x": 3874.566665649414,
+        "y": 1100.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "a2003991.03fd4",
+        "id": "834482bc.da8c9",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "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": 3918,
-        "y": 1815.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3928.566665649414,
+        "y": 1846.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f2d8cb03.1eed48",
-                "6e32cf18.31944"
+                "78906c54.263be4",
+                "da17cabc.510218"
             ]
         ]
     },
     {
-        "id": "6e32cf18.31944",
+        "id": "da17cabc.510218",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4141,
-        "y": 1770.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4151.566665649414,
+        "y": 1801.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "201ffc86.8db20c"
+                "4c8e2849.b6ab18"
             ]
         ]
     },
     {
-        "id": "f2d8cb03.1eed48",
+        "id": "78906c54.263be4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4143,
-        "y": 1834.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4153.566665649414,
+        "y": 1865.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b29b2d4c.c3046"
+                "dfe47f7c.d37a1"
             ]
         ]
     },
     {
-        "id": "2386e717.060b18",
+        "id": "7e4bfbaf.bbef8c",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 4476,
-        "y": 1728.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4486.566665649414,
+        "y": 1759.5667877197266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "b29b2d4c.c3046",
+        "id": "dfe47f7c.d37a1",
         "type": "returnFailure",
         "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": 4302,
-        "y": 1853.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4312.566665649414,
+        "y": 1884.5667877197266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "201ffc86.8db20c",
+        "id": "4c8e2849.b6ab18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4306,
-        "y": 1767.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4316.566665649414,
+        "y": 1798.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2386e717.060b18",
-                "c71df80d.cfbb08"
+                "7e4bfbaf.bbef8c",
+                "26579dba.f3fbba"
             ]
         ]
     },
     {
-        "id": "c71df80d.cfbb08",
+        "id": "26579dba.f3fbba",
         "type": "set",
         "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": 4477,
-        "y": 1833.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4487.566665649414,
+        "y": 1864.5667877197266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e385afea.eec45",
+        "id": "8836114.dcb937",
         "type": "comment",
         "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": 4472,
-        "y": 1782.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4482.566665649414,
+        "y": 1813.5667877197266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "22f952b9.882086",
+        "id": "359ab66.2c0144a",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "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",
+        "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='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\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": 3920,
-        "y": 1974.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3930.566665649414,
+        "y": 2005.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "52dfb8b2.652278",
+        "id": "713b2333.204aec",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainB",
         "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": 3965,
-        "y": 1884.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3975.566665649414,
+        "y": 1915.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "4961c905.9d4bb",
+        "id": "9f1fac8a.3f574",
         "type": "comment",
         "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": 3854,
-        "y": 1922.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3864.566665649414,
+        "y": 1953.5667877197266,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "10cbf4f3.49fe3b",
+        "id": "d4510409.d18f8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "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": 2848,
-        "y": 2278,
-        "z": "b31344e1.6b9228",
+        "x": 2860.566665649414,
+        "y": 2349.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "49d3005f.62282",
+        "id": "f73397ef.aaf4c",
         "type": "set",
         "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": 2642,
-        "y": 2179,
-        "z": "b31344e1.6b9228",
+        "x": 2658.566665649414,
+        "y": 2228.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "9f05df83.0d8378",
+        "id": "200f044c.0142e4",
         "type": "comment",
         "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": 2616,
-        "y": 2132,
-        "z": "b31344e1.6b9228",
+        "x": 2624.566665649414,
+        "y": 2162.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "65916227.3c1154",
-        "type": "save",
-        "name": "save vpn-binding A resource (aka. OTN domainA) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<parameter name='access-provider-id' value='`$domain-A.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-A.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='src-access-ltp-id' value='' />\n<parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\n<parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2796,
-        "y": 2831,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "17bd32c6.c38a7d"
-            ]
-        ]
-    },
-    {
-        "id": "fa5ee7b8.d80d3",
-        "type": "save",
-        "name": "save connectivity-A relationship to vpn-binding-A, in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2787.5,
-        "y": 2880,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7c2c78d5.f4945",
+        "id": "3078ca2b.4c72c6",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "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": 4058,
-        "y": 1166,
-        "z": "b31344e1.6b9228",
+        "x": 4068.566665649414,
+        "y": 1197.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "eb4dde28.2b2138",
+        "id": "2cc88657.e87afa",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "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": 4047,
-        "y": 2039.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4057.566665649414,
+        "y": 2070.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "17bd32c6.c38a7d",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3082,
-        "y": 2838,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "20a19a36.cfd0d6"
-            ]
-        ]
-    },
-    {
-        "id": "20a19a36.cfd0d6",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3222.500244140625,
-        "y": 2839.25390625,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dba0a851.2f60f8",
-        "type": "comment",
-        "name": "TODO: FIXME: put proper values",
-        "info": "",
-        "comments": "",
-        "x": 2718,
-        "y": 2777,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "cb2d65a2.90a53",
-        "type": "save",
-        "name": "save vpn-binding B resource (aka. OTN domainB) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<parameter name='access-provider-id' value='`$domain-B.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-B.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$domain-B.node-id`' />\n<parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-access-ltp-id' value='' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2786,
-        "y": 3121,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "a71dc667.1e8b48"
-            ]
-        ]
-    },
-    {
-        "id": "c245f255.688bf",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3226.500244140625,
-        "y": 3121.25390625,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a71dc667.1e8b48",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3086,
-        "y": 3120,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "c245f255.688bf"
-            ]
-        ]
-    },
-    {
-        "id": "86719a40.1873b8",
-        "type": "comment",
-        "name": "TODO: FIXME: put proper values",
-        "info": "",
-        "comments": "",
-        "x": 2712,
-        "y": 3073,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "ca75e77c.cd7028",
-        "type": "save",
-        "name": "save connectivity-B relationship to vpn-binding-B, in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2784.5,
-        "y": 3161,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a23bd528.d58958",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "set attachment param and send request to NCE-T\nfor bandwidth matrix\nmay require a new template for JSON body",
-        "comments": "",
-        "x": 2593,
-        "y": 3241,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "15e0419f.a2cb36",
-        "type": "set",
-        "name": "set attachment_param domain A",
-        "xml": "<set>\n<!--<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />-->\n<!--<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='otn-dest-node' value='`$domain-A.node-id`' />-->\n<!--<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />-->\n<!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n\n\n\n<parameter name='`otn-tunnel-sliceA-list[$idx].request-id`' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].otn-dest-node`' value='`$domain-A.node-id`' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceA-list[$idx].src-ttp-id`' value='' />\n<parameter name='`otn-tunnel-sliceA-list[$idx].dst-ttp-id`' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-sliceA-list_length`' value='`$idx + 1`' />\n\n<!--otn-tunnel-slice-list[$idx]-->\n\n",
-        "comments": "",
-        "x": 2658,
-        "y": 3286,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "2d08c6.2cc1e73a",
+        "id": "117cb756.a2a2d9",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "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": 5102,
-        "y": 686,
-        "z": "b31344e1.6b9228",
+        "x": 5112.566665649414,
+        "y": 717.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "fe7f5526.b757d",
-                "ace94fc7.113e6",
-                "42739782.dc6168"
+                "3866efd7.2177",
+                "72d35790.07a0a8",
+                "261ed4c9.21b32c"
             ]
         ]
     },
     {
-        "id": "1dfc0585.305702",
+        "id": "d72f2b29.b29698",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2655,
-        "y": 342,
-        "z": "b31344e1.6b9228",
+        "x": 2665.566665649414,
+        "y": 373.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8622621b.5191"
+                "a21b0826.040f68"
             ]
         ]
     },
     {
-        "id": "7de95d04.4c5e84",
+        "id": "ba7cd715.7b1848",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1585.0001220703125,
-        "y": 759.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 1595.5667877197266,
+        "y": 790.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "38efe599.5c2462"
+                "5a4e861b.fe333"
             ]
         ]
     },
     {
-        "id": "a0ff94f7.a05cd8",
+        "id": "7935e728.7a6cd8",
         "type": "switchNode",
         "name": "switch allotted-resource.relationship-list not empty",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2323,
-        "y": 465,
-        "z": "b31344e1.6b9228",
+        "x": 2333.566665649414,
+        "y": 496.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8055d128.93cf8",
-                "a4e55956.340f1"
+                "c03e1705.5e117",
+                "443647ac.996ce8"
             ]
         ]
     },
     {
-        "id": "a4e55956.340f1",
+        "id": "443647ac.996ce8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2633,
-        "y": 472,
-        "z": "b31344e1.6b9228",
+        "x": 2643.566665649414,
+        "y": 503.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "8055d128.93cf8",
+        "id": "c03e1705.5e117",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2632,
-        "y": 526,
-        "z": "b31344e1.6b9228",
+        "x": 2642.566665649414,
+        "y": 557.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "33bd7ebe.34c502"
+                "f30f322a.ce56f8"
             ]
         ]
     },
     {
-        "id": "2ecd1033.1e79d8",
+        "id": "a7413863.fffc18",
         "type": "set",
         "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": 2005,
-        "y": 709,
-        "z": "b31344e1.6b9228",
+        "x": 2015.566665649414,
+        "y": 740.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "38efe599.5c2462",
+        "id": "5a4e861b.fe333",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1762,
-        "y": 752,
-        "z": "b31344e1.6b9228",
+        "x": 1772.566665649414,
+        "y": 783.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2ecd1033.1e79d8",
-                "e459bf6d.9da9d8"
+                "a7413863.fffc18",
+                "cb7d8033.d10ca8"
             ]
         ]
     },
     {
-        "id": "f61b9c.2378ec68",
+        "id": "ef7f5983.624538",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3191,
-        "y": 938,
-        "z": "b31344e1.6b9228",
+        "x": 3201.566665649414,
+        "y": 969.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "4914fb6.031ad84",
+        "id": "670222f1.9217fc",
         "type": "save",
         "name": "get p-interface-src from aai",
         "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": 3234,
-        "y": 1003,
-        "z": "b31344e1.6b9228",
+        "x": 3244.566665649414,
+        "y": 1034.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "669f51ab.4dcf7",
-                "bfa60b88.954ac8",
-                "83a912b8.5c33b"
+                "89cd3be0.fed2e8",
+                "6ce22fa5.148738",
+                "316c237c.fde964"
             ]
         ]
     },
     {
-        "id": "33a198b5.ec1ae",
+        "id": "b42a18a6.f5c9c",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "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": 3231,
-        "y": 1847,
-        "z": "b31344e1.6b9228",
+        "x": 3241.566665649414,
+        "y": 1878.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "cc45c64e.73066",
-                "33759aa.996c566",
-                "fff61c46.59cf58"
+                "e0e6a71d.ebb61",
+                "20818b75.1274cc",
+                "ef5e9023.0ffb1"
             ]
         ]
     },
     {
-        "id": "13eb2671.9e12f2",
+        "id": "c8a39fd5.26e7b",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3192,
-        "y": 1791,
-        "z": "b31344e1.6b9228",
+        "x": 3202.566665649414,
+        "y": 1822.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "8622621b.5191",
+        "id": "a21b0826.040f68",
         "type": "save",
         "name": "get allotted-resource relationship from aai",
         "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": 2948,
-        "y": 289,
-        "z": "b31344e1.6b9228",
+        "x": 2958.566665649414,
+        "y": 320.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "774c27b3.d5b958",
-                "314f18ee.d0e28",
-                "177a6858.e45f48"
+                "4aea984e.525588",
+                "b162701f.2122e",
+                "62d5ee30.6cb7d8"
             ]
         ]
     },
     {
-        "id": "314f18ee.d0e28",
+        "id": "b162701f.2122e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3221.490966796875,
-        "y": 181.573974609375,
-        "z": "b31344e1.6b9228",
+        "x": 3232.057632446289,
+        "y": 213.14064025878906,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "bf0d979c.0d6a2"
+                "1f5782e1.732415"
             ]
         ]
     },
     {
-        "id": "bf0d979c.0d6a2",
+        "id": "1f5782e1.732415",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3399.0625,
-        "y": 181.8597412109375,
-        "z": "b31344e1.6b9228",
+        "x": 3409.629165649414,
+        "y": 213.42640686035156,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "177a6858.e45f48",
+        "id": "62d5ee30.6cb7d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3217,
-        "y": 231,
-        "z": "b31344e1.6b9228",
+        "x": 3227.566665649414,
+        "y": 262.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "69e0c103.73f7e"
+                "95458c8d.84809"
             ]
         ]
     },
     {
-        "id": "69e0c103.73f7e",
+        "id": "95458c8d.84809",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3399,
-        "y": 231,
-        "z": "b31344e1.6b9228",
+        "x": 3409.566665649414,
+        "y": 262.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "774c27b3.d5b958",
+        "id": "4aea984e.525588",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3221,
-        "y": 282,
-        "z": "b31344e1.6b9228",
+        "x": 3231.566665649414,
+        "y": 313.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8d4f11e6.7da04"
+                "f1c741f5.f9107"
             ]
         ]
     },
     {
-        "id": "8d4f11e6.7da04",
+        "id": "f1c741f5.f9107",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3401,
-        "y": 282,
-        "z": "b31344e1.6b9228",
+        "x": 3411.566665649414,
+        "y": 313.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a0ff94f7.a05cd8"
+                "7935e728.7a6cd8"
             ]
         ]
     },
     {
-        "id": "fe8ff063.6863b8",
+        "id": "c6653aca.b9464",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2892,
-        "y": 506,
-        "z": "b31344e1.6b9228",
+        "x": 2902.566665649414,
+        "y": 537.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7f3884a8.055b2c"
+                "f3ed889.142a978"
             ]
         ]
     },
     {
-        "id": "7f3884a8.055b2c",
+        "id": "f3ed889.142a978",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3172,
-        "y": 506,
-        "z": "b31344e1.6b9228",
+        "x": 3182.566665649414,
+        "y": 537.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7de95d04.4c5e84"
+                "ba7cd715.7b1848"
             ]
         ]
     },
     {
-        "id": "5050eb58.e00ed4",
+        "id": "dba40877.5798e",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3377,
-        "y": 480,
-        "z": "b31344e1.6b9228",
+        "x": 3387.566665649414,
+        "y": 511.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "9ce29b77.ad6fe8"
+                "196e356.b3ce64b"
             ]
         ]
     },
     {
-        "id": "9ce29b77.ad6fe8",
+        "id": "196e356.b3ce64b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3553.9998779296875,
-        "y": 472.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3564.5665435791016,
+        "y": 504.56654357910156,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e7ee0b09.87c5d8",
-                "7fe89152.e612e8"
+                "e3e6b765.4d9878",
+                "b8269eb.7fee5e"
             ]
         ]
     },
     {
-        "id": "e7ee0b09.87c5d8",
+        "id": "e3e6b765.4d9878",
         "type": "set",
         "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": 3796.9998779296875,
-        "y": 429.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3807.5665435791016,
+        "y": 461.56654357910156,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "7fe89152.e612e8",
+        "id": "b8269eb.7fee5e",
         "type": "save",
         "name": "get network-policy from aai",
         "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": 3785.9998779296875,
-        "y": 484.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3796.5665435791016,
+        "y": 516.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "64fb2208.a0a974",
-                "c3b9f4d3.aab1b8",
-                "f6aa84f.18621f8"
+                "52707298.644854",
+                "73e07a10.53585c",
+                "cc16ab53.2ad86"
             ]
         ]
     },
     {
-        "id": "f6aa84f.18621f8",
+        "id": "cc16ab53.2ad86",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4039,
-        "y": 371,
-        "z": "b31344e1.6b9228",
+        "x": 4049.566665649414,
+        "y": 402.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c20366f5.78311"
+                "a488a64d.fae9f"
             ]
         ]
     },
     {
-        "id": "c20366f5.78311",
+        "id": "a488a64d.fae9f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4187.571533203125,
-        "y": 371.2857666015625,
-        "z": "b31344e1.6b9228",
+        "x": 4198.138198852539,
+        "y": 402.85243225097656,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "a9aadb9.f22de28",
+        "id": "3e172036.3dfe9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4186.509033203125,
-        "y": 415.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4197.075698852539,
+        "y": 446.99269104003906,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "c3b9f4d3.aab1b8",
+        "id": "73e07a10.53585c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4027.509033203125,
-        "y": 415.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4038.075698852539,
+        "y": 446.99269104003906,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a9aadb9.f22de28"
+                "3e172036.3dfe9"
             ]
         ]
     },
     {
-        "id": "64fb2208.a0a974",
+        "id": "52707298.644854",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4034.509033203125,
-        "y": 494.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4045.075698852539,
+        "y": 525.9926910400391,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7a83723d.cc96f4"
+                "f6f5e0ef.37ff18"
             ]
         ]
     },
     {
-        "id": "7a83723d.cc96f4",
+        "id": "f6f5e0ef.37ff18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4173.509033203125,
-        "y": 494.426025390625,
-        "z": "b31344e1.6b9228",
+        "x": 4184.075698852539,
+        "y": 525.9926910400391,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "1f8d33e3.a771dc",
-                "420f3616.2f701"
+                "f1f16ad9.ab6c1",
+                "43bfbebe.764f5"
             ]
         ]
     },
     {
-        "id": "1f8d33e3.a771dc",
+        "id": "f1f16ad9.ab6c1",
         "type": "set",
         "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": 4379,
-        "y": 492,
-        "z": "b31344e1.6b9228",
+        "x": 4389.566665649414,
+        "y": 523.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "4835023e.e8e8cc",
+        "id": "82e83a40.d9e3c",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "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": 3235,
-        "y": 673,
-        "z": "b31344e1.6b9228",
+        "x": 3245.566665649414,
+        "y": 704.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "eafc912d.cb0fe",
-                "14b2df73.02d4e1"
+                "bc26e44c.af9fc",
+                "1d377ef3.0119d9"
             ]
         ]
     },
     {
-        "id": "14b2df73.02d4e1",
+        "id": "1d377ef3.0119d9",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3458,
-        "y": 659,
-        "z": "b31344e1.6b9228",
+        "x": 3468.566665649414,
+        "y": 690.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "bb352d17.34137"
+                "2e20e3ac.843a84"
             ]
         ]
     },
     {
-        "id": "eafc912d.cb0fe",
+        "id": "bc26e44c.af9fc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3460,
-        "y": 692,
-        "z": "b31344e1.6b9228",
+        "x": 3470.566665649414,
+        "y": 723.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4040c9e2.8e3008"
+                "26e72470.d1e50c"
             ]
         ]
     },
     {
-        "id": "4040c9e2.8e3008",
+        "id": "26e72470.d1e50c",
         "type": "returnFailure",
         "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": 3603,
-        "y": 689,
-        "z": "b31344e1.6b9228",
+        "x": 3613.566665649414,
+        "y": 720.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "bb352d17.34137",
+        "id": "2e20e3ac.843a84",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3606,
-        "y": 652,
-        "z": "b31344e1.6b9228",
+        "x": 3616.566665649414,
+        "y": 683.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8f0d5ee9.6635d",
-                "300f312a.b253d6"
+                "d1ca7e66.d6d25",
+                "8b886e18.72a2f"
             ]
         ]
     },
     {
-        "id": "8f0d5ee9.6635d",
+        "id": "d1ca7e66.d6d25",
         "type": "set",
         "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": 3768,
-        "y": 647,
-        "z": "b31344e1.6b9228",
+        "x": 3778.566665649414,
+        "y": 678.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "684cf1ab.a79f48",
+        "id": "ccfa8314.375c3",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "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": 3249,
-        "y": 1509.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3259.566665649414,
+        "y": 1541.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "10ff0da4.16d4ea",
-                "55c5195b.3875c8"
+                "fb9d05a4.702cb",
+                "2e323a70.856296"
             ]
         ]
     },
     {
-        "id": "55c5195b.3875c8",
+        "id": "2e323a70.856296",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3472,
-        "y": 1495.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3482.566665649414,
+        "y": 1527.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7202d26b.6dffec"
+                "ac71b291.7c3e"
             ]
         ]
     },
     {
-        "id": "10ff0da4.16d4ea",
+        "id": "fb9d05a4.702cb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3474,
-        "y": 1528.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3484.566665649414,
+        "y": 1560.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "30474e74.e5639a"
+                "96d94f89.40a6f8"
             ]
         ]
     },
     {
-        "id": "30474e74.e5639a",
+        "id": "96d94f89.40a6f8",
         "type": "returnFailure",
         "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": 3617,
-        "y": 1525.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3627.566665649414,
+        "y": 1557.5665435791016,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "7202d26b.6dffec",
+        "id": "ac71b291.7c3e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3620,
-        "y": 1488.9998779296875,
-        "z": "b31344e1.6b9228",
+        "x": 3630.566665649414,
+        "y": 1520.5665435791016,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "885f2609.7cba58",
-                "e1d06713.adb0c8"
+                "eab11739.c2283",
+                "dc956cf0.69a068"
             ]
         ]
     },
     {
-        "id": "885f2609.7cba58",
+        "id": "eab11739.c2283",
         "type": "set",
         "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": 3814,
-        "y": 1492,
-        "z": "b31344e1.6b9228",
+        "x": 3824.566665649414,
+        "y": 1523.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "d352d101.d008a8",
+        "id": "195092e3.943c55",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1078,
-        "y": 197,
-        "z": "b31344e1.6b9228",
+        "x": 1088.566665649414,
+        "y": 228.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "5f8f79a5.68d88",
-        "type": "execute",
-        "name": "execute UUID generator for vpn-binding domainA",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainA-uuid\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2771,
-        "y": 2745,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9fa3320.fe9395",
-        "type": "execute",
-        "name": "execute UUID generator for vpn-binding domainB",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainB-uuid\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2764,
-        "y": 3038,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bb95643a.1dafd8",
+        "id": "81305781.090ed8",
         "type": "for",
         "name": "for each relationship",
         "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": 3882,
-        "y": 1243,
-        "z": "b31344e1.6b9228",
+        "x": 3892.566665649414,
+        "y": 1274.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "232e8f32.739b48"
+                "f76721b5.8461d"
             ]
         ]
     },
     {
-        "id": "232e8f32.739b48",
+        "id": "f76721b5.8461d",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4088,
-        "y": 1243,
-        "z": "b31344e1.6b9228",
+        "x": 4098.566665649414,
+        "y": 1274.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8bbe738e.7fafb"
+                "b969fa1c.797cc8"
             ]
         ]
     },
     {
-        "id": "8bbe738e.7fafb",
+        "id": "b969fa1c.797cc8",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4303.28564453125,
-        "y": 1242.82177734375,
-        "z": "b31344e1.6b9228",
+        "x": 4313.852310180664,
+        "y": 1274.388442993164,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c3ad3464.e3237"
+                "53dab03f.fc20f"
             ]
         ]
     },
     {
-        "id": "c3ad3464.e3237",
+        "id": "53dab03f.fc20f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4510.1171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4520.683853149414,
+        "y": 1274.906997680664,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f0158859.e44c4",
-                "1be7b379.0a0a35",
-                "bee0e07a.660808"
+                "c8f50b30.1a1a",
+                "5524147a.4f670c",
+                "e21dfbfb.d70ee"
             ]
         ]
     },
     {
-        "id": "f0158859.e44c4",
+        "id": "c8f50b30.1a1a",
         "type": "set",
         "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": 4725.1171875,
-        "y": 1205.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4735.683853149414,
+        "y": 1236.906997680664,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "1be7b379.0a0a35",
+        "id": "5524147a.4f670c",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "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": 4722.1171875,
-        "y": 1244.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4732.683853149414,
+        "y": 1275.906997680664,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5d7ec3ca.e9fe2c"
+                "468c57ff.e87bd"
             ]
         ]
     },
     {
-        "id": "bee0e07a.660808",
+        "id": "e21dfbfb.d70ee",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4677.6171875,
-        "y": 1286.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4688.183853149414,
+        "y": 1317.906997680664,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "5d7ec3ca.e9fe2c",
+        "id": "468c57ff.e87bd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4902.6171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 4913.183853149414,
+        "y": 1274.906997680664,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5c631dd4.8f5fbc"
+                "674f9840.48c03"
             ]
         ]
     },
     {
-        "id": "5c631dd4.8f5fbc",
+        "id": "674f9840.48c03",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5060.6171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 5071.183853149414,
+        "y": 1274.906997680664,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d5d5e908.7a8eb8"
+                "202acc61.848adc"
             ]
         ]
     },
     {
-        "id": "d5d5e908.7a8eb8",
+        "id": "202acc61.848adc",
         "type": "set",
         "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": 5267.6171875,
-        "y": 1243.34033203125,
-        "z": "b31344e1.6b9228",
+        "x": 5278.183853149414,
+        "y": 1274.906997680664,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "60f3b421.08732c",
+        "id": "5952bd35.50a834",
         "type": "for",
         "name": "for each relationship",
         "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": 3879,
-        "y": 2112.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 3889.566665649414,
+        "y": 2143.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "715a89d.cfea178"
+                "6a89a776.9e1148"
             ]
         ]
     },
     {
-        "id": "715a89d.cfea178",
+        "id": "6a89a776.9e1148",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4085,
-        "y": 2112.0001220703125,
-        "z": "b31344e1.6b9228",
+        "x": 4095.566665649414,
+        "y": 2143.5667877197266,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "977e3712.429b18"
+                "c422bc84.9ff58"
             ]
         ]
     },
     {
-        "id": "977e3712.429b18",
+        "id": "c422bc84.9ff58",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4300.28564453125,
-        "y": 2111.8218994140625,
-        "z": "b31344e1.6b9228",
+        "x": 4310.852310180664,
+        "y": 2143.3885650634766,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2113d9ff.cdd31e"
+                "35ec76d0.e92ad2"
             ]
         ]
     },
     {
-        "id": "2113d9ff.cdd31e",
+        "id": "35ec76d0.e92ad2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4507.1171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4517.683853149414,
+        "y": 2143.9071197509766,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3c92c59b.613ca2",
-                "193b4238.409d8e",
-                "b71c718.f135e1"
+                "2da8c0eb.ef8a5",
+                "ed9d3d70.991958",
+                "4afbd03e.c78838"
             ]
         ]
     },
     {
-        "id": "3c92c59b.613ca2",
+        "id": "2da8c0eb.ef8a5",
         "type": "set",
         "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": 4722.1171875,
-        "y": 2074.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4732.683853149414,
+        "y": 2105.9071197509766,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "193b4238.409d8e",
+        "id": "ed9d3d70.991958",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "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": 4719.1171875,
-        "y": 2113.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4729.683853149414,
+        "y": 2144.9071197509766,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "df85928.81de67"
+                "12a67fc9.3eabd"
             ]
         ]
     },
     {
-        "id": "b71c718.f135e1",
+        "id": "4afbd03e.c78838",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4674.6171875,
-        "y": 2155.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4685.183853149414,
+        "y": 2186.9071197509766,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "df85928.81de67",
+        "id": "12a67fc9.3eabd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4899.6171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 4910.183853149414,
+        "y": 2143.9071197509766,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8b1f9fde.337d98"
+                "e5260f19.3624e"
             ]
         ]
     },
     {
-        "id": "8b1f9fde.337d98",
+        "id": "e5260f19.3624e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5057.6171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
+        "x": 5068.183853149414,
+        "y": 2143.9071197509766,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "20d9b129.b72206"
+                "fea1a0aa.e8456"
             ]
         ]
     },
     {
-        "id": "20d9b129.b72206",
+        "id": "fea1a0aa.e8456",
         "type": "set",
         "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": 5264.6171875,
-        "y": 2112.3404541015625,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "e6402796.6c8a4",
-        "type": "set",
-        "name": "set attachment_param domain B",
-        "xml": "<set>\n<!--<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />-->\n<!--<parameter name='otn-source-node' value='`$domain-B.node-id`' />-->\n<!--<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />-->\n<!--<parameter name='dst-ttp-id' value='' />-->\n<!--<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n\n<parameter name='`otn-tunnel-sliceB-list[$idx].request-id`' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-source-node`' value='`$domain-B.node-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-sliceB-list[$idx].src-ttp-id`' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='`otn-tunnel-sliceB-list[$idx].dst-ttp-id`' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-sliceB-list_length`' value='`$idx + 1`' />\n",
-        "comments": "",
-        "x": 2653,
-        "y": 3661,
-        "z": "b31344e1.6b9228",
+        "x": 5275.183853149414,
+        "y": 2143.9071197509766,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "300f312a.b253d6",
+        "id": "8b886e18.72a2f",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "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": 3795,
-        "y": 719,
-        "z": "b31344e1.6b9228",
+        "x": 3805.566665649414,
+        "y": 750.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "1c354309.a76ffd",
-                "950deba8.cc3e4",
-                "c2c16051.a906d8"
+                "230a01ea.26a66e",
+                "548c580d.50378",
+                "266b6d86.22640a"
             ]
         ]
     },
     {
-        "id": "1c354309.a76ffd",
+        "id": "230a01ea.26a66e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3990.5001220703125,
-        "y": 671,
-        "z": "b31344e1.6b9228",
+        "x": 4001.0667877197266,
+        "y": 702.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d41af0c3.594838"
+                "8a1e2c2.231ae5"
             ]
         ]
     },
     {
-        "id": "950deba8.cc3e4",
+        "id": "548c580d.50378",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3982.5001220703125,
-        "y": 726,
-        "z": "b31344e1.6b9228",
+        "x": 3993.0667877197266,
+        "y": 757.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3d15fff1.053cf"
+                "f0a74837.6bf648"
             ]
         ]
     },
     {
-        "id": "c2c16051.a906d8",
+        "id": "266b6d86.22640a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3987.5001220703125,
-        "y": 783,
-        "z": "b31344e1.6b9228",
+        "x": 3998.0667877197266,
+        "y": 814.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d7ef8f23.d036"
+                "c89ea643.5fb658"
             ]
         ]
     },
     {
-        "id": "d7ef8f23.d036",
+        "id": "c89ea643.5fb658",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4139.5001220703125,
-        "y": 784,
-        "z": "b31344e1.6b9228",
+        "x": 4150.066787719727,
+        "y": 815.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "3d15fff1.053cf",
+        "id": "f0a74837.6bf648",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4150.5001220703125,
-        "y": 729,
-        "z": "b31344e1.6b9228",
+        "x": 4161.066787719727,
+        "y": 760.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "d41af0c3.594838",
+        "id": "8a1e2c2.231ae5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4134.8824462890625,
-        "y": 668.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 4145.449111938477,
+        "y": 700.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b45d0128.680c8"
+                "5c25cba9.41b2b4"
             ]
         ]
     },
     {
-        "id": "7cb8afd4.8d20b8",
+        "id": "f1310713.19e1c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4717,
-        "y": 687,
-        "z": "b31344e1.6b9228",
+        "x": 4727.566665649414,
+        "y": 718.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "47edc84c.808f88"
+                "cbcc3226.5de568"
             ]
         ]
     },
     {
-        "id": "47edc84c.808f88",
+        "id": "cbcc3226.5de568",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4894,
-        "y": 679,
-        "z": "b31344e1.6b9228",
+        "x": 4904.566665649414,
+        "y": 710.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "266ac25a.ea33a6",
-                "2d08c6.2cc1e73a"
+                "9672ea99.0655d",
+                "117cb756.a2a2d9"
             ]
         ]
     },
     {
-        "id": "b45d0128.680c8",
+        "id": "5c25cba9.41b2b4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4319,
-        "y": 683,
-        "z": "b31344e1.6b9228",
+        "x": 4329.566665649414,
+        "y": 714.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4f9ef890.59c338"
+                "c4bf834f.523618"
             ]
         ]
     },
     {
-        "id": "4f9ef890.59c338",
+        "id": "c4bf834f.523618",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4514,
-        "y": 683,
-        "z": "b31344e1.6b9228",
+        "x": 4524.566665649414,
+        "y": 714.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7cb8afd4.8d20b8",
-                "212f425.c6d5fbe"
+                "f1310713.19e1c",
+                "88191017.73b938"
             ]
         ]
     },
     {
-        "id": "266ac25a.ea33a6",
+        "id": "9672ea99.0655d",
         "type": "set",
         "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": 5132,
-        "y": 634,
-        "z": "b31344e1.6b9228",
+        "x": 5142.566665649414,
+        "y": 665.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "fe7f5526.b757d",
+        "id": "3866efd7.2177",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5312,
-        "y": 677,
-        "z": "b31344e1.6b9228",
+        "x": 5322.566665649414,
+        "y": 708.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c4631195.e5511"
+                "fe38d110.6015b8"
             ]
         ]
     },
     {
-        "id": "ace94fc7.113e6",
+        "id": "72d35790.07a0a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5304,
-        "y": 732,
-        "z": "b31344e1.6b9228",
+        "x": 5314.566665649414,
+        "y": 763.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "af8bf071.82c85"
+                "7783383e.51854"
             ]
         ]
     },
     {
-        "id": "42739782.dc6168",
+        "id": "261ed4c9.21b32c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5309,
-        "y": 789,
-        "z": "b31344e1.6b9228",
+        "x": 5319.566665649414,
+        "y": 820.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b1e33e76.6db9b"
+                "fa12b901.242fd8"
             ]
         ]
     },
     {
-        "id": "b1e33e76.6db9b",
+        "id": "fa12b901.242fd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5461,
-        "y": 790,
-        "z": "b31344e1.6b9228",
+        "x": 5471.566665649414,
+        "y": 821.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "af8bf071.82c85",
+        "id": "7783383e.51854",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5472,
-        "y": 735,
-        "z": "b31344e1.6b9228",
+        "x": 5482.566665649414,
+        "y": 766.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "c4631195.e5511",
+        "id": "fe38d110.6015b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5456.38232421875,
-        "y": 674.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 5466.948989868164,
+        "y": 706.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4dcc9c46.887914"
+                "60bc3d89.a08324"
             ]
         ]
     },
     {
-        "id": "4dcc9c46.887914",
+        "id": "60bc3d89.a08324",
         "type": "set",
         "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": 5671,
-        "y": 671,
-        "z": "b31344e1.6b9228",
+        "x": 5681.566665649414,
+        "y": 702.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e1d06713.adb0c8",
+        "id": "dc956cf0.69a068",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "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": 3836,
-        "y": 1560,
-        "z": "b31344e1.6b9228",
+        "x": 3846.566665649414,
+        "y": 1591.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "34f7d7e6.e7fa8",
-                "cb710953.72942",
-                "4c788e8d.e93588"
+                "bf4fb85e.9c3948",
+                "6a7367e2.bb2c9",
+                "ddd9af1d.15854"
             ]
         ]
     },
     {
-        "id": "34f7d7e6.e7fa8",
+        "id": "bf4fb85e.9c3948",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4031.5001220703125,
-        "y": 1512,
-        "z": "b31344e1.6b9228",
+        "x": 4042.0667877197266,
+        "y": 1543.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "fd0d1ee5.65b0f"
+                "350a8536.22a84a"
             ]
         ]
     },
     {
-        "id": "cb710953.72942",
+        "id": "6a7367e2.bb2c9",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4023.5001220703125,
-        "y": 1567,
-        "z": "b31344e1.6b9228",
+        "x": 4034.0667877197266,
+        "y": 1598.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "68639fde.fb4de8"
+                "145991d9.a47ef6"
             ]
         ]
     },
     {
-        "id": "4c788e8d.e93588",
+        "id": "ddd9af1d.15854",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4028.5001220703125,
-        "y": 1624,
-        "z": "b31344e1.6b9228",
+        "x": 4039.0667877197266,
+        "y": 1655.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ed57c904.1da5b"
+                "820f34bd.964968"
             ]
         ]
     },
     {
-        "id": "ed57c904.1da5b",
+        "id": "820f34bd.964968",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4180.5001220703125,
-        "y": 1625,
-        "z": "b31344e1.6b9228",
+        "x": 4191.066787719727,
+        "y": 1656.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "68639fde.fb4de8",
+        "id": "145991d9.a47ef6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4191.5001220703125,
-        "y": 1570,
-        "z": "b31344e1.6b9228",
+        "x": 4202.066787719727,
+        "y": 1601.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "fd0d1ee5.65b0f",
+        "id": "350a8536.22a84a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4175.8824462890625,
-        "y": 1509.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 4186.449111938477,
+        "y": 1541.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2c890085.25e4f8"
+                "6f232f80.17fde"
             ]
         ]
     },
     {
-        "id": "b16b2c11.a7e9e",
+        "id": "df02e92.6642a98",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4758,
-        "y": 1528,
-        "z": "b31344e1.6b9228",
+        "x": 4768.566665649414,
+        "y": 1559.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e2c7b2a2.534808"
+                "360786c5.7cab22"
             ]
         ]
     },
     {
-        "id": "e2c7b2a2.534808",
+        "id": "360786c5.7cab22",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4935,
-        "y": 1520,
-        "z": "b31344e1.6b9228",
+        "x": 4945.566665649414,
+        "y": 1551.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8256d13e.acb508",
-                "e33af2d.2ed629"
+                "41cd01ea.c63f78",
+                "aaeef3c0.eb5678"
             ]
         ]
     },
     {
-        "id": "2c890085.25e4f8",
+        "id": "6f232f80.17fde",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4360,
-        "y": 1524,
-        "z": "b31344e1.6b9228",
+        "x": 4370.566665649414,
+        "y": 1555.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7ad873b6.5b0624"
+                "d99ab523.6da018"
             ]
         ]
     },
     {
-        "id": "7ad873b6.5b0624",
+        "id": "d99ab523.6da018",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4555,
-        "y": 1524,
-        "z": "b31344e1.6b9228",
+        "x": 4565.566665649414,
+        "y": 1555.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b16b2c11.a7e9e",
-                "ba30acec.499f9"
+                "df02e92.6642a98",
+                "c50f0505.bf6c28"
             ]
         ]
     },
     {
-        "id": "e33af2d.2ed629",
+        "id": "aaeef3c0.eb5678",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "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": 5143,
-        "y": 1527,
-        "z": "b31344e1.6b9228",
+        "x": 5153.566665649414,
+        "y": 1558.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "dd2f9c6b.57f548",
-                "3b879379.c9bf84",
-                "13b1398c.3c465e"
+                "3618e547.e0a40a",
+                "eed6fd7.fbf15",
+                "3313cec2.2b8cca"
             ]
         ]
     },
     {
-        "id": "8256d13e.acb508",
+        "id": "41cd01ea.c63f78",
         "type": "set",
         "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": 5173,
-        "y": 1475,
-        "z": "b31344e1.6b9228",
+        "x": 5183.566665649414,
+        "y": 1506.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "dd2f9c6b.57f548",
+        "id": "3618e547.e0a40a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5353,
-        "y": 1518,
-        "z": "b31344e1.6b9228",
+        "x": 5363.566665649414,
+        "y": 1549.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "56d2c260.edc91c"
+                "b22ebd12.40a81"
             ]
         ]
     },
     {
-        "id": "3b879379.c9bf84",
+        "id": "eed6fd7.fbf15",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5345,
-        "y": 1573,
-        "z": "b31344e1.6b9228",
+        "x": 5355.566665649414,
+        "y": 1604.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7449bea.eaa7fc"
+                "7d8acc36.091ccc"
             ]
         ]
     },
     {
-        "id": "13b1398c.3c465e",
+        "id": "3313cec2.2b8cca",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5350,
-        "y": 1630,
-        "z": "b31344e1.6b9228",
+        "x": 5360.566665649414,
+        "y": 1661.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "232c7315.841b1c"
+                "112ac18e.80256e"
             ]
         ]
     },
     {
-        "id": "232c7315.841b1c",
+        "id": "112ac18e.80256e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5502,
-        "y": 1631,
-        "z": "b31344e1.6b9228",
+        "x": 5512.566665649414,
+        "y": 1662.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "7449bea.eaa7fc",
+        "id": "7d8acc36.091ccc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5513,
-        "y": 1576,
-        "z": "b31344e1.6b9228",
+        "x": 5523.566665649414,
+        "y": 1607.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "56d2c260.edc91c",
+        "id": "b22ebd12.40a81",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5497.38232421875,
-        "y": 1515.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 5507.948989868164,
+        "y": 1547.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "49d0cb53.31a39c"
+                "1c9d9642.f84cba"
             ]
         ]
     },
     {
-        "id": "49d0cb53.31a39c",
+        "id": "1c9d9642.f84cba",
         "type": "set",
         "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": 5712,
-        "y": 1512,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "4197c53b.8564cc",
-        "type": "execute",
-        "name": "execute RestApiCallNode slice creation domainA",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceA-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2006,
-        "y": 4699,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "70c04755.d69dd8",
-                "d409404c.9b0598"
-            ]
-        ]
-    },
-    {
-        "id": "d409404c.9b0598",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2289,
-        "y": 4679,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "b37528b2.115b48"
-            ]
-        ]
-    },
-    {
-        "id": "70c04755.d69dd8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2290.000213623047,
-        "y": 4729.99990940094,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "31bb8bbe.1ece2c"
-            ]
-        ]
-    },
-    {
-        "id": "b37528b2.115b48",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain A\" />\n",
-        "comments": "",
-        "x": 2429.0002479553223,
-        "y": 4679.000000953674,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "31bb8bbe.1ece2c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2435.02725982666,
-        "y": 4727.745394706726,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c751bc62.d2e9d8",
-        "type": "execute",
-        "name": "execute RestApiCallNode slice creation domainB",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceB-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2002,
-        "y": 4868,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "9cb98bdf.eb0c38",
-                "32bfa672.12903a"
-            ]
-        ]
-    },
-    {
-        "id": "32bfa672.12903a",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2276,
-        "y": 4848,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "b28dd680.86b978"
-            ]
-        ]
-    },
-    {
-        "id": "9cb98bdf.eb0c38",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2277.000213623047,
-        "y": 4898.99990940094,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "2765f5a8.5ab652"
-            ]
-        ]
-    },
-    {
-        "id": "b28dd680.86b978",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain B\" />\n",
-        "comments": "",
-        "x": 2416.0002479553223,
-        "y": 4848.000000953674,
-        "z": "b31344e1.6b9228",
+        "x": 5722.566665649414,
+        "y": 1543.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "2765f5a8.5ab652",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2422.02725982666,
-        "y": 4896.745394706726,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "33bd7ebe.34c502",
+        "id": "f30f322a.ce56f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2796,
-        "y": 452,
-        "z": "b31344e1.6b9228",
+        "x": 2806.566665649414,
+        "y": 483.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "fe8ff063.6863b8",
-                "4e85bccf.c8cf0c"
+                "c6653aca.b9464",
+                "b73a30ff.3793c"
             ]
         ]
     },
     {
-        "id": "4e85bccf.c8cf0c",
+        "id": "b73a30ff.3793c",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3077,
-        "y": 408,
-        "z": "b31344e1.6b9228",
+        "x": 3087.566665649414,
+        "y": 439.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "badd7dbd.ce16"
+                "be2994c5.6111e8"
             ]
         ]
     },
     {
-        "id": "badd7dbd.ce16",
+        "id": "be2994c5.6111e8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3339,
-        "y": 408,
-        "z": "b31344e1.6b9228",
+        "x": 3349.566665649414,
+        "y": 439.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5050eb58.e00ed4"
+                "dba40877.5798e"
             ]
         ]
     },
     {
-        "id": "212f425.c6d5fbe",
+        "id": "88191017.73b938",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4720,
-        "y": 761,
-        "z": "b31344e1.6b9228",
+        "x": 4730.566665649414,
+        "y": 792.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "656d86d7.e1bb3"
+                "65c2e1c9.1b56d8"
             ]
         ]
     },
     {
-        "id": "656d86d7.e1bb3",
+        "id": "65c2e1c9.1b56d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4897,
-        "y": 753,
-        "z": "b31344e1.6b9228",
+        "x": 4907.566665649414,
+        "y": 784.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4f5b4545.d432fc"
+                "e785d4f0.4913e8"
             ]
         ]
     },
     {
-        "id": "4f5b4545.d432fc",
+        "id": "e785d4f0.4913e8",
         "type": "set",
         "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": 5132,
-        "y": 877,
-        "z": "b31344e1.6b9228",
+        "x": 5142.566665649414,
+        "y": 908.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "5e5727f6.ce94f",
+        "id": "5f8b1fbc.6dcf18",
         "type": "set",
         "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": 5172,
-        "y": 1717,
-        "z": "b31344e1.6b9228",
+        "x": 5182.566665649414,
+        "y": 1748.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "33761656.d7dc5a",
+        "id": "1932705.17f659",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4937,
-        "y": 1593,
-        "z": "b31344e1.6b9228",
+        "x": 4947.566665649414,
+        "y": 1624.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5e5727f6.ce94f"
+                "5f8b1fbc.6dcf18"
             ]
         ]
     },
     {
-        "id": "ba30acec.499f9",
+        "id": "c50f0505.bf6c28",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4760,
-        "y": 1601,
-        "z": "b31344e1.6b9228",
+        "x": 4770.566665649414,
+        "y": 1632.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "33761656.d7dc5a"
+                "1932705.17f659"
             ]
         ]
     },
     {
-        "id": "6b9897c8.516f28",
-        "type": "execute",
-        "name": "execute RestApiCallNode domainA UNI Coloring",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2718,
-        "y": 3473,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "423bbf1a.980188",
-                "5a878bc1.0c7c24"
-            ]
-        ]
-    },
-    {
-        "id": "5a878bc1.0c7c24",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2984,
-        "y": 3453,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "857ed73a.517d58"
-            ]
-        ]
-    },
-    {
-        "id": "423bbf1a.980188",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2985.000213623047,
-        "y": 3503.99990940094,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "c8157b69.44d2d"
-            ]
-        ]
-    },
-    {
-        "id": "857ed73a.517d58",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI Coloring for domain A\" />\n",
-        "comments": "",
-        "x": 3124.0002479553223,
-        "y": 3453.0000009536743,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "c8157b69.44d2d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3130.02725982666,
-        "y": 3501.745394706726,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1473b1fb.f66ede",
-        "type": "execute",
-        "name": "execute RestApiCallNode domainB UNI Coloring",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2718,
-        "y": 3839,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "8f6a2d0c.d8e1f8",
-                "9fe0565f.7886"
-            ]
-        ]
-    },
-    {
-        "id": "9fe0565f.7886",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2984,
-        "y": 3819,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "9f93d2ab.f5b508"
-            ]
-        ]
-    },
-    {
-        "id": "8f6a2d0c.d8e1f8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2985.000213623047,
-        "y": 3869.99990940094,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "c9ec128c.8a9e98"
-            ]
-        ]
-    },
-    {
-        "id": "9f93d2ab.f5b508",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",
-        "comments": "",
-        "x": 3124.0002479553223,
-        "y": 3819.0000009536743,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "c9ec128c.8a9e98",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3130.02725982666,
-        "y": 3867.745394706726,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "420f3616.2f701",
+        "id": "43bfbebe.764f5",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 4378,
-        "y": 538,
-        "z": "b31344e1.6b9228",
+        "x": 4388.566665649414,
+        "y": 569.5666656494141,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "b1349530.c53cc",
+        "id": "3a026a1.c8b1f96",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "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": 2734,
-        "y": 672,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "84b0870f.4db1e",
-        "type": "execute",
-        "name": "execute UUID generator for otn-tunnel-name",
-        "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": 2715,
-        "y": 722,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2dfd81e1.a251ae",
-        "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": 1972,
-        "y": 224,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "3ffb610e.7895d6",
-                "1fed210d.6adb97"
-            ]
-        ]
-    },
-    {
-        "id": "3ffb610e.7895d6",
-        "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": 2256,
-        "y": 194,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "1f03402a.5db7",
-        "type": "set",
-        "name": "set query_param",
-        "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
-        "comments": "",
-        "x": 2631,
-        "y": 2231,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "56710693.e24068",
-        "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": 2615,
-        "y": 3930,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "3323f682.f60c3a",
-        "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": 2672,
-        "y": 767,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "13ac3dbd.1f366a",
-        "type": "for",
-        "name": "for vidx..tmp.otninfo_length[]",
-        "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 2666,
-        "y": 2351,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "f2924301.397558"
-            ]
-        ]
-    },
-    {
-        "id": "1e2e68c3.addf6f",
-        "type": "switchNode",
-        "name": "switch srcPort == NULL",
-        "xml": "<switch test='`length($tmp.otninfo[$otnidx].srcPort) == 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2936,
-        "y": 2353,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "2e3585b0.01a1f2",
-                "eadfc48d.7db62"
-            ]
-        ]
-    },
-    {
-        "id": "2e3585b0.01a1f2",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3153,
-        "y": 2330,
-        "z": "b31344e1.6b9228",
+        "x": 2744.566665649414,
+        "y": 703.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "eadfc48d.7db62",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "5ea4cfd5.51261",
+        "type": "execute",
+        "name": "execute UUID generator for otn-tunnel-name",
+        "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": 3153,
-        "y": 2377,
-        "z": "b31344e1.6b9228",
+        "x": 2725.566665649414,
+        "y": 753.5666656494141,
+        "z": "9256178d.211a68",
         "wires": [
-            [
-                "91bb64fe.b40488"
-            ]
+            []
         ]
     },
     {
-        "id": "91bb64fe.b40488",
-        "type": "switchNode",
-        "name": "switch srcPort == NULL",
-        "xml": "<switch test='`length($tmp.otninfo[$otnidx].dstPort) == 0`'>\n",
+        "id": "48ff46b8.d3629",
+        "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": 3356,
-        "y": 2376,
-        "z": "b31344e1.6b9228",
+        "x": 1986.566665649414,
+        "y": 287.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ecd0f109.dbad88",
-                "fd54750b.bb4c08"
+                "84ff5346.d202e8",
+                "91e3d9ca.33dbb"
             ]
         ]
     },
     {
-        "id": "fd54750b.bb4c08",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "84ff5346.d202e8",
+        "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": "",
-        "outputs": 1,
-        "x": 3551,
-        "y": 2330,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
+        "x": 2266.566665649414,
+        "y": 225.56666564941406,
+        "z": "9256178d.211a68",
+        "wires": []
     },
     {
-        "id": "ecd0f109.dbad88",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "f8f7fd3.b9ae18",
+        "type": "set",
+        "name": "set query_param",
+        "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
+        "comments": "",
+        "x": 2639.566665649414,
+        "y": 2281.566665649414,
+        "z": "9256178d.211a68",
+        "wires": []
+    },
+    {
+        "id": "eb24a93a.96e538",
+        "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": 2625.566665649414,
+        "y": 3961.566665649414,
+        "z": "9256178d.211a68",
+        "wires": []
+    },
+    {
+        "id": "e11f1e73.f567a8",
+        "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<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
+        "comments": "",
+        "x": 2682.566665649414,
+        "y": 798.5666656494141,
+        "z": "9256178d.211a68",
+        "wires": []
+    },
+    {
+        "id": "9c7b5506.97a75",
+        "type": "for",
+        "name": "for vidx..tmp.otninfo_length[]",
+        "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 3549,
-        "y": 2370,
-        "z": "b31344e1.6b9228",
+        "x": 2670.566665649414,
+        "y": 2528.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
-            []
+            [
+                "9ffd0093.8105f8"
+            ]
         ]
     },
     {
-        "id": "647d2436.140504",
+        "id": "85036bc9.25f0a",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3788,
-        "y": 2951,
-        "z": "b31344e1.6b9228",
+        "x": 3799.566665649414,
+        "y": 2950.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "810630b1.0e1b6"
+                "bd2b4caa.40f07"
             ]
         ]
     },
     {
-        "id": "fdfa6fb7.1a35f",
+        "id": "4d0fe394.a0f5c4",
         "type": "save",
         "name": "save connectivity-A relationship to vpn-binding-A, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-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": 4361.5,
-        "y": 3023,
-        "z": "b31344e1.6b9228",
+        "x": 4372.066665649414,
+        "y": 3054.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "810630b1.0e1b6",
+        "id": "bd2b4caa.40f07",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4094,
-        "y": 2950,
-        "z": "b31344e1.6b9228",
+        "x": 4105.566665649414,
+        "y": 2949.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a594830d.53acd8"
+                "28d033b7.b1a7b4"
             ]
         ]
     },
     {
-        "id": "a594830d.53acd8",
+        "id": "28d033b7.b1a7b4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4303.5,
-        "y": 2950.25390625,
-        "z": "b31344e1.6b9228",
+        "x": 4315.066665649414,
+        "y": 2949.820571899414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "4c295920.4b5da",
+        "id": "da384da9.50fad",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3825,
-        "y": 2383,
-        "z": "b31344e1.6b9228",
+        "x": 3832.566665649414,
+        "y": 2429.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "19452741.32e4c1",
+        "id": "458c9236.fc09c4",
         "type": "switchNode",
         "name": "switch otnidx == 0",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3698,
-        "y": 3036,
-        "z": "b31344e1.6b9228",
+        "x": 3708.566665649414,
+        "y": 3067.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "9c40fb98.e1f61",
-                "20acba8d.85a5f6"
+                "20b3c9fb.2f7a1e",
+                "2b2bcdf.9a75432"
             ]
         ]
     },
     {
-        "id": "9c40fb98.e1f61",
+        "id": "20b3c9fb.2f7a1e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3881,
-        "y": 3036,
-        "z": "b31344e1.6b9228",
+        "x": 3891.566665649414,
+        "y": 3067.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a42fc89d.d0c4a"
+                "85853f45.184448"
             ]
         ]
     },
     {
-        "id": "20acba8d.85a5f6",
+        "id": "2b2bcdf.9a75432",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3706,
-        "y": 3183,
-        "z": "b31344e1.6b9228",
+        "x": 3716.566665649414,
+        "y": 3214.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "332942c6.7f663e"
+                "69e93af2.71c7f4"
             ]
         ]
     },
     {
-        "id": "f5749296.6a691",
+        "id": "dec16147.315f48",
         "type": "switchNode",
         "name": "switch otnidx == last",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4047,
-        "y": 3264,
-        "z": "b31344e1.6b9228",
+        "x": 4057.566665649414,
+        "y": 3295.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2103be8f.1fc842",
-                "1554c822.b8c828"
+                "6e1ea31a.8dc254",
+                "3327fa99.59aede"
             ]
         ]
     },
     {
-        "id": "2103be8f.1fc842",
+        "id": "6e1ea31a.8dc254",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4232,
-        "y": 3265,
-        "z": "b31344e1.6b9228",
+        "x": 4242.566665649414,
+        "y": 3296.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a1250da6.1c6"
+                "35e519f9.462626"
             ]
         ]
     },
     {
-        "id": "1554c822.b8c828",
+        "id": "3327fa99.59aede",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4251,
-        "y": 3531,
-        "z": "b31344e1.6b9228",
+        "x": 4261.566665649414,
+        "y": 3562.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "99adbaff.3e741"
+                "234eca18.b570de"
             ]
         ]
     },
     {
-        "id": "f416ea28.cb6ab",
+        "id": "3a9f4476.809074",
         "type": "save",
         "name": "save connectivity-B relationship to vpn-binding-B, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-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": 4662,
-        "y": 3266,
-        "z": "b31344e1.6b9228",
+        "x": 4672.566665649414,
+        "y": 3297.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6548b2c.2addd8",
+        "id": "4efd8bac.69de6c",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4736,
-        "y": 3564,
-        "z": "b31344e1.6b9228",
+        "x": 4746.566665649414,
+        "y": 3595.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "ddd52155.f542e8",
+        "id": "401e45e3.6933bc",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-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='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\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='dummy' />\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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-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='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\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='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\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": 4672,
-        "y": 3615,
-        "z": "b31344e1.6b9228",
+        "x": 4682.566665649414,
+        "y": 3646.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "a14f6e93.1adaf8",
+        "id": "9a88afee.ea2358",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "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-otnidx-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-otnidx-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": 4801,
-        "y": 3665,
-        "z": "b31344e1.6b9228",
+        "x": 4811.566665649414,
+        "y": 3696.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "16a831c0.877516",
+        "id": "303e66ea.a0468a",
         "type": "comment",
         "name": "connectivity has not been created for middle domains, so we have to create one",
         "info": "",
         "comments": "",
-        "x": 4811,
-        "y": 3508,
-        "z": "b31344e1.6b9228",
+        "x": 4821.566665649414,
+        "y": 3539.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "2e301756.38a228",
+        "id": "bd97ab87.4b8898",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-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-otnidx-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-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4769,
-        "y": 3724,
-        "z": "b31344e1.6b9228",
+        "x": 4779.566665649414,
+        "y": 3755.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "99adbaff.3e741",
+        "id": "234eca18.b570de",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4408,
-        "y": 3532,
-        "z": "b31344e1.6b9228",
+        "x": 4418.566665649414,
+        "y": 3563.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e6548b2c.2addd8",
-                "ddd52155.f542e8",
-                "a14f6e93.1adaf8",
-                "2e301756.38a228",
-                "ebae712b.9f6bf8"
+                "4efd8bac.69de6c",
+                "401e45e3.6933bc",
+                "9a88afee.ea2358",
+                "bd97ab87.4b8898",
+                "2cb520a2.c67d5"
             ]
         ]
     },
     {
-        "id": "f2924301.397558",
+        "id": "9ffd0093.8105f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2918,
-        "y": 2412,
-        "z": "b31344e1.6b9228",
+        "x": 2939.566665649414,
+        "y": 2528.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4c295920.4b5da",
-                "647d2436.140504",
-                "19452741.32e4c1",
-                "1d59f70d.1ee6c9",
-                "b15a67ed.f1cb18",
-                "e4fb52b5.f04798",
-                "f5263d8c.0dd66"
+                "da384da9.50fad",
+                "85036bc9.25f0a",
+                "458c9236.fc09c4",
+                "afb7d963.d1d2e",
+                "b5c03e87.4a3d2",
+                "5fbd4527.08216c",
+                "580438cc.a39858"
             ]
         ]
     },
     {
-        "id": "2e1edee2.ee8112",
+        "id": "7371bc78.68f23c",
         "type": "set",
         "name": "set attachment_param domain A",
-        "xml": "<set>\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].otn-dest-node`' value='`$tmp.otninfo[0].dstPort.dst-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].src-ttp-id`' value='' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[0].dstPort.dst-tunnel-tp-id`' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[10].list_length`' value='`$idx + 1`' />-->\n\n\n",
+        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",
         "comments": "",
-        "x": 4286,
-        "y": 3080,
-        "z": "b31344e1.6b9228",
+        "x": 4296.566665649414,
+        "y": 3111.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ba046748.bfe1b",
+        "id": "9da935b4.011d78",
         "type": "execute",
         "name": "execute RestApiCallNode domainA UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4339,
-        "y": 3124,
-        "z": "b31344e1.6b9228",
+        "x": 4349.566665649414,
+        "y": 3155.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b63ee960.cee2c",
-                "1b1f60e5.7a7c9f"
+                "a38d117f.617d1",
+                "64ad5e9f.cde688"
             ]
         ]
     },
     {
-        "id": "1b1f60e5.7a7c9f",
+        "id": "64ad5e9f.cde688",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4610,
-        "y": 3109,
-        "z": "b31344e1.6b9228",
+        "x": 4620.566665649414,
+        "y": 3140.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e9f5d50.e9a0928"
+                "ae1e714f.21e89"
             ]
         ]
     },
     {
-        "id": "b63ee960.cee2c",
+        "id": "a38d117f.617d1",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4608.000213623047,
-        "y": 3166.99990940094,
-        "z": "b31344e1.6b9228",
+        "x": 4618.566879272461,
+        "y": 3198.566575050354,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c9e53751.966bb8"
+                "cc46ab1d.b8d358"
             ]
         ]
     },
     {
-        "id": "e9f5d50.e9a0928",
+        "id": "ae1e714f.21e89",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI Coloring for domain A\" />\n",
         "comments": "",
-        "x": 4750.000247955322,
-        "y": 3109.0000009536743,
-        "z": "b31344e1.6b9228",
+        "x": 4760.566913604736,
+        "y": 3140.5666666030884,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "c9e53751.966bb8",
+        "id": "cc46ab1d.b8d358",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4756.02725982666,
-        "y": 3157.745394706726,
-        "z": "b31344e1.6b9228",
+        "x": 4766.593925476074,
+        "y": 3189.31206035614,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "a42fc89d.d0c4a",
+        "id": "85853f45.184448",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4022,
-        "y": 3026,
-        "z": "b31344e1.6b9228",
+        "x": 4032.566665649414,
+        "y": 3057.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "fdfa6fb7.1a35f",
-                "ba046748.bfe1b",
-                "2e1edee2.ee8112"
+                "4d0fe394.a0f5c4",
+                "9da935b4.011d78",
+                "7371bc78.68f23c"
             ]
         ]
     },
     {
-        "id": "a1250da6.1c6",
+        "id": "35e519f9.462626",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4366,
-        "y": 3266,
-        "z": "b31344e1.6b9228",
+        "x": 4376.566665649414,
+        "y": 3297.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f416ea28.cb6ab",
-                "6f1cb48c.6026e4",
-                "1cf9708b.795d07"
+                "3a9f4476.809074",
+                "6085ae42.a24518",
+                "92ddf8d8.c0a7e"
             ]
         ]
     },
     {
-        "id": "1cf9708b.795d07",
+        "id": "92ddf8d8.c0a7e",
         "type": "set",
         "name": "set attachment_param domain B",
-        "xml": "<set>\n\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\n\n",
+        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
         "comments": "",
-        "x": 4586,
-        "y": 3310,
-        "z": "b31344e1.6b9228",
+        "x": 4596.566665649414,
+        "y": 3341.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "6f1cb48c.6026e4",
+        "id": "6085ae42.a24518",
         "type": "execute",
         "name": "execute RestApiCallNode domainB UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4637,
-        "y": 3354,
-        "z": "b31344e1.6b9228",
+        "x": 4647.566665649414,
+        "y": 3385.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "6e1323b5.c04ce4",
-                "1555b51f.0ca46b"
+                "e3b13fd7.7163e8",
+                "22b24822.5449d"
             ]
         ]
     },
     {
-        "id": "1555b51f.0ca46b",
+        "id": "22b24822.5449d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4900,
-        "y": 3334,
-        "z": "b31344e1.6b9228",
+        "x": 4910.566665649414,
+        "y": 3365.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7a3f18c.e7bf268"
+                "f1d0e9c2.a4fe58"
             ]
         ]
     },
     {
-        "id": "6e1323b5.c04ce4",
+        "id": "e3b13fd7.7163e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4901.000213623047,
-        "y": 3384.99990940094,
-        "z": "b31344e1.6b9228",
+        "x": 4911.566879272461,
+        "y": 3416.566575050354,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "c1d2c5de.5e2688"
+                "117ef1f.6c1660e"
             ]
         ]
     },
     {
-        "id": "7a3f18c.e7bf268",
+        "id": "f1d0e9c2.a4fe58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",
         "comments": "",
-        "x": 5040.000247955322,
-        "y": 3334.0000009536743,
-        "z": "b31344e1.6b9228",
+        "x": 5050.566913604736,
+        "y": 3365.5666666030884,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "c1d2c5de.5e2688",
+        "id": "117ef1f.6c1660e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5046.02725982666,
-        "y": 3382.745394706726,
-        "z": "b31344e1.6b9228",
+        "x": 5056.593925476074,
+        "y": 3414.31206035614,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "ebae712b.9f6bf8",
+        "id": "2cb520a2.c67d5",
         "type": "set",
         "name": "set attachment_param domain otnidx",
-        "xml": "<set>\n\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].otn-dest-node`' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].bw-odu`' value=\"`'0,' + $gfp`\" />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list[$idx].dst-ttp-id`' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />-->\n<!--<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />-->\n",
-        "comments": "",
-        "x": 4683,
-        "y": 3784,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "b29e7a1b.0bb9",
-        "type": "execute",
-        "name": "execute RestApiCallNode domainB UNI Coloring",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 4727,
-        "y": 3902,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "b649c2ac.1863c8",
-                "5df7a032.7812b8"
-            ]
-        ]
-    },
-    {
-        "id": "5df7a032.7812b8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4971,
-        "y": 3881,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "5f52118f.5992f"
-            ]
-        ]
-    },
-    {
-        "id": "b649c2ac.1863c8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4976,
-        "y": 3938,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "d6363d68.6bc1d"
-            ]
-        ]
-    },
-    {
-        "id": "5f52118f.5992f",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing UNI coloring for domain B\" />\n",
-        "comments": "",
-        "x": 5111.000247955322,
-        "y": 3881.0000009536743,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "d6363d68.6bc1d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 5121.027046203613,
-        "y": 3935.745485305786,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ff94df56.8391f8",
-        "type": "comment",
-        "name": "find domain-otnidx URL info from either src or dst pnf (src-access-node-id). However, eth network id is hard to find, unless hard code topology id 2",
-        "info": "",
+        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 4931,
-        "y": 3844,
-        "z": "b31344e1.6b9228",
+        "x": 4693.566665649414,
+        "y": 3815.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "bc1d9c19.8a817",
+        "id": "bb7c148d.8dd4d8",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1986,
-        "y": 4143,
-        "z": "b31344e1.6b9228",
+        "x": 2012.566665649414,
+        "y": 4162.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3b12d36f.6d8234",
-                "89a53740.4d3c98",
-                "a61d86b5.6c70f"
+                "bfb40bbb.94779",
+                "3cbbde56.b4a31a",
+                "1a8f636f.24e13d"
             ]
         ]
     },
     {
-        "id": "3b12d36f.6d8234",
+        "id": "bfb40bbb.94779",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2197,
-        "y": 4145,
-        "z": "b31344e1.6b9228",
+        "x": 2200.566665649414,
+        "y": 4175.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3ced61cb.b2d7fe"
+                "eaca1bd7.371c7"
             ]
         ]
     },
     {
-        "id": "89a53740.4d3c98",
+        "id": "3cbbde56.b4a31a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2197.490966796875,
-        "y": 4190.574035644531,
-        "z": "b31344e1.6b9228",
+        "x": 2201.057632446289,
+        "y": 4221.140701293945,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3eafcbaf.f2f56c"
+                "38f81285.85b9a6"
             ]
         ]
     },
     {
-        "id": "a61d86b5.6c70f",
+        "id": "1a8f636f.24e13d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2195,
-        "y": 4234,
-        "z": "b31344e1.6b9228",
+        "x": 2198.566665649414,
+        "y": 4264.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "170e04a2.1b39fb"
+                "f0bf5dd6.fd17a"
             ]
         ]
     },
     {
-        "id": "3ced61cb.b2d7fe",
+        "id": "eaca1bd7.371c7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2370,
-        "y": 4143,
-        "z": "b31344e1.6b9228",
+        "x": 2373.566665649414,
+        "y": 4173.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ef9d0591.fefb08"
+                "8ebcdd79.0a28b"
             ]
         ]
     },
     {
-        "id": "3eafcbaf.f2f56c",
+        "id": "38f81285.85b9a6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2360.0623779296875,
-        "y": 4190.859771728516,
-        "z": "b31344e1.6b9228",
+        "x": 2363.6290435791016,
+        "y": 4221.42643737793,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "170e04a2.1b39fb",
+        "id": "f0bf5dd6.fd17a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2362,
-        "y": 4233,
-        "z": "b31344e1.6b9228",
+        "x": 2365.566665649414,
+        "y": 4263.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "bf30e0be.23b998",
+        "id": "782b021e.0fd0fc",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1991,
-        "y": 4322,
-        "z": "b31344e1.6b9228",
+        "x": 2001.566665649414,
+        "y": 4353.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "557999e1.77dcb"
+                "80466868.45553"
             ]
         ]
     },
     {
-        "id": "d613988a.0c40c",
+        "id": "6f32f968.2f76b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2801,
-        "y": 4322,
-        "z": "b31344e1.6b9228",
+        "x": 2811.566665649414,
+        "y": 4353.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e4afc290.74f038"
+                "5534fc3.85d0104"
             ]
         ]
     },
     {
-        "id": "f7f46916.4f1ee",
+        "id": "be092ed.4a93b5",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2573,
-        "y": 4322,
-        "z": "b31344e1.6b9228",
+        "x": 2583.566665649414,
+        "y": 4353.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d613988a.0c40c"
+                "6f32f968.2f76b8"
             ]
         ]
     },
     {
-        "id": "ce29a297.cf1cb8",
+        "id": "114fcf9e.f212a8",
         "type": "set",
         "name": "set providerValue",
         "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",
         "comments": "",
-        "x": 3003,
-        "y": 4085,
-        "z": "b31344e1.6b9228",
+        "x": 3703.566665649414,
+        "y": 4120.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "90828ea.8f9357",
+        "id": "aaeb5226.81f7d",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
         "comments": "",
-        "x": 3995,
-        "y": 3215,
-        "z": "b31344e1.6b9228",
+        "x": 4005.566665649414,
+        "y": 3246.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "332942c6.7f663e",
+        "id": "69e93af2.71c7f4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3830,
-        "y": 3190,
-        "z": "b31344e1.6b9228",
+        "x": 3840.566665649414,
+        "y": 3221.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "90828ea.8f9357",
-                "f5749296.6a691"
+                "aaeb5226.81f7d",
+                "dec16147.315f48"
             ]
         ]
     },
     {
-        "id": "d0adb7e4.435f98",
+        "id": "d12bfd13.8bf75",
         "type": "set",
         "name": "set tmp.arr",
-        "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n\n\n",
+        "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
         "comments": "",
-        "x": 1954,
-        "y": 170,
-        "z": "b31344e1.6b9228",
+        "x": 1960.566665649414,
+        "y": 237.56666564941406,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ef9d0591.fefb08",
+        "id": "8ebcdd79.0a28b",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2611,
-        "y": 4145,
-        "z": "b31344e1.6b9228",
+        "x": 2602.566665649414,
+        "y": 4174.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2fbee9b.ff76316"
+                "3567bff3.8ebcd8"
             ]
         ]
     },
     {
-        "id": "2fbee9b.ff76316",
+        "id": "3567bff3.8ebcd8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2823,
-        "y": 4143,
-        "z": "b31344e1.6b9228",
+        "x": 2817.566665649414,
+        "y": 4175.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ce29a297.cf1cb8",
-                "72392f69.a40338"
+                "473c1519.d01eb4"
             ]
         ]
     },
     {
-        "id": "49f4d5cd.eba3ac",
+        "id": "809d3147.ec0f3",
         "type": "for",
         "name": "for arridx in tmp.arr",
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3588,
-        "y": 4060,
-        "z": "b31344e1.6b9228",
+        "x": 4270.566665649414,
+        "y": 4095.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a296aaec.6a9f7"
+                "aa9ab401.5fa778"
             ]
         ]
     },
     {
-        "id": "72392f69.a40338",
+        "id": "5596317e.9b3628",
         "type": "switchNode",
         "name": "switch $tmp.arr_length != 0",
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3054,
-        "y": 4140,
-        "z": "b31344e1.6b9228",
+        "x": 3736.566665649414,
+        "y": 4175.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "1e30cbc6.5b29c4",
-                "73a572c0.fcdcfc"
+                "a957484e.5a6ff",
+                "94a2b6d3.766e58"
             ]
         ]
     },
     {
-        "id": "1e30cbc6.5b29c4",
+        "id": "a957484e.5a6ff",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3250,
-        "y": 4110,
-        "z": "b31344e1.6b9228",
+        "x": 3932.566665649414,
+        "y": 4145.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "79192fda.22a8a8"
+                "b3c10703.b98f2"
             ]
         ]
     },
     {
-        "id": "73a572c0.fcdcfc",
+        "id": "94a2b6d3.766e58",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3251,
-        "y": 4181,
-        "z": "b31344e1.6b9228",
+        "x": 3933.566665649414,
+        "y": 4216.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e5b5d449.e95738"
+                "60df48e3.d4564"
             ]
         ]
     },
     {
-        "id": "79192fda.22a8a8",
+        "id": "b3c10703.b98f2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3401,
-        "y": 4108,
-        "z": "b31344e1.6b9228",
+        "x": 4083.566665649414,
+        "y": 4143.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "49f4d5cd.eba3ac",
-                "ee34549a.68661"
+                "809d3147.ec0f3",
+                "5065f5c6.173234"
             ]
         ]
     },
     {
-        "id": "a296aaec.6a9f7",
+        "id": "aa9ab401.5fa778",
         "type": "switchNode",
         "name": "switch tmp.arr[$arridx] == $providerValue",
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3879,
-        "y": 4060,
-        "z": "b31344e1.6b9228",
+        "x": 4561.566665649414,
+        "y": 4095.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f6a570fa.8c3e18",
-                "f096fdfa.51af18"
+                "6d737171.e1452",
+                "b5a839dc.7835"
             ]
         ]
     },
     {
-        "id": "f6a570fa.8c3e18",
+        "id": "6d737171.e1452",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4154,
-        "y": 4029,
-        "z": "b31344e1.6b9228",
+        "x": 4836.566665649414,
+        "y": 4064.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7e64bb9a.5c5954"
+                "397594e.7aa86ec"
             ]
         ]
     },
     {
-        "id": "f096fdfa.51af18",
+        "id": "b5a839dc.7835",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4155,
-        "y": 4100,
-        "z": "b31344e1.6b9228",
+        "x": 4837.566665649414,
+        "y": 4135.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2ae9b410.b8e274"
+                "49c3abd.61fa054"
             ]
         ]
     },
     {
-        "id": "7e64bb9a.5c5954",
+        "id": "397594e.7aa86ec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4305,
-        "y": 4027,
-        "z": "b31344e1.6b9228",
+        "x": 4987.566665649414,
+        "y": 4062.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "883ad39b.46747",
-                "3d5cad7b.78211a",
-                "ac8bc417.7b82a",
-                "6ea95490.220544",
-                "6a39b9a6.2592"
+                "412bffc9.1c0e28",
+                "1704d5ec.8e1b6a",
+                "12f4e6d8.82a019",
+                "d12115f5.e77c3",
+                "eb231f11.de562"
             ]
         ]
     },
     {
-        "id": "883ad39b.46747",
+        "id": "412bffc9.1c0e28",
         "type": "set",
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 4486,
-        "y": 3988,
-        "z": "b31344e1.6b9228",
+        "x": 5175.566665649414,
+        "y": 4022.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "3d5cad7b.78211a",
+        "id": "1704d5ec.8e1b6a",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4565,
-        "y": 4032,
-        "z": "b31344e1.6b9228",
+        "x": 5247.566665649414,
+        "y": 4067.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a39b9a6.2592",
+        "id": "eb231f11.de562",
         "type": "set",
         "name": "set twoD arr",
         "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",
         "comments": "",
-        "x": 4489,
-        "y": 4188,
-        "z": "b31344e1.6b9228",
+        "x": 5162.566665649414,
+        "y": 4194.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "6ea95490.220544",
+        "id": "d12115f5.e77c3",
         "type": "set",
         "name": "set sizeOfSliceList",
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
         "comments": "",
-        "x": 4510,
-        "y": 4124,
-        "z": "b31344e1.6b9228",
-        "wires": []
-    },
-    {
-        "id": "171513de.343584",
-        "type": "switchNode",
-        "name": "switch $otn-tunnel-slice_length == 0",
-        "xml": "<switch test='`$otn-tunnel-slice_length == 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4668,
-        "y": 4078,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "e6552b83.2df3a",
-                "b95e5493.31a9b"
-            ]
-        ]
-    },
-    {
-        "id": "e6552b83.2df3a",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4900,
-        "y": 4041,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "9402566e.5ec598"
-            ]
-        ]
-    },
-    {
-        "id": "b95e5493.31a9b",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4901,
-        "y": 4089,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9402566e.5ec598",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 5051,
-        "y": 4039,
-        "z": "b31344e1.6b9228",
-        "wires": [
-            [
-                "b29e36f1.f6f35"
-            ]
-        ]
-    },
-    {
-        "id": "b29e36f1.f6f35",
-        "type": "set",
-        "name": "set sizeOfSliceList",
-        "xml": "<set>\n<!--<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />-->\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice_length`' value='`$otnidx + 1`' />\n<parameter name='`otn-tunnel-slice[$otnidx].list_length`' value='`$idx + 1`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[$arridx].list_length' value='1' />",
-        "comments": "",
-        "x": 5253,
-        "y": 4035,
-        "z": "b31344e1.6b9228",
+        "x": 5183.566665649414,
+        "y": 4130.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e5b5d449.e95738",
+        "id": "60df48e3.d4564",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3403,
-        "y": 4181,
-        "z": "b31344e1.6b9228",
+        "x": 4085.566665649414,
+        "y": 4216.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b867d047.fac",
-                "3788e630.590d72"
+                "974dbcc3.cf34c8",
+                "ca9f0d65.bbf04"
             ]
         ]
     },
     {
-        "id": "b867d047.fac",
+        "id": "974dbcc3.cf34c8",
         "type": "save",
         "name": "store $arridx somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3658,
-        "y": 4174,
-        "z": "b31344e1.6b9228",
+        "x": 4340.566665649414,
+        "y": 4209.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "3788e630.590d72",
+        "id": "ca9f0d65.bbf04",
         "type": "set",
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",
         "comments": "",
-        "x": 3586,
-        "y": 4221,
-        "z": "b31344e1.6b9228",
+        "x": 4268.566665649414,
+        "y": 4256.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "ee34549a.68661",
+        "id": "5065f5c6.173234",
         "type": "switchNode",
         "name": "switch found?",
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3579,
-        "y": 4105,
-        "z": "b31344e1.6b9228",
+        "x": 4261.566665649414,
+        "y": 4140.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "d1f76975.e11b9",
-                "3421ae07.ec9d62"
+                "f595c5ce.d138f8",
+                "a27215c.554f2e8"
             ]
         ]
     },
     {
-        "id": "d1f76975.e11b9",
+        "id": "f595c5ce.d138f8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3739,
-        "y": 4097,
-        "z": "b31344e1.6b9228",
+        "x": 4421.566665649414,
+        "y": 4132.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "2d9d0080.4d96d"
+                "3c70617c.e2885e"
             ]
         ]
     },
     {
-        "id": "3421ae07.ec9d62",
+        "id": "a27215c.554f2e8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3737,
-        "y": 4134,
-        "z": "b31344e1.6b9228",
+        "x": 4419.566665649414,
+        "y": 4169.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "91314308.ab84d"
+                "27b0e714.f2ecf8"
             ]
         ]
     },
     {
-        "id": "2d9d0080.4d96d",
+        "id": "3c70617c.e2885e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3864,
-        "y": 4097,
-        "z": "b31344e1.6b9228",
+        "x": 4546.566665649414,
+        "y": 4132.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd3f24a6.bbbfb8",
+        "id": "a0581441.562ff8",
         "type": "save",
         "name": "store $arridx+1 somewhere in vpn-binding",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4171,
-        "y": 4155,
-        "z": "b31344e1.6b9228",
+        "x": 4853.566665649414,
+        "y": 4190.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "91314308.ab84d",
+        "id": "27b0e714.f2ecf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3897,
-        "y": 4142,
-        "z": "b31344e1.6b9228",
+        "x": 4579.566665649414,
+        "y": 4177.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "fd3f24a6.bbbfb8",
-                "3fbaf181.1ff88e"
+                "a0581441.562ff8",
+                "a72a86e5.09979"
             ]
         ]
     },
     {
-        "id": "3fbaf181.1ff88e",
+        "id": "a72a86e5.09979",
         "type": "set",
         "name": "set twoD array",
         "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",
         "comments": "",
-        "x": 4088,
-        "y": 4201,
-        "z": "b31344e1.6b9228",
+        "x": 4770.566665649414,
+        "y": 4236.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "2ae9b410.b8e274",
+        "id": "49c3abd.61fa054",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4288,
-        "y": 4099,
-        "z": "b31344e1.6b9228",
+        "x": 4970.566665649414,
+        "y": 4134.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "ac8bc417.7b82a",
+        "id": "12f4e6d8.82a019",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4468,
-        "y": 4255,
-        "z": "b31344e1.6b9228",
+        "x": 5141.566665649414,
+        "y": 4261.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "1d59f70d.1ee6c9",
+        "id": "afb7d963.d1d2e",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3528,
-        "y": 2442,
-        "z": "b31344e1.6b9228",
+        "x": 3546.566665649414,
+        "y": 2519.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "13d01e4b.11cf72",
-                "f41dda2a.86b79"
+                "2a68f8d8.e1dda",
+                "4b46d94e.68d61"
             ]
         ]
     },
     {
-        "id": "13d01e4b.11cf72",
+        "id": "2a68f8d8.e1dda",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3917,
-        "y": 2420,
-        "z": "b31344e1.6b9228",
+        "x": 3912.566665649414,
+        "y": 2480.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "a63400f9.70b798"
+                "9cc98ff4.caf3c"
             ]
         ]
     },
     {
-        "id": "f41dda2a.86b79",
+        "id": "4b46d94e.68d61",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3918,
-        "y": 2466,
-        "z": "b31344e1.6b9228",
+        "x": 3913.566665649414,
+        "y": 2526.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "201cd4b0.391f6c"
+                "a85d4c51.ca6c38"
             ]
         ]
     },
     {
-        "id": "a63400f9.70b798",
+        "id": "9cc98ff4.caf3c",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 4131,
-        "y": 2419,
-        "z": "b31344e1.6b9228",
+        "x": 4126.566665649414,
+        "y": 2479.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "201cd4b0.391f6c",
+        "id": "a85d4c51.ca6c38",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 4129,
-        "y": 2464,
-        "z": "b31344e1.6b9228",
+        "x": 4124.566665649414,
+        "y": 2524.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e4afc290.74f038",
+        "id": "5534fc3.85d0104",
         "type": "set",
         "name": "set attachment_param sliceG",
         "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",
         "comments": "",
-        "x": 3128,
-        "y": 4440,
-        "z": "b31344e1.6b9228",
+        "x": 3064.566665649414,
+        "y": 4351.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "5a129ea2.020ec",
+        "id": "42aa6078.f937c",
         "type": "execute",
         "name": "execute RestApiCallNode sliceG creation domainG",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2714,
-        "y": 4534,
-        "z": "b31344e1.6b9228",
+        "x": 2649.566665649414,
+        "y": 4459.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "235df5b8.967b5a",
-                "2fcb7bfa.e794ec"
+                "51d7fa89.689264",
+                "5ac90edf.1e939"
             ]
         ]
     },
     {
-        "id": "2fcb7bfa.e794ec",
+        "id": "5ac90edf.1e939",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2997,
-        "y": 4514,
-        "z": "b31344e1.6b9228",
+        "x": 2932.566665649414,
+        "y": 4439.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ec27b172.f3b03"
+                "86bbe7aa.1bf2"
             ]
         ]
     },
     {
-        "id": "235df5b8.967b5a",
+        "id": "51d7fa89.689264",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2998.000213623047,
-        "y": 4564.99990940094,
-        "z": "b31344e1.6b9228",
+        "x": 2933.566879272461,
+        "y": 4490.566575050354,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "afac7d54.5ea3c8"
+                "f017812e.0e0548"
             ]
         ]
     },
     {
-        "id": "ec27b172.f3b03",
+        "id": "86bbe7aa.1bf2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing slice creation api for domain A\" />\n",
         "comments": "",
-        "x": 3137.0002479553223,
-        "y": 4514.000000953674,
-        "z": "b31344e1.6b9228",
+        "x": 3072.5669136047363,
+        "y": 4439.566666603088,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "afac7d54.5ea3c8",
+        "id": "f017812e.0e0548",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3143.02725982666,
-        "y": 4562.745394706726,
-        "z": "b31344e1.6b9228",
+        "x": 3078.593925476074,
+        "y": 4488.31206035614,
+        "z": "9256178d.211a68",
         "wires": [
             []
         ]
     },
     {
-        "id": "b15a67ed.f1cb18",
+        "id": "b5c03e87.4a3d2",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 3712,
-        "y": 2562,
-        "z": "b31344e1.6b9228",
+        "x": 3722.566665649414,
+        "y": 2593.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "e4fb52b5.f04798",
+        "id": "5fbd4527.08216c",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3756,
-        "y": 2610,
-        "z": "b31344e1.6b9228",
+        "x": 3766.566665649414,
+        "y": 2641.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "38280842.8f481",
-                "762394a6.8c9edc",
-                "bf6967d.9863518"
+                "1efdee28.f91a52",
+                "64406c95.e8d00c",
+                "d9f7dd8f.9ba66"
             ]
         ]
     },
     {
-        "id": "38280842.8f481",
+        "id": "1efdee28.f91a52",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3968.5,
-        "y": 2557,
-        "z": "b31344e1.6b9228",
+        "x": 3979.066665649414,
+        "y": 2588.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7c3bab6c.40727c"
+                "2ed8b0a7.4efac8"
             ]
         ]
     },
     {
-        "id": "762394a6.8c9edc",
+        "id": "64406c95.e8d00c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3980.5,
-        "y": 2607,
-        "z": "b31344e1.6b9228",
+        "x": 3991.066665649414,
+        "y": 2638.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "9fa14d44.80429"
+                "51fd5363.368514"
             ]
         ]
     },
     {
-        "id": "bf6967d.9863518",
+        "id": "d9f7dd8f.9ba66",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3971.5,
-        "y": 2662,
-        "z": "b31344e1.6b9228",
+        "x": 3982.066665649414,
+        "y": 2693.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "e6f16a7e.5e034"
+                "e38f0d80.1c1bb"
             ]
         ]
     },
     {
-        "id": "e6f16a7e.5e034",
+        "id": "e38f0d80.1c1bb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4116.5,
-        "y": 2661,
-        "z": "b31344e1.6b9228",
+        "x": 4127.066665649414,
+        "y": 2692.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "9fa14d44.80429",
+        "id": "51fd5363.368514",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4127.5,
-        "y": 2604,
-        "z": "b31344e1.6b9228",
+        "x": 4138.066665649414,
+        "y": 2635.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "7c3bab6c.40727c",
+        "id": "2ed8b0a7.4efac8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4093.8824462890625,
-        "y": 2550.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 4104.449111938477,
+        "y": 2582.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "3ada39cb.077d7e"
+                "6b9e1826.ee6da8"
             ]
         ]
     },
     {
-        "id": "79f49c03.b31834",
+        "id": "138f1f2d.7207a9",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4653,
-        "y": 2569,
-        "z": "b31344e1.6b9228",
+        "x": 4663.566665649414,
+        "y": 2600.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b38ec96c.50bcb"
+                "d1f83019.79c9b"
             ]
         ]
     },
     {
-        "id": "b38ec96c.50bcb",
+        "id": "d1f83019.79c9b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4830,
-        "y": 2561,
-        "z": "b31344e1.6b9228",
+        "x": 4840.566665649414,
+        "y": 2592.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b25407c2.fe4e9",
-                "76abd2d6.8cf2bc"
+                "7ed11e.38da0ee4",
+                "162cc00f.d817a8"
             ]
         ]
     },
     {
-        "id": "3ada39cb.077d7e",
+        "id": "6b9e1826.ee6da8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4255,
-        "y": 2565,
-        "z": "b31344e1.6b9228",
+        "x": 4265.566665649414,
+        "y": 2596.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "631c6ac2.9b4684"
+                "86ec64e1.e780c"
             ]
         ]
     },
     {
-        "id": "631c6ac2.9b4684",
+        "id": "86ec64e1.e780c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4450,
-        "y": 2565,
-        "z": "b31344e1.6b9228",
+        "x": 4460.566665649414,
+        "y": 2596.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "79f49c03.b31834"
+                "138f1f2d.7207a9"
             ]
         ]
     },
     {
-        "id": "76abd2d6.8cf2bc",
+        "id": "162cc00f.d817a8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "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.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5038,
-        "y": 2568,
-        "z": "b31344e1.6b9228",
+        "x": 5048.566665649414,
+        "y": 2599.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b500a3b6.711188",
-                "e4ff3e60.96d148",
-                "ef9c5a3.20232a8"
+                "e0385378.198358",
+                "503d9090.68b5e8",
+                "17aba33b.4460b5"
             ]
         ]
     },
     {
-        "id": "b25407c2.fe4e9",
+        "id": "7ed11e.38da0ee4",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5068,
-        "y": 2516,
-        "z": "b31344e1.6b9228",
+        "x": 5078.566665649414,
+        "y": 2547.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "b500a3b6.711188",
+        "id": "e0385378.198358",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5248,
-        "y": 2559,
-        "z": "b31344e1.6b9228",
+        "x": 5258.566665649414,
+        "y": 2590.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "8c9a0f1.a2e9b7"
+                "2933c6cc.a68082"
             ]
         ]
     },
     {
-        "id": "e4ff3e60.96d148",
+        "id": "503d9090.68b5e8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5240,
-        "y": 2614,
-        "z": "b31344e1.6b9228",
+        "x": 5250.566665649414,
+        "y": 2645.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "7d5ba752.0bac28"
+                "d5a44647.f1fdd8"
             ]
         ]
     },
     {
-        "id": "ef9c5a3.20232a8",
+        "id": "17aba33b.4460b5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5245,
-        "y": 2671,
-        "z": "b31344e1.6b9228",
+        "x": 5255.566665649414,
+        "y": 2702.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5979580a.e6b1f8"
+                "8e808d45.23fde8"
             ]
         ]
     },
     {
-        "id": "5979580a.e6b1f8",
+        "id": "8e808d45.23fde8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5397,
-        "y": 2672,
-        "z": "b31344e1.6b9228",
+        "x": 5407.566665649414,
+        "y": 2703.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "7d5ba752.0bac28",
+        "id": "d5a44647.f1fdd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5408,
-        "y": 2617,
-        "z": "b31344e1.6b9228",
+        "x": 5418.566665649414,
+        "y": 2648.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "8c9a0f1.a2e9b7",
+        "id": "2933c6cc.a68082",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5392.38232421875,
-        "y": 2556.6556701660156,
-        "z": "b31344e1.6b9228",
+        "x": 5402.948989868164,
+        "y": 2588.2223358154297,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "b4fe40f1.fee308"
+                "ee8d6c6a.1b65b8"
             ]
         ]
     },
     {
-        "id": "b4fe40f1.fee308",
+        "id": "ee8d6c6a.1b65b8",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.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": 5607,
-        "y": 2553,
-        "z": "b31344e1.6b9228",
+        "x": 5617.566665649414,
+        "y": 2584.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "557999e1.77dcb",
+        "id": "80466868.45553",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2223,
-        "y": 4320,
-        "z": "b31344e1.6b9228",
+        "x": 2233.566665649414,
+        "y": 4351.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f7f46916.4f1ee",
-                "5a129ea2.020ec"
+                "be092ed.4a93b5",
+                "42aa6078.f937c"
             ]
         ]
     },
     {
-        "id": "4ba5097d.b20fe",
+        "id": "580438cc.a39858",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
-        "xml": "<switch test='`$dmnsidx == 0`'>\n",
+        "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3112,
-        "y": 4307,
-        "z": "b31344e1.6b9228",
+        "x": 3736.566665649414,
+        "y": 2810.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "dbd9c4f1.fac738",
-                "119d0f31.7b8509"
+                "253b733.7c34c8c",
+                "ac577a23.1df5c8"
             ]
         ]
     },
     {
-        "id": "dbd9c4f1.fac738",
+        "id": "253b733.7c34c8c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3313,
-        "y": 4305,
-        "z": "b31344e1.6b9228",
+        "x": 3937.566665649414,
+        "y": 2808.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4fe6e9a2.ce8d7"
+                "489357ce.d601e8"
             ]
         ]
     },
     {
-        "id": "4fe6e9a2.ce8d7",
+        "id": "4ffee2dc.bf60cc",
         "type": "set",
-        "name": "set attachment_param domain A",
-        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />",
+        "name": "set pce-src-node",
+        "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 3527,
-        "y": 4307,
-        "z": "b31344e1.6b9228",
+        "x": 4218.566665649414,
+        "y": 2758.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "fd470af3.59fcc",
+        "id": "f4366d42.1a2168",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
-        "xml": "<switch test='`$dmnsidx == $otn-tunnel-slice_length - 1`'>\n",
+        "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3530,
-        "y": 4356,
-        "z": "b31344e1.6b9228",
+        "x": 4154.566665649414,
+        "y": 2859.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ddf1f941.709858",
-                "2f7e38f0.34a468"
+                "ed86bff.8de464",
+                "8d9d80f9.3a4208"
             ]
         ]
     },
     {
-        "id": "ddf1f941.709858",
+        "id": "ed86bff.8de464",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3731,
-        "y": 4354,
-        "z": "b31344e1.6b9228",
+        "x": 4384.566665649414,
+        "y": 2855.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "5c127cf0.9c2d34"
+                "7e911b6f.cd69e4"
             ]
         ]
     },
     {
-        "id": "5c127cf0.9c2d34",
+        "id": "b90e6234.50db9",
         "type": "set",
         "name": "set attachment_param domain B",
-        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 3945,
-        "y": 4356,
-        "z": "b31344e1.6b9228",
+        "x": 4721.566665649414,
+        "y": 2799.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "119d0f31.7b8509",
+        "id": "ac577a23.1df5c8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3313,
-        "y": 4354,
-        "z": "b31344e1.6b9228",
+        "x": 3937.566665649414,
+        "y": 2857.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "fd470af3.59fcc"
+                "f4366d42.1a2168"
             ]
         ]
     },
     {
-        "id": "2f7e38f0.34a468",
+        "id": "8d9d80f9.3a4208",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3732,
-        "y": 4400,
-        "z": "b31344e1.6b9228",
+        "x": 4385.566665649414,
+        "y": 2901.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "4e4fdb4.a02e5a4"
+                "c46aeca7.68602"
             ]
         ]
     },
     {
-        "id": "4e4fdb4.a02e5a4",
+        "id": "c46aeca7.68602",
         "type": "set",
         "name": "set attachment_param domain G",
-        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
+        "comments": "",
+        "x": 4599.566665649414,
+        "y": 2901.566665649414,
+        "z": "9256178d.211a68",
+        "wires": []
+    },
+    {
+        "id": "b5fed2d4.4f9558",
+        "type": "set",
+        "name": "set tmp.slicevpns",
+        "xml": "<set>\n<parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n<parameter name='tmp.slicevpns_length' value=\"`$tmp.slicevpns_length + 1`\" />\n\n<parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value=\"`$prop.vpn-binding-otnidx-uuid`\" />\n\n",
         "comments": "",
-        "x": 3946,
-        "y": 4399,
-        "z": "b31344e1.6b9228",
+        "x": 4497.566665649414,
+        "y": 2950.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "f5263d8c.0dd66",
+        "id": "473c1519.d01eb4",
         "type": "switchNode",
-        "name": "switch dmnsidx == 0 (domainA)",
-        "xml": "<switch test='`$otnidx == 0`'>\n",
+        "name": "switch vpnuuid is for this slice",
+        "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.aai.service-instance.service-instance-id `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3726,
-        "y": 2779,
-        "z": "b31344e1.6b9228",
+        "x": 3061.566665649414,
+        "y": 4174.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "cb45f40e.c4e9f",
-                "686c2e71.b364f8"
+                "1fb0ccb2.86983b",
+                "44883739.f6f7d8"
             ]
         ]
     },
     {
-        "id": "cb45f40e.c4e9f",
+        "id": "1fb0ccb2.86983b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3927,
-        "y": 2777,
-        "z": "b31344e1.6b9228",
+        "x": 3278.566665649414,
+        "y": 4153.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "906b7761.ec3cf"
+                "7e38fab1.3b9244"
             ]
         ]
     },
     {
-        "id": "906b7761.ec3cf",
-        "type": "set",
-        "name": "set attachment_param domain A",
-        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
+        "id": "44883739.f6f7d8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
-        "x": 4141,
-        "y": 2779,
-        "z": "b31344e1.6b9228",
-        "wires": []
+        "outputs": 1,
+        "x": 3278.566665649414,
+        "y": 4202.566665649414,
+        "z": "9256178d.211a68",
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "bb50949c.2c4e68",
-        "type": "switchNode",
-        "name": "switch dmnsidx == last (domainB)",
-        "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
+        "id": "7e38fab1.3b9244",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4144,
-        "y": 2828,
-        "z": "b31344e1.6b9228",
+        "x": 3446.566665649414,
+        "y": 4153.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "f9f184f6.8f0c58",
-                "b1eb5cf.84b33a"
+                "114fcf9e.f212a8",
+                "5596317e.9b3628"
             ]
         ]
     },
     {
-        "id": "f9f184f6.8f0c58",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "a0f26d15.101368",
+        "type": "set",
+        "name": "set attachment_param domain A",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
+        "comments": "",
+        "x": 4273.566665649414,
+        "y": 2805.566665649414,
+        "z": "9256178d.211a68",
+        "wires": []
+    },
+    {
+        "id": "489357ce.d601e8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4374,
-        "y": 2824,
-        "z": "b31344e1.6b9228",
+        "x": 4061.566665649414,
+        "y": 2799.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "ea46128e.0ba028"
+                "a0f26d15.101368"
             ]
         ]
     },
     {
-        "id": "ea46128e.0ba028",
+        "id": "3c67b199.38de76",
         "type": "set",
-        "name": "set attachment_param domain B",
-        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
+        "name": "set pce-src-node",
+        "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 4588,
-        "y": 2827,
-        "z": "b31344e1.6b9228",
+        "x": 4673.566665649414,
+        "y": 2847.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
     },
     {
-        "id": "686c2e71.b364f8",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "7e911b6f.cd69e4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3927,
-        "y": 2826,
-        "z": "b31344e1.6b9228",
+        "x": 4517.566665649414,
+        "y": 2831.566665649414,
+        "z": "9256178d.211a68",
         "wires": [
             [
-                "bb50949c.2c4e68"
+                "b90e6234.50db9"
             ]
         ]
     },
     {
-        "id": "b1eb5cf.84b33a",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "6e431d76.be632c",
+        "type": "get-resource",
+        "name": "get-resource pnfs-list",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
         "comments": "",
         "outputs": 1,
-        "x": 4375,
-        "y": 2870,
-        "z": "b31344e1.6b9228",
+        "x": 2003.566665649414,
+        "y": 96.56666564941406,
+        "z": "9256178d.211a68",
         "wires": [
-            [
-                "591dd2d5.72937c"
-            ]
+            []
+        ]
+    },
+    {
+        "id": "29e9cbd2.ce75c4",
+        "type": "get-resource",
+        "name": "get-resource logical-links",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 2015.566665649414,
+        "y": 137.56666564941406,
+        "z": "9256178d.211a68",
+        "wires": [
+            []
         ]
     },
     {
-        "id": "591dd2d5.72937c",
+        "id": "7f3d74ad.534c3c",
+        "type": "comment",
+        "name": "The following two nodes are for PCE",
+        "info": "",
+        "comments": "",
+        "x": 2039.566665649414,
+        "y": 59.56666564941406,
+        "z": "9256178d.211a68",
+        "wires": []
+    },
+    {
+        "id": "6d8a85f2.9b51f4",
         "type": "set",
-        "name": "set attachment_param domain G",
-        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
+        "name": "set tmp.arr",
+        "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
+        "comments": "",
+        "x": 1960.566665649414,
+        "y": 183.56666564941406,
+        "z": "9256178d.211a68",
+        "wires": []
+    },
+    {
+        "id": "3add3536.bf190a",
+        "type": "execute",
+        "name": "execute printContext",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
         "comments": "",
-        "x": 4589,
-        "y": 2870,
-        "z": "b31344e1.6b9228",
+        "outputs": 1,
+        "x": 2650.566665649414,
+        "y": 2395.566665649414,
+        "z": "9256178d.211a68",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d33e8b85.64336",
+        "type": "set",
+        "name": "set maxtpn",
+        "xml": "<set>\n<parameter name='maxtpn' value='`($maxtpn + $gfp)`' />",
+        "comments": "",
+        "x": 3677.566665649414,
+        "y": 2998.566665649414,
+        "z": "9256178d.211a68",
         "wires": []
+    },
+    {
+        "id": "33633691.1ec92a",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-find-maximum-used-tpn",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2843.566665649414,
+        "y": 2459.566665649414,
+        "z": "9256178d.211a68",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file