X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fp2p_eline%2FGENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.json;h=a7effbcf9acf7a70e0e7a481e6eac0fd69d72e16;hb=51946551fe9016b38ba03747a3376febf7124b8e;hp=df10744cacc590ffc8e9774d3e380c626ed4a07b;hpb=63194cd9cd9548e513ea6c78b45f5de3010238bb;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.json b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.json
index df10744c..a7effbcf 100644
--- a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.json
+++ b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "b86b0fef.6d8f2",
+        "id": "7ed82570.98fbdc",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 228.56666564941406,
-        "y": 144.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 128.56666564941406,
+        "y": 178.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2128d45c.da5aa4"
+                "391afd32.1d09aa"
             ]
         ]
     },
     {
-        "id": "2128d45c.da5aa4",
+        "id": "391afd32.1d09aa",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,5626 +22,6338 @@
         "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": 453.85235595703125,
-        "y": 218.8047742843628,
-        "z": "25a21122.0e2cfe",
+        "x": 353.85235595703125,
+        "y": 252.8047742843628,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "70e99b08.a81814"
+                "90765c89.647058"
             ]
         ]
     },
     {
-        "id": "70e99b08.a81814",
+        "id": "90765c89.647058",
         "type": "method",
-        "name": "method tsli-vnf-topology-operation-trans-slice-modify",
-        "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-modify' mode='sync'>\n",
+        "name": "method p2p-vnf-topology-operation-p2p-modify",
+        "xml": "<method rpc='p2p-vnf-topology-operation-p2p-modify' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 459.9952697753906,
-        "y": 303.5666961669922,
-        "z": "25a21122.0e2cfe",
+        "x": 359.9952697753906,
+        "y": 337.5666961669922,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3d648e68.8f83fa"
+                "9cde6295.2d0718"
             ]
         ]
     },
     {
-        "id": "3d648e68.8f83fa",
+        "id": "9cde6295.2d0718",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 829.8047027587891,
-        "y": 328.2333526611328,
-        "z": "25a21122.0e2cfe",
+        "x": 729.8047027587891,
+        "y": 362.2333526611328,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4898a5d2.c4814c",
-                "43d16cc8.33970c",
-                "dd074b01.699d5"
+                "4ae0dd2a.d94ce4",
+                "79738588.734b34",
+                "1f3c8c44.a01cfc"
             ]
         ]
     },
     {
-        "id": "4898a5d2.c4814c",
+        "id": "4ae0dd2a.d94ce4",
         "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": 1085.138198852539,
-        "y": 482.1636505126953,
-        "z": "25a21122.0e2cfe",
+        "x": 985.1381988525391,
+        "y": 516.1636505126953,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "43d16cc8.33970c",
+        "id": "79738588.734b34",
         "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": 1152.566665649414,
-        "y": 301.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1052.566665649414,
+        "y": 335.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5739653.c5aef1c",
-                "4e5f3667.ce514",
-                "7d9553c0.a90d3c"
+                "8962e75e.00261",
+                "4fd36492.b80aa4",
+                "9a3dacb1.190568"
             ]
         ]
     },
     {
-        "id": "5739653.c5aef1c",
+        "id": "8962e75e.00261",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1377.566665649414,
-        "y": 159.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1277.566665649414,
+        "y": 193.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "fc0ebeea.3842e8"
+                "3deda3f.9bf2e5c"
             ]
         ]
     },
     {
-        "id": "4e5f3667.ce514",
+        "id": "4fd36492.b80aa4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1373.057632446289,
-        "y": 229.1407012939453,
-        "z": "25a21122.0e2cfe",
+        "x": 1273.057632446289,
+        "y": 263.1407012939453,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9ccb6432.a6f758"
+                "3f0b2c08.7bc00c"
             ]
         ]
     },
     {
-        "id": "7d9553c0.a90d3c",
+        "id": "9a3dacb1.190568",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1361.566665649414,
-        "y": 275.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1261.566665649414,
+        "y": 309.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2159c0a9.b6525"
+                "9b28e102.0626c"
             ]
         ]
     },
     {
-        "id": "fc0ebeea.3842e8",
+        "id": "3deda3f.9bf2e5c",
         "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": 1616.566665649414,
-        "y": 156.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1516.566665649414,
+        "y": 190.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9f0f2f3b.2aa0c8",
-                "29eb9fec.58b94"
+                "20af607b.68774",
+                "3658cbc.aa6dfb4"
             ]
         ]
     },
     {
-        "id": "9ccb6432.a6f758",
+        "id": "3f0b2c08.7bc00c",
         "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": 1526.6290435791016,
-        "y": 232.4264373779297,
-        "z": "25a21122.0e2cfe",
+        "x": 1426.6290435791016,
+        "y": 266.4264373779297,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "2159c0a9.b6525",
+        "id": "9b28e102.0626c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1530.566665649414,
-        "y": 276.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1430.566665649414,
+        "y": 310.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "9f0f2f3b.2aa0c8",
+        "id": "20af607b.68774",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1829.566665649414,
-        "y": 180.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1729.566665649414,
+        "y": 214.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c939819f.3d19a"
+                "be8ab5c2.2f32"
             ]
         ]
     },
     {
-        "id": "29eb9fec.58b94",
+        "id": "3658cbc.aa6dfb4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1831.566665649414,
-        "y": 120.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1731.566665649414,
+        "y": 154.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "1c8a1ea6.0feed9",
+        "id": "1f591d09.2d25db",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1131.566665649414,
-        "y": 189.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1031.566665649414,
+        "y": 223.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "c939819f.3d19a",
+        "id": "be8ab5c2.2f32",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1774.566665649414,
-        "y": 362.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1674.566665649414,
+        "y": 396.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f0cde51e.fc048",
-                "5a4aff44.5be78",
-                "e781046f.1418e",
-                "127eaa7a.98449e",
-                "8780743f.a296a",
-                "323fc4b1.60fe74"
+                "d30b8bfe.c0acd",
+                "b8b8c8f9.3c3308",
+                "86a1c6ac.aa4d9",
+                "57401e8a.a8ecc"
             ]
         ]
     },
     {
-        "id": "db6151f2.0aacb",
+        "id": "1aaac7fe.3c1ba",
         "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",
         "comments": "",
-        "x": 4343.566665649414,
-        "y": 869.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4243.566665649414,
+        "y": 903.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e016be81.6c64f",
+        "id": "3b804e52.a7cf2a",
         "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": 4344.566665649414,
-        "y": 924.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4244.566665649414,
+        "y": 958.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "103cc7a8.7e9b88",
+        "id": "1ad24ca8.e833c3",
         "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": 2300.566665649414,
-        "y": 319.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 2200.566665649414,
+        "y": 353.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f2966e51.e2caf8",
-                "2b2db624.af7c1a",
-                "626f780f.86dfb8"
+                "b8507b63.6f6868",
+                "67c1af9f.10fa88",
+                "7ec43e4c.6fd9e"
             ]
         ]
     },
     {
-        "id": "f2966e51.e2caf8",
+        "id": "b8507b63.6f6868",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2516.566665649414,
-        "y": 386.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 2416.566665649414,
+        "y": 420.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8eff1c95.000698"
+                "5fc7bb3c.8d1c74"
             ]
         ]
     },
     {
-        "id": "2b2db624.af7c1a",
+        "id": "67c1af9f.10fa88",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2517.057632446289,
-        "y": 286.14064025878906,
-        "z": "25a21122.0e2cfe",
+        "x": 2417.057632446289,
+        "y": 320.14064025878906,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e741338f.fadbb8"
+                "4da82d11.2ee7a4"
             ]
         ]
     },
     {
-        "id": "626f780f.86dfb8",
+        "id": "7ec43e4c.6fd9e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2512.566665649414,
-        "y": 335.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 2412.566665649414,
+        "y": 369.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2cb8a0b4.ed0f98"
+                "32e3d071.7e8958"
             ]
         ]
     },
     {
-        "id": "e741338f.fadbb8",
+        "id": "4da82d11.2ee7a4",
         "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": 2694.629165649414,
-        "y": 286.42640686035156,
-        "z": "25a21122.0e2cfe",
+        "x": 2594.629165649414,
+        "y": 320.42640686035156,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "2cb8a0b4.ed0f98",
+        "id": "32e3d071.7e8958",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2694.566665649414,
-        "y": 335.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 2594.566665649414,
+        "y": 369.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "1c10a7b4.762648",
+        "id": "5d5e04cf.2d233c",
         "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": 3569.566665649414,
-        "y": 840.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 3469.566665649414,
+        "y": 874.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "54f63921.d24288",
-                "11c3d54e.f4363b",
-                "e636914f.ca32e"
+                "737046f3.901008",
+                "c17a2f42.f8ce5",
+                "6c18d1b1.1fb02"
             ]
         ]
     },
     {
-        "id": "54f63921.d24288",
+        "id": "737046f3.901008",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3861.057632446289,
-        "y": 819.1406402587891,
-        "z": "25a21122.0e2cfe",
+        "x": 3761.057632446289,
+        "y": 853.1406402587891,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4ad84bdb.1011e4"
+                "d252d89c.bf824"
             ]
         ]
     },
     {
-        "id": "11c3d54e.f4363b",
+        "id": "c17a2f42.f8ce5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3849.566665649414,
-        "y": 863.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 3749.566665649414,
+        "y": 897.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "611bd1d0.bbec68"
+                "ac4aea44.3a1468"
             ]
         ]
     },
     {
-        "id": "4ad84bdb.1011e4",
+        "id": "d252d89c.bf824",
         "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": 4009.629165649414,
-        "y": 819.4264068603516,
-        "z": "25a21122.0e2cfe",
+        "x": 3909.629165649414,
+        "y": 853.4264068603516,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "611bd1d0.bbec68",
+        "id": "ac4aea44.3a1468",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4008.566665649414,
-        "y": 863.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 3908.566665649414,
+        "y": 897.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e636914f.ca32e",
+        "id": "6c18d1b1.1fb02",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3855.566665649414,
-        "y": 910.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 3755.566665649414,
+        "y": 944.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "4dddc413.6cd63c",
+        "id": "9334f6e1.75bd8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4009.566665649414,
-        "y": 949.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 3909.566665649414,
+        "y": 983.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "db6151f2.0aacb",
-                "e016be81.6c64f",
-                "9f8998d0.ce9c48",
-                "44a9159e.85e724",
-                "8f0ab711.e0d798",
-                "d96045a7.1a29c8",
-                "7c9d6be0.59e3fc",
-                "5f01b0d6.663678",
-                "96f11e74.5cf9",
-                "32dd1d69.d1982a",
-                "fefb165c.6d9d48",
-                "afd6fb79.f36b6",
-                "1a397526.128d93"
+                "1aaac7fe.3c1ba",
+                "3b804e52.a7cf2a",
+                "609f7b84.9a3f44",
+                "1d55bdaf.3f48b2",
+                "6876f035.c2a16",
+                "f41eeb62.b3bcb",
+                "e8bc0d88.0a94d",
+                "e8d2e62e.a7299",
+                "b172c901.cf8828",
+                "4228fba9.d84434",
+                "fc1cf650.aa6b18",
+                "3b99997f.82150e",
+                "2ab2958e.345c6a"
             ]
         ]
     },
     {
-        "id": "9f8998d0.ce9c48",
+        "id": "609f7b84.9a3f44",
         "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": 4356.566665649414,
-        "y": 992.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4256.566665649414,
+        "y": 1026.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ad94bc3e.2edb18",
-                "3c6b8cbe.35a074",
-                "e925e05d.5c3e7"
+                "feb2378a.2af25",
+                "cbad9eb.a48376",
+                "4fed791d.880998"
             ]
         ]
     },
     {
-        "id": "44a9159e.85e724",
+        "id": "1d55bdaf.3f48b2",
         "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": 4335.566665649414,
-        "y": 1594.5665435791016,
-        "z": "25a21122.0e2cfe",
+        "x": 4235.566665649414,
+        "y": 1628.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ce3181da.534ae8",
-                "dd474f13.0169c8",
-                "1e53e46c.6ee5dc"
+                "2518a058.abd538",
+                "6ec44045.1b76e",
+                "3ecdb083.b8e9c8"
             ]
         ]
     },
     {
-        "id": "ad94bc3e.2edb18",
+        "id": "feb2378a.2af25",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4557.566665649414,
-        "y": 876.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4457.566665649414,
+        "y": 910.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "11095a88.1d6375"
+                "edb5d5b7.00d9d8"
             ]
         ]
     },
     {
-        "id": "3c6b8cbe.35a074",
+        "id": "cbad9eb.a48376",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4553.075698852539,
-        "y": 925.9926910400391,
-        "z": "25a21122.0e2cfe",
+        "x": 4453.075698852539,
+        "y": 959.9926910400391,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1c85f4a2.49e393"
+                "302f34fb.b2cccc"
             ]
         ]
     },
     {
-        "id": "e925e05d.5c3e7",
+        "id": "4fed791d.880998",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4557.075698852539,
-        "y": 976.9926910400391,
-        "z": "25a21122.0e2cfe",
+        "x": 4457.075698852539,
+        "y": 1010.9926910400391,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "7e7cdd76.7cfb84"
+                "a17dcb43.36654"
             ]
         ]
     },
     {
-        "id": "11095a88.1d6375",
+        "id": "edb5d5b7.00d9d8",
         "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": 4706.138198852539,
-        "y": 875.8524322509766,
-        "z": "25a21122.0e2cfe",
+        "x": 4606.138198852539,
+        "y": 909.8524322509766,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "1c85f4a2.49e393",
+        "id": "302f34fb.b2cccc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4696.075698852539,
-        "y": 925.9926910400391,
-        "z": "25a21122.0e2cfe",
+        "x": 4596.075698852539,
+        "y": 959.9926910400391,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ce3181da.534ae8",
+        "id": "2518a058.abd538",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4558.566665649414,
-        "y": 1564.5665435791016,
-        "z": "25a21122.0e2cfe",
+        "x": 4458.566665649414,
+        "y": 1598.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b22dee41.00f36"
+                "ae2f5ea5.ffcca8"
             ]
         ]
     },
     {
-        "id": "dd474f13.0169c8",
+        "id": "6ec44045.1b76e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4554.075698852539,
-        "y": 1613.9925689697266,
-        "z": "25a21122.0e2cfe",
+        "x": 4454.075698852539,
+        "y": 1647.9925689697266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6933584e.ecc31"
+                "8fe524e0.344e88"
             ]
         ]
     },
     {
-        "id": "1e53e46c.6ee5dc",
+        "id": "3ecdb083.b8e9c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4558.075698852539,
-        "y": 1664.9925689697266,
-        "z": "25a21122.0e2cfe",
+        "x": 4458.075698852539,
+        "y": 1698.9925689697266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b7fe5d85.6c90f"
+                "55939baf.cd26bc"
             ]
         ]
     },
     {
-        "id": "b22dee41.00f36",
+        "id": "ae2f5ea5.ffcca8",
         "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": 4707.138198852539,
-        "y": 1563.852310180664,
-        "z": "25a21122.0e2cfe",
+        "x": 4607.138198852539,
+        "y": 1597.852310180664,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "6933584e.ecc31",
+        "id": "8fe524e0.344e88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4697.075698852539,
-        "y": 1613.9925689697266,
-        "z": "25a21122.0e2cfe",
+        "x": 4597.075698852539,
+        "y": 1647.9925689697266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "95843474.b9bce8",
+        "id": "4f9233a2.7d7c54",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5371.233169555664,
-        "y": 1020.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5271.233169555664,
+        "y": 1054.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b4615ea7.1bce1",
-                "be2e7ced.c4df",
-                "ce2c131b.42f24",
-                "71b17710.70c14",
-                "89a7842f.afd83"
+                "633cbeb7.169858",
+                "bab31b18.59cf48",
+                "a317ded0.bb3c4",
+                "ab06c276.223ba8",
+                "cc9240f8.8f7cd"
             ]
         ]
     },
     {
-        "id": "4503129f.bd2fd4",
+        "id": "316e9aaa.7c7b56",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5198.566665649414,
-        "y": 1021.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5098.566665649414,
+        "y": 1055.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "95843474.b9bce8"
+                "4f9233a2.7d7c54"
             ]
         ]
     },
     {
-        "id": "8659354b.96b4a",
+        "id": "71d04631.299a38",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5208.057632446289,
-        "y": 1064.1407012939453,
-        "z": "25a21122.0e2cfe",
+        "x": 5108.057632446289,
+        "y": 1098.1407012939453,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "df26ebdc.1c7d8"
+                "92bf2c3c.4b1f48"
             ]
         ]
     },
     {
-        "id": "f14e9aee.41ddd",
+        "id": "ec19e5df.bfee3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5196.566665649414,
-        "y": 1110.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5096.566665649414,
+        "y": 1144.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "779f16ad.79c298"
+                "97714895.6880b8"
             ]
         ]
     },
     {
-        "id": "df26ebdc.1c7d8",
+        "id": "92bf2c3c.4b1f48",
         "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": 5361.629043579102,
-        "y": 1067.4264373779297,
-        "z": "25a21122.0e2cfe",
+        "x": 5261.629043579102,
+        "y": 1101.4264373779297,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "779f16ad.79c298",
+        "id": "97714895.6880b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 5365.566665649414,
-        "y": 1111.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5265.566665649414,
+        "y": 1145.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "7e7cdd76.7cfb84",
+        "id": "a17dcb43.36654",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4718.566665649414,
-        "y": 978.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4618.566665649414,
+        "y": 1012.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d6ce477c.e6b1",
-                "6ff01134.d27b1"
+                "655303f9.8975f4",
+                "9b0960f2.c7d238"
             ]
         ]
     },
     {
-        "id": "b7fe5d85.6c90f",
+        "id": "55939baf.cd26bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4708.566665649414,
-        "y": 1666.5665435791016,
-        "z": "25a21122.0e2cfe",
+        "x": 4608.566665649414,
+        "y": 1700.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "44dc4d90.b0cc4c",
-                "abe40e95.5db908"
+                "b454ce1a.9a4dd",
+                "ee0171c8.01d89"
             ]
         ]
     },
     {
-        "id": "12aedd33.0f1043",
+        "id": "5175d7af.72a12",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5339.233169555664,
-        "y": 1856.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5239.233169555664,
+        "y": 1890.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e22e2a42.a26b1",
-                "cf28df7d.f3d4b",
-                "daaed265.7759a8",
-                "cb8398b0.7dbb5",
-                "7bc8d59f.6d2444"
+                "211166d6.cdaa9a",
+                "47621f66.6345e",
+                "f6c10bde.dea908",
+                "6cfa339.cd5cfcc",
+                "3ea9d16d.7e59be"
             ]
         ]
     },
     {
-        "id": "9a2935ba.2db97",
+        "id": "81d2e905.09274",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5166.566665649414,
-        "y": 1857.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5066.566665649414,
+        "y": 1891.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "12aedd33.0f1043"
+                "5175d7af.72a12"
             ]
         ]
     },
     {
-        "id": "dcc235b8.72838",
+        "id": "55a1f73d.5c93d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5176.057632446289,
-        "y": 1900.1407012939453,
-        "z": "25a21122.0e2cfe",
+        "x": 5076.057632446289,
+        "y": 1934.1407012939453,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6a73fa3d.d6c2b4"
+                "17672cb7.bdb783"
             ]
         ]
     },
     {
-        "id": "262965f5.6cf9ea",
+        "id": "5050329c.16639c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5164.566665649414,
-        "y": 1946.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5064.566665649414,
+        "y": 1980.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "403c1229.13a954"
+                "2763dbec.eed664"
             ]
         ]
     },
     {
-        "id": "6a73fa3d.d6c2b4",
+        "id": "17672cb7.bdb783",
         "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": 5329.629043579102,
-        "y": 1903.4264373779297,
-        "z": "25a21122.0e2cfe",
+        "x": 5229.629043579102,
+        "y": 1937.4264373779297,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "403c1229.13a954",
+        "id": "2763dbec.eed664",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 5333.566665649414,
-        "y": 1947.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5233.566665649414,
+        "y": 1981.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "b4615ea7.1bce1",
+        "id": "633cbeb7.169858",
         "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": 5635.566665649414,
-        "y": 1004.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5535.566665649414,
+        "y": 1038.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "7fca3373.091184",
-                "84a28ee2.eeb658"
+                "ecc11d6d.c862e",
+                "365f4120.012e4e"
             ]
         ]
     },
     {
-        "id": "84a28ee2.eeb658",
+        "id": "365f4120.012e4e",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5858.566665649414,
-        "y": 959.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5758.566665649414,
+        "y": 993.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "70d4fffc.d22c5"
+                "ed0cfcb5.6f799"
             ]
         ]
     },
     {
-        "id": "7fca3373.091184",
+        "id": "ecc11d6d.c862e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5860.566665649414,
-        "y": 1023.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5760.566665649414,
+        "y": 1057.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3dce84d0.b85dd4"
+                "15da62b1.5ec4c5"
             ]
         ]
     },
     {
-        "id": "850dbb90.b4b68",
+        "id": "477c6bc0.f92bb4",
         "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": 6193.566665649414,
-        "y": 914.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6093.566665649414,
+        "y": 948.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "3dce84d0.b85dd4",
+        "id": "15da62b1.5ec4c5",
         "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": 6022.566665649414,
-        "y": 1019.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5922.566665649414,
+        "y": 1053.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "70d4fffc.d22c5",
+        "id": "ed0cfcb5.6f799",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6023.566665649414,
-        "y": 956.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5923.566665649414,
+        "y": 990.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "caf9269d.270b2",
-                "850dbb90.b4b68"
+                "af8cf87c.3e959",
+                "477c6bc0.f92bb4"
             ]
         ]
     },
     {
-        "id": "caf9269d.270b2",
+        "id": "af8cf87c.3e959",
         "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": 6194.566665649414,
-        "y": 1022.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6094.566665649414,
+        "y": 1056.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "59bf2583.d75a84",
+        "id": "29511ba5.29d8ec",
         "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": 6195.566665649414,
-        "y": 971.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6095.566665649414,
+        "y": 1005.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "be2e7ced.c4df",
+        "id": "bab31b18.59cf48",
         "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": 5682.566665649414,
-        "y": 1073.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5582.566665649414,
+        "y": 1107.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "27594e13.316c22",
+        "id": "5ea2f33c.ca6484",
         "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": 5571.566665649414,
-        "y": 1114.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5471.566665649414,
+        "y": 1148.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e22e2a42.a26b1",
+        "id": "211166d6.cdaa9a",
         "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": 5625.566665649414,
-        "y": 1860.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5525.566665649414,
+        "y": 1894.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b2f644ca.d12c2",
-                "b58bca2c.4bf2c"
+                "cebb0d50.db953",
+                "688b6aa8.d1c6fc"
             ]
         ]
     },
     {
-        "id": "b58bca2c.4bf2c",
+        "id": "688b6aa8.d1c6fc",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5848.566665649414,
-        "y": 1815.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5748.566665649414,
+        "y": 1849.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "983024ad.f8675"
+                "d72320d8.a0b208"
             ]
         ]
     },
     {
-        "id": "b2f644ca.d12c2",
+        "id": "cebb0d50.db953",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5850.566665649414,
-        "y": 1879.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5750.566665649414,
+        "y": 1913.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4af84f4.a49b8b"
+                "bbeb85e7.eaaa98"
             ]
         ]
     },
     {
-        "id": "c96d7934.c0e9e8",
+        "id": "1350a764.a43111",
         "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": 6183.566665649414,
-        "y": 1773.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 6083.566665649414,
+        "y": 1807.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "4af84f4.a49b8b",
+        "id": "bbeb85e7.eaaa98",
         "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": 6009.566665649414,
-        "y": 1898.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5909.566665649414,
+        "y": 1932.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "983024ad.f8675",
+        "id": "d72320d8.a0b208",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6013.566665649414,
-        "y": 1812.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5913.566665649414,
+        "y": 1846.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c96d7934.c0e9e8",
-                "183e4dc8.9e45ba"
+                "1350a764.a43111",
+                "56aea40d.d80c4c"
             ]
         ]
     },
     {
-        "id": "183e4dc8.9e45ba",
+        "id": "56aea40d.d80c4c",
         "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": 6184.566665649414,
-        "y": 1878.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 6084.566665649414,
+        "y": 1912.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "57730d78.763bfc",
+        "id": "339b4703.86709",
         "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": 6179.566665649414,
-        "y": 1827.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 6079.566665649414,
+        "y": 1861.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "daaed265.7759a8",
+        "id": "f6c10bde.dea908",
         "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<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": 5627.566665649414,
-        "y": 2019.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5527.566665649414,
+        "y": 2053.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf28df7d.f3d4b",
+        "id": "47621f66.6345e",
         "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": 5672.566665649414,
-        "y": 1929.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5572.566665649414,
+        "y": 1963.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "9f3e922b.b3211",
+        "id": "62d8e003.5e65d8",
         "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": 5561.566665649414,
-        "y": 1967.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5461.566665649414,
+        "y": 2001.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "8f0ab711.e0d798",
+        "id": "6876f035.c2a16",
         "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": 4556.566665649414,
-        "y": 2264.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4456.566665649414,
+        "y": 2298.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "d96045a7.1a29c8",
+        "id": "f41eeb62.b3bcb",
         "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": 4350.566665649414,
-        "y": 2165.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4250.566665649414,
+        "y": 2199.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "d2d69fa1.baa39",
+        "id": "699e7317.6b96a4",
         "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": 4324.566665649414,
-        "y": 2118.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4224.566665649414,
+        "y": 2152.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ce2c131b.42f24",
+        "id": "a317ded0.bb3c4",
         "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": 5765.566665649414,
-        "y": 1211.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5665.566665649414,
+        "y": 1245.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "cb8398b0.7dbb5",
+        "id": "6cfa339.cd5cfcc",
         "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": 5754.566665649414,
-        "y": 2084.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5654.566665649414,
+        "y": 2118.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "92b1873d.551bc",
+        "id": "c6a5d055.f8bb1",
         "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": 6809.566665649414,
-        "y": 731.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6709.566665649414,
+        "y": 765.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3b96c7df.05e2",
-                "1eec19a2.07645e",
-                "b1213bca.c3532"
+                "cd3a2dd3.05e5a8",
+                "1bf85ef.2838b21",
+                "420343c3.3589dc"
             ]
         ]
     },
     {
-        "id": "8eff1c95.000698",
+        "id": "5fc7bb3c.8d1c74",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2696.566665649414,
-        "y": 386.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 2596.566665649414,
+        "y": 420.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ad97eaf2.db3cf"
+                "a84decbd.fa4a3"
             ]
         ]
     },
     {
-        "id": "5c4d87c2.cacd08",
+        "id": "aeab2187.904e6",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1093.5667877197266,
-        "y": 781.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 993.5667877197266,
+        "y": 815.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ba05feca.357468"
+                "d7c3541f.d6d0a"
             ]
         ]
     },
     {
-        "id": "41f5506e.8f5aa",
+        "id": "e7f6967b.1fb18",
         "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": 2259.566665649414,
-        "y": 480.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 2159.566665649414,
+        "y": 514.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8b2a546b.9f5318",
-                "f654fc01.bf0048"
+                "e252c083.ada758",
+                "8a02442.5502738"
             ]
         ]
     },
     {
-        "id": "f654fc01.bf0048",
+        "id": "8a02442.5502738",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2580.566665649414,
-        "y": 462.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 2480.566665649414,
+        "y": 496.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "8b2a546b.9f5318",
+        "id": "e252c083.ada758",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2562.566665649414,
-        "y": 560.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 2462.566665649414,
+        "y": 594.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "24772c6a.a8483c"
+                "2a9b5bea.92ec14"
             ]
         ]
     },
     {
-        "id": "94799b47.aa87f8",
+        "id": "f770d866.8cfe48",
         "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<parameter name='currLinkIsFound' value=\"false\" />\n\n\n",
         "comments": "",
-        "x": 1516.566665649414,
-        "y": 684.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1416.566665649414,
+        "y": 718.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ba05feca.357468",
+        "id": "d7c3541f.d6d0a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1270.566665649414,
-        "y": 774.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1170.566665649414,
+        "y": 808.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "94799b47.aa87f8",
-                "433e887a.5dd2c",
-                "fc0b0bdf.af57e8"
+                "f770d866.8cfe48",
+                "67e01b15.d67c64"
             ]
         ]
     },
     {
-        "id": "fa0822cd.53caf",
+        "id": "2cea34fe.7ff014",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 4898.566665649414,
-        "y": 983.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4798.566665649414,
+        "y": 1017.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "d6ce477c.e6b1",
+        "id": "655303f9.8975f4",
         "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": 4941.566665649414,
-        "y": 1048.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4841.566665649414,
+        "y": 1082.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4503129f.bd2fd4",
-                "8659354b.96b4a",
-                "f14e9aee.41ddd"
+                "316e9aaa.7c7b56",
+                "71d04631.299a38",
+                "ec19e5df.bfee3"
             ]
         ]
     },
     {
-        "id": "44dc4d90.b0cc4c",
+        "id": "b454ce1a.9a4dd",
         "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": 4938.566665649414,
-        "y": 1892.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4838.566665649414,
+        "y": 1926.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9a2935ba.2db97",
-                "dcc235b8.72838",
-                "262965f5.6cf9ea"
+                "81d2e905.09274",
+                "55a1f73d.5c93d8",
+                "5050329c.16639c"
             ]
         ]
     },
     {
-        "id": "2ca1c6c2.0f0f22",
+        "id": "4cadce3c.fc3c8",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 4899.566665649414,
-        "y": 1836.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4799.566665649414,
+        "y": 1870.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ad97eaf2.db3cf",
+        "id": "a84decbd.fa4a3",
         "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": 2989.566665649414,
-        "y": 333.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 2889.566665649414,
+        "y": 367.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ef5e96fe.587c78",
-                "e171a2b9.a46c9",
-                "ed7e8b76.daabf"
+                "139101d.c6544fe",
+                "39ec14f9.5d95cc",
+                "e120429c.bc5038"
             ]
         ]
     },
     {
-        "id": "e171a2b9.a46c9",
+        "id": "39ec14f9.5d95cc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3263.057632446289,
-        "y": 226.14064025878906,
-        "z": "25a21122.0e2cfe",
+        "x": 3163.057632446289,
+        "y": 260.14064025878906,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ae21063b.421918"
+                "b220c2f2.2811f8"
             ]
         ]
     },
     {
-        "id": "ae21063b.421918",
+        "id": "b220c2f2.2811f8",
         "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": 3440.629165649414,
-        "y": 226.42640686035156,
-        "z": "25a21122.0e2cfe",
+        "x": 3340.629165649414,
+        "y": 260.42640686035156,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ed7e8b76.daabf",
+        "id": "e120429c.bc5038",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3258.566665649414,
-        "y": 275.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 3158.566665649414,
+        "y": 309.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1fe6476a.260d99"
+                "b527f79c.27eb58"
             ]
         ]
     },
     {
-        "id": "1fe6476a.260d99",
+        "id": "b527f79c.27eb58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3440.566665649414,
-        "y": 275.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 3340.566665649414,
+        "y": 309.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ef5e96fe.587c78",
+        "id": "139101d.c6544fe",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3262.566665649414,
-        "y": 326.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 3162.566665649414,
+        "y": 360.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5ed5bf6.6fd244"
+                "5a7a1590.04f2a4"
             ]
         ]
     },
     {
-        "id": "5ed5bf6.6fd244",
+        "id": "5a7a1590.04f2a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3442.566665649414,
-        "y": 326.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 3342.566665649414,
+        "y": 360.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "41f5506e.8f5aa"
+                "e7f6967b.1fb18"
             ]
         ]
     },
     {
-        "id": "99ef6a45.9ad878",
+        "id": "868ff940.3c40b8",
         "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": 868.5666656494141,
-        "y": 710.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 768.5666656494141,
+        "y": 744.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "99689150.5b9778"
+                "53465e88.bf1338"
             ]
         ]
     },
     {
-        "id": "99689150.5b9778",
+        "id": "53465e88.bf1338",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1139.566665649414,
-        "y": 706.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1039.566665649414,
+        "y": 740.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5c4d87c2.cacd08"
+                "aeab2187.904e6"
             ]
         ]
     },
     {
-        "id": "2bf740bc.b587b",
+        "id": "2acc7de6.ba44da",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3418.566665649414,
-        "y": 524.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 3318.566665649414,
+        "y": 558.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3a3c2a70.68a7ee"
+                "1ba0c2fe.530a7d"
             ]
         ]
     },
     {
-        "id": "3a3c2a70.68a7ee",
+        "id": "1ba0c2fe.530a7d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3595.5665435791016,
-        "y": 517.5665435791016,
-        "z": "25a21122.0e2cfe",
+        "x": 3495.5665435791016,
+        "y": 551.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e9454f9d.caf03",
-                "6d43a86.3d48758"
+                "36b4ef1.f78561",
+                "689094f0.f3db04"
             ]
         ]
     },
     {
-        "id": "e9454f9d.caf03",
+        "id": "36b4ef1.f78561",
         "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": 3838.5665435791016,
-        "y": 474.56654357910156,
-        "z": "25a21122.0e2cfe",
+        "x": 3738.5665435791016,
+        "y": 508.56654357910156,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "6d43a86.3d48758",
+        "id": "689094f0.f3db04",
         "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": 3827.5665435791016,
-        "y": 529.5665435791016,
-        "z": "25a21122.0e2cfe",
+        "x": 3727.5665435791016,
+        "y": 563.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8a364a72.424c28",
-                "fd07ec43.4387a",
-                "4d3c4393.f4c224"
+                "e75fbbb3.7fba2",
+                "2fda6ca1.8207e4",
+                "df158bbf.d20168"
             ]
         ]
     },
     {
-        "id": "4d3c4393.f4c224",
+        "id": "df158bbf.d20168",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4080.566665649414,
-        "y": 415.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 3980.566665649414,
+        "y": 449.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8a48cdf4.281a78"
+                "528123.112cfedc"
             ]
         ]
     },
     {
-        "id": "8a48cdf4.281a78",
+        "id": "528123.112cfedc",
         "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": 4229.138198852539,
-        "y": 415.85243225097656,
-        "z": "25a21122.0e2cfe",
+        "x": 4129.138198852539,
+        "y": 449.85243225097656,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "81c305db.010dc",
+        "id": "401b1dd2.2d0c84",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4228.075698852539,
-        "y": 459.99269104003906,
-        "z": "25a21122.0e2cfe",
+        "x": 4128.075698852539,
+        "y": 493.99269104003906,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "fd07ec43.4387a",
+        "id": "2fda6ca1.8207e4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4069.075698852539,
-        "y": 459.99269104003906,
-        "z": "25a21122.0e2cfe",
+        "x": 3969.075698852539,
+        "y": 493.99269104003906,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "81c305db.010dc"
+                "401b1dd2.2d0c84"
             ]
         ]
     },
     {
-        "id": "8a364a72.424c28",
+        "id": "e75fbbb3.7fba2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4076.075698852539,
-        "y": 538.9926910400391,
-        "z": "25a21122.0e2cfe",
+        "x": 3976.075698852539,
+        "y": 572.9926910400391,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "41b3b67d.c6f8e8"
+                "29685226.26d7b6"
             ]
         ]
     },
     {
-        "id": "41b3b67d.c6f8e8",
+        "id": "29685226.26d7b6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4215.075698852539,
-        "y": 538.9926910400391,
-        "z": "25a21122.0e2cfe",
+        "x": 4115.075698852539,
+        "y": 572.9926910400391,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f0091688.66654",
-                "4f7a1356.449274"
+                "b7f6ee59.c1f0a",
+                "4f4b77bb.effd9"
             ]
         ]
     },
     {
-        "id": "f0091688.66654",
+        "id": "b7f6ee59.c1f0a",
         "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": 4420.566665649414,
-        "y": 536.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4320.566665649414,
+        "y": 570.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "6ff01134.d27b1",
+        "id": "9b0960f2.c7d238",
         "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": 4942.566665649414,
-        "y": 718.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4842.566665649414,
+        "y": 752.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "39467319.609964",
-                "3cc969fb.c20abe"
+                "94c0e823.bd83",
+                "b5a5d52e.8f7da8"
             ]
         ]
     },
     {
-        "id": "3cc969fb.c20abe",
+        "id": "b5a5d52e.8f7da8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5165.566665649414,
-        "y": 704.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5065.566665649414,
+        "y": 738.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2dfb867b.202c62"
+                "d2c19564.10c95"
             ]
         ]
     },
     {
-        "id": "39467319.609964",
+        "id": "94c0e823.bd83",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5167.566665649414,
-        "y": 737.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5067.566665649414,
+        "y": 771.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "fb83e9be.2efe"
+                "77422c58.e2ca74"
             ]
         ]
     },
     {
-        "id": "fb83e9be.2efe",
+        "id": "77422c58.e2ca74",
         "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": 5310.566665649414,
-        "y": 734.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5210.566665649414,
+        "y": 768.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "2dfb867b.202c62",
+        "id": "d2c19564.10c95",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5313.566665649414,
-        "y": 697.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5213.566665649414,
+        "y": 731.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "15d7491f.df8677",
-                "965ca101.13418"
+                "86b3b06a.5fafe8",
+                "532eff46.9b467"
             ]
         ]
     },
     {
-        "id": "15d7491f.df8677",
+        "id": "86b3b06a.5fafe8",
         "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": 5475.566665649414,
-        "y": 692.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5375.566665649414,
+        "y": 726.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "abe40e95.5db908",
+        "id": "ee0171c8.01d89",
         "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": 4956.566665649414,
-        "y": 1555.5665435791016,
-        "z": "25a21122.0e2cfe",
+        "x": 4856.566665649414,
+        "y": 1589.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d51c262f.477ec",
-                "4509355c.99159c"
+                "35d69142.81ac16",
+                "31d8fff7.b254e"
             ]
         ]
     },
     {
-        "id": "4509355c.99159c",
+        "id": "31d8fff7.b254e",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5179.566665649414,
-        "y": 1541.5665435791016,
-        "z": "25a21122.0e2cfe",
+        "x": 5079.566665649414,
+        "y": 1575.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d6d3b9d3.95749"
+                "3036014d.a3b5f6"
             ]
         ]
     },
     {
-        "id": "d51c262f.477ec",
+        "id": "35d69142.81ac16",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5181.566665649414,
-        "y": 1574.5665435791016,
-        "z": "25a21122.0e2cfe",
+        "x": 5081.566665649414,
+        "y": 1608.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "41fb7895.687548"
+                "58956fb.abac91"
             ]
         ]
     },
     {
-        "id": "41fb7895.687548",
+        "id": "58956fb.abac91",
         "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": 5324.566665649414,
-        "y": 1571.5665435791016,
-        "z": "25a21122.0e2cfe",
+        "x": 5224.566665649414,
+        "y": 1605.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "d6d3b9d3.95749",
+        "id": "3036014d.a3b5f6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5327.566665649414,
-        "y": 1534.5665435791016,
-        "z": "25a21122.0e2cfe",
+        "x": 5227.566665649414,
+        "y": 1568.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "dc31fe9c.b39df",
-                "22e60879.c39a9"
+                "ad167193.a62748",
+                "3753ad56.c9003a"
             ]
         ]
     },
     {
-        "id": "dc31fe9c.b39df",
+        "id": "ad167193.a62748",
         "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": 5521.566665649414,
-        "y": 1537.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5421.566665649414,
+        "y": 1571.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "dd074b01.699d5",
+        "id": "1f3c8c44.a01cfc",
         "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": 1119.566665649414,
-        "y": 241.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1019.5666656494141,
+        "y": 275.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "71b17710.70c14",
+        "id": "ab06c276.223ba8",
         "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": 5589.566665649414,
-        "y": 1288.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5489.566665649414,
+        "y": 1322.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "262b12c7.d4eb86"
+                "ea9f29c0.504f38"
             ]
         ]
     },
     {
-        "id": "262b12c7.d4eb86",
+        "id": "ea9f29c0.504f38",
         "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": 5795.566665649414,
-        "y": 1288.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5695.566665649414,
+        "y": 1322.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5944b4c4.a90d9c"
+                "f9452712.6e7898"
             ]
         ]
     },
     {
-        "id": "5944b4c4.a90d9c",
+        "id": "f9452712.6e7898",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6010.852310180664,
-        "y": 1288.388442993164,
-        "z": "25a21122.0e2cfe",
+        "x": 5910.852310180664,
+        "y": 1322.388442993164,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "97ca4a46.233f6"
+                "2ef61702.ff9d28"
             ]
         ]
     },
     {
-        "id": "97ca4a46.233f6",
+        "id": "2ef61702.ff9d28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6217.683853149414,
-        "y": 1288.906997680664,
-        "z": "25a21122.0e2cfe",
+        "x": 6117.683853149414,
+        "y": 1322.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "18a90b5a.512eed",
-                "9b9213f3.dfc428",
-                "21506293.2b15d6"
+                "ad35cc1f.1df8c8",
+                "fdae5377.6e0e68",
+                "3c7c23ae.86ecbc"
             ]
         ]
     },
     {
-        "id": "18a90b5a.512eed",
+        "id": "ad35cc1f.1df8c8",
         "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": 6432.683853149414,
-        "y": 1250.906997680664,
-        "z": "25a21122.0e2cfe",
+        "x": 6332.683853149414,
+        "y": 1284.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "9b9213f3.dfc428",
+        "id": "fdae5377.6e0e68",
         "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": 6429.683853149414,
-        "y": 1289.906997680664,
-        "z": "25a21122.0e2cfe",
+        "x": 6329.683853149414,
+        "y": 1323.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8cbab548.0454b"
+                "fb285ef7.1b4a58"
             ]
         ]
     },
     {
-        "id": "21506293.2b15d6",
+        "id": "3c7c23ae.86ecbc",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6385.183853149414,
-        "y": 1331.906997680664,
-        "z": "25a21122.0e2cfe",
+        "x": 6285.183853149414,
+        "y": 1365.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "8cbab548.0454b",
+        "id": "fb285ef7.1b4a58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6610.183853149414,
-        "y": 1288.906997680664,
-        "z": "25a21122.0e2cfe",
+        "x": 6510.183853149414,
+        "y": 1322.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "326ba546.7f7e7a"
+                "e8c4036a.c50bb8"
             ]
         ]
     },
     {
-        "id": "326ba546.7f7e7a",
+        "id": "e8c4036a.c50bb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6768.183853149414,
-        "y": 1288.906997680664,
-        "z": "25a21122.0e2cfe",
+        "x": 6668.183853149414,
+        "y": 1322.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "49cced3d.6f7764"
+                "5ff1493f.72bdd"
             ]
         ]
     },
     {
-        "id": "49cced3d.6f7764",
+        "id": "5ff1493f.72bdd",
         "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": 6975.183853149414,
-        "y": 1288.906997680664,
-        "z": "25a21122.0e2cfe",
+        "x": 6875.183853149414,
+        "y": 1322.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "7bc8d59f.6d2444",
+        "id": "3ea9d16d.7e59be",
         "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": 5586.566665649414,
-        "y": 2157.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5486.566665649414,
+        "y": 2191.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8f6d6d5b.1cead8"
+                "bfbafb18.47d55"
             ]
         ]
     },
     {
-        "id": "8f6d6d5b.1cead8",
+        "id": "bfbafb18.47d55",
         "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": 5792.566665649414,
-        "y": 2157.5667877197266,
-        "z": "25a21122.0e2cfe",
+        "x": 5692.566665649414,
+        "y": 2191.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e19b436a.7033d"
+                "4b1bcb13.657274"
             ]
         ]
     },
     {
-        "id": "e19b436a.7033d",
+        "id": "4b1bcb13.657274",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6007.852310180664,
-        "y": 2157.3885650634766,
-        "z": "25a21122.0e2cfe",
+        "x": 5907.852310180664,
+        "y": 2191.3885650634766,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "bec0ab0f.3e04c8"
+                "25238122.c9549e"
             ]
         ]
     },
     {
-        "id": "bec0ab0f.3e04c8",
+        "id": "25238122.c9549e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6214.683853149414,
-        "y": 2157.9071197509766,
-        "z": "25a21122.0e2cfe",
+        "x": 6114.683853149414,
+        "y": 2191.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "27fbcba1.3d3b74",
-                "ceb087f2.f1a2d",
-                "f5af142d.56f9a8"
+                "3cddf86c.952478",
+                "82ecbff8.c2935",
+                "7c6dea89.5156fc"
             ]
         ]
     },
     {
-        "id": "27fbcba1.3d3b74",
+        "id": "3cddf86c.952478",
         "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": 6429.683853149414,
-        "y": 2119.9071197509766,
-        "z": "25a21122.0e2cfe",
+        "x": 6329.683853149414,
+        "y": 2153.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ceb087f2.f1a2d",
+        "id": "82ecbff8.c2935",
         "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": 6426.683853149414,
-        "y": 2158.9071197509766,
-        "z": "25a21122.0e2cfe",
+        "x": 6326.683853149414,
+        "y": 2192.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3dd2b911.678516"
+                "f35bec69.fa6618"
             ]
         ]
     },
     {
-        "id": "f5af142d.56f9a8",
+        "id": "7c6dea89.5156fc",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6382.183853149414,
-        "y": 2200.9071197509766,
-        "z": "25a21122.0e2cfe",
+        "x": 6282.183853149414,
+        "y": 2234.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "3dd2b911.678516",
+        "id": "f35bec69.fa6618",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6607.183853149414,
-        "y": 2157.9071197509766,
-        "z": "25a21122.0e2cfe",
+        "x": 6507.183853149414,
+        "y": 2191.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2d748944.5ecffe"
+                "bca90be9.eb3b4"
             ]
         ]
     },
     {
-        "id": "2d748944.5ecffe",
+        "id": "bca90be9.eb3b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6765.183853149414,
-        "y": 2157.9071197509766,
-        "z": "25a21122.0e2cfe",
+        "x": 6665.183853149414,
+        "y": 2191.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6570963f.999c3"
+                "cc4e410.f7e474"
             ]
         ]
     },
     {
-        "id": "6570963f.999c3",
+        "id": "cc4e410.f7e474",
         "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": 6972.183853149414,
-        "y": 2157.9071197509766,
-        "z": "25a21122.0e2cfe",
+        "x": 6872.183853149414,
+        "y": 2191.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "965ca101.13418",
+        "id": "532eff46.9b467",
         "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": 5502.566665649414,
-        "y": 764.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5402.566665649414,
+        "y": 798.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "50b56074.398fb8",
-                "37713986.ac02f6",
-                "9d9c191d.f7c08"
+                "cfac27d1.f56fb",
+                "98843042.abae5",
+                "ad4bc4fb.4375a8"
             ]
         ]
     },
     {
-        "id": "50b56074.398fb8",
+        "id": "cfac27d1.f56fb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5698.066787719727,
-        "y": 716.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5598.066787719727,
+        "y": 750.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e3c2a355.360d3"
+                "42953eb.d2e8cc"
             ]
         ]
     },
     {
-        "id": "37713986.ac02f6",
+        "id": "98843042.abae5",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5690.066787719727,
-        "y": 771.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5590.066787719727,
+        "y": 805.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f545ca2e.f44db"
+                "b64afde.27ba6"
             ]
         ]
     },
     {
-        "id": "9d9c191d.f7c08",
+        "id": "ad4bc4fb.4375a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5695.066787719727,
-        "y": 828.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5595.066787719727,
+        "y": 862.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e48b21a8.d61508"
+                "36f7d7a0.66c5f"
             ]
         ]
     },
     {
-        "id": "e48b21a8.d61508",
+        "id": "36f7d7a0.66c5f",
         "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": 5847.066787719727,
-        "y": 829.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5747.066787719727,
+        "y": 863.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "f545ca2e.f44db",
+        "id": "b64afde.27ba6",
         "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": 5858.066787719727,
-        "y": 774.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5758.066787719727,
+        "y": 808.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e3c2a355.360d3",
+        "id": "42953eb.d2e8cc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5842.449111938477,
-        "y": 714.2223358154297,
-        "z": "25a21122.0e2cfe",
+        "x": 5742.449111938477,
+        "y": 748.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "206fadad.185672"
+                "4bb018ae.9365f"
             ]
         ]
     },
     {
-        "id": "16b234e1.30a8c3",
+        "id": "12009159.0799bf",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6424.566665649414,
-        "y": 732.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6324.566665649414,
+        "y": 766.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e787bf98.1dda3"
+                "2ed9d78.0097928"
             ]
         ]
     },
     {
-        "id": "e787bf98.1dda3",
+        "id": "2ed9d78.0097928",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6601.566665649414,
-        "y": 724.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6501.566665649414,
+        "y": 758.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "71a48553.06547c",
-                "92b1873d.551bc"
+                "63498f0d.93d68",
+                "c6a5d055.f8bb1"
             ]
         ]
     },
     {
-        "id": "206fadad.185672",
+        "id": "4bb018ae.9365f",
         "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": 6026.566665649414,
-        "y": 728.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 5926.566665649414,
+        "y": 762.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "69c3e96a.358898"
+                "4e52f1e.bbcdb1"
             ]
         ]
     },
     {
-        "id": "69c3e96a.358898",
+        "id": "4e52f1e.bbcdb1",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6221.566665649414,
-        "y": 728.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6121.566665649414,
+        "y": 762.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "16b234e1.30a8c3",
-                "90deb9f8.a72b18"
+                "12009159.0799bf",
+                "66f34217.bc91ec"
             ]
         ]
     },
     {
-        "id": "71a48553.06547c",
+        "id": "63498f0d.93d68",
         "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": 6839.566665649414,
-        "y": 679.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6739.566665649414,
+        "y": 713.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "3b96c7df.05e2",
+        "id": "cd3a2dd3.05e5a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 7019.566665649414,
-        "y": 722.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6919.566665649414,
+        "y": 756.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6f8ea6fb.24df1"
+                "b3c8e8eb.ab9658"
             ]
         ]
     },
     {
-        "id": "1eec19a2.07645e",
+        "id": "1bf85ef.2838b21",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 7011.566665649414,
-        "y": 777.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6911.566665649414,
+        "y": 811.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "91f5de57.10361"
+                "f4a0a941.e6174"
             ]
         ]
     },
     {
-        "id": "b1213bca.c3532",
+        "id": "420343c3.3589dc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 7016.566665649414,
-        "y": 834.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6916.566665649414,
+        "y": 868.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "62327f7e.aacf68"
+                "57b6c192.31833"
             ]
         ]
     },
     {
-        "id": "62327f7e.aacf68",
+        "id": "57b6c192.31833",
         "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": 7168.566665649414,
-        "y": 835.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 7068.566665649414,
+        "y": 869.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "91f5de57.10361",
+        "id": "f4a0a941.e6174",
         "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": 7179.566665649414,
-        "y": 780.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 7079.566665649414,
+        "y": 814.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "6f8ea6fb.24df1",
+        "id": "b3c8e8eb.ab9658",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7163.948989868164,
-        "y": 720.2223358154297,
-        "z": "25a21122.0e2cfe",
+        "x": 7063.948989868164,
+        "y": 754.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "10e59332.2edbc5"
+                "a03bd3df.8ec05"
             ]
         ]
     },
     {
-        "id": "10e59332.2edbc5",
+        "id": "a03bd3df.8ec05",
         "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": 7378.566665649414,
-        "y": 716.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 7278.566665649414,
+        "y": 750.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "22e60879.c39a9",
+        "id": "3753ad56.c9003a",
         "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": 5543.566665649414,
-        "y": 1605.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5443.566665649414,
+        "y": 1639.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3be38b30.4b1f64",
-                "53e462a7.300ecc",
-                "be7dfbd6.3bfbb"
+                "a7301f2a.402338",
+                "5484e700.5c89d",
+                "215a5bb9.bd15a4"
             ]
         ]
     },
     {
-        "id": "3be38b30.4b1f64",
+        "id": "a7301f2a.402338",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5739.066787719727,
-        "y": 1557.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5639.066787719727,
+        "y": 1591.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3d4c22c4.8bc33e"
+                "7fc657c9.5c7cc8"
             ]
         ]
     },
     {
-        "id": "53e462a7.300ecc",
+        "id": "5484e700.5c89d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5731.066787719727,
-        "y": 1612.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5631.066787719727,
+        "y": 1646.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "cc499006.fb3a6"
+                "474d315c.5dded"
             ]
         ]
     },
     {
-        "id": "be7dfbd6.3bfbb",
+        "id": "215a5bb9.bd15a4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5736.066787719727,
-        "y": 1669.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5636.066787719727,
+        "y": 1703.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "95cfda12.13aa08"
+                "4e1d6af8.1ffc14"
             ]
         ]
     },
     {
-        "id": "95cfda12.13aa08",
+        "id": "4e1d6af8.1ffc14",
         "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": 5888.066787719727,
-        "y": 1670.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5788.066787719727,
+        "y": 1704.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "cc499006.fb3a6",
+        "id": "474d315c.5dded",
         "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": 5899.066787719727,
-        "y": 1615.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5799.066787719727,
+        "y": 1649.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "3d4c22c4.8bc33e",
+        "id": "7fc657c9.5c7cc8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5883.449111938477,
-        "y": 1555.2223358154297,
-        "z": "25a21122.0e2cfe",
+        "x": 5783.449111938477,
+        "y": 1589.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "7d552eed.53cb2"
+                "5a87fca6.7b1764"
             ]
         ]
     },
     {
-        "id": "6ebd5273.de974c",
+        "id": "8a681c82.4147c8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6465.566665649414,
-        "y": 1573.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6365.566665649414,
+        "y": 1607.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d2cb326b.2ce928"
+                "25c0f761.e40b7"
             ]
         ]
     },
     {
-        "id": "d2cb326b.2ce928",
+        "id": "25c0f761.e40b7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6642.566665649414,
-        "y": 1565.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6542.566665649414,
+        "y": 1599.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "afdd7500.c5c358",
-                "995d487d.d5b57"
+                "dc2cab92.383e5",
+                "5874b3af.124b94"
             ]
         ]
     },
     {
-        "id": "7d552eed.53cb2",
+        "id": "5a87fca6.7b1764",
         "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": 6067.566665649414,
-        "y": 1569.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5967.566665649414,
+        "y": 1603.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6d34d717.589238"
+                "71c1ea6.16ca194"
             ]
         ]
     },
     {
-        "id": "6d34d717.589238",
+        "id": "71c1ea6.16ca194",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6262.566665649414,
-        "y": 1569.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6162.566665649414,
+        "y": 1603.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6ebd5273.de974c",
-                "9bbf0d49.94213"
+                "8a681c82.4147c8",
+                "15c438a7.4c22d7"
             ]
         ]
     },
     {
-        "id": "995d487d.d5b57",
+        "id": "5874b3af.124b94",
         "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": 6850.566665649414,
-        "y": 1572.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6750.566665649414,
+        "y": 1606.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "bb91f7ce.3ad978",
-                "8e3f2e93.c1d45",
-                "c8e3caf1.3f9eb8"
+                "6cc22362.6b5aa4",
+                "dbd01d5b.37e41",
+                "f57a568d.3942"
             ]
         ]
     },
     {
-        "id": "afdd7500.c5c358",
+        "id": "dc2cab92.383e5",
         "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": 6880.566665649414,
-        "y": 1520.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6780.566665649414,
+        "y": 1554.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "bb91f7ce.3ad978",
+        "id": "6cc22362.6b5aa4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 7060.566665649414,
-        "y": 1563.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6960.566665649414,
+        "y": 1597.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ced1d2ca.c0f7c"
+                "57bfbb8e.7f8e04"
             ]
         ]
     },
     {
-        "id": "8e3f2e93.c1d45",
+        "id": "dbd01d5b.37e41",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 7052.566665649414,
-        "y": 1618.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6952.566665649414,
+        "y": 1652.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "20b91ac9.f7bb0e"
+                "396bc1e7.c35d2e"
             ]
         ]
     },
     {
-        "id": "c8e3caf1.3f9eb8",
+        "id": "f57a568d.3942",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 7057.566665649414,
-        "y": 1675.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6957.566665649414,
+        "y": 1709.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "625c69e0.19da8"
+                "68626ec4.afefc8"
             ]
         ]
     },
     {
-        "id": "625c69e0.19da8",
+        "id": "68626ec4.afefc8",
         "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": 7209.566665649414,
-        "y": 1676.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 7109.566665649414,
+        "y": 1710.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "20b91ac9.f7bb0e",
+        "id": "396bc1e7.c35d2e",
         "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": 7220.566665649414,
-        "y": 1621.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 7120.566665649414,
+        "y": 1655.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ced1d2ca.c0f7c",
+        "id": "57bfbb8e.7f8e04",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7204.948989868164,
-        "y": 1561.2223358154297,
-        "z": "25a21122.0e2cfe",
+        "x": 7104.948989868164,
+        "y": 1595.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "483f20c0.02d49"
+                "183ddb54.5f2965"
             ]
         ]
     },
     {
-        "id": "483f20c0.02d49",
+        "id": "183ddb54.5f2965",
         "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": 7419.566665649414,
-        "y": 1557.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 7319.566665649414,
+        "y": 1591.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "24772c6a.a8483c",
+        "id": "2a9b5bea.92ec14",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 416.56666564941406,
-        "y": 686.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 316.56666564941406,
+        "y": 720.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3dd61cc7.9b7d74",
-                "99ef6a45.9ad878"
+                "3a6bcd00.26c4c4",
+                "868ff940.3c40b8"
             ]
         ]
     },
     {
-        "id": "3dd61cc7.9b7d74",
+        "id": "3a6bcd00.26c4c4",
         "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": 862.5666656494141,
-        "y": 545.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 762.5666656494141,
+        "y": 579.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "51cf951b.e925c4"
+                "22d238c4.fa2b2"
             ]
         ]
     },
     {
-        "id": "51cf951b.e925c4",
+        "id": "22d238c4.fa2b2",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3227.566665649414,
-        "y": 527.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 3127.566665649414,
+        "y": 561.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2bf740bc.b587b"
+                "2acc7de6.ba44da"
             ]
         ]
     },
     {
-        "id": "90deb9f8.a72b18",
+        "id": "66f34217.bc91ec",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 6427.566665649414,
-        "y": 806.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6327.566665649414,
+        "y": 840.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d620e654.6255c"
+                "8e17eafe.169168"
             ]
         ]
     },
     {
-        "id": "d620e654.6255c",
+        "id": "8e17eafe.169168",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6604.566665649414,
-        "y": 798.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6504.566665649414,
+        "y": 832.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4397af3f.dc85e"
+                "39419ce1.8622b4"
             ]
         ]
     },
     {
-        "id": "4397af3f.dc85e",
+        "id": "39419ce1.8622b4",
         "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": 6839.566665649414,
-        "y": 922.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 6739.566665649414,
+        "y": 956.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "40a79108.ee4848",
+        "id": "2bb9adc0.ca5fca",
         "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": 6879.566665649414,
-        "y": 1762.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6779.566665649414,
+        "y": 1796.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "607a3e65.d46208",
+        "id": "63d86b29.fe0a8c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6644.566665649414,
-        "y": 1638.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6544.566665649414,
+        "y": 1672.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "40a79108.ee4848"
+                "2bb9adc0.ca5fca"
             ]
         ]
     },
     {
-        "id": "9bbf0d49.94213",
+        "id": "15c438a7.4c22d7",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 6467.566665649414,
-        "y": 1646.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6367.566665649414,
+        "y": 1680.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "607a3e65.d46208"
+                "63d86b29.fe0a8c"
             ]
         ]
     },
     {
-        "id": "4f7a1356.449274",
+        "id": "4f4b77bb.effd9",
         "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": 4419.566665649414,
-        "y": 582.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4319.566665649414,
+        "y": 616.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "d1460a52.2dc398",
+        "id": "a3f33877.70aa",
         "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": 4441.566665649414,
-        "y": 717.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4341.566665649414,
+        "y": 751.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "96f11e74.5cf9",
+        "id": "b172c901.cf8828",
         "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": 4422.566665649414,
-        "y": 767.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4322.566665649414,
+        "y": 801.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "f0cde51e.fc048",
+        "id": "d30b8bfe.c0acd",
         "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": 2032.566665649414,
-        "y": 315.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1932.566665649414,
+        "y": 349.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "fe22e044.99d4c8",
-                "103cc7a8.7e9b88"
+                "bb8d5638.aa00f",
+                "1ad24ca8.e833c3"
             ]
         ]
     },
     {
-        "id": "fe22e044.99d4c8",
+        "id": "bb8d5638.aa00f",
         "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": 2297.566665649414,
-        "y": 238.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 2197.566665649414,
+        "y": 272.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "7c9d6be0.59e3fc",
+        "id": "e8bc0d88.0a94d",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 4339.566665649414,
-        "y": 2217.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4239.566665649414,
+        "y": 2251.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "5f01b0d6.663678",
+        "id": "e8d2e62e.a7299",
         "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": 4322.566665649414,
-        "y": 3975.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4222.566665649414,
+        "y": 4009.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "32dd1d69.d1982a",
+        "id": "4228fba9.d84434",
         "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": 4379.566665649414,
-        "y": 812.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 4279.566665649414,
+        "y": 846.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "fefb165c.6d9d48",
+        "id": "3f522b00.e7a774",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 4368.566665649414,
-        "y": 2457.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4268.566665649414,
+        "y": 2491.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "15c5a249.e6ba26"
+                "bc62ddbe.40b578"
             ]
         ]
     },
     {
-        "id": "1531085f.c55ba",
+        "id": "a84a4901.ab0e28",
         "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='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\n",
         "comments": "",
         "outputs": 1,
-        "x": 5496.566665649414,
-        "y": 2964.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5396.566665649414,
+        "y": 2998.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "fcadaec7.4e387"
+                "bd40be8c.dbbe2"
             ]
         ]
     },
     {
-        "id": "24f90323.65c334",
+        "id": "e8742cf6.070f98",
         "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": 6069.066665649414,
-        "y": 3068.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5969.066665649414,
+        "y": 3102.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "fcadaec7.4e387",
+        "id": "bd40be8c.dbbe2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5802.566665649414,
-        "y": 2963.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5702.566665649414,
+        "y": 2997.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "47fc66cf.f2219"
+                "62dd0574.924774"
             ]
         ]
     },
     {
-        "id": "47fc66cf.f2219",
+        "id": "62dd0574.924774",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6012.066665649414,
-        "y": 2963.820571899414,
-        "z": "25a21122.0e2cfe",
+        "x": 5912.066665649414,
+        "y": 2997.820571899414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "e4910759.e9a85",
+        "id": "dfdbadd6.a714c8",
         "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": 5532.566665649414,
-        "y": 2428.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5432.566665649414,
+        "y": 2462.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "19efb26.3a5054e",
+        "id": "7a29235.bdc29dc",
         "type": "switchNode",
         "name": "switch otnidx == 0",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5405.566665649414,
-        "y": 3081.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5305.566665649414,
+        "y": 3115.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6ac91bae.a4e2fc",
-                "f696dd3e.08c3d"
+                "9e040fdf.4e1908",
+                "afd9af18.cbf68"
             ]
         ]
     },
     {
-        "id": "6ac91bae.a4e2fc",
+        "id": "9e040fdf.4e1908",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5588.566665649414,
-        "y": 3081.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5488.566665649414,
+        "y": 3115.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5559f5ba.2a16b4"
+                "4d493b22.a954ac"
             ]
         ]
     },
     {
-        "id": "f696dd3e.08c3d",
+        "id": "afd9af18.cbf68",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5413.566665649414,
-        "y": 3228.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5313.566665649414,
+        "y": 3262.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "16a87f5a.f1d3a9"
+                "48643fac.9b7948"
             ]
         ]
     },
     {
-        "id": "b74045ae.325b78",
+        "id": "2165c5b.74a7eba",
         "type": "switchNode",
         "name": "switch otnidx == last",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5754.566665649414,
-        "y": 3309.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5654.566665649414,
+        "y": 3343.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "93c212f0.0f2258",
-                "d060ce07.272bc8"
+                "be7f13b1.86e45",
+                "d545210.3bcece"
             ]
         ]
     },
     {
-        "id": "93c212f0.0f2258",
+        "id": "be7f13b1.86e45",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5939.566665649414,
-        "y": 3310.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5839.566665649414,
+        "y": 3344.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8ce15cd2.dd2d"
+                "fa774d24.89417"
             ]
         ]
     },
     {
-        "id": "d060ce07.272bc8",
+        "id": "d545210.3bcece",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5958.566665649414,
-        "y": 3576.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5858.566665649414,
+        "y": 3610.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1b72857d.e58193"
+                "a5e2b559.bb92b8"
             ]
         ]
     },
     {
-        "id": "a4b93978.557f9",
+        "id": "76fed0d3.50c2b8",
         "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": 6369.566665649414,
-        "y": 3311.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6269.566665649414,
+        "y": 3345.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "c7b0c40a.9c6038",
+        "id": "70c2d887.ebd89",
         "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": 6443.566665649414,
-        "y": 3609.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6343.566665649414,
+        "y": 3643.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "689f50a5.dff04",
+        "id": "6dff6f96.bdd14",
         "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='`$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": 6379.566665649414,
-        "y": 3660.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6279.566665649414,
+        "y": 3694.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "67d0e07e.cd61f8",
+        "id": "da14d71e.29e388",
         "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": 6508.566665649414,
-        "y": 3710.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6408.566665649414,
+        "y": 3744.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "8bcc08c5.9c4d7",
+        "id": "36a913e9.1aa2ec",
         "type": "comment",
         "name": "connectivity has not been created for middle domains, so we have to create one",
         "info": "",
         "comments": "",
-        "x": 6518.566665649414,
-        "y": 3553.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6418.566665649414,
+        "y": 3587.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "64006ab7.c64d44",
+        "id": "e8dd53ff.bedac8",
         "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": 6476.566665649414,
-        "y": 3769.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6376.566665649414,
+        "y": 3803.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "1b72857d.e58193",
+        "id": "a5e2b559.bb92b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6115.566665649414,
-        "y": 3577.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6015.566665649414,
+        "y": 3611.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c7b0c40a.9c6038",
-                "689f50a5.dff04",
-                "67d0e07e.cd61f8",
-                "64006ab7.c64d44",
-                "9642c24b.bc1f8"
+                "70c2d887.ebd89",
+                "6dff6f96.bdd14",
+                "da14d71e.29e388",
+                "e8dd53ff.bedac8",
+                "74474f32.496d08"
             ]
         ]
     },
     {
-        "id": "15c5a249.e6ba26",
+        "id": "bc62ddbe.40b578",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4625.566665649414,
-        "y": 2457.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4525.566665649414,
+        "y": 2491.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e4910759.e9a85",
-                "1531085f.c55ba",
-                "19efb26.3a5054e",
-                "ad7dc399.bf418",
-                "59469467.70a6d4",
-                "982e5c66.4703f8",
-                "e9c05ada.bb249"
+                "dfdbadd6.a714c8",
+                "a84a4901.ab0e28",
+                "7a29235.bdc29dc",
+                "ea78e7b3.e08de",
+                "d3bd92d0.f9c398",
+                "a0d9c335.32979",
+                "df425f50.085b58"
             ]
         ]
     },
     {
-        "id": "b962e9bf.f7ec68",
+        "id": "e594bba7.4a822",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",
         "comments": "",
-        "x": 5993.566665649414,
-        "y": 3125.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5893.566665649414,
+        "y": 3159.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "7f4b2d0d.ab9d0c",
+        "id": "87b29bcd.d06e1",
         "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": 6046.566665649414,
-        "y": 3169.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5946.566665649414,
+        "y": 3203.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d0a8f560.124258",
-                "e919fb8f.48aeb"
+                "5032251f.1cf2d4",
+                "be6cefef.c756f"
             ]
         ]
     },
     {
-        "id": "e919fb8f.48aeb",
+        "id": "be6cefef.c756f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6317.566665649414,
-        "y": 3154.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6217.566665649414,
+        "y": 3188.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "408ad253.15a054"
+                "9820d829.628f68"
             ]
         ]
     },
     {
-        "id": "d0a8f560.124258",
+        "id": "5032251f.1cf2d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6315.566879272461,
-        "y": 3212.566575050354,
-        "z": "25a21122.0e2cfe",
+        "x": 6215.566879272461,
+        "y": 3246.566575050354,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "bfaa06ad.2149c"
+                "d853eef3.2531b"
             ]
         ]
     },
     {
-        "id": "408ad253.15a054",
+        "id": "9820d829.628f68",
         "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": 6457.566913604736,
-        "y": 3154.5666666030884,
-        "z": "25a21122.0e2cfe",
+        "x": 6357.566913604736,
+        "y": 3188.5666666030884,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "bfaa06ad.2149c",
+        "id": "d853eef3.2531b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6463.593925476074,
-        "y": 3203.31206035614,
-        "z": "25a21122.0e2cfe",
+        "x": 6363.593925476074,
+        "y": 3237.31206035614,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "5559f5ba.2a16b4",
+        "id": "4d493b22.a954ac",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5729.566665649414,
-        "y": 3071.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5629.566665649414,
+        "y": 3105.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "24f90323.65c334",
-                "7f4b2d0d.ab9d0c",
-                "b962e9bf.f7ec68"
+                "e8742cf6.070f98",
+                "e594bba7.4a822"
             ]
         ]
     },
     {
-        "id": "8ce15cd2.dd2d",
+        "id": "fa774d24.89417",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6073.566665649414,
-        "y": 3311.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5973.566665649414,
+        "y": 3345.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a4b93978.557f9",
-                "fc367338.14f248",
-                "546374c7.67c9c4"
+                "76fed0d3.50c2b8",
+                "1f8bf5f5.3f985a"
             ]
         ]
     },
     {
-        "id": "546374c7.67c9c4",
+        "id": "1f8bf5f5.3f985a",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
         "comments": "",
-        "x": 6293.566665649414,
-        "y": 3355.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6193.566665649414,
+        "y": 3389.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "fc367338.14f248",
+        "id": "56138fb2.fa508",
         "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": 6344.566665649414,
-        "y": 3399.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6244.566665649414,
+        "y": 3433.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "edc516eb.d6818",
-                "889681a1.8aebb"
+                "c11f4412.596988",
+                "3d65e0af.86bdc"
             ]
         ]
     },
     {
-        "id": "889681a1.8aebb",
+        "id": "3d65e0af.86bdc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6607.566665649414,
-        "y": 3379.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6507.566665649414,
+        "y": 3413.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b62983f6.8b1c68"
+                "ab4947b8.f3efc8"
             ]
         ]
     },
     {
-        "id": "edc516eb.d6818",
+        "id": "c11f4412.596988",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6608.566879272461,
-        "y": 3430.566575050354,
-        "z": "25a21122.0e2cfe",
+        "x": 6508.566879272461,
+        "y": 3464.566575050354,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "51aaba5d.abae2c"
+                "42fcaa4.0e80754"
             ]
         ]
     },
     {
-        "id": "b62983f6.8b1c68",
+        "id": "ab4947b8.f3efc8",
         "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": 6747.566913604736,
-        "y": 3379.5666666030884,
-        "z": "25a21122.0e2cfe",
+        "x": 6647.566913604736,
+        "y": 3413.5666666030884,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "51aaba5d.abae2c",
+        "id": "42fcaa4.0e80754",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6753.593925476074,
-        "y": 3428.31206035614,
-        "z": "25a21122.0e2cfe",
+        "x": 6653.593925476074,
+        "y": 3462.31206035614,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "9642c24b.bc1f8",
+        "id": "74474f32.496d08",
         "type": "set",
         "name": "set attachment_param domain otnidx",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 6390.566665649414,
-        "y": 3829.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6290.566665649414,
+        "y": 3863.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "127eaa7a.98449e",
+        "id": "c12964ef.831f2",
         "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": 3709.566665649414,
-        "y": 4176.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 3609.566665649414,
+        "y": 4210.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4f7f9fac.fe049",
-                "7f9abc32.a826f4",
-                "58223279.e77444"
+                "46b1e3df.d037b4",
+                "12132e54.c462e2",
+                "bec1d9b0.34cbd8"
             ]
         ]
     },
     {
-        "id": "4f7f9fac.fe049",
+        "id": "46b1e3df.d037b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3897.566665649414,
-        "y": 4189.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 3797.566665649414,
+        "y": 4223.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f21f6a6d.7c0b9"
+                "57bca9f.85d5a58"
             ]
         ]
     },
     {
-        "id": "7f9abc32.a826f4",
+        "id": "12132e54.c462e2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3898.057632446289,
-        "y": 4235.140701293945,
-        "z": "25a21122.0e2cfe",
+        "x": 3798.057632446289,
+        "y": 4269.140701293945,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5b9e9e7e.bd3fb8"
+                "6123f77d.b84b7"
             ]
         ]
     },
     {
-        "id": "58223279.e77444",
+        "id": "bec1d9b0.34cbd8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3895.566665649414,
-        "y": 4278.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 3795.566665649414,
+        "y": 4312.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "81ac9378.5e17c8"
+                "c1bcff3.65bc5"
             ]
         ]
     },
     {
-        "id": "f21f6a6d.7c0b9",
+        "id": "57bca9f.85d5a58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4070.566665649414,
-        "y": 4187.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 3970.566665649414,
+        "y": 4221.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1562d3ab.607dc4"
+                "48f214f2.afe82c"
             ]
         ]
     },
     {
-        "id": "5b9e9e7e.bd3fb8",
+        "id": "6123f77d.b84b7",
         "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": 4060.6290435791016,
-        "y": 4235.42643737793,
-        "z": "25a21122.0e2cfe",
+        "x": 3960.6290435791016,
+        "y": 4269.42643737793,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "81ac9378.5e17c8",
+        "id": "c1bcff3.65bc5",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4062.566665649414,
-        "y": 4277.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 3962.566665649414,
+        "y": 4311.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e781046f.1418e",
+        "id": "6a14b8fb.57e66",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3698.566665649414,
-        "y": 4367.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 3598.566665649414,
+        "y": 4401.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d5bebf9c.374a9"
+                "d21b0d43.234748"
             ]
         ]
     },
     {
-        "id": "a7536813.9c6d5",
+        "id": "5a7ba4c6.c66bd4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4508.566665649414,
-        "y": 4367.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4408.566665649414,
+        "y": 4401.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a13486f2.279748"
+                "d757ef24.d8b4b8"
             ]
         ]
     },
     {
-        "id": "d852a581.272668",
+        "id": "7025e4fd.b3ba94",
         "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": 4280.566665649414,
-        "y": 4367.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4180.566665649414,
+        "y": 4401.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a7536813.9c6d5"
+                "5a7ba4c6.c66bd4"
             ]
         ]
     },
     {
-        "id": "35196fa7.3e82b8",
+        "id": "714d6791.87f3b8",
         "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": 5400.566665649414,
-        "y": 4134.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5300.566665649414,
+        "y": 4168.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "1b7fbbc1.fdc524",
+        "id": "820ac720.b45068",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
         "comments": "",
-        "x": 5702.566665649414,
-        "y": 3260.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5602.566665649414,
+        "y": 3294.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "16a87f5a.f1d3a9",
+        "id": "48643fac.9b7948",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5537.566665649414,
-        "y": 3235.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5437.566665649414,
+        "y": 3269.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1b7fbbc1.fdc524",
-                "b74045ae.325b78"
+                "820ac720.b45068",
+                "2165c5b.74a7eba"
             ]
         ]
     },
     {
-        "id": "5a4aff44.5be78",
+        "id": "b8b8c8f9.3c3308",
         "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<!--<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<parameter name='bwModified' value='false' />\n",
         "comments": "",
-        "x": 1991.566665649414,
-        "y": 265.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1891.566665649414,
+        "y": 299.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "1562d3ab.607dc4",
+        "id": "48f214f2.afe82c",
         "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": 4299.566665649414,
-        "y": 4188.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4199.566665649414,
+        "y": 4222.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1d7f1d69.47cb1b"
+                "13a3ad3e.ce4b03"
             ]
         ]
     },
     {
-        "id": "1d7f1d69.47cb1b",
+        "id": "13a3ad3e.ce4b03",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4514.566665649414,
-        "y": 4189.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4414.566665649414,
+        "y": 4223.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "25f755d1.b61592"
+                "aaee7064.6ec4a8"
             ]
         ]
     },
     {
-        "id": "5d5ba3f2.74414c",
+        "id": "54a1b0ce.796af",
         "type": "for",
         "name": "for arridx in tmp.arr",
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5967.566665649414,
-        "y": 4109.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5867.566665649414,
+        "y": 4143.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c853cdfd.dbbe38"
+                "1cad0dda.a27a62"
             ]
         ]
     },
     {
-        "id": "b4d44dab.0baa88",
+        "id": "5f82b085.2694c",
         "type": "switchNode",
         "name": "switch $tmp.arr_length != 0",
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5433.566665649414,
-        "y": 4189.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5333.566665649414,
+        "y": 4223.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "62eec498.21eadc",
-                "978a0072.3fd11"
+                "64f08945.d78fe",
+                "c8f5bcb9.62dc"
             ]
         ]
     },
     {
-        "id": "62eec498.21eadc",
+        "id": "64f08945.d78fe",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5629.566665649414,
-        "y": 4159.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5529.566665649414,
+        "y": 4193.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "899efa3b.42e148"
+                "bfcf40e9.39a97"
             ]
         ]
     },
     {
-        "id": "978a0072.3fd11",
+        "id": "c8f5bcb9.62dc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5630.566665649414,
-        "y": 4230.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5530.566665649414,
+        "y": 4264.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "214f2c3d.6d899c"
+                "f29be22.ac73ba"
             ]
         ]
     },
     {
-        "id": "899efa3b.42e148",
+        "id": "bfcf40e9.39a97",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5780.566665649414,
-        "y": 4157.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5680.566665649414,
+        "y": 4191.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5d5ba3f2.74414c",
-                "a601628e.52c128"
+                "54a1b0ce.796af",
+                "5025eb6e.6416ac"
             ]
         ]
     },
     {
-        "id": "c853cdfd.dbbe38",
+        "id": "1cad0dda.a27a62",
         "type": "switchNode",
         "name": "switch tmp.arr[$arridx] == $providerValue",
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6258.566665649414,
-        "y": 4109.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6158.566665649414,
+        "y": 4143.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "32f1af6e.548f98",
-                "aa4fe454.7a4ce"
+                "ef1aab2d.dfd7e",
+                "c7951c87.3f94f8"
             ]
         ]
     },
     {
-        "id": "32f1af6e.548f98",
+        "id": "ef1aab2d.dfd7e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6533.566665649414,
-        "y": 4078.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6433.566665649414,
+        "y": 4112.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "811e814b.5875b8"
+                "3158c3e7.0f4f1c"
             ]
         ]
     },
     {
-        "id": "aa4fe454.7a4ce",
+        "id": "c7951c87.3f94f8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6534.566665649414,
-        "y": 4149.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6434.566665649414,
+        "y": 4183.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "989bacbe.4af828"
+                "18af5fa5.bfa388"
             ]
         ]
     },
     {
-        "id": "811e814b.5875b8",
+        "id": "3158c3e7.0f4f1c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6684.566665649414,
-        "y": 4076.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6584.566665649414,
+        "y": 4110.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "af4f903c.21f488",
-                "2d6d2965.4ae4be",
-                "e5b6e917.a4d33",
-                "1c32b22d.5aadde",
-                "1865add8.1adbe2"
+                "c68342ac.2196d8",
+                "a6f93050.eee23",
+                "cc632799.cbb108",
+                "245ca61c.76b612",
+                "939302e5.823e3"
             ]
         ]
     },
     {
-        "id": "af4f903c.21f488",
+        "id": "c68342ac.2196d8",
         "type": "set",
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 6872.566665649414,
-        "y": 4036.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6772.566665649414,
+        "y": 4070.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "2d6d2965.4ae4be",
+        "id": "a6f93050.eee23",
         "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": 6944.566665649414,
-        "y": 4081.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6844.566665649414,
+        "y": 4115.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "1865add8.1adbe2",
+        "id": "939302e5.823e3",
         "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": 6859.566665649414,
-        "y": 4208.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6759.566665649414,
+        "y": 4242.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "1c32b22d.5aadde",
+        "id": "245ca61c.76b612",
         "type": "set",
         "name": "set sizeOfSliceList",
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
         "comments": "",
-        "x": 6880.566665649414,
-        "y": 4144.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6780.566665649414,
+        "y": 4178.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "214f2c3d.6d899c",
+        "id": "f29be22.ac73ba",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5782.566665649414,
-        "y": 4230.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5682.566665649414,
+        "y": 4264.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2a37cb43.8a38d4",
-                "2a56e17b.8d5c2e"
+                "b939d5a3.62c49",
+                "19ae4c6e.0e8cdc"
             ]
         ]
     },
     {
-        "id": "2a37cb43.8a38d4",
+        "id": "b939d5a3.62c49",
         "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": 6037.566665649414,
-        "y": 4223.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5937.566665649414,
+        "y": 4257.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "2a56e17b.8d5c2e",
+        "id": "19ae4c6e.0e8cdc",
         "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": 5965.566665649414,
-        "y": 4270.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5865.566665649414,
+        "y": 4304.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "a601628e.52c128",
+        "id": "5025eb6e.6416ac",
         "type": "switchNode",
         "name": "switch found?",
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5958.566665649414,
-        "y": 4154.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5858.566665649414,
+        "y": 4188.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "38e10d32.2b93c2",
-                "dbcc850c.fc8dd"
+                "5f0ac92a.2af9f8",
+                "5a001e78.4b9ed8"
             ]
         ]
     },
     {
-        "id": "38e10d32.2b93c2",
+        "id": "5f0ac92a.2af9f8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6118.566665649414,
-        "y": 4146.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6018.566665649414,
+        "y": 4180.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b21401a.fc6228"
+                "26dc24b4.633a24"
             ]
         ]
     },
     {
-        "id": "dbcc850c.fc8dd",
+        "id": "5a001e78.4b9ed8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6116.566665649414,
-        "y": 4183.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6016.566665649414,
+        "y": 4217.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e4683213.00ce18"
+                "77dbb1e6.82cb3"
             ]
         ]
     },
     {
-        "id": "b21401a.fc6228",
+        "id": "26dc24b4.633a24",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6243.566665649414,
-        "y": 4146.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6143.566665649414,
+        "y": 4180.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2a7d328.f35de8",
+        "id": "88be3e5.2470dc",
         "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": 6550.566665649414,
-        "y": 4204.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6450.566665649414,
+        "y": 4238.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "e4683213.00ce18",
+        "id": "77dbb1e6.82cb3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6276.566665649414,
-        "y": 4191.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6176.566665649414,
+        "y": 4225.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a2a7d328.f35de8",
-                "930daebd.33fb78"
+                "88be3e5.2470dc",
+                "7d97455b.7a4494"
             ]
         ]
     },
     {
-        "id": "930daebd.33fb78",
+        "id": "7d97455b.7a4494",
         "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": 6467.566665649414,
-        "y": 4250.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6367.566665649414,
+        "y": 4284.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "989bacbe.4af828",
+        "id": "18af5fa5.bfa388",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6667.566665649414,
-        "y": 4148.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6567.566665649414,
+        "y": 4182.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "e5b6e917.a4d33",
+        "id": "cc632799.cbb108",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6838.566665649414,
-        "y": 4275.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6738.566665649414,
+        "y": 4309.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ad7dc399.bf418",
+        "id": "ea78e7b3.e08de",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5235.566665649414,
-        "y": 2487.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5135.566665649414,
+        "y": 2521.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "359b938e.1f1cd4",
-                "64d68365.eb604c"
+                "11f77bdc.5c21c4",
+                "4e61ac39.13325c"
             ]
         ]
     },
     {
-        "id": "359b938e.1f1cd4",
+        "id": "11f77bdc.5c21c4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5624.566665649414,
-        "y": 2465.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5524.566665649414,
+        "y": 2499.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "73a3115c.3a191"
+                "7430e7ea.530e58"
             ]
         ]
     },
     {
-        "id": "64d68365.eb604c",
+        "id": "4e61ac39.13325c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5625.566665649414,
-        "y": 2511.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5525.566665649414,
+        "y": 2545.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "40a2bbc1.5980e4"
+                "40bd7840.ab6ab8"
             ]
         ]
     },
     {
-        "id": "73a3115c.3a191",
+        "id": "7430e7ea.530e58",
         "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": 5838.566665649414,
-        "y": 2464.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5738.566665649414,
+        "y": 2498.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "40a2bbc1.5980e4",
+        "id": "40bd7840.ab6ab8",
         "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": 5836.566665649414,
-        "y": 2509.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5736.566665649414,
+        "y": 2543.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "a13486f2.279748",
+        "id": "d757ef24.d8b4b8",
         "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": 4761.566665649414,
-        "y": 4365.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4661.566665649414,
+        "y": 4399.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "3fa485d1.c8f9c2",
+        "id": "b77c6069.584e4",
         "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": 4346.566665649414,
-        "y": 4473.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4246.566665649414,
+        "y": 4507.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f023dd0f.b91278",
-                "29f41b43.8a7c44"
+                "ba44af6e.91f5c8",
+                "3bd2b367.4ad41c"
             ]
         ]
     },
     {
-        "id": "29f41b43.8a7c44",
+        "id": "3bd2b367.4ad41c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4629.566665649414,
-        "y": 4453.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4529.566665649414,
+        "y": 4487.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e71ba272.6cc34"
+                "37d6233a.1b0304"
             ]
         ]
     },
     {
-        "id": "f023dd0f.b91278",
+        "id": "ba44af6e.91f5c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4630.566879272461,
-        "y": 4504.566575050354,
-        "z": "25a21122.0e2cfe",
+        "x": 4530.566879272461,
+        "y": 4538.566575050354,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "7f431198.b36fd"
+                "37a623d1.3ee5dc"
             ]
         ]
     },
     {
-        "id": "e71ba272.6cc34",
+        "id": "37d6233a.1b0304",
         "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": 4769.566913604736,
-        "y": 4453.566666603088,
-        "z": "25a21122.0e2cfe",
+        "x": 4669.566913604736,
+        "y": 4487.566666603088,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "7f431198.b36fd",
+        "id": "37a623d1.3ee5dc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4775.593925476074,
-        "y": 4502.31206035614,
-        "z": "25a21122.0e2cfe",
+        "x": 4675.593925476074,
+        "y": 4536.31206035614,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "59469467.70a6d4",
+        "id": "d3bd92d0.f9c398",
         "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": 5419.566665649414,
-        "y": 2607.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5319.566665649414,
+        "y": 2641.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "982e5c66.4703f8",
+        "id": "a0d9c335.32979",
         "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": 5463.566665649414,
-        "y": 2655.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5363.566665649414,
+        "y": 2689.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "48087d37.a26c6c",
-                "da051a0e.70b99",
-                "11fa1a3.3e28f66"
+                "36774af5.729fc6",
+                "692ec606.1c0bf",
+                "a64279c9.e169f8"
             ]
         ]
     },
     {
-        "id": "48087d37.a26c6c",
+        "id": "36774af5.729fc6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5676.066665649414,
-        "y": 2602.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5576.066665649414,
+        "y": 2636.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d7b6e1d4.5db9c8"
+                "24f01093.ed22"
             ]
         ]
     },
     {
-        "id": "da051a0e.70b99",
+        "id": "692ec606.1c0bf",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5688.066665649414,
-        "y": 2652.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5588.066665649414,
+        "y": 2686.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8bafac6.5725d5"
+                "b3f7be01.e6de6"
             ]
         ]
     },
     {
-        "id": "11fa1a3.3e28f66",
+        "id": "a64279c9.e169f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5679.066665649414,
-        "y": 2707.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5579.066665649414,
+        "y": 2741.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1bd627d5.df5018"
+                "4198105e.daee7"
             ]
         ]
     },
     {
-        "id": "1bd627d5.df5018",
+        "id": "4198105e.daee7",
         "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": 5824.066665649414,
-        "y": 2706.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5724.066665649414,
+        "y": 2740.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "8bafac6.5725d5",
+        "id": "b3f7be01.e6de6",
         "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": 5835.066665649414,
-        "y": 2649.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5735.066665649414,
+        "y": 2683.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "d7b6e1d4.5db9c8",
+        "id": "24f01093.ed22",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5801.449111938477,
-        "y": 2596.2223358154297,
-        "z": "25a21122.0e2cfe",
+        "x": 5701.449111938477,
+        "y": 2630.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "7412b5af.ff0f9c"
+                "96aa274b.2af748"
             ]
         ]
     },
     {
-        "id": "2b52018c.262d56",
+        "id": "70fdda05.22abe4",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6360.566665649414,
-        "y": 2614.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6260.566665649414,
+        "y": 2648.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "691fa48a.848bcc"
+                "5724269.b9bddd8"
             ]
         ]
     },
     {
-        "id": "691fa48a.848bcc",
+        "id": "5724269.b9bddd8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6537.566665649414,
-        "y": 2606.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6437.566665649414,
+        "y": 2640.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "40d861d8.1df158",
-                "6005e754.3b403"
+                "29fcda51.42b766",
+                "d5b1f1ff.e7e908"
             ]
         ]
     },
     {
-        "id": "7412b5af.ff0f9c",
+        "id": "96aa274b.2af748",
         "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": 5962.566665649414,
-        "y": 2610.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5862.566665649414,
+        "y": 2644.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "cee0c51f.59e4e8"
+                "c5ea1030.bae808"
             ]
         ]
     },
     {
-        "id": "cee0c51f.59e4e8",
+        "id": "c5ea1030.bae808",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6157.566665649414,
-        "y": 2610.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6057.566665649414,
+        "y": 2644.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2b52018c.262d56"
+                "70fdda05.22abe4"
             ]
         ]
     },
     {
-        "id": "6005e754.3b403",
+        "id": "d5b1f1ff.e7e908",
         "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": 6745.566665649414,
-        "y": 2613.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6645.566665649414,
+        "y": 2647.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ba9890c1.c4a288",
-                "659d7a5f.8396d4",
-                "c60c2b5.88a3ed8"
+                "56bf4e9f.3968f8",
+                "437d47d9.20134",
+                "1f059162.8a738f"
             ]
         ]
     },
     {
-        "id": "40d861d8.1df158",
+        "id": "29fcda51.42b766",
         "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": 6775.566665649414,
-        "y": 2561.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6675.566665649414,
+        "y": 2595.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ba9890c1.c4a288",
+        "id": "56bf4e9f.3968f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6955.566665649414,
-        "y": 2604.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6855.566665649414,
+        "y": 2638.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "203ebc79.0da80c"
+                "1dc1cb6d.3c36b5"
             ]
         ]
     },
     {
-        "id": "659d7a5f.8396d4",
+        "id": "437d47d9.20134",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6947.566665649414,
-        "y": 2659.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6847.566665649414,
+        "y": 2693.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "23f5bad7.571c16"
+                "7f43de09.864508"
             ]
         ]
     },
     {
-        "id": "c60c2b5.88a3ed8",
+        "id": "1f059162.8a738f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6952.566665649414,
-        "y": 2716.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6852.566665649414,
+        "y": 2750.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d78cb5ab.fdf3"
+                "b0293f66.5c8dc"
             ]
         ]
     },
     {
-        "id": "d78cb5ab.fdf3",
+        "id": "b0293f66.5c8dc",
         "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": 7104.566665649414,
-        "y": 2717.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 7004.566665649414,
+        "y": 2751.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "23f5bad7.571c16",
+        "id": "7f43de09.864508",
         "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": 7115.566665649414,
-        "y": 2662.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 7015.566665649414,
+        "y": 2696.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "203ebc79.0da80c",
+        "id": "1dc1cb6d.3c36b5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7099.948989868164,
-        "y": 2602.2223358154297,
-        "z": "25a21122.0e2cfe",
+        "x": 6999.948989868164,
+        "y": 2636.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "510e20cb.08311"
+                "966090bf.048df8"
             ]
         ]
     },
     {
-        "id": "510e20cb.08311",
+        "id": "966090bf.048df8",
         "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": 7314.566665649414,
-        "y": 2598.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 7214.566665649414,
+        "y": 2632.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "d5bebf9c.374a9",
+        "id": "d21b0d43.234748",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3930.566665649414,
-        "y": 4365.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 3830.566665649414,
+        "y": 4399.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d852a581.272668",
-                "3fa485d1.c8f9c2"
+                "7025e4fd.b3ba94",
+                "b77c6069.584e4"
             ]
         ]
     },
     {
-        "id": "e9c05ada.bb249",
+        "id": "df425f50.085b58",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5433.566665649414,
-        "y": 2824.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5333.566665649414,
+        "y": 2858.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e3270b50.ca16b",
-                "1493e80e.a20608"
+                "f12d2166.2196f",
+                "682813b1.580324"
             ]
         ]
     },
     {
-        "id": "e3270b50.ca16b",
+        "id": "f12d2166.2196f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5634.566665649414,
-        "y": 2822.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5534.566665649414,
+        "y": 2856.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8c1f5350.45b238"
+                "c9eeec2d.e136b"
             ]
         ]
     },
     {
-        "id": "8c1f5350.45b238",
+        "id": "c9eeec2d.e136b",
         "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": 5848.566665649414,
-        "y": 2824.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5748.566665649414,
+        "y": 2858.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "efd041d2.1f57c",
+        "id": "cb7ac096.290b9",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5851.566665649414,
-        "y": 2873.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5751.566665649414,
+        "y": 2907.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "18ead70f.a7a7d1",
-                "86ea5500.031798"
+                "69e4928.c222dec",
+                "f0c4a8ec.842b18"
             ]
         ]
     },
     {
-        "id": "18ead70f.a7a7d1",
+        "id": "69e4928.c222dec",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6081.566665649414,
-        "y": 2869.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5981.566665649414,
+        "y": 2903.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "45ea107a.0ebac8"
+                "2b076d1.a6bcd92"
             ]
         ]
     },
     {
-        "id": "45ea107a.0ebac8",
+        "id": "2b076d1.a6bcd92",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 6295.566665649414,
-        "y": 2872.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6195.566665649414,
+        "y": 2906.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "1493e80e.a20608",
+        "id": "682813b1.580324",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5634.566665649414,
-        "y": 2871.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5534.566665649414,
+        "y": 2905.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "efd041d2.1f57c"
+                "cb7ac096.290b9"
             ]
         ]
     },
     {
-        "id": "86ea5500.031798",
+        "id": "f0c4a8ec.842b18",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6082.566665649414,
-        "y": 2915.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5982.566665649414,
+        "y": 2949.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "7828b5dc.b70c4c"
+                "707799e0.88ec2"
             ]
         ]
     },
     {
-        "id": "7828b5dc.b70c4c",
+        "id": "707799e0.88ec2",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 6296.566665649414,
-        "y": 2915.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6196.566665649414,
+        "y": 2949.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "72c2b2cc.2ba44c",
+        "id": "850f3d1.0a8294",
         "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": 6194.566665649414,
-        "y": 2964.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 6094.566665649414,
+        "y": 2998.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "25f755d1.b61592",
+        "id": "aaee7064.6ec4a8",
         "type": "switchNode",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 4758.566665649414,
-        "y": 4188.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4658.566665649414,
+        "y": 4222.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "15207d44.a4310b",
-                "179e4c90.1525b3"
+                "89261301.f79ae",
+                "bc254e44.388f98"
             ]
         ]
     },
     {
-        "id": "15207d44.a4310b",
+        "id": "89261301.f79ae",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4975.566665649414,
-        "y": 4167.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4875.566665649414,
+        "y": 4201.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "64fe7f3a.b5df9"
+                "b99882e3.9c25b8"
             ]
         ]
     },
     {
-        "id": "179e4c90.1525b3",
+        "id": "bc254e44.388f98",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4975.566665649414,
-        "y": 4216.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4875.566665649414,
+        "y": 4250.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "64fe7f3a.b5df9",
+        "id": "b99882e3.9c25b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5143.566665649414,
-        "y": 4167.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5043.566665649414,
+        "y": 4201.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "35196fa7.3e82b8",
-                "b4d44dab.0baa88"
+                "714d6791.87f3b8",
+                "5f82b085.2694c"
             ]
         ]
     },
     {
-        "id": "433e887a.5dd2c",
+        "id": "67e01b15.d67c64",
         "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": 1483.566665649414,
-        "y": 798.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1380.566650390625,
+        "y": 835.566650390625,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4058fc82.6dfacc",
-                "4151c29c.d64b0c",
-                "5541a408.f0ed0c"
+                "fdf74857.41608",
+                "ee4e91c.5d8d17",
+                "855c696.c46c118"
             ]
         ]
     },
     {
-        "id": "4058fc82.6dfacc",
+        "id": "fdf74857.41608",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1696.057632446289,
-        "y": 765.1406402587891,
-        "z": "25a21122.0e2cfe",
+        "x": 1596.057632446289,
+        "y": 799.1406402587891,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "417a2c30.fd69ac"
+                "43b6bc30.e8a804"
             ]
         ]
     },
     {
-        "id": "4151c29c.d64b0c",
+        "id": "ee4e91c.5d8d17",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1684.566665649414,
-        "y": 809.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1584.566665649414,
+        "y": 843.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2fc8bb7d.787cac"
+                "a4b65a55.9111d"
             ]
         ]
     },
     {
-        "id": "417a2c30.fd69ac",
+        "id": "43b6bc30.e8a804",
         "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": 1844.629165649414,
-        "y": 765.4264068603516,
-        "z": "25a21122.0e2cfe",
+        "x": 1744.629165649414,
+        "y": 799.4264068603516,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "2fc8bb7d.787cac",
+        "id": "a4b65a55.9111d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1843.566665649414,
-        "y": 809.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1743.566665649414,
+        "y": 843.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "5541a408.f0ed0c",
+        "id": "855c696.c46c118",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1689.566665649414,
-        "y": 852.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1589.566665649414,
+        "y": 886.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e145a9c3.48d208"
+                "2b531922.e9da96"
             ]
         ]
     },
     {
-        "id": "e145a9c3.48d208",
+        "id": "2b531922.e9da96",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 835.5666656494141,
-        "y": 1191.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 735.5666656494141,
+        "y": 1225.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "88efa0d6.0c1808"
+                "7c91e56b.1594b4"
             ]
         ]
     },
     {
-        "id": "88efa0d6.0c1808",
+        "id": "7c91e56b.1594b4",
         "type": "for",
         "name": "for each svc-instance relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1109.566665649414,
-        "y": 1191.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1009.5666656494141,
+        "y": 1225.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c2dd1c9b.b3dd48"
+                "bfa4ee31.b57fd"
             ]
         ]
     },
     {
-        "id": "c2dd1c9b.b3dd48",
+        "id": "bfa4ee31.b57fd",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1344.900161743164,
-        "y": 1192.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1244.900161743164,
+        "y": 1226.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e5b1da68.bc54"
+                "ccebaa1.97cf958"
             ]
         ]
     },
     {
-        "id": "e5b1da68.bc54",
+        "id": "ccebaa1.97cf958",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 628.5669097900391,
-        "y": 1345.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 528.5669097900391,
+        "y": 1379.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "fb4c81c8.58ec08"
+                "6f5f9c23.47e85c"
             ]
         ]
     },
     {
-        "id": "68774cff.da4f7c",
+        "id": "36292c23.d5bad4",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1017.5666656494141,
-        "y": 1350.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 917.5666656494141,
+        "y": 1384.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ae979c86.2af0a",
-                "c51e116c.9e96e",
-                "bc29e653.3cf5f8"
+                "f72960d6.00c9a8",
+                "cf896404.076eb8",
+                "8c05370a.85ef68"
             ]
         ]
     },
     {
-        "id": "ae979c86.2af0a",
+        "id": "f72960d6.00c9a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1213.566665649414,
-        "y": 1315.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1113.566665649414,
+        "y": 1349.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "323455e1.4146ea"
+                "3b76e03e.4509b"
             ]
         ]
     },
     {
-        "id": "c51e116c.9e96e",
+        "id": "cf896404.076eb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1214.057632446289,
-        "y": 1361.1407012939453,
-        "z": "25a21122.0e2cfe",
+        "x": 1114.057632446289,
+        "y": 1395.1407012939453,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "bf9be58f.d0c428"
+                "c0ebf57b.8932c"
             ]
         ]
     },
     {
-        "id": "bc29e653.3cf5f8",
+        "id": "8c05370a.85ef68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1178.566665649414,
-        "y": 1406.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1078.566665649414,
+        "y": 1440.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "dd499616.1dbe"
+                "ac014ec8.afc2c"
             ]
         ]
     },
     {
-        "id": "bf9be58f.d0c428",
+        "id": "c0ebf57b.8932c",
         "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": 1373.629165649414,
-        "y": 1358.4264068603516,
-        "z": "25a21122.0e2cfe",
+        "x": 1273.629165649414,
+        "y": 1392.4264068603516,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "dd499616.1dbe",
+        "id": "ac014ec8.afc2c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1331.566665649414,
-        "y": 1408.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1231.566665649414,
+        "y": 1442.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "66825a6f.db4e3c",
+        "id": "ab34961f.f94a7",
         "type": "switchNode",
         "name": "switch loglink-id exists in conn",
         "xml": "<switch test='`$tmp.aai.logical-link.link-id == $tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1606.566665649414,
-        "y": 1298.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1506.566665649414,
+        "y": 1332.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "85e80e78.a683f",
-                "e9363fe4.4910f8"
+                "743d201b.02ef4",
+                "96c2bcb9.b7be6"
             ]
         ]
     },
     {
-        "id": "85e80e78.a683f",
+        "id": "743d201b.02ef4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1817.566665649414,
-        "y": 1263.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1717.566665649414,
+        "y": 1297.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ea49207.e144c6"
+                "bc409e2e.3633b"
             ]
         ]
     },
     {
-        "id": "e9363fe4.4910f8",
+        "id": "96c2bcb9.b7be6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1814.566665649414,
-        "y": 1324.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1714.566665649414,
+        "y": 1358.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "a72bfa1e.2c0188",
+        "id": "b2c89b06.1d18",
         "type": "set",
         "name": "set currLinkIsFound",
         "xml": "<set>\n<parameter name='currLinkIsFound' value=\"true\" />\n\n\n",
         "comments": "",
-        "x": 2155.566665649414,
-        "y": 1236.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 2055.566665649414,
+        "y": 1270.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ea49207.e144c6",
+        "id": "bc409e2e.3633b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1969.566665649414,
-        "y": 1264.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1869.566665649414,
+        "y": 1298.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a72bfa1e.2c0188"
+                "b2c89b06.1d18"
             ]
         ]
     },
     {
-        "id": "77625e01.45cfa",
+        "id": "8e75c992.3dcad8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2122.566665649414,
-        "y": 1292.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 2022.566665649414,
+        "y": 1326.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "747752c5.edcc6c",
+        "id": "aabee6e1.198dd8",
         "type": "comment",
         "name": "currLinkIsFound. Go to the next logical-link",
         "info": "",
         "comments": "",
-        "x": 2127.566665649414,
-        "y": 1186.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 2027.566665649414,
+        "y": 1220.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "fc0b0bdf.af57e8",
+        "id": "ef9e5601.232bf8",
         "type": "switchNode",
         "name": "switch currLinkIsFound",
         "xml": "<switch test='`$currLinkIsFound`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1409.566665649414,
-        "y": 916.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1309.566665649414,
+        "y": 950.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ec2c299e.a7094",
-                "12a10d8.78ec073"
+                "b3aa3ada.f160e8",
+                "b7eb38ae.e82468"
             ]
         ]
     },
     {
-        "id": "ec2c299e.a7094",
+        "id": "b3aa3ada.f160e8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1595.566665649414,
-        "y": 895.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1495.566665649414,
+        "y": 929.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "43c18e2d.dbbe18"
+                "92e1cebb.b308b8"
             ]
         ]
     },
     {
-        "id": "12a10d8.78ec073",
+        "id": "b7eb38ae.e82468",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1592.566665649414,
-        "y": 1031.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1492.566665649414,
+        "y": 1065.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4dddc413.6cd63c"
+                "9334f6e1.75bd8"
             ]
         ]
     },
     {
-        "id": "43c18e2d.dbbe18",
+        "id": "92e1cebb.b308b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1837.566665649414,
-        "y": 890.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1737.566665649414,
+        "y": 924.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "6e81ab2b.cd2004",
+        "id": "33f6edc7.c109aa",
         "type": "comment",
         "name": "A new logical-link has been found: modify process should be triggered",
         "info": "",
         "comments": "",
-        "x": 1783.566665649414,
-        "y": 994.5666656494141,
-        "z": "25a21122.0e2cfe",
+        "x": 1683.566665649414,
+        "y": 1028.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "323455e1.4146ea",
+        "id": "3b76e03e.4509b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1377.566665649414,
-        "y": 1299.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1277.566665649414,
+        "y": 1333.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "66825a6f.db4e3c",
-                "4b0ae75c.1aab4"
+                "ab34961f.f94a7",
+                "1c716952.137bb7"
             ]
         ]
     },
     {
-        "id": "4b0ae75c.1aab4",
+        "id": "1c716952.137bb7",
         "type": "switchNode",
         "name": "switch connectivityBW == gfp",
         "xml": "<switch test='`$tmp.aai.connectivity.bandwidth-profile-name == $gfp`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1607.566665649414,
-        "y": 1389.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1507.566665649414,
+        "y": 1423.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c8e4becf.570ed8",
-                "efb821b0.8f5c8"
+                "7f55db50.0bbafc",
+                "ba68eea1.e9a338"
             ]
         ]
     },
     {
-        "id": "c8e4becf.570ed8",
+        "id": "7f55db50.0bbafc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1812.566665649414,
-        "y": 1385.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1712.566665649414,
+        "y": 1419.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "efb821b0.8f5c8",
+        "id": "ba68eea1.e9a338",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1814.566665649414,
-        "y": 1435.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1714.566665649414,
+        "y": 1469.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "35c21580.2c9b32"
+                "94ed181a.25fe8"
             ]
         ]
     },
     {
-        "id": "fd83a72b.0cf5a8",
+        "id": "e266b7f2.fe727",
         "type": "set",
         "name": "set bwModified",
         "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
         "comments": "",
-        "x": 2163.566665649414,
-        "y": 1413.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 2063.566665649414,
+        "y": 1447.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "35c21580.2c9b32",
+        "id": "94ed181a.25fe8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1968.566665649414,
-        "y": 1434.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1868.566665649414,
+        "y": 1468.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "fd83a72b.0cf5a8",
-                "b1b00645.427888"
+                "e266b7f2.fe727",
+                "c9ff8521.2183a8"
             ]
         ]
     },
     {
-        "id": "b1b00645.427888",
+        "id": "c9ff8521.2183a8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 988.5666656494141,
-        "y": 1639.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 888.5666656494141,
+        "y": 1673.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3c4549a7.0d1376"
+                "2fcf0107.404b9e"
             ]
         ]
     },
     {
-        "id": "3c4549a7.0d1376",
+        "id": "2fcf0107.404b9e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1193.566665649414,
-        "y": 1639.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1093.566665649414,
+        "y": 1673.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "adf26b65.8f90e"
+                "f620da7d.b85a28"
             ]
         ]
     },
     {
-        "id": "adf26b65.8f90e",
+        "id": "f620da7d.b85a28",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1359.566665649414,
-        "y": 1639.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1259.566665649414,
+        "y": 1673.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "64e47481.3a26d4"
+                "5afceee0.e00098"
             ]
         ]
     },
     {
-        "id": "64e47481.3a26d4",
+        "id": "5afceee0.e00098",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1522.566665649414,
-        "y": 1639.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1422.566665649414,
+        "y": 1673.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6e6ea5ef.8c2224",
-                "d5aad2e.d2c753"
+                "da12db00.5b12d",
+                "a52b001a.5c9b18"
             ]
         ]
     },
     {
-        "id": "d5aad2e.d2c753",
+        "id": "a52b001a.5c9b18",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 1751.566665649414,
-        "y": 1579.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1651.566665649414,
+        "y": 1613.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "6e6ea5ef.8c2224",
+        "id": "da12db00.5b12d",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1260.566665649414,
-        "y": 1733.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1160.566665649414,
+        "y": 1767.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8146e5c8.89f0a",
-                "7ba4a096.c89f48",
-                "d58f3b9.ef82248"
+                "88650b88.fc30d",
+                "ec560486.50e96",
+                "25b4ff2b.4b18b8"
             ]
         ]
     },
     {
-        "id": "f88195dd.98254",
+        "id": "e1e2e790.cb03a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1644.566665649414,
-        "y": 1733.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1544.566665649414,
+        "y": 1767.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1f6be69e.efcee9",
-                "dca75bc1.9206a8"
+                "37781926.bbe2d6",
+                "76e90665.699c78",
+                "ce24e399.073d3"
             ]
         ]
     },
     {
-        "id": "8146e5c8.89f0a",
+        "id": "88650b88.fc30d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1471.566665649414,
-        "y": 1735.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1371.566665649414,
+        "y": 1769.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f88195dd.98254"
+                "e1e2e790.cb03a8"
             ]
         ]
     },
     {
-        "id": "7ba4a096.c89f48",
+        "id": "ec560486.50e96",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1472.057632446289,
-        "y": 1781.1407012939453,
-        "z": "25a21122.0e2cfe",
+        "x": 1372.057632446289,
+        "y": 1815.1407012939453,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e8dc9623.1376d8"
+                "3ccd5736.62782"
             ]
         ]
     },
     {
-        "id": "d58f3b9.ef82248",
+        "id": "25b4ff2b.4b18b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1469.566665649414,
-        "y": 1824.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1369.566665649414,
+        "y": 1858.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1a1a5ddc.251932"
+                "704847a.0ccbeb8"
             ]
         ]
     },
     {
-        "id": "1a1a5ddc.251932",
+        "id": "704847a.0ccbeb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1636.566665649414,
-        "y": 1841.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1536.566665649414,
+        "y": 1875.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e8dc9623.1376d8",
+        "id": "3ccd5736.62782",
         "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": 1634.6290435791016,
-        "y": 1781.4264373779297,
-        "z": "25a21122.0e2cfe",
+        "x": 1534.6290435791016,
+        "y": 1815.4264373779297,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "fb4c81c8.58ec08",
+        "id": "6f5f9c23.47e85c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 800.5666656494141,
-        "y": 1345.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 700.5666656494141,
+        "y": 1379.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "68774cff.da4f7c",
-                "458e84.00aae97c"
+                "36292c23.d5bad4",
+                "96bb2834.ab4d4"
             ]
         ]
     },
     {
-        "id": "458e84.00aae97c",
+        "id": "96bb2834.ab4d4",
         "type": "set",
         "name": "unset tmp.aai.connectivity",
         "xml": "<set>\n<parameter name='tmp.aai.connectivity.' value='' />\n",
         "comments": "",
-        "x": 1020.5666656494141,
-        "y": 1293.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 920.5666656494141,
+        "y": 1327.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "1f6be69e.efcee9",
+        "id": "37781926.bbe2d6",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1995.066665649414,
-        "y": 1728.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1895.066665649414,
+        "y": 1762.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "dca75bc1.9206a8",
+        "id": "76e90665.699c78",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1922.066665649414,
-        "y": 1792.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 1822.066665649414,
+        "y": 1826.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "ee7fd236.9ed9a8",
+        "id": "9be1948a.b31058",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
-        "x": 2066.566665649414,
-        "y": 120.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1971.566650390625,
+        "y": 46.566673278808594,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "323fc4b1.60fe74",
+        "id": "57401e8a.a8ecc",
         "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": 2026.566665649414,
-        "y": 164.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1921.566650390625,
+        "y": 99.5666732788086,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "8780743f.a296a",
+        "id": "86a1c6ac.aa4d9",
         "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": 2039.566665649414,
-        "y": 209.56666564941406,
-        "z": "25a21122.0e2cfe",
+        "x": 1931.566650390625,
+        "y": 138.56668090820312,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "afd6fb79.f36b6",
+        "id": "fc1cf650.aa6b18",
         "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": "",
         "outputs": 1,
-        "x": 4346.566665649414,
-        "y": 2326.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4246.566665649414,
+        "y": 2360.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "89a7842f.afd83",
+        "id": "cc9240f8.8f7cd",
         "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='`$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": 5637.566665649414,
-        "y": 1163.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 5537.566665649414,
+        "y": 1197.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "1a397526.128d93",
+        "id": "3b99997f.82150e",
         "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": 4535.566665649414,
-        "y": 2398.566665649414,
-        "z": "25a21122.0e2cfe",
+        "x": 4435.567077636719,
+        "y": 2417.566696166992,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2ab2958e.345c6a",
+        "type": "switchNode",
+        "name": "switch src and dst same domain?",
+        "xml": "<switch test=\"`$param-prefix-domainA[$param-prefix-domainA_length -9] == $param-prefix-domainB[$param-prefix-domainB_length -9]`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2888.9000854492188,
+        "y": 2464.5668182373047,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "21c7a96f.230fc6",
+                "a4bfb1a.7ba14d"
+            ]
+        ]
+    },
+    {
+        "id": "a4bfb1a.7ba14d",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3102.9000244140625,
+        "y": 2477.566696166992,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "591ba76d.52253"
+            ]
+        ]
+    },
+    {
+        "id": "21c7a96f.230fc6",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3083.8999633789062,
+        "y": 2578.5668182373047,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "791966ec.7cb7a"
+            ]
+        ]
+    },
+    {
+        "id": "d5865f6c.c9966",
+        "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": 3677.2332153320312,
+        "y": 2420.899948120117,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "791966ec.7cb7a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3234.2333984375,
+        "y": 2578.8998260498047,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "5c02cdd2.3ba3bc",
+                "6d7db185.f222a",
+                "4a5a5654.7a3e18",
+                "1ef4d127.0e3e8f"
+            ]
+        ]
+    },
+    {
+        "id": "5c02cdd2.3ba3bc",
+        "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-samedomain-uuid\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3518.2332763671875,
+        "y": 2584.566696166992,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6d7db185.f222a",
+        "type": "set",
+        "name": "set attachment_param Same Domain",
+        "xml": "<set>\n<parameter name='tmp.sameDomain-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.sameDomain-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
+        "comments": "",
+        "x": 3486.2332763671875,
+        "y": 2644.899703979492,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "4a5a5654.7a3e18",
+        "type": "save",
+        "name": "save vpn-binding same domain 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-samedomain-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-samedomain-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='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\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.sameDomain-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.sameDomain-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": 3551.5665283203125,
+        "y": 2700.899703979492,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "9d7de4f8.93c768"
+            ]
+        ]
+    },
+    {
+        "id": "9d7de4f8.93c768",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3868.5665283203125,
+        "y": 2702.899703979492,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "3ccad972.8b2556"
+            ]
+        ]
+    },
+    {
+        "id": "3ccad972.8b2556",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4032.0665283203125,
+        "y": 2702.153610229492,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1ef4d127.0e3e8f",
+        "type": "save",
+        "name": "save connectivity-domainA relationship to vpn-binding-sameDomain, 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-samedomain-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": 3600.23291015625,
+        "y": 2755.566452026367,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "591ba76d.52253",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3253.8998413085938,
+        "y": 2443.5668182373047,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "d5865f6c.c9966",
+                "3f522b00.e7a774"
+            ]
+        ]
+    },
+    {
+        "id": "ac7ac40f.6ba598",
+        "type": "set",
+        "name": "set attachment_param for OTN A",
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
+        "comments": "",
+        "x": 643,
+        "y": 2076.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "e669d16d.38d03",
+        "type": "set",
+        "name": "set pnf-name",
+        "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
+        "comments": "",
+        "x": 581,
+        "y": 2124.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "470fb63d.0a55b8",
+        "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": 607,
+        "y": 2241.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "bd66b470.31b5d8",
+                "51c8764a.3044c",
+                "abb4bd26.885e5"
+            ]
+        ]
+    },
+    {
+        "id": "bd66b470.31b5d8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 802.5001220703125,
+        "y": 2193.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "5dbd746e.2a26a4"
+            ]
+        ]
+    },
+    {
+        "id": "51c8764a.3044c",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 794.5001220703125,
+        "y": 2248.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "4e8d2414.8f8eec"
+            ]
+        ]
+    },
+    {
+        "id": "5dbd746e.2a26a4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 946.8824462890625,
+        "y": 2192.9891662597656,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "812dd5d1.dde898"
+            ]
+        ]
+    },
+    {
+        "id": "a5443da6.ad8678",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1529,
+        "y": 2195.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "70a7204b.0ea1d8"
+            ]
+        ]
+    },
+    {
+        "id": "812dd5d1.dde898",
+        "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": 1131,
+        "y": 2191.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "7886079.b4f95f8"
+            ]
+        ]
+    },
+    {
+        "id": "7886079.b4f95f8",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1326,
+        "y": 2191.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "a5443da6.ad8678"
+            ]
+        ]
+    },
+    {
+        "id": "abb4bd26.885e5",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 799.5001220703125,
+        "y": 2305.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "e5ef91a4.4dc22"
+            ]
+        ]
+    },
+    {
+        "id": "e5ef91a4.4dc22",
+        "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": 951.5001220703125,
+        "y": 2306.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "4e8d2414.8f8eec",
+        "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": 962.5001220703125,
+        "y": 2249.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "b78e417e.9e5128",
+        "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": 1914,
+        "y": 2208.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "2e2e40ce.837fb",
+                "b317a2a6.81686",
+                "2a5f3037.5e6bf"
+            ]
+        ]
+    },
+    {
+        "id": "70a7204b.0ea1d8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1708,
+        "y": 2195.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "7a83b201.90f15c",
+                "b78e417e.9e5128"
+            ]
+        ]
+    },
+    {
+        "id": "7a83b201.90f15c",
+        "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": 1944,
+        "y": 2156.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "2e2e40ce.837fb",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2124,
+        "y": 2199.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "5b2aca6e.68dd9c"
+            ]
+        ]
+    },
+    {
+        "id": "b317a2a6.81686",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2116,
+        "y": 2254.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "83f0e85f.95d068"
+            ]
+        ]
+    },
+    {
+        "id": "2a5f3037.5e6bf",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2121,
+        "y": 2311.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "c5782cdd.b4cf6"
+            ]
+        ]
+    },
+    {
+        "id": "c5782cdd.b4cf6",
+        "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": 2273,
+        "y": 2312.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "83f0e85f.95d068",
+        "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": 2284,
+        "y": 2257.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "5b2aca6e.68dd9c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2268.38232421875,
+        "y": 2196.9891662597656,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "28d41ca6.66cafc"
+            ]
+        ]
+    },
+    {
+        "id": "28d41ca6.66cafc",
+        "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": 2483,
+        "y": 2193.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "8559d791.3348a",
+        "type": "set",
+        "name": "set vpn-bindingA and connectivityA",
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
+        "comments": "",
+        "x": 638,
+        "y": 2016.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "2ec1dd57.5743da",
+        "type": "set",
+        "name": "set sotn_value",
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$gfp *1000000`' />\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<parameter name='EIR' value='0' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
+        "comments": "",
+        "x": 590.5,
+        "y": 2579.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "6059dee6.cfa7c",
+        "type": "execute",
+        "name": "execute RestApiCallNode Create ethernet Service without token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service.templatefile`\" />-->\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service-modify.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivityA.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\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='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\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": "",
+        "outputs": 1,
+        "x": 744.5,
+        "y": 2627.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "461f2bfe.52478c",
+                "577c9525.87fa7c"
+            ]
+        ]
+    },
+    {
+        "id": "461f2bfe.52478c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1090,
+        "y": 2608.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "10f69144.7b4de7"
+            ]
+        ]
+    },
+    {
+        "id": "577c9525.87fa7c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1094,
+        "y": 2648.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "8cffbf3.0a002c"
+            ]
+        ]
+    },
+    {
+        "id": "10f69144.7b4de7",
+        "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 Create ethernet service rest api\" />\n",
+        "comments": "",
+        "x": 1248,
+        "y": 2608.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "8cffbf3.0a002c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1251.5,
+        "y": 2648.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "c0fd436b.9f0558",
+                "3a753166.0d0e96",
+                "3a73518d.f9cb96"
+            ]
+        ]
+    },
+    {
+        "id": "55040664.2c4708",
+        "type": "comment",
+        "name": "TODO: FIXME:",
+        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "comments": "",
+        "x": 588,
+        "y": 2535.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "c0fd436b.9f0558",
+        "type": "save",
+        "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1635.000244140625,
+        "y": 2583.3336181640625,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3a753166.0d0e96",
+        "type": "save",
+        "name": "update connectivity resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1562.000244140625,
+        "y": 2629.3336181640625,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3a73518d.f9cb96",
+        "type": "save",
+        "name": "update service-instance resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Activated' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1581.750244140625,
+        "y": 2689.8336181640625,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ce24e399.073d3",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 329,
+        "y": 2273.33349609375,
+        "z": "7a2c5977.5cc868",
+        "wires": [
+            [
+                "8559d791.3348a",
+                "ac7ac40f.6ba598",
+                "e669d16d.38d03",
+                "470fb63d.0a55b8",
+                "2ec1dd57.5743da",
+                "6059dee6.cfa7c",
+                "51061087.32f088"
+            ]
+        ]
+    },
+    {
+        "id": "51061087.32f088",
+        "type": "set",
+        "name": "unset vpn-bindingA and connectivityA",
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"\" />\n<parameter name='tmp.aai.connectivityA.' value=\"\" />\n",
+        "comments": "",
+        "x": 630.3333129882812,
+        "y": 1956.3333740234375,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "a60e8c64.59a75",
+        "type": "set",
+        "name": "unset the max bandwidth",
+        "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"\" />\n<parameter name='route-distinguisher' value='' />\n\n\n\n",
+        "comments": "",
+        "x": 1921.3333740234375,
+        "y": 193.33334350585938,
+        "z": "7a2c5977.5cc868",
+        "wires": []
+    },
+    {
+        "id": "ff6e4688.eabb4",
+        "type": "set",
+        "name": "unset the max bandwidth",
+        "xml": "<set>\n<parameter name='gfp' value='' />\n\n\n\n",
+        "comments": "",
+        "x": 1920.3333740234375,
+        "y": 239.33334350585938,
+        "z": "7a2c5977.5cc868",
+        "wires": []
     }
 ]
\ No newline at end of file