From 51946551fe9016b38ba03747a3376febf7124b8e Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Fri, 28 Oct 2022 18:13:38 -0400
Subject: Support for integration of E-Line based Cloud Leased Line service
 with hardware domain controller.

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

Former-commit-id: ac7a2377e8fea65230d3403b9dd8413daf65c70a
---
 ...ENERIC-RESOURCE-API_vnf-topology-operation.json | 1637 +++----
 ...PI_p2p-vnf-topology-operation-p2p-activate.json | 2002 +++++----
 ...logy-operation-p2p-callbackdg-notification.json |  166 +-
 ...-API_p2p-vnf-topology-operation-p2p-create.json | 3845 +++++++++--------
 ...-API_p2p-vnf-topology-operation-p2p-delete.json |  815 ++--
 ...operation-p2p-get-otn-tunnel-path-from-oof.json | 3589 ++++++++++++++++
 ...-API_p2p-vnf-topology-operation-p2p-modify.json | 4466 +++++++++++---------
 .../src/main/resources/graph.versions              |    3 +-
 ...GENERIC-RESOURCE-API_vnf-topology-operation.xml |    9 +
 ...API_p2p-vnf-topology-operation-p2p-activate.xml | 1361 +++---
 ...E-API_p2p-vnf-topology-operation-p2p-create.xml |  686 +--
 ...E-API_p2p-vnf-topology-operation-p2p-delete.xml |   48 +-
 ...-operation-p2p-get-otn-tunnel-path-from-oof.xml |  762 ++++
 ...E-API_p2p-vnf-topology-operation-p2p-modify.xml | 1087 +----
 14 files changed, 12681 insertions(+), 7795 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof.json
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof.xml

(limited to 'platform-logic/generic-resource-api/src')

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
index 54240bdb..78f1ca88 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "e88b81b7.3ada5",
+        "id": "dfdd654b.818d08",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 1666.4833984375,
-        "y": 1128.86669921875,
-        "z": "4bc0b1ec.14338",
+        "x": 176.56666564941406,
+        "y": 235.98507690429688,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "bf29c52c.35a068"
+                "f9d7c8fc.ce43c"
             ]
         ]
     },
     {
-        "id": "bf29c52c.35a068",
+        "id": "f9d7c8fc.ce43c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,2382 +22,2475 @@
         "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": 1749.7691040039062,
-        "y": 1190.1047973632812,
-        "z": "4bc0b1ec.14338",
+        "x": 259.8523712158203,
+        "y": 297.2231750488281,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "7d3a1efa.4adcf8"
+                "b52076aa.e3fd68"
             ]
         ]
     },
     {
-        "id": "7d3a1efa.4adcf8",
+        "id": "b52076aa.e3fd68",
         "type": "method",
         "name": "method vnf-topology-operation",
         "xml": "<method rpc='vnf-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1741.9120254516602,
-        "y": 1252.866693496704,
-        "z": "4bc0b1ec.14338",
+        "x": 251.99529266357422,
+        "y": 359.985071182251,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "5952377f.77e268"
+                "ce9719be.dec46"
             ]
         ]
     },
     {
-        "id": "30d81292.040126",
+        "id": "b8dca471.7aa578",
         "type": "comment",
         "name": "vnf-topology-operation",
         "info": "",
         "comments": "",
-        "x": 2066.3996963500977,
-        "y": 971.8816223144531,
-        "z": "4bc0b1ec.14338",
+        "x": 576.4829635620117,
+        "y": 79,
+        "z": "6a76dcf7.7f5664",
         "wires": []
     },
     {
-        "id": "5952377f.77e268",
+        "id": "ce9719be.dec46",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1765.650161743164,
-        "y": 1582.5602197647095,
-        "z": "4bc0b1ec.14338",
+        "x": 275.7334289550781,
+        "y": 689.6785974502563,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "733f55d7.131eac",
-                "da2815a6.f8a0b8",
-                "13908072.a437a8"
+                "5ed78105.7aa87",
+                "f12ada4f.761a48",
+                "ae658ab3.a051b8"
             ]
         ]
     },
     {
-        "id": "733f55d7.131eac",
+        "id": "5ed78105.7aa87",
         "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": 2058.150115966797,
-        "y": 1737.7242527008057,
-        "z": "4bc0b1ec.14338",
+        "x": 568.2333831787109,
+        "y": 844.8426303863525,
+        "z": "6a76dcf7.7f5664",
         "wires": []
     },
     {
-        "id": "da2815a6.f8a0b8",
+        "id": "f12ada4f.761a48",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2061.054832458496,
-        "y": 1580.771463394165,
-        "z": "4bc0b1ec.14338",
+        "x": 571.1380996704102,
+        "y": 687.8898410797119,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "8b8beffc.039348",
-                "7849edf.9973214",
-                "dde0348e.6243d8",
-                "7d1a20f7.623798",
-                "968d56db.db9438",
-                "38662be3.b2822c",
-                "1662f81b.18c22",
-                "aa805b7d.6c386",
-                "5ec4c91.e108038"
+                "b31e684.5876618",
+                "d0d343e2.83df8",
+                "46b0a271.11b1c4",
+                "5c3b10a.f53ee7",
+                "4efb4bb.11ea1b4",
+                "ab845fb5.03438",
+                "4b6c216.958da6",
+                "8e01d8b9.6150f",
+                "c6ae39cb.030c7"
             ]
         ]
     },
     {
-        "id": "8b8beffc.039348",
+        "id": "b31e684.5876618",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2395.8643798828125,
-        "y": 1408.390573501587,
-        "z": "4bc0b1ec.14338",
+        "x": 905.9476470947266,
+        "y": 515.5089511871338,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "3b002d62.a8cbb2"
+                "3d871ae9.3ed7a6"
             ]
         ]
     },
     {
-        "id": "7849edf.9973214",
+        "id": "d0d343e2.83df8",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2457.9121980667114,
-        "y": 2380.581328392029,
-        "z": "4bc0b1ec.14338",
+        "x": 967.9954652786255,
+        "y": 1487.6997060775757,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "52a6ff48.d7bd68"
+                "b7ea90d8.99beb8"
             ]
         ]
     },
     {
-        "id": "7d1a20f7.623798",
+        "id": "5c3b10a.f53ee7",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2436.62646484375,
-        "y": 3623.771514892578,
-        "z": "4bc0b1ec.14338",
+        "x": 946.7097320556641,
+        "y": 2730.889892578125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "5100cd3.70a0234"
+                "4329899d.a0d748"
             ]
         ]
     },
     {
-        "id": "5100cd3.70a0234",
+        "id": "4329899d.a0d748",
         "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=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 2659.81689453125,
-        "y": 3622.771514892578,
-        "z": "4bc0b1ec.14338",
+        "x": 1169.900161743164,
+        "y": 2729.889892578125,
+        "z": "6a76dcf7.7f5664",
         "wires": []
     },
     {
-        "id": "13908072.a437a8",
+        "id": "ae658ab3.a051b8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-vnf-input",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2166.9000854492188,
-        "y": 1333.247751235962,
-        "z": "4bc0b1ec.14338",
+        "x": 676.9833526611328,
+        "y": 440.3661289215088,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "a9ff2689.cb6588",
+        "id": "3e87b05f.1e3f78",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3261.6740112304688,
-        "y": 2312.628692626953,
-        "z": "4bc0b1ec.14338",
+        "x": 1771.7572784423828,
+        "y": 1419.7470703125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "52a6ff48.d7bd68",
+        "id": "b7ea90d8.99beb8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-unassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2823.6739807128906,
-        "y": 2401.962142944336,
-        "z": "4bc0b1ec.14338",
+        "x": 1333.7572479248047,
+        "y": 1509.0805206298828,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "dde0348e.6243d8",
+        "id": "46b0a271.11b1c4",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2441.007278442383,
-        "y": 1916.9620380401611,
-        "z": "4bc0b1ec.14338",
+        "x": 951.0905456542969,
+        "y": 1024.080415725708,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "269a2b0.f1cb4d6"
+                "1d39be12.760012"
             ]
         ]
     },
     {
-        "id": "2809699c.5f54fe",
+        "id": "83370fb4.20bb5",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3243.4835510253906,
-        "y": 1815.866683959961,
-        "z": "4bc0b1ec.14338",
+        "x": 1753.5668182373047,
+        "y": 922.9850616455078,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "968d56db.db9438",
+        "id": "4efb4bb.11ea1b4",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2403.8167114257812,
-        "y": 1578.5333366394043,
-        "z": "4bc0b1ec.14338",
+        "x": 913.8999786376953,
+        "y": 685.6517143249512,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "7e2000d8.4ec838"
+                "67e1b729.25b8b8"
             ]
         ]
     },
     {
-        "id": "38662be3.b2822c",
+        "id": "ab845fb5.03438",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2459.4836282730103,
-        "y": 2512.952995300293,
-        "z": "4bc0b1ec.14338",
+        "x": 969.5668954849243,
+        "y": 1620.0713729858398,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "93f6f664.bf3bb8"
+                "398ea83f.97c8a"
             ]
         ]
     },
     {
-        "id": "1662f81b.18c22",
+        "id": "4b6c216.958da6",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2463.483642578125,
-        "y": 2742.9530334472656,
-        "z": "4bc0b1ec.14338",
+        "x": 973.5669097900391,
+        "y": 1850.0714111328125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "9c058263.f651f"
+                "71b609c3.431b88"
             ]
         ]
     },
     {
-        "id": "cd102660.bb1e6",
+        "id": "807e1838.d2dd7",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2645.48348236084,
-        "y": 1633.953013420105,
-        "z": "4bc0b1ec.14338",
+        "x": 1155.566749572754,
+        "y": 741.0713911056519,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "2a266a60.b04266",
-                "488133bc.0f672c",
-                "ae2eaab0.a734b",
-                "2a5813fb.13f48c",
-                "18eea3f9.585dfc",
-                "73c3e8de.57ba98",
-                "523731c3.a7de08",
-                "fbf38bf3.ff2fd8"
+                "d49e7ace.8946e8",
+                "6e4cda2c.7b7c1c",
+                "956415d7.cd2d78",
+                "34c5595a.502a46",
+                "934a2942.d7a94",
+                "6d542904.0c4b8",
+                "f4bc3207.d16e7",
+                "b7f0bf68.ae0bb8"
             ]
         ]
     },
     {
-        "id": "488133bc.0f672c",
+        "id": "6e4cda2c.7b7c1c",
         "type": "outcome",
         "name": "ActivateSiteInstance",
         "xml": "<outcome value='ActivateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2905.9597244262695,
-        "y": 1455.432264328003,
-        "z": "4bc0b1ec.14338",
+        "x": 1416.0429916381836,
+        "y": 562.5506420135498,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "22e28862.76e788"
+                "3a186675.b68ec2"
             ]
         ]
     },
     {
-        "id": "2a266a60.b04266",
+        "id": "d49e7ace.8946e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2875.5310974121094,
-        "y": 1818.4769744873047,
-        "z": "4bc0b1ec.14338",
+        "x": 1385.6143646240234,
+        "y": 925.5953521728516,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "2809699c.5f54fe"
+                "83370fb4.20bb5"
             ]
         ]
     },
     {
-        "id": "7e2000d8.4ec838",
+        "id": "67e1b729.25b8b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2584.48348236084,
-        "y": 1578.953013420105,
-        "z": "4bc0b1ec.14338",
+        "x": 1094.566749572754,
+        "y": 686.0713911056519,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "cd102660.bb1e6"
+                "807e1838.d2dd7"
             ]
         ]
     },
     {
-        "id": "22e28862.76e788",
+        "id": "3a186675.b68ec2",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3272.483528137207,
-        "y": 1457.953046798706,
-        "z": "4bc0b1ec.14338",
+        "x": 1782.566795349121,
+        "y": 565.0714244842529,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "ef245f0b.91786",
+        "id": "47926cc9.a06a24",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2703.483596801758,
-        "y": 1949.9530048370361,
-        "z": "4bc0b1ec.14338",
+        "x": 1213.5668640136719,
+        "y": 1057.071382522583,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "b2294d3d.e67388",
-                "977f892d.892b5",
-                "7fd03916.78c9f",
-                "c7876cff.7da128",
-                "2ffb338a.e768dc",
-                "5a38a2ee.1eafa4",
-                "e2b46309.d91078",
-                "16a941e3.dfa776"
+                "9114e99a.16c478",
+                "459ca422.e82a24",
+                "7a237a0b.730834",
+                "3bc18dfa.76a112",
+                "9948d8a8.5c7568",
+                "590b1709.8f7f5",
+                "bd1de01f.d7413",
+                "396c2dc7.20b4fa"
             ]
         ]
     },
     {
-        "id": "977f892d.892b5",
+        "id": "459ca422.e82a24",
         "type": "outcome",
         "name": "DeactivateSiteInstance",
         "xml": "<outcome value='DeactivateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2946.9597930908203,
-        "y": 1901.4322533607483,
-        "z": "4bc0b1ec.14338",
+        "x": 1457.0430603027344,
+        "y": 1008.5506310462952,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "afdb68e5.25dd98"
+                "ca631845.730db"
             ]
         ]
     },
     {
-        "id": "b2294d3d.e67388",
+        "id": "9114e99a.16c478",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2898.5311279296875,
-        "y": 2311.4769592285156,
-        "z": "4bc0b1ec.14338",
+        "x": 1408.6143951416016,
+        "y": 1418.5953369140625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "a9ff2689.cb6588"
+                "3e87b05f.1e3f78"
             ]
         ]
     },
     {
-        "id": "269a2b0.f1cb4d6",
+        "id": "1d39be12.760012",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2642.483596801758,
-        "y": 1894.9530048370361,
-        "z": "4bc0b1ec.14338",
+        "x": 1152.5668640136719,
+        "y": 1002.071382522583,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "ef245f0b.91786"
+                "47926cc9.a06a24"
             ]
         ]
     },
     {
-        "id": "afdb68e5.25dd98",
+        "id": "ca631845.730db",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3316.483596801758,
-        "y": 1898.9530358314514,
-        "z": "4bc0b1ec.14338",
+        "x": 1826.5668640136719,
+        "y": 1006.0714135169983,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "f622cc00.b0b5e8",
+        "id": "b3ef0f78.dfb4e",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2657.817024230957,
-        "y": 2599.5393047332764,
-        "z": "4bc0b1ec.14338",
+        "x": 1167.900291442871,
+        "y": 1706.6576824188232,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "e1ff755f.e76d3",
-                "e405ba4a.1f0f",
-                "88cb6da4.63cf38",
-                "7aa3aa5f.c41a1c",
-                "fa7f26be.a20b5",
-                "ed7ffe0.84d4e8",
-                "8906fa5d.35ed",
-                "dd123475.dff318",
-                "43a256d2.b2cfe",
-                "9873c351.d4c7c8",
-                "6662582d.8003b"
+                "5211336f.13b5fc",
+                "4ae7cc67.66bddc",
+                "877dc0db.fcbc08",
+                "31b2044a.c75314",
+                "be0f5ef1.007e88",
+                "daeef74c.513d78",
+                "c0d1c8ba.724dd8",
+                "5d2ccada.022134",
+                "89b79e98.b9e79",
+                "5aead910.a4e09",
+                "a0f59a01.118fa",
+                "85085184.f669c8"
             ]
         ]
     },
     {
-        "id": "e405ba4a.1f0f",
+        "id": "4ae7cc67.66bddc",
         "type": "outcome",
         "name": "CreateSiteInstance",
         "xml": "<outcome value='CreateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2919.29345703125,
-        "y": 2516.018585205078,
-        "z": "4bc0b1ec.14338",
+        "x": 1429.376724243164,
+        "y": 1623.136962890625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "83ad355d.ce01e"
+                "c022f24b.660f88"
             ]
         ]
     },
     {
-        "id": "e1ff755f.e76d3",
+        "id": "5211336f.13b5fc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2892.864501953125,
-        "y": 2923.0631408691406,
-        "z": "4bc0b1ec.14338",
+        "x": 1400.9478149414062,
+        "y": 2063.181640625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "a1f5166b.6bcb28"
+                "63b478fb.e93e8"
             ]
         ]
     },
     {
-        "id": "93f6f664.bf3bb8",
+        "id": "398ea83f.97c8a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2641.8171129226685,
-        "y": 2510.5393629074097,
-        "z": "4bc0b1ec.14338",
+        "x": 1151.9003801345825,
+        "y": 1617.6577405929565,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "f622cc00.b0b5e8"
+                "b3ef0f78.dfb4e"
             ]
         ]
     },
     {
-        "id": "83ad355d.ce01e",
+        "id": "c022f24b.660f88",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3295.8171615600586,
-        "y": 2514.5393438339233,
-        "z": "4bc0b1ec.14338",
+        "x": 1805.9004287719727,
+        "y": 1621.6577215194702,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "a1f5166b.6bcb28",
+        "id": "63b478fb.e93e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3033.150077819824,
-        "y": 2924.1195640563965,
-        "z": "4bc0b1ec.14338",
+        "x": 1541.2333908081055,
+        "y": 2064.238063812256,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "310ddd73.fc571a",
+        "id": "c5bbad79.736928",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2698.483642578125,
-        "y": 3151.4530334472656,
-        "z": "4bc0b1ec.14338",
+        "x": 1208.566909790039,
+        "y": 2258.5714111328125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "132d1eaa.aa5039",
-                "fc99ec88.0b77f",
-                "87f0a7cb.006e28",
-                "708278cd.1a09c8",
-                "174c712f.3761bf",
-                "2f0fc13e.945516",
-                "2fb36780.f5a5f",
-                "e6636bbd.350918",
-                "8a295d0c.3408b8",
-                "3b17290e.72545e",
-                "4b2d1724.361ac"
+                "e394d7de.5248",
+                "f69c530d.87eed",
+                "1789afb0.1ab7b",
+                "d1b7f4dc.309008",
+                "815c9ddd.01be8",
+                "dc05565a.4c2348",
+                "baacc70f.fa88",
+                "4134139c.b679c4",
+                "bb97bcce.11a178",
+                "e2b51c4b.ac5188",
+                "68c1cc63.db848c",
+                "339e9c64.eb19a4"
             ]
         ]
     },
     {
-        "id": "fc99ec88.0b77f",
+        "id": "f69c530d.87eed",
         "type": "outcome",
         "name": "DeleteSiteInstance",
         "xml": "<outcome value='DeleteSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2938.959861755371,
-        "y": 3096.932277202606,
-        "z": "4bc0b1ec.14338",
+        "x": 1449.0431289672852,
+        "y": 2204.050654888153,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "f2df933c.c5ed"
+                "bf8f41d8.e3ff6"
             ]
         ]
     },
     {
-        "id": "132d1eaa.aa5039",
+        "id": "e394d7de.5248",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2899.86474609375,
-        "y": 3501.977325439453,
-        "z": "4bc0b1ec.14338",
+        "x": 1406.9480590820312,
+        "y": 2668.0955810546875,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "404ebe2c.38f428"
+                "6c0aca6e.966584"
             ]
         ]
     },
     {
-        "id": "9c058263.f651f",
+        "id": "71b609c3.431b88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2637.483642578125,
-        "y": 3096.4530334472656,
-        "z": "4bc0b1ec.14338",
+        "x": 1147.566909790039,
+        "y": 2203.5714111328125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "310ddd73.fc571a"
+                "c5bbad79.736928"
             ]
         ]
     },
     {
-        "id": "f2df933c.c5ed",
+        "id": "bf8f41d8.e3ff6",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3311.4836654663086,
-        "y": 3094.453029155731,
-        "z": "4bc0b1ec.14338",
+        "x": 1821.5669326782227,
+        "y": 2201.571406841278,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "404ebe2c.38f428",
+        "id": "6c0aca6e.966584",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3039.1502685546875,
-        "y": 3495.700225830078,
-        "z": "4bc0b1ec.14338",
+        "x": 1546.2335815429688,
+        "y": 2661.8184814453125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "ae2eaab0.a734b",
+        "id": "956415d7.cd2d78",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2937.1501541137695,
-        "y": 1506.4530773162842,
-        "z": "4bc0b1ec.14338",
+        "x": 1447.2334213256836,
+        "y": 613.571455001831,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "973c78d4.b7a778"
+                "e3239cde.9453b8"
             ]
         ]
     },
     {
-        "id": "973c78d4.b7a778",
+        "id": "e3239cde.9453b8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3376.6738357543945,
-        "y": 1504.9738292694092,
-        "z": "4bc0b1ec.14338",
+        "x": 1886.7571029663086,
+        "y": 612.092206954956,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "7fd03916.78c9f",
+        "id": "7a237a0b.730834",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2988.150032043457,
-        "y": 1949.4530320167542,
-        "z": "4bc0b1ec.14338",
+        "x": 1498.233299255371,
+        "y": 1056.571409702301,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "7eabe86c.22944"
+                "26315124.f7acce"
             ]
         ]
     },
     {
-        "id": "7eabe86c.22944",
+        "id": "26315124.f7acce",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3444.673728942871,
-        "y": 1948.9738674163818,
-        "z": "4bc0b1ec.14338",
+        "x": 1954.7569961547852,
+        "y": 1056.0922451019287,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "724b541f.f3e91c",
+        "id": "a4754136.88298",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3374.150032043457,
-        "y": 1545.453016281128,
-        "z": "4bc0b1ec.14338",
+        "x": 1884.233299255371,
+        "y": 652.5713939666748,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "2a5813fb.13f48c",
+        "id": "34c5595a.502a46",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2930.626350402832,
-        "y": 1552.9322338104248,
-        "z": "4bc0b1ec.14338",
+        "x": 1440.709617614746,
+        "y": 660.0506114959717,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "724b541f.f3e91c"
+                "a4754136.88298"
             ]
         ]
     },
     {
-        "id": "c7876cff.7da128",
+        "id": "3bc18dfa.76a112",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2980.150077819824,
-        "y": 1987.7863473892212,
-        "z": "4bc0b1ec.14338",
+        "x": 1490.2333450317383,
+        "y": 1094.904725074768,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "d076def2.732d48"
+                "b4acf596.9f08d"
             ]
         ]
     },
     {
-        "id": "d076def2.732d48",
+        "id": "b4acf596.9f08d",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3454.673728942871,
-        "y": 2004.3071494102478,
-        "z": "4bc0b1ec.14338",
+        "x": 1964.7569961547852,
+        "y": 1111.4255270957947,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "88cb6da4.63cf38",
+        "id": "877dc0db.fcbc08",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2969.1503524780273,
-        "y": 2604.7864196300507,
-        "z": "4bc0b1ec.14338",
+        "x": 1479.2336196899414,
+        "y": 1711.9047973155975,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "3ec37f0f.177d7"
+                "e05650b.db5c3b"
             ]
         ]
     },
     {
-        "id": "3ec37f0f.177d7",
+        "id": "e05650b.db5c3b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3425.673973083496,
-        "y": 2609.3071990013123,
-        "z": "4bc0b1ec.14338",
+        "x": 1935.7572402954102,
+        "y": 1716.4255766868591,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "87f0a7cb.006e28",
+        "id": "1789afb0.1ab7b",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2974.816879272461,
-        "y": 3207.786421775818,
-        "z": "4bc0b1ec.14338",
+        "x": 1484.900146484375,
+        "y": 2314.9047994613647,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "d14e919a.a96cf8"
+                "921d3e26.df393"
             ]
         ]
     },
     {
-        "id": "d14e919a.a96cf8",
+        "id": "921d3e26.df393",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3401.3405990600586,
-        "y": 3207.307277202606,
-        "z": "4bc0b1ec.14338",
+        "x": 1911.4238662719727,
+        "y": 2314.425654888153,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "708278cd.1a09c8",
+        "id": "d1b7f4dc.309008",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2983.5150299072266,
-        "y": 3147.9843282699585,
-        "z": "4bc0b1ec.14338",
+        "x": 1493.5982971191406,
+        "y": 2255.1027059555054,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "7314c670.880a1"
+                "53d608a7.159f08"
             ]
         ]
     },
     {
-        "id": "7314c670.880a1",
+        "id": "53d608a7.159f08",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3416.0386352539062,
-        "y": 3147.5050415992737,
-        "z": "4bc0b1ec.14338",
+        "x": 1926.1219024658203,
+        "y": 2254.6234192848206,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "7aa3aa5f.c41a1c",
+        "id": "31b2044a.c75314",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2984.5147018432617,
-        "y": 2560.9843831062317,
-        "z": "4bc0b1ec.14338",
+        "x": 1494.5979690551758,
+        "y": 1668.1027607917786,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "426226e2.5c5b58"
+                "a71f3eff.8c6448"
             ]
         ]
     },
     {
-        "id": "426226e2.5c5b58",
+        "id": "a71f3eff.8c6448",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3441.0383682250977,
-        "y": 2559.5051970481873,
-        "z": "4bc0b1ec.14338",
+        "x": 1951.1216354370117,
+        "y": 1666.6235747337341,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "18eea3f9.585dfc",
+        "id": "934a2942.d7a94",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2939.779571533203,
-        "y": 1593.696762084961,
-        "z": "4bc0b1ec.14338",
+        "x": 1449.8628387451172,
+        "y": 700.8151397705078,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "58e38cbe.373f14"
+                "2dc21f49.614618"
             ]
         ]
     },
     {
-        "id": "73c3e8de.57ba98",
+        "id": "6d542904.0c4b8",
         "type": "outcome",
         "name": "ActivateSDWANSiteInstance",
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2943.779571533203,
-        "y": 1636.3632049560547,
-        "z": "4bc0b1ec.14338",
+        "x": 1453.8628387451172,
+        "y": 743.4815826416016,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "58e38cbe.373f14"
+                "2dc21f49.614618"
             ]
         ]
     },
     {
-        "id": "58e38cbe.373f14",
+        "id": "2dc21f49.614618",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3214.7795639038086,
-        "y": 1614.3632566928864,
-        "z": "4bc0b1ec.14338",
+        "x": 1724.8628311157227,
+        "y": 721.4816343784332,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "1930e867.cca0a"
+                "34f45ffc.0d3b9"
             ]
         ]
     },
     {
-        "id": "1930e867.cca0a",
+        "id": "34f45ffc.0d3b9",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3592.779411315918,
-        "y": 1611.6969158649445,
-        "z": "4bc0b1ec.14338",
+        "x": 2102.862678527832,
+        "y": 718.8152935504913,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "6325bf4d.f51788",
+        "id": "6a41e523.0a5a0c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3640.8166122436523,
-        "y": 2059.8197164535522,
-        "z": "4bc0b1ec.14338",
+        "x": 2150.8998794555664,
+        "y": 1166.9380941390991,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "19898a1e.e9b3e6",
+        "id": "32c8e17c.ab2146",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3243.8167037963867,
-        "y": 2061.4860610961914,
-        "z": "4bc0b1ec.14338",
+        "x": 1753.8999710083008,
+        "y": 1168.6044387817383,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "6325bf4d.f51788"
+                "6a41e523.0a5a0c"
             ]
         ]
     },
     {
-        "id": "5a38a2ee.1eafa4",
+        "id": "590b1709.8f7f5",
         "type": "outcome",
         "name": "DeactivateSDWANSiteInstance",
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2985.8166885375977,
-        "y": 2083.4860258102417,
-        "z": "4bc0b1ec.14338",
+        "x": 1495.8999557495117,
+        "y": 1190.6044034957886,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "19898a1e.e9b3e6"
+                "32c8e17c.ab2146"
             ]
         ]
     },
     {
-        "id": "2ffb338a.e768dc",
+        "id": "9948d8a8.5c7568",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2979.8166580200195,
-        "y": 2040.8195781707764,
-        "z": "4bc0b1ec.14338",
+        "x": 1489.8999252319336,
+        "y": 1147.9379558563232,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "19898a1e.e9b3e6"
+                "32c8e17c.ab2146"
             ]
         ]
     },
     {
-        "id": "fa7f26be.a20b5",
+        "id": "be0f5ef1.007e88",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2965.3350324630737,
-        "y": 2659.4744925498962,
-        "z": "4bc0b1ec.14338",
+        "x": 1475.4182996749878,
+        "y": 1766.5928702354431,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "b5405fcf.8ba238"
+                "b492c57d.a3474"
             ]
         ]
     },
     {
-        "id": "ed7ffe0.84d4e8",
+        "id": "daeef74c.513d78",
         "type": "outcome",
         "name": "CreateSDWANSiteInstance",
         "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2957.33500957489,
-        "y": 2701.140881061554,
-        "z": "4bc0b1ec.14338",
+        "x": 1467.4182767868042,
+        "y": 1808.2592587471008,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "b5405fcf.8ba238"
+                "b492c57d.a3474"
             ]
         ]
     },
     {
-        "id": "b5405fcf.8ba238",
+        "id": "b492c57d.a3474",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3215.335024833679,
-        "y": 2679.1409163475037,
-        "z": "4bc0b1ec.14338",
+        "x": 1725.4182920455933,
+        "y": 1786.2592940330505,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "92eafac7.d7d518"
+                "72f7ce5f.c9bf18"
             ]
         ]
     },
     {
-        "id": "92eafac7.d7d518",
+        "id": "72f7ce5f.c9bf18",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3593.3348722457886,
-        "y": 2676.4745755195618,
-        "z": "4bc0b1ec.14338",
+        "x": 2103.4181394577026,
+        "y": 1783.5929532051086,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "174c712f.3761bf",
+        "id": "815c9ddd.01be8",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2965.816795349121,
-        "y": 3254.819728374481,
-        "z": "4bc0b1ec.14338",
+        "x": 1475.9000625610352,
+        "y": 2361.938106060028,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "3dff1506.96185a"
+                "6c071a28.b0380c"
             ]
         ]
     },
     {
-        "id": "2f0fc13e.945516",
+        "id": "dc05565a.4c2348",
         "type": "outcome",
         "name": "DeleteSDWANSiteInstance",
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2965.816795349121,
-        "y": 3295.4862933158875,
-        "z": "4bc0b1ec.14338",
+        "x": 1475.9000625610352,
+        "y": 2402.6046710014343,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "3dff1506.96185a"
+                "6c071a28.b0380c"
             ]
         ]
     },
     {
-        "id": "3dff1506.96185a",
+        "id": "6c071a28.b0380c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3215.8167877197266,
-        "y": 3274.4861521720886,
-        "z": "4bc0b1ec.14338",
+        "x": 1725.9000549316406,
+        "y": 2381.6045298576355,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "f021df83.ca6fc8"
+                "40857ba0.6b4e94"
             ]
         ]
     },
     {
-        "id": "f021df83.ca6fc8",
+        "id": "40857ba0.6b4e94",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3593.816635131836,
-        "y": 3271.8198113441467,
-        "z": "4bc0b1ec.14338",
+        "x": 2103.89990234375,
+        "y": 2378.9381890296936,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d4dca55.3a5976",
+        "id": "bed51cff.64823",
         "type": "set",
         "name": "set skip-mdsal-update to Y",
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
         "comments": "",
-        "x": 3756.5152893066406,
-        "y": 1299.3737182617188,
-        "z": "4bc0b1ec.14338",
+        "x": 2266.5985565185547,
+        "y": 406.4920959472656,
+        "z": "6a76dcf7.7f5664",
         "wires": []
     },
     {
-        "id": "1daa7df.70ab082",
+        "id": "341e8458.4e6cd4",
         "type": "set",
         "name": "set ack-final to 'N'",
         "xml": "<set>\n<parameter name='ack-final' value='N' />\n",
         "comments": "",
-        "x": 3728.324981689453,
-        "y": 1363.7217407226562,
-        "z": "4bc0b1ec.14338",
+        "x": 2238.408248901367,
+        "y": 470.8401184082031,
+        "z": "6a76dcf7.7f5664",
         "wires": []
     },
     {
-        "id": "a8f40bda.5bb508",
+        "id": "f14829a1.2ca648",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3485.6980743408203,
-        "y": 1297.2942504882812,
-        "z": "4bc0b1ec.14338",
+        "x": 1995.7813415527344,
+        "y": 404.4126281738281,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "2d4dca55.3a5976",
-                "1daa7df.70ab082"
+                "bed51cff.64823",
+                "341e8458.4e6cd4"
             ]
         ]
     },
     {
-        "id": "79a25c14.32e15c",
+        "id": "71c3a0fb.c3bd6",
         "type": "comment",
         "name": "ack-final=N triggers Provider to call vnf-topology-operation-aysnc DG",
         "info": "",
         "comments": "",
-        "x": 3940.642364501953,
-        "y": 1404.6911010742188,
-        "z": "4bc0b1ec.14338",
+        "x": 2450.725631713867,
+        "y": 511.8094787597656,
+        "z": "6a76dcf7.7f5664",
         "wires": []
     },
     {
-        "id": "f6324746.f511b",
+        "id": "cdf51dda.2001a",
         "type": "switchNode",
         "name": "so-response-url empty?",
         "xml": "<switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2625.7691955566406,
-        "y": 1149.1673278808594,
-        "z": "4bc0b1ec.14338",
+        "x": 1135.8524627685547,
+        "y": 256.28570556640625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "83c6ec86.da31f8",
-                "eeff3a17.e7e33"
+                "dc753b5b.ce947",
+                "1cca6a19.d4bcce"
             ]
         ]
     },
     {
-        "id": "83c6ec86.da31f8",
+        "id": "dc753b5b.ce947",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2850.7691955566406,
-        "y": 1105.1673278808594,
-        "z": "4bc0b1ec.14338",
+        "x": 1360.8524627685547,
+        "y": 212.28570556640625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "4ace38e9.9f9bb"
+                "39fc89bc.139ef6"
             ]
         ]
     },
     {
-        "id": "eeff3a17.e7e33",
+        "id": "1cca6a19.d4bcce",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2840.7691955566406,
-        "y": 1197.1673278808594,
-        "z": "4bc0b1ec.14338",
+        "x": 1350.8524627685547,
+        "y": 304.28570556640625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "2d5bfc62.93c09c"
+                "8cdcc429.48d3f"
             ]
         ]
     },
     {
-        "id": "2d5bfc62.93c09c",
+        "id": "8cdcc429.48d3f",
         "type": "switchNode",
         "name": "so-response-url = ignored URL?",
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3062.7691955566406,
-        "y": 1198.1673278808594,
-        "z": "4bc0b1ec.14338",
+        "x": 1572.8524627685547,
+        "y": 305.28570556640625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "592ba5cb.40959c",
-                "86f26788.b01fd"
+                "132481eb.6ecaa6",
+                "b55574b8.d45858"
             ]
         ]
     },
     {
-        "id": "4ace38e9.9f9bb",
+        "id": "39fc89bc.139ef6",
         "type": "call",
         "name": "call vnf-topology-operation-assign-sync",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3526.7691955566406,
-        "y": 1106.1673278808594,
-        "z": "4bc0b1ec.14338",
+        "x": 2036.8524627685547,
+        "y": 213.28570556640625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "592ba5cb.40959c",
+        "id": "132481eb.6ecaa6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3302.7691955566406,
-        "y": 1197.1673278808594,
-        "z": "4bc0b1ec.14338",
+        "x": 1812.8524627685547,
+        "y": 304.28570556640625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "4ace38e9.9f9bb"
+                "39fc89bc.139ef6"
             ]
         ]
     },
     {
-        "id": "86f26788.b01fd",
+        "id": "b55574b8.d45858",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3310.7691955566406,
-        "y": 1298.1673278808594,
-        "z": "4bc0b1ec.14338",
+        "x": 1820.8524627685547,
+        "y": 405.28570556640625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "a8f40bda.5bb508"
+                "f14829a1.2ca648"
             ]
         ]
     },
     {
-        "id": "96168a09.862768",
+        "id": "97009ed2.e8db48",
         "type": "execute",
         "name": "execute getProperties",
         "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' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2639.1456604003906,
-        "y": 1039.4270935058594,
-        "z": "4bc0b1ec.14338",
+        "x": 1149.2289276123047,
+        "y": 146.54547119140625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "3b002d62.a8cbb2",
+        "id": "3d871ae9.3ed7a6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2448.2367248535156,
-        "y": 1037.6089172363281,
-        "z": "4bc0b1ec.14338",
+        "x": 958.3199920654297,
+        "y": 144.727294921875,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "f6324746.f511b",
-                "96168a09.862768"
+                "cdf51dda.2001a",
+                "97009ed2.e8db48"
             ]
         ]
     },
     {
-        "id": "8906fa5d.35ed",
+        "id": "c0d1c8ba.724dd8",
         "type": "outcome",
         "name": "CreateSOTNUnderlayInstance",
         "xml": "<outcome value='CreateSOTNUnderlayInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2965.1499967575073,
-        "y": 2738.881522655487,
-        "z": "4bc0b1ec.14338",
+        "x": 1475.2332639694214,
+        "y": 1845.999900341034,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "fef451b8.46e348"
+                "116f34b6.7fa84b"
             ]
         ]
     },
     {
-        "id": "fef451b8.46e348",
+        "id": "116f34b6.7fa84b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3421.673617362976,
-        "y": 2743.4023020267487,
-        "z": "4bc0b1ec.14338",
+        "x": 1931.7568845748901,
+        "y": 1850.5206797122955,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "523731c3.a7de08",
+        "id": "f4bc3207.d16e7",
         "type": "outcome",
         "name": "ActivateSOTNUnderlayInstance",
         "xml": "<outcome value='ActivateSOTNUnderlayInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2956.483367919922,
-        "y": 1675.2148926258087,
-        "z": "4bc0b1ec.14338",
+        "x": 1466.566635131836,
+        "y": 782.3332703113556,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "d803a916.c26a2"
+                "3ba953ed.89044c"
             ]
         ]
     },
     {
-        "id": "d803a916.c26a2",
+        "id": "3ba953ed.89044c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3416.340362548828,
-        "y": 1669.7357025146484,
-        "z": "4bc0b1ec.14338",
+        "x": 1926.4236297607422,
+        "y": 776.8540802001953,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "e2b46309.d91078",
+        "id": "bd1de01f.d7413",
         "type": "outcome",
         "name": "DeactivateSOTNUnderlayInstance",
         "xml": "<outcome value='DeactivateSOTNUnderlayInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2988.1500549316406,
-        "y": 2119.5482025146484,
-        "z": "4bc0b1ec.14338",
+        "x": 1498.2333221435547,
+        "y": 1226.6665802001953,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "97cb689b.12abe8"
+                "88972057.0160b8"
             ]
         ]
     },
     {
-        "id": "97cb689b.12abe8",
+        "id": "88972057.0160b8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3456.340362548828,
-        "y": 2122.402145385742,
-        "z": "4bc0b1ec.14338",
+        "x": 1966.4236297607422,
+        "y": 1229.520523071289,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "2fb36780.f5a5f",
+        "id": "baacc70f.fa88",
         "type": "outcome",
         "name": "DeleteSOTNUnderlayInstance",
         "xml": "<outcome value='DeleteSOTNUnderlayInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2974.1500701904297,
-        "y": 3329.2149786949158,
-        "z": "4bc0b1ec.14338",
+        "x": 1484.2333374023438,
+        "y": 2436.3333563804626,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "4a952dbe.755414"
+                "9f60c82b.0d9518"
             ]
         ]
     },
     {
-        "id": "4a952dbe.755414",
+        "id": "9f60c82b.0d9518",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3412.3404998779297,
-        "y": 3325.4023566246033,
-        "z": "4bc0b1ec.14338",
+        "x": 1922.4237670898438,
+        "y": 2432.52073431015,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "dd123475.dff318",
+        "id": "5d2ccada.022134",
         "type": "outcome",
         "name": "CreateAccessConnectivityInstance",
         "xml": "<outcome value='CreateAccessConnectivityInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2978.9833984375,
-        "y": 2442.631622314453,
-        "z": "4bc0b1ec.14338",
+        "x": 1489.066665649414,
+        "y": 1549.75,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "f30dea44.5310a"
+                "b1c0b560.1e6ca"
             ]
         ]
     },
     {
-        "id": "f30dea44.5310a",
+        "id": "b1c0b560.1e6ca",
         "type": "for",
         "name": "for:vnf-input-paramters",
         "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3264.916259765625,
-        "y": 2439.915069580078,
-        "z": "4bc0b1ec.14338",
+        "x": 1774.999526977539,
+        "y": 1547.033447265625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "fb984fae.3364e"
+                "e6440193.7508d"
             ]
         ]
     },
     {
-        "id": "fb984fae.3364e",
+        "id": "e6440193.7508d",
         "type": "switchNode",
         "name": "switch:manufacturer",
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 3502.082763671875,
-        "y": 2433.915069580078,
-        "z": "4bc0b1ec.14338",
+        "x": 2012.166030883789,
+        "y": 1541.033447265625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "e67bc64c.0398f"
+                "66c05795.7bc64"
             ]
         ]
     },
     {
-        "id": "e67bc64c.0398f",
+        "id": "66c05795.7bc64",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3696.082763671875,
-        "y": 2434.915313720703,
-        "z": "4bc0b1ec.14338",
+        "x": 2206.166030883789,
+        "y": 1542.03369140625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "8d8e308e.1b59b8"
+                "5558e390.29909c"
             ]
         ]
     },
     {
-        "id": "43a256d2.b2cfe",
+        "id": "89b79e98.b9e79",
         "type": "outcome",
         "name": "CreateInternetProfileInstance",
         "xml": "<outcome value='CreateInternetProfileInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2956.7666015625,
-        "y": 2479.498077392578,
-        "z": "4bc0b1ec.14338",
+        "x": 1466.849868774414,
+        "y": 1586.616455078125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "45ba019e.eee1f"
+                "e83093f7.bcfc78"
             ]
         ]
     },
     {
-        "id": "45ba019e.eee1f",
+        "id": "e83093f7.bcfc78",
         "type": "for",
         "name": "for:vnf-input-paramters",
         "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3241.9228515625,
-        "y": 2478.487579345703,
-        "z": "4bc0b1ec.14338",
+        "x": 1752.006118774414,
+        "y": 1585.60595703125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "25a0cc04.79cdb4"
+                "f3953ef4.88b3f"
             ]
         ]
     },
     {
-        "id": "25a0cc04.79cdb4",
+        "id": "f3953ef4.88b3f",
         "type": "switchNode",
         "name": "switch:manufacturer",
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 3495.0892333984375,
-        "y": 2475.487579345703,
-        "z": "4bc0b1ec.14338",
+        "x": 2005.1725006103516,
+        "y": 1582.60595703125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "aec2847e.abf538"
+                "6c8ce23.e2c2e1c"
             ]
         ]
     },
     {
-        "id": "aec2847e.abf538",
+        "id": "6c8ce23.e2c2e1c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3691.089111328125,
-        "y": 2491.487823486328,
-        "z": "4bc0b1ec.14338",
+        "x": 2201.172378540039,
+        "y": 1598.606201171875,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "89a01537.562948"
+                "8b9f81ff.389598"
             ]
         ]
     },
     {
-        "id": "89a01537.562948",
+        "id": "8b9f81ff.389598",
         "type": "switchNode",
         "name": "switch:manufacturer value",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3914.089599609375,
-        "y": 2501.488067626953,
-        "z": "4bc0b1ec.14338",
+        "x": 2424.172866821289,
+        "y": 1608.6064453125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "50f63bc0.ba434c"
+                "dc5b7e72.810978"
             ]
         ]
     },
     {
-        "id": "8d8e308e.1b59b8",
+        "id": "5558e390.29909c",
         "type": "switchNode",
         "name": "switch:manufacturer value",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3928.083251953125,
-        "y": 2434.915557861328,
-        "z": "4bc0b1ec.14338",
+        "x": 2438.166519165039,
+        "y": 1542.033935546875,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "2d893c14.30a154",
-                "3527054b.036f12"
+                "c76b6c11.0547d8",
+                "bc1362e3.3603f"
             ]
         ]
     },
     {
-        "id": "2d893c14.30a154",
+        "id": "c76b6c11.0547d8",
         "type": "outcomeTrue",
         "name": "HUAWEI",
         "xml": "<outcome value='HUAWEI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4159.916748046875,
-        "y": 2436.915313720703,
-        "z": "4bc0b1ec.14338",
+        "x": 2670.000015258789,
+        "y": 1544.03369140625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "ba8ce22c.801388"
+                "6eb5c1da.0bfee"
             ]
         ]
     },
     {
-        "id": "3527054b.036f12",
+        "id": "bc1362e3.3603f",
         "type": "other",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4154.316650390625,
-        "y": 2468.631622314453,
-        "z": "4bc0b1ec.14338",
+        "x": 2664.399917602539,
+        "y": 1575.75,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "86eaec8c.877db"
+                "7aeca839.db8ba"
             ]
         ]
     },
     {
-        "id": "50f63bc0.ba434c",
+        "id": "dc5b7e72.810978",
         "type": "outcomeTrue",
         "name": "HUAWEI",
         "xml": "<outcome value='HUAWEI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4141.9228515625,
-        "y": 2531.487823486328,
-        "z": "4bc0b1ec.14338",
+        "x": 2652.006118774414,
+        "y": 1638.606201171875,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "a45c1561.bdeab"
+                "29115a8b.c1fb4e"
             ]
         ]
     },
     {
-        "id": "ba8ce22c.801388",
+        "id": "6eb5c1da.0bfee",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:bbs-access-connectivity-vnf-topology-operation-create-huawei",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4656.760314941406,
-        "y": 2436.925811767578,
-        "z": "4bc0b1ec.14338",
+        "x": 3166.8435821533203,
+        "y": 1544.044189453125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "86eaec8c.877db",
+        "id": "7aeca839.db8ba",
         "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=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`\" />",
         "comments": "",
-        "x": 4402.649658203125,
-        "y": 2480.2982482910156,
-        "z": "4bc0b1ec.14338",
+        "x": 2912.732925415039,
+        "y": 1587.4166259765625,
+        "z": "6a76dcf7.7f5664",
         "wires": []
     },
     {
-        "id": "a45c1561.bdeab",
+        "id": "29115a8b.c1fb4e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-vnf-topology-operation-create-huawei",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-create-huawei' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4642.766845703125,
-        "y": 2533.498565673828,
-        "z": "4bc0b1ec.14338",
+        "x": 3152.850112915039,
+        "y": 1640.616943359375,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6636bbd.350918",
+        "id": "4134139c.b679c4",
         "type": "outcome",
         "name": "DeleteAccessConnectivityInstance",
         "xml": "<outcome value='DeleteAccessConnectivityInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2990.2333984375,
-        "y": 3005.631622314453,
-        "z": "4bc0b1ec.14338",
+        "x": 1500.316665649414,
+        "y": 2112.75,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "f0f8f8cc.2fc398"
+                "55377c66.987614"
             ]
         ]
     },
     {
-        "id": "f0f8f8cc.2fc398",
+        "id": "55377c66.987614",
         "type": "for",
         "name": "for:vnf-input-paramters",
         "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3303.056640625,
-        "y": 2996.621368408203,
-        "z": "4bc0b1ec.14338",
+        "x": 1813.139907836914,
+        "y": 2103.73974609375,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "ce973850.035718"
+                "5fe58f19.01ff6"
             ]
         ]
     },
     {
-        "id": "ce973850.035718",
+        "id": "5fe58f19.01ff6",
         "type": "switchNode",
         "name": "switch:manufacturer",
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 3574.2227783203125,
-        "y": 2990.621368408203,
-        "z": "4bc0b1ec.14338",
+        "x": 2084.3060455322266,
+        "y": 2097.73974609375,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "80e5371c.2d1c4"
+                "95c60a93.2b0bf"
             ]
         ]
     },
     {
-        "id": "80e5371c.2d1c4",
+        "id": "95c60a93.2b0bf",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3774.222900390625,
-        "y": 2990.6212463378906,
-        "z": "4bc0b1ec.14338",
+        "x": 2284.306167602539,
+        "y": 2097.7396240234375,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "6b050c8d.d83004"
+                "e83593ca.1cec88"
             ]
         ]
     },
     {
-        "id": "8a295d0c.3408b8",
+        "id": "bb97bcce.11a178",
         "type": "outcome",
         "name": "DeleteInternetProfileInstance",
         "xml": "<outcome value='DeleteInternetProfileInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2971.800048828125,
-        "y": 3045.681671142578,
-        "z": "4bc0b1ec.14338",
+        "x": 1481.883316040039,
+        "y": 2152.800048828125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "7ace04bc.fb5b14"
+                "5ab384b6.0ddaec"
             ]
         ]
     },
     {
-        "id": "7ace04bc.fb5b14",
+        "id": "5ab384b6.0ddaec",
         "type": "for",
         "name": "for:vnf-input-paramters",
         "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3249.1334228515625,
-        "y": 3057.3983459472656,
-        "z": "4bc0b1ec.14338",
+        "x": 1759.2166900634766,
+        "y": 2164.5167236328125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "7991faae.c4e784"
+                "f4b725dc.66125"
             ]
         ]
     },
     {
-        "id": "7991faae.c4e784",
+        "id": "f4b725dc.66125",
         "type": "switchNode",
         "name": "switch:manufacturer",
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 3477.2997512817383,
-        "y": 3046.3983869552612,
-        "z": "4bc0b1ec.14338",
+        "x": 1987.3830184936523,
+        "y": 2153.516764640808,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "5f0c4cf5.be1e74"
+                "4e10ba21.d7181c"
             ]
         ]
     },
     {
-        "id": "5f0c4cf5.be1e74",
+        "id": "4e10ba21.d7181c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3667.299629211426,
-        "y": 3046.3986310958862,
-        "z": "4bc0b1ec.14338",
+        "x": 2177.38289642334,
+        "y": 2153.517008781433,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "4e412874.a899a8"
+                "4916e32a.95a604"
             ]
         ]
     },
     {
-        "id": "4e412874.a899a8",
+        "id": "4916e32a.95a604",
         "type": "switchNode",
         "name": "switch:manufacturer value",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3881.300117492676,
-        "y": 3042.3988752365112,
-        "z": "4bc0b1ec.14338",
+        "x": 2391.38338470459,
+        "y": 2149.517252922058,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "a8223e45.798b18"
+                "5b3af93a.7b79d8"
             ]
         ]
     },
     {
-        "id": "6b050c8d.d83004",
+        "id": "e83593ca.1cec88",
         "type": "switchNode",
         "name": "switch:manufacturer value",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4033.2232971191406,
-        "y": 2983.621383666992,
-        "z": "4bc0b1ec.14338",
+        "x": 2543.3065643310547,
+        "y": 2090.739761352539,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "db0b13e8.151ac"
+                "4964ed42.f1a95c"
             ]
         ]
     },
     {
-        "id": "db0b13e8.151ac",
+        "id": "4964ed42.f1a95c",
         "type": "outcomeTrue",
         "name": "HUAWEI",
         "xml": "<outcome value='HUAWEI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4236.056640625,
-        "y": 2992.6212463378906,
-        "z": "4bc0b1ec.14338",
+        "x": 2746.139907836914,
+        "y": 2099.7396240234375,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "91df7c90.f18db"
+                "252a2876.a0f3a"
             ]
         ]
     },
     {
-        "id": "a8223e45.798b18",
+        "id": "5b3af93a.7b79d8",
         "type": "outcomeTrue",
         "name": "HUAWEI",
         "xml": "<outcome value='HUAWEI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4069.1331787109375,
-        "y": 3038.3985900878906,
-        "z": "4bc0b1ec.14338",
+        "x": 2579.2164459228516,
+        "y": 2145.5169677734375,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "1901255e.b7d76b"
+                "e644c5e7.1679f"
             ]
         ]
     },
     {
-        "id": "1901255e.b7d76b",
+        "id": "e644c5e7.1679f",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-vnf-topology-operation-delete-huawei",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4411.977294921875,
-        "y": 3098.409210205078,
-        "z": "4bc0b1ec.14338",
+        "x": 2922.060562133789,
+        "y": 2205.527587890625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "91df7c90.f18db",
+        "id": "252a2876.a0f3a",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:bbs-access-connectivity-vnf-topology-operation-delete-huawei",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-access-connectivity-vnf-topology-operation-delete-huawei' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4677.234130859375,
-        "y": 3041.6322326660156,
-        "z": "4bc0b1ec.14338",
+        "x": 3187.317398071289,
+        "y": 2148.7506103515625,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa805b7d.6c386",
+        "id": "8e01d8b9.6150f",
         "type": "outcome",
         "name": "update",
         "xml": "<outcome value='update'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2454.983341217041,
-        "y": 3465.881706237793,
-        "z": "4bc0b1ec.14338",
+        "x": 965.0666084289551,
+        "y": 2573.00008392334,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "61bdc8d8.841c8"
+                "313bb3b1.1c3d7c"
             ]
         ]
     },
     {
-        "id": "61bdc8d8.841c8",
+        "id": "313bb3b1.1c3d7c",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2657.983371734619,
-        "y": 3559.381706237793,
-        "z": "4bc0b1ec.14338",
+        "x": 1168.0666389465332,
+        "y": 2666.50008392334,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "f863cc4d.263a4",
-                "7ce235c6.94f4c4",
-                "aaadbe52.f1426"
+                "3d0bfa6d.d7f59e",
+                "64df6332.60edcc",
+                "8d3d2edf.2dab28",
+                "70c644da.671004"
             ]
         ]
     },
     {
-        "id": "f863cc4d.263a4",
+        "id": "3d0bfa6d.d7f59e",
         "type": "outcome",
         "name": "ChangeInternetProfileInstance",
         "xml": "<outcome value='ChangeInternetProfileInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2930.983310699463,
-        "y": 3555.881706237793,
-        "z": "4bc0b1ec.14338",
+        "x": 1430.066562652588,
+        "y": 2779.9999618530273,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "ae4d2d8.a98245"
+                "b1c7f7db.d6d93"
             ]
         ]
     },
     {
-        "id": "ae4d2d8.a98245",
+        "id": "b1c7f7db.d6d93",
         "type": "for",
         "name": "for:vnf-input-paramters",
         "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3255.1395263671875,
-        "y": 3554.871368408203,
-        "z": "4bc0b1ec.14338",
+        "x": 1754.2227783203125,
+        "y": 2778.9896240234375,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "ff8d4eb6.1850f8"
+                "45de1e5b.e0e01"
             ]
         ]
     },
     {
-        "id": "ff8d4eb6.1850f8",
+        "id": "45de1e5b.e0e01",
         "type": "switchNode",
         "name": "switch:manufacturer",
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 3516.305908203125,
-        "y": 3552.871368408203,
-        "z": "4bc0b1ec.14338",
+        "x": 2015.38916015625,
+        "y": 2776.9896240234375,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "9c3bd827.1745b8"
+                "f889f413.6bbf28"
             ]
         ]
     },
     {
-        "id": "9c3bd827.1745b8",
+        "id": "f889f413.6bbf28",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3704.305793762207,
-        "y": 3554.871530532837,
-        "z": "4bc0b1ec.14338",
+        "x": 2203.389045715332,
+        "y": 2778.9897861480713,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "f672e236.85abc8"
+                "7466e456.5c4424"
             ]
         ]
     },
     {
-        "id": "f672e236.85abc8",
+        "id": "7466e456.5c4424",
         "type": "switchNode",
         "name": "switch:manufacturer value",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3915.3064346313477,
-        "y": 3554.871855735779,
-        "z": "4bc0b1ec.14338",
+        "x": 2414.3896865844727,
+        "y": 2778.990111351013,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "37697a61.1ace26"
+                "61539a7e.2e8ab4"
             ]
         ]
     },
     {
-        "id": "37697a61.1ace26",
+        "id": "61539a7e.2e8ab4",
         "type": "outcomeTrue",
         "name": "HUAWEI",
         "xml": "<outcome value='HUAWEI'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4167.139667510986,
-        "y": 3480.871519088745,
-        "z": "4bc0b1ec.14338",
+        "x": 2677.2229347229004,
+        "y": 2587.989896774292,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "23e61b46.ee0434"
+                "d93cdc37.70209"
             ]
         ]
     },
     {
-        "id": "23e61b46.ee0434",
+        "id": "d93cdc37.70209",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-vnf-topology-operation-change-huawei",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-change-huawei' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4630.984222412109,
-        "y": 3481.881851196289,
-        "z": "4bc0b1ec.14338",
+        "x": 3141.0674896240234,
+        "y": 2589.000228881836,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "fbf38bf3.ff2fd8",
+        "id": "b7f0bf68.ae0bb8",
         "type": "outcome",
         "name": "ActivateTransportSliceInstance",
         "xml": "<outcome value='ActivateTransportSliceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2952.4833984375,
-        "y": 1738.8816223144531,
-        "z": "4bc0b1ec.14338",
+        "x": 1462.566665649414,
+        "y": 846,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "3a998a51.36f466"
+                "f0f0af06.7c7118"
             ]
         ]
     },
     {
-        "id": "3a998a51.36f466",
+        "id": "f0f0af06.7c7118",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-trans-slice-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3412.3403930664062,
-        "y": 1733.4024322032928,
-        "z": "4bc0b1ec.14338",
+        "x": 1922.4236602783203,
+        "y": 840.5208098888397,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "3b17290e.72545e",
+        "id": "e2b51c4b.ac5188",
         "type": "outcome",
         "name": "DeleteTransportSliceInstance",
         "xml": "<outcome value='DeleteTransportSliceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2968.4833984375,
-        "y": 3396.881622314453,
-        "z": "4bc0b1ec.14338",
+        "x": 1478.566665649414,
+        "y": 2504,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "4d393173.01f608"
+                "76a76590.982dac"
             ]
         ]
     },
     {
-        "id": "4d393173.01f608",
+        "id": "76a76590.982dac",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-trans-slice-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3406.673828125,
-        "y": 3393.0690002441406,
-        "z": "4bc0b1ec.14338",
+        "x": 1916.757095336914,
+        "y": 2500.1873779296875,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "9873c351.d4c7c8",
+        "id": "5aead910.a4e09",
         "type": "outcome",
         "name": "AllocateTransportSliceInstance",
         "xml": "<outcome value='AllocateTransportSliceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2961.4833984375,
-        "y": 2806.881622314453,
-        "z": "4bc0b1ec.14338",
+        "x": 1474.5667114257812,
+        "y": 1893,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "84a7b1a1.28caa"
+                "4c41b0d9.be1938"
             ]
         ]
     },
     {
-        "id": "84a7b1a1.28caa",
+        "id": "4c41b0d9.be1938",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-trans-slice-allocate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-trans-slice-allocate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3414.007080078125,
-        "y": 2801.402374267578,
-        "z": "4bc0b1ec.14338",
+        "x": 1924.090347290039,
+        "y": 1908.520751953125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "16a941e3.dfa776",
+        "id": "396c2dc7.20b4fa",
         "type": "outcome",
         "name": "DeactivateTransportSliceInstance",
         "xml": "<outcome value='DeactivateTransportSliceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2986.4833984375,
-        "y": 2191.881622314453,
-        "z": "4bc0b1ec.14338",
+        "x": 1496.566665649414,
+        "y": 1299,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "832bb1f7.f0c948"
+                "7f2c84f4.4cce24"
             ]
         ]
     },
     {
-        "id": "832bb1f7.f0c948",
+        "id": "7f2c84f4.4cce24",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-trans-slice-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3454.6737060546875,
-        "y": 2194.735565185547,
-        "z": "4bc0b1ec.14338",
+        "x": 1964.7569732666016,
+        "y": 1301.8539428710938,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "7ce235c6.94f4c4",
+        "id": "64df6332.60edcc",
         "type": "outcome",
         "name": "ModifyTransportSliceInstance",
         "xml": "<outcome value='DeleteTransportSliceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2925.4833984375,
-        "y": 3612.881622314453,
-        "z": "4bc0b1ec.14338",
+        "x": 1424.566650390625,
+        "y": 2836.9998779296875,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "f675a646.b2d48"
+                "5f40ac71.c38e54"
             ]
         ]
     },
     {
-        "id": "f675a646.b2d48",
+        "id": "5f40ac71.c38e54",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-trans-slice-modify",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-trans-slice-modify' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3363.673828125,
-        "y": 3609.0690002441406,
-        "z": "4bc0b1ec.14338",
+        "x": 1862.757080078125,
+        "y": 2833.187255859375,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "6662582d.8003b",
+        "id": "a0f59a01.118fa",
         "type": "outcome",
         "name": "CreateCloudLeasedLineInstance",
         "xml": "<outcome value='CreateCloudLeasedLineInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2960.4833984375,
-        "y": 2862.881622314453,
-        "z": "4bc0b1ec.14338",
+        "x": 1476.5667114257812,
+        "y": 1947,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "9b881571.57a9c"
+                "7ff3d94.a00d128"
             ]
         ]
     },
     {
-        "id": "9b881571.57a9c",
+        "id": "7ff3d94.a00d128",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3413.007080078125,
-        "y": 2857.402374267578,
-        "z": "4bc0b1ec.14338",
+        "x": 1923.090347290039,
+        "y": 1964.520751953125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b2d1724.361ac",
+        "id": "68c1cc63.db848c",
         "type": "outcome",
         "name": "DeleteCloudLeasedLineInstance",
         "xml": "<outcome value='DeleteCloudLeasedLineInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2977.4833984375,
-        "y": 3444.881622314453,
-        "z": "4bc0b1ec.14338",
+        "x": 1487.566665649414,
+        "y": 2552,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "8681c556.fb7ad8"
+                "a7b9b61c.1fdec"
             ]
         ]
     },
     {
-        "id": "8681c556.fb7ad8",
+        "id": "a7b9b61c.1fdec",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3421.007080078125,
-        "y": 3445.402374267578,
-        "z": "4bc0b1ec.14338",
+        "x": 1931.090347290039,
+        "y": 2552.520751953125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "aaadbe52.f1426",
+        "id": "8d3d2edf.2dab28",
         "type": "outcome",
         "name": "ModifyCloudLeasedLineInstance",
         "xml": "<outcome value='ModifyCloudLeasedLineInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 2927.4833984375,
-        "y": 3667.881622314453,
-        "z": "4bc0b1ec.14338",
+        "x": 1426.566650390625,
+        "y": 2891.9998779296875,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "9dfb2696.be55f"
+                "bada9db5.120e68"
             ]
         ]
     },
     {
-        "id": "9dfb2696.be55f",
+        "id": "bada9db5.120e68",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-modify' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3371.007080078125,
-        "y": 3668.402374267578,
-        "z": "4bc0b1ec.14338",
+        "x": 1870.09033203125,
+        "y": 2892.5206298828125,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
     },
     {
-        "id": "5ec4c91.e108038",
+        "id": "c6ae39cb.030c7",
         "type": "other",
         "name": "changeassign",
         "xml": "<outcome value='changeassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2435.8944769965274,
-        "y": 1753.8817342122397,
-        "z": "4bc0b1ec.14338",
+        "x": 945.9777442084414,
+        "y": 861.0001118977866,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "b406fbd.7862008"
+                "2191d9ff.7557be"
             ]
         ]
     },
     {
-        "id": "b406fbd.7862008",
+        "id": "2191d9ff.7557be",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2616.7278103298613,
-        "y": 1753.603956434462,
-        "z": "4bc0b1ec.14338",
+        "x": 1126.8110775417754,
+        "y": 860.7223341200088,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "dc516eeb.58a0d"
+                "2ec2c947.c59716"
             ]
         ]
     },
     {
-        "id": "dc516eeb.58a0d",
+        "id": "2ec2c947.c59716",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2716.7280349731445,
-        "y": 1838.048285484314,
-        "z": "4bc0b1ec.14338",
+        "x": 1226.8113021850586,
+        "y": 945.1666631698608,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "ad412dac.deb808"
+                "a156724.c2f089"
             ]
         ]
     },
     {
-        "id": "ad412dac.deb808",
+        "id": "a156724.c2f089",
         "type": "outcome",
         "name": "CreateVnfInstance",
         "xml": "<outcome value='CreateVnfInstance'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2932.283365885416,
-        "y": 1856.937289767795,
-        "z": "4bc0b1ec.14338",
+        "x": 1442.3666330973301,
+        "y": 964.0556674533418,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             [
-                "363fc11d.26c836"
+                "809cf6ab.146288"
             ]
         ]
     },
     {
-        "id": "363fc11d.26c836",
+        "id": "809cf6ab.146288",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-changeassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-changeassign' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3317.8389434814453,
-        "y": 1858.048623085022,
-        "z": "4bc0b1ec.14338",
+        "x": 1827.9222106933594,
+        "y": 965.1670007705688,
+        "z": "6a76dcf7.7f5664",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "e4b688bf.c2f8a8",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='p2p-vnf-topology-operation-p2p-create' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1967.566650390625,
+        "y": 2016.36669921875,
+        "z": "6a76dcf7.7f5664",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "885fd99d.c1b148",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='p2p-vnf-topology-operation-p2p-delete' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1928.566650390625,
+        "y": 2598.16650390625,
+        "z": "6a76dcf7.7f5664",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "852a84f7.1d8638",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='p2p-vnf-topology-operation-p2p-modify' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1881.566635131836,
+        "y": 2947.1663818359375,
+        "z": "6a76dcf7.7f5664",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "85085184.f669c8",
+        "type": "outcome",
+        "name": "CreateCloudLeasedLineInstanceByEline",
+        "xml": "<outcome value='CreateCloudLeasedLineInstanceByEline'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1490.7334594726562,
+        "y": 2009.9666748046875,
+        "z": "6a76dcf7.7f5664",
+        "wires": [
+            [
+                "e4b688bf.c2f8a8"
+            ]
+        ]
+    },
+    {
+        "id": "339e9c64.eb19a4",
+        "type": "outcome",
+        "name": "DeleteCloudLeasedLineInstanceByEline",
+        "xml": "<outcome value='DeleteCloudLeasedLineInstanceByEline'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1489.7333984375,
+        "y": 2601.16650390625,
+        "z": "6a76dcf7.7f5664",
+        "wires": [
+            [
+                "885fd99d.c1b148"
+            ]
+        ]
+    },
+    {
+        "id": "70c644da.671004",
+        "type": "outcome",
+        "name": "ModifyCloudLeasedLineInstanceByEline",
+        "xml": "<outcome value='ModifyCloudLeasedLineInstanceByEline'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1425.7333984375,
+        "y": 2947.7666015625,
+        "z": "6a76dcf7.7f5664",
+        "wires": [
+            [
+                "852a84f7.1d8638"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-activate.json b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-activate.json
index 879663fe..4bc2b9d7 100644
--- a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-activate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "94b540c9.238618",
+        "id": "b426698f.bcfc1",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 149.75,
-        "y": 94.75,
-        "z": "30d84baa.6f57bc",
+        "x": 152.56666564941406,
+        "y": 111.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "dda31e25.b7e27"
+                "dda42032.d7c16"
             ]
         ]
     },
     {
-        "id": "dda31e25.b7e27",
+        "id": "dda42032.d7c16",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,2448 +22,2778 @@
         "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": 281.0356903076172,
-        "y": 143.98810863494873,
-        "z": "30d84baa.6f57bc",
+        "x": 283.85235595703125,
+        "y": 160.8047742843628,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "a1958103.ff3f88"
+                "e2264d45.69ec48"
             ]
         ]
     },
     {
-        "id": "a1958103.ff3f88",
+        "id": "e2264d45.69ec48",
         "type": "method",
         "name": "method p2p-vnf-topology-operation-p2p-activate",
         "xml": "<method rpc='p2p-vnf-topology-operation-p2p-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 284.1786193847656,
-        "y": 228.75003242492676,
-        "z": "30d84baa.6f57bc",
+        "x": 286.9952850341797,
+        "y": 245.56669807434082,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "a73db057.8ff74"
+                "ee8a72fb.598d5"
             ]
         ]
     },
     {
-        "id": "a73db057.8ff74",
+        "id": "ee8a72fb.598d5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 433.988037109375,
-        "y": 358.4166564941406,
-        "z": "30d84baa.6f57bc",
+        "x": 436.80470275878906,
+        "y": 375.2333221435547,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "91bdee0e.c7f15",
-                "957a18ba.9d8e",
-                "11da7ad8.21f09d"
+                "6f85f731.13b82",
+                "eba98a4a.ac8ff",
+                "a74dc401.a8636"
             ]
         ]
     },
     {
-        "id": "91bdee0e.c7f15",
+        "id": "6f85f731.13b82",
         "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": 702.3216552734375,
-        "y": 745.34716796875,
-        "z": "30d84baa.6f57bc",
+        "x": 705.1383209228516,
+        "y": 762.1638336181641,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "1d1c9d38.a24823",
+        "id": "40b1f55.6d6428c",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 733.75,
-        "y": 419.75,
-        "z": "30d84baa.6f57bc",
+        "x": 736.5666656494141,
+        "y": 436.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "957a18ba.9d8e",
+        "id": "eba98a4a.ac8ff",
         "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[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].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<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 753.75,
-        "y": 515.75,
-        "z": "30d84baa.6f57bc",
+        "x": 756.5666656494141,
+        "y": 532.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "255854de.861404",
-                "fd908507.674308",
-                "4a62dd9f.61cdac"
+                "1e7b283c.1e038",
+                "52313592.2606f4",
+                "3666eff1.a4c68"
             ]
         ]
     },
     {
-        "id": "255854de.861404",
+        "id": "1e7b283c.1e038",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 972.75,
-        "y": 453.75,
-        "z": "30d84baa.6f57bc",
+        "x": 975.5666656494141,
+        "y": 470.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "622587e3.99be58"
+                "4802c9ed.bd319"
             ]
         ]
     },
     {
-        "id": "fd908507.674308",
+        "id": "52313592.2606f4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 982.240966796875,
-        "y": 496.32403564453125,
-        "z": "30d84baa.6f57bc",
+        "x": 985.0576324462891,
+        "y": 513.1407012939453,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "d8fc9dc9.3e6cf"
+                "aaeb8158.8891e8"
             ]
         ]
     },
     {
-        "id": "4a62dd9f.61cdac",
+        "id": "3666eff1.a4c68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 970.75,
-        "y": 542.75,
-        "z": "30d84baa.6f57bc",
+        "x": 973.5666656494141,
+        "y": 559.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "5e548c85.32cd14"
+                "5ca110f5.52cc9"
             ]
         ]
     },
     {
-        "id": "d8fc9dc9.3e6cf",
+        "id": "aaeb8158.8891e8",
         "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": 1135.8123779296875,
-        "y": 499.6097717285156,
-        "z": "30d84baa.6f57bc",
+        "x": 1138.6290435791016,
+        "y": 516.4264373779297,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "5e548c85.32cd14",
+        "id": "5ca110f5.52cc9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1139.75,
-        "y": 543.75,
-        "z": "30d84baa.6f57bc",
+        "x": 1142.566665649414,
+        "y": 560.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "622587e3.99be58",
+        "id": "4802c9ed.bd319",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1169.75,
-        "y": 449.75,
-        "z": "30d84baa.6f57bc",
+        "x": 1172.566665649414,
+        "y": 466.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "439a3ae3.2ab694"
+                "5f77cdf0.1ff4fc"
             ]
         ]
     },
     {
-        "id": "439a3ae3.2ab694",
+        "id": "5f77cdf0.1ff4fc",
         "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": 1393.08349609375,
-        "y": 449.74993896484375,
-        "z": "30d84baa.6f57bc",
+        "x": 1395.900161743164,
+        "y": 466.5666046142578,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "1016c8ba.b6da07"
+                "dbbed370.683fd8"
             ]
         ]
     },
     {
-        "id": "1016c8ba.b6da07",
+        "id": "dbbed370.683fd8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1593.7501335144043,
-        "y": 450.75002098083496,
-        "z": "30d84baa.6f57bc",
+        "x": 1537.5668334960938,
+        "y": 384.5666961669922,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "f655b129.6c8e3"
+                "a62a2704.25f8d8"
             ]
         ]
     },
     {
-        "id": "7d98821b.e6839c",
+        "id": "44bcd2e8.a3bb64",
         "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": 4412.75,
-        "y": 166.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4415.566665649414,
+        "y": 183.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "c978ce8f.5eb918",
+        "id": "235bcd4f.ba7e9a",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te: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`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te/tunnels'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4493.75,
-        "y": 481.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4496.566665649414,
+        "y": 498.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "c08a95fe.6696f8",
-                "b0f4c0f5.92a118"
+                "9f56fadc.33cce8",
+                "143f9e70.b45a92"
             ]
         ]
     },
     {
-        "id": "c08a95fe.6696f8",
+        "id": "9f56fadc.33cce8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4803.25,
-        "y": 450.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4806.066665649414,
+        "y": 467.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "f00f23ff.750aa8"
+                "705d82c.67d11fc"
             ]
         ]
     },
     {
-        "id": "b0f4c0f5.92a118",
+        "id": "143f9e70.b45a92",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4808.25,
-        "y": 515.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4811.066665649414,
+        "y": 532.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "c22d4e2c.b8095"
+                "a78f86b9.c32d28"
             ]
         ]
     },
     {
-        "id": "f00f23ff.750aa8",
+        "id": "705d82c.67d11fc",
         "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 OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4979.25,
-        "y": 450.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4982.066665649414,
+        "y": 467.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "c22d4e2c.b8095",
+        "id": "a78f86b9.c32d28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4974.75,
-        "y": 515.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4977.566665649414,
+        "y": 532.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1f1dcb6.1fec3",
+        "id": "af922307.c203c8",
         "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='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
         "comments": "",
-        "x": 4360.25,
-        "y": 669.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4363.066665649414,
+        "y": 686.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "251b183d.cbc77",
+        "id": "4cfae106.244c4",
         "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.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\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",
+        "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=\"`$tmp.templateFileNameForEthSrv`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\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=\"post\"/>\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": 4514.25,
-        "y": 717.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4517.066665649414,
+        "y": 734.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "be60985c.4fbc58",
-                "b84a3cc3.684a28"
+                "1e0a9e34.d5eca2",
+                "4e3f62b2.97234c"
             ]
         ]
     },
     {
-        "id": "be60985c.4fbc58",
+        "id": "1e0a9e34.d5eca2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4859.75,
-        "y": 698.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4862.566665649414,
+        "y": 715.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "305db122.d214ee"
+                "35316f81.9ed85"
             ]
         ]
     },
     {
-        "id": "b84a3cc3.684a28",
+        "id": "4e3f62b2.97234c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4863.75,
-        "y": 738.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4866.566665649414,
+        "y": 755.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "d6fb6749.eab338"
+                "1cbef478.7c261c"
             ]
         ]
     },
     {
-        "id": "305db122.d214ee",
+        "id": "35316f81.9ed85",
         "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": 5017.75,
-        "y": 698.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5020.566665649414,
+        "y": 715.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "d6fb6749.eab338",
+        "id": "1cbef478.7c261c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5021.25,
-        "y": 738.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5024.066665649414,
+        "y": 755.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "4fa6f4cb.4aa39c",
-                "f065baf1.f73c4",
-                "677bc6cc.c2278",
-                "fce678f7.abc0e",
-                "c53e4466.6aae58",
-                "4b53c1cb.8fea68"
+                "be879311.90668",
+                "a145aca2.ac879",
+                "e634d16b.4c8208"
             ]
         ]
     },
     {
-        "id": "d7ddb4d7.9c1b5",
+        "id": "a769c383.79df18",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 4357.75,
-        "y": 625.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4360.566665649414,
+        "y": 642.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "4fa6f4cb.4aa39c",
+        "id": "be879311.90668",
         "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": 5538.750244140625,
-        "y": 578.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5541.566909790039,
+        "y": 595.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e1a352b3.d1c22",
+        "id": "d5dfd505.69af2",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 5402.750244140625,
-        "y": 537.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5405.566909790039,
+        "y": 554.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "f065baf1.f73c4",
+        "id": "a145aca2.ac879",
         "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": 5465.750244140625,
-        "y": 624.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5468.566909790039,
+        "y": 641.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d8047beb.a120a",
+        "id": "44c284d2.4d6d3c",
         "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": 4350.75,
-        "y": 214.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4353.566665649414,
+        "y": 231.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "c0003a50.a00b1",
+        "id": "55fb0c25.47026c",
         "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": 4376.75,
-        "y": 331.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4379.566665649414,
+        "y": 348.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "767b670a.725628",
-                "8de69881.7810c",
-                "dbb97564.e7a91"
+                "baf31efa.9d02c8",
+                "74922f45.cf4ee",
+                "c4e9d6bb.97a8b"
             ]
         ]
     },
     {
-        "id": "767b670a.725628",
+        "id": "baf31efa.9d02c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4572.2501220703125,
-        "y": 283.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4575.066787719727,
+        "y": 300.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "9fa9eef6.966618"
+                "43bc0802.15854"
             ]
         ]
     },
     {
-        "id": "8de69881.7810c",
+        "id": "74922f45.cf4ee",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4564.2501220703125,
-        "y": 338.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4567.066787719727,
+        "y": 355.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "2b81f91f.bfddb6"
+                "6499c72f.95b628"
             ]
         ]
     },
     {
-        "id": "9fa9eef6.966618",
+        "id": "43bc0802.15854",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4716.6324462890625,
-        "y": 283.4056701660156,
-        "z": "30d84baa.6f57bc",
+        "x": 4719.449111938477,
+        "y": 300.2223358154297,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "33a206d2.a6527a"
+                "6fa2d3b0.fd7efc"
             ]
         ]
     },
     {
-        "id": "4f3c702b.c83bb",
+        "id": "b0f8c595.8444c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5298.75,
-        "y": 285.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5301.566665649414,
+        "y": 302.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "cb134ba5.74bf48"
+                "4e73c346.ee277c"
             ]
         ]
     },
     {
-        "id": "33a206d2.a6527a",
+        "id": "6fa2d3b0.fd7efc",
         "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": 4900.75,
-        "y": 281.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4903.566665649414,
+        "y": 298.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "893da1cb.bc091"
+                "d9bb61c1.741d"
             ]
         ]
     },
     {
-        "id": "893da1cb.bc091",
+        "id": "d9bb61c1.741d",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5095.75,
-        "y": 281.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5098.566665649414,
+        "y": 298.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "4f3c702b.c83bb"
+                "b0f8c595.8444c"
             ]
         ]
     },
     {
-        "id": "dbb97564.e7a91",
+        "id": "c4e9d6bb.97a8b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4569.2501220703125,
-        "y": 395.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4572.066787719727,
+        "y": 412.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "b75e061e.d5ec88"
+                "8bff9189.cce068"
             ]
         ]
     },
     {
-        "id": "b75e061e.d5ec88",
+        "id": "8bff9189.cce068",
         "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": 4721.2501220703125,
-        "y": 396.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4724.066787719727,
+        "y": 413.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "2b81f91f.bfddb6",
+        "id": "6499c72f.95b628",
         "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": 4732.2501220703125,
-        "y": 339.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4735.066787719727,
+        "y": 356.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "848a4c57.f2a3d",
+        "id": "1c233ea3.b1f299",
         "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": 5683.75,
-        "y": 298.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5686.566665649414,
+        "y": 315.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "2e1535a4.41297a",
-                "1778db70.6907f5",
-                "72b5f7c.70da408"
+                "d61ed221.5ecdd",
+                "d1b9cbed.664ff",
+                "cd554430.08993"
             ]
         ]
     },
     {
-        "id": "cb134ba5.74bf48",
+        "id": "4e73c346.ee277c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5477.75,
-        "y": 285.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5480.566665649414,
+        "y": 302.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "19fba605.f323fa",
-                "848a4c57.f2a3d"
+                "85104104.6dac4",
+                "1c233ea3.b1f299"
             ]
         ]
     },
     {
-        "id": "19fba605.f323fa",
+        "id": "85104104.6dac4",
         "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": 5713.75,
-        "y": 246.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5716.566665649414,
+        "y": 263.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "2e1535a4.41297a",
+        "id": "d61ed221.5ecdd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5893.75,
-        "y": 289.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5896.566665649414,
+        "y": 306.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "780f3b99.e0b614"
+                "ecba12bc.ca79d"
             ]
         ]
     },
     {
-        "id": "1778db70.6907f5",
+        "id": "d1b9cbed.664ff",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5885.75,
-        "y": 344.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5888.566665649414,
+        "y": 361.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "142c73b0.fb0d8c"
+                "1044edab.10a4d2"
             ]
         ]
     },
     {
-        "id": "72b5f7c.70da408",
+        "id": "cd554430.08993",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5890.75,
-        "y": 401.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5893.566665649414,
+        "y": 418.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "4764feda.35a838"
+                "f2bc07a2.346708"
             ]
         ]
     },
     {
-        "id": "4764feda.35a838",
+        "id": "f2bc07a2.346708",
         "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": 6042.75,
-        "y": 402.75,
-        "z": "30d84baa.6f57bc",
+        "x": 6045.566665649414,
+        "y": 419.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "142c73b0.fb0d8c",
+        "id": "1044edab.10a4d2",
         "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": 6053.75,
-        "y": 347.75,
-        "z": "30d84baa.6f57bc",
+        "x": 6056.566665649414,
+        "y": 364.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "780f3b99.e0b614",
+        "id": "ecba12bc.ca79d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6038.13232421875,
-        "y": 287.4056701660156,
-        "z": "30d84baa.6f57bc",
+        "x": 6040.948989868164,
+        "y": 304.2223358154297,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "bba0e779.8df588"
+                "eef0bb47.7a3f88"
             ]
         ]
     },
     {
-        "id": "bba0e779.8df588",
+        "id": "eef0bb47.7a3f88",
         "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": 6252.75,
-        "y": 283.75,
-        "z": "30d84baa.6f57bc",
+        "x": 6255.566665649414,
+        "y": 300.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "11da7ad8.21f09d",
+        "id": "a74dc401.a8636",
         "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": 719.75,
-        "y": 463.75,
-        "z": "30d84baa.6f57bc",
+        "x": 722.5666656494141,
+        "y": 480.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "97981e3f.7665d",
+        "id": "d36679f1.a0d8a",
         "type": "set",
         "name": "set attachment_param for OTN B",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
-        "x": 3819.75,
-        "y": 1623.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3822.566665649414,
+        "y": 1640.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "1bef475b.0876b9",
+        "id": "2c2876b1.2b5332",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te: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`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te/tunnels'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 3882.75,
-        "y": 1952.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3885.566665649414,
+        "y": 1969.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "a5d1d793.c9259",
-                "24fe1da2.474a9a"
+                "5f444ade.96d9a4",
+                "9af37a8f.f23f18"
             ]
         ]
     },
     {
-        "id": "a5d1d793.c9259",
+        "id": "5f444ade.96d9a4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4178.25,
-        "y": 1919.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4181.066665649414,
+        "y": 1936.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "b911fc3e.201c1"
+                "a98d5509.6c7c78"
             ]
         ]
     },
     {
-        "id": "24fe1da2.474a9a",
+        "id": "9af37a8f.f23f18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4183.25,
-        "y": 1984.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4186.066665649414,
+        "y": 2001.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "467082f5.e654ac"
+                "55dfdfe9.281428"
             ]
         ]
     },
     {
-        "id": "b911fc3e.201c1",
+        "id": "a98d5509.6c7c78",
         "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 OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4346.25,
-        "y": 1919.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4349.066665649414,
+        "y": 1936.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "467082f5.e654ac",
+        "id": "55dfdfe9.281428",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4356.75,
-        "y": 1984.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4359.566665649414,
+        "y": 2001.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ace90237.5528b8",
+        "id": "36fc5af8.9e293e",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
         "comments": "",
-        "x": 3758.75,
-        "y": 1680.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3761.566665649414,
+        "y": 1697.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "e4aaac37.9b5738",
+        "id": "dce692d6.26705",
         "type": "get-resource",
         "name": "get-resource dst 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": 3778.75,
-        "y": 1777.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3781.566665649414,
+        "y": 1794.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "57142ea4.bc3bb",
-                "cc1afb43.a5676",
-                "86a15efe.377578"
+                "20c07b90.5b79e4",
+                "d792ecbe.f58c98",
+                "c2d6e25d.4e48e"
             ]
         ]
     },
     {
-        "id": "57142ea4.bc3bb",
+        "id": "20c07b90.5b79e4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3981.2501220703125,
-        "y": 1730.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3984.0667877197266,
+        "y": 1747.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "19ef9dfe.b1b91a"
+                "89d1ed.e4ef561"
             ]
         ]
     },
     {
-        "id": "cc1afb43.a5676",
+        "id": "d792ecbe.f58c98",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3973.2501220703125,
-        "y": 1785.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3976.0667877197266,
+        "y": 1802.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "fc294828.8c7aa"
+                "b9bab20f.a76c4"
             ]
         ]
     },
     {
-        "id": "19ef9dfe.b1b91a",
+        "id": "89d1ed.e4ef561",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4125.6324462890625,
-        "y": 1728.4056701660156,
-        "z": "30d84baa.6f57bc",
+        "x": 4128.449111938477,
+        "y": 1745.2223358154297,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "a34e91d1.6b4f48"
+                "c9698e5e.6f47e8"
             ]
         ]
     },
     {
-        "id": "a34e91d1.6b4f48",
+        "id": "c9698e5e.6f47e8",
         "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": 4309.75,
-        "y": 1742.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4312.566665649414,
+        "y": 1759.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "bcf409d1.2bca88"
+                "ba34540d.aed56"
             ]
         ]
     },
     {
-        "id": "86a15efe.377578",
+        "id": "c2d6e25d.4e48e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3978.2501220703125,
-        "y": 1842.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3981.0667877197266,
+        "y": 1859.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "9228ece.bfbed9"
+                "4767f1dc.5f98f"
             ]
         ]
     },
     {
-        "id": "9228ece.bfbed9",
+        "id": "4767f1dc.5f98f",
         "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": 4130.2501220703125,
-        "y": 1843.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4133.066787719727,
+        "y": 1860.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "fc294828.8c7aa",
+        "id": "b9bab20f.a76c4",
         "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": 4141.2501220703125,
-        "y": 1788.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4144.066787719727,
+        "y": 1805.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "8fd77208.a2c738",
+        "id": "7f94f6a1.089328",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4707.75,
-        "y": 1746.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4710.566665649414,
+        "y": 1763.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "2b23a5a1.db882a"
+                "c702a308.63c03"
             ]
         ]
     },
     {
-        "id": "bcf409d1.2bca88",
+        "id": "ba34540d.aed56",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4504.75,
-        "y": 1742.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4507.566665649414,
+        "y": 1759.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "8fd77208.a2c738"
+                "7f94f6a1.089328"
             ]
         ]
     },
     {
-        "id": "ee733a11.b10eb8",
+        "id": "6943fd0d.83e3ac",
         "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": 5092.75,
-        "y": 1745.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5095.566665649414,
+        "y": 1762.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "8e9e736e.ee5478",
-                "98c4188c.f20b2",
-                "454707d0.8a14d8"
+                "708333aa.3b759c",
+                "4e0cc838.81e228",
+                "29a9be9f.036812"
             ]
         ]
     },
     {
-        "id": "2b23a5a1.db882a",
+        "id": "c702a308.63c03",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4884.75,
-        "y": 1738.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4887.566665649414,
+        "y": 1755.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "923bc8de.eb024",
-                "ee733a11.b10eb8"
+                "c3389354.588f68",
+                "6943fd0d.83e3ac"
             ]
         ]
     },
     {
-        "id": "923bc8de.eb024",
+        "id": "c3389354.588f68",
         "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": 5122.75,
-        "y": 1693.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5125.566665649414,
+        "y": 1710.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "35e39fbb.1f604",
+        "id": "6e37f843.94e3c",
         "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": 5451.75,
-        "y": 1849.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5454.566665649414,
+        "y": 1866.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "13ebe3ed.f2247c",
+        "id": "dd8e2b89.1af3f8",
         "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": 5462.75,
-        "y": 1794.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5465.566665649414,
+        "y": 1811.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "b78b9bfd.914f38",
+        "id": "ab654ac.84c6838",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5447.13232421875,
-        "y": 1734.4056701660156,
-        "z": "30d84baa.6f57bc",
+        "x": 5449.948989868164,
+        "y": 1751.2223358154297,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "4076fb5b.40dc5c"
+                "f1731e20.0070f8"
             ]
         ]
     },
     {
-        "id": "4076fb5b.40dc5c",
+        "id": "f1731e20.0070f8",
         "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": 5661.75,
-        "y": 1730.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5664.566665649414,
+        "y": 1747.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "8e9e736e.ee5478",
+        "id": "708333aa.3b759c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5302.75,
-        "y": 1736.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5305.566665649414,
+        "y": 1753.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "b78b9bfd.914f38"
+                "ab654ac.84c6838"
             ]
         ]
     },
     {
-        "id": "98c4188c.f20b2",
+        "id": "4e0cc838.81e228",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5294.75,
-        "y": 1791.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5297.566665649414,
+        "y": 1808.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "13ebe3ed.f2247c"
+                "dd8e2b89.1af3f8"
             ]
         ]
     },
     {
-        "id": "454707d0.8a14d8",
+        "id": "29a9be9f.036812",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5299.75,
-        "y": 1848.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5302.566665649414,
+        "y": 1865.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "35e39fbb.1f604"
+                "6e37f843.94e3c"
             ]
         ]
     },
     {
-        "id": "f655b129.6c8e3",
+        "id": "a62a2704.25f8d8",
         "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": 1831.75,
-        "y": 452.75,
-        "z": "30d84baa.6f57bc",
+        "x": 1755.5667114257812,
+        "y": 385.56663513183594,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "d8fbecfc.eada5",
-                "70aafcb6.3ffce4",
-                "18daf882.cb46e7"
+                "89759382.78fc28",
+                "6073b91a.46b8d8",
+                "1561e008.8fdf5"
             ]
         ]
     },
     {
-        "id": "d8fbecfc.eada5",
+        "id": "89759382.78fc28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2039.75,
-        "y": 416.75,
-        "z": "30d84baa.6f57bc",
+        "x": 1963.5667114257812,
+        "y": 349.56663513183594,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "92d3d22d.c618f8"
+                "37909c7a.4f488c"
             ]
         ]
     },
     {
-        "id": "70aafcb6.3ffce4",
+        "id": "6073b91a.46b8d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2040.240966796875,
-        "y": 462.32403564453125,
-        "z": "30d84baa.6f57bc",
+        "x": 1964.0576782226562,
+        "y": 395.1406707763672,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "de1e5ed.546bf2"
+                "593c848.7fab97c"
             ]
         ]
     },
     {
-        "id": "18daf882.cb46e7",
+        "id": "1561e008.8fdf5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2037.75,
-        "y": 505.75,
-        "z": "30d84baa.6f57bc",
+        "x": 1961.5667114257812,
+        "y": 438.56663513183594,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "b369c83a.de60d8"
+                "f8a1a536.821978"
             ]
         ]
     },
     {
-        "id": "de1e5ed.546bf2",
+        "id": "593c848.7fab97c",
         "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": 2202.8123779296875,
-        "y": 462.6097717285156,
-        "z": "30d84baa.6f57bc",
+        "x": 2131.6289672851562,
+        "y": 395.4264373779297,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "b369c83a.de60d8",
+        "id": "f8a1a536.821978",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2206.75,
-        "y": 506.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2135.5665893554688,
+        "y": 439.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "98b87635.4ab2",
+        "id": "d62cc4aa.0dacf8",
         "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": 2512.75,
-        "y": 505.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2515.566665649414,
+        "y": 522.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "133fd3a1.d9493c",
-                "1efd7812.84eb68",
-                "be58cccd.20957"
+                "4f7704ef.c67464",
+                "75e7413d.db94a8",
+                "9b74dfdc.0fcfa8"
             ]
         ]
     },
     {
-        "id": "c3829b9e.475158",
+        "id": "7ec784b8.19253c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2892.75,
-        "y": 593.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2895.566665649414,
+        "y": 610.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "52401003.e54ba8"
+                "707dc165.f11cc"
             ]
         ]
     },
     {
-        "id": "133fd3a1.d9493c",
+        "id": "4f7704ef.c67464",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2723.75,
-        "y": 594.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2726.566665649414,
+        "y": 611.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "c3829b9e.475158"
+                "7ec784b8.19253c"
             ]
         ]
     },
     {
-        "id": "1efd7812.84eb68",
+        "id": "75e7413d.db94a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2726.240966796875,
-        "y": 490.32403564453125,
-        "z": "30d84baa.6f57bc",
+        "x": 2729.057632446289,
+        "y": 507.1407012939453,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "3a938444.bd8bbc"
+                "ef36654.465dc18"
             ]
         ]
     },
     {
-        "id": "be58cccd.20957",
+        "id": "9b74dfdc.0fcfa8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2721.75,
-        "y": 534.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2724.566665649414,
+        "y": 551.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "9589b818.4000b"
+                "c5d97f0c.6d92a8"
             ]
         ]
     },
     {
-        "id": "9589b818.4000b",
+        "id": "c5d97f0c.6d92a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2889.75,
-        "y": 534.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2892.566665649414,
+        "y": 551.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "3a938444.bd8bbc",
+        "id": "ef36654.465dc18",
         "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": 2888.8125,
-        "y": 489.6097412109375,
-        "z": "30d84baa.6f57bc",
+        "x": 2891.629165649414,
+        "y": 506.42640686035156,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "92d3d22d.c618f8",
+        "id": "c1f994fa.7ebb78",
         "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": 2240.75,
-        "y": 411.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2381.5664672851562,
+        "y": 352.56663513183594,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "7db3ded6.deaf"
+                "f95d2666.111718"
             ]
         ]
     },
     {
-        "id": "7db3ded6.deaf",
+        "id": "f95d2666.111718",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2445.75,
-        "y": 411.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2448.566665649414,
+        "y": 428.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "cfbe6a35.f2fd5"
+                "b1b638b8.90f52"
             ]
         ]
     },
     {
-        "id": "cfbe6a35.f2fd5",
+        "id": "b1b638b8.90f52",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2611.75,
-        "y": 411.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2614.566665649414,
+        "y": 428.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "66d97a83.58a794"
+                "9380412.542cac"
             ]
         ]
     },
     {
-        "id": "66d97a83.58a794",
+        "id": "9380412.542cac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2774.75,
-        "y": 411.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2777.566665649414,
+        "y": 428.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "98b87635.4ab2",
-                "eec13dad.1221b"
+                "d62cc4aa.0dacf8",
+                "f73cf3dc.062078"
             ]
         ]
     },
     {
-        "id": "ae8dd7ac.9cc1d",
+        "id": "f2b45fb6.a0f76",
         "type": "switchNode",
         "name": "switch vpn-binding has dst-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3333.75,
-        "y": 694.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3336.566665649414,
+        "y": 711.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "8935f293.cb1e78",
-                "f32e6b37.4758a8"
+                "f1a8e611.58e15",
+                "e15b01ae.08b0a8"
             ]
         ]
     },
     {
-        "id": "8935f293.cb1e78",
+        "id": "f1a8e611.58e15",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3547.75,
-        "y": 731.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3550.566665649414,
+        "y": 748.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "394930dc.1bf1c"
+                "27573b1a.b0f27c"
             ]
         ]
     },
     {
-        "id": "f32e6b37.4758a8",
+        "id": "e15b01ae.08b0a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3549.75,
-        "y": 669.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3552.566665649414,
+        "y": 686.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "d8995170.21ddb"
+                "edfafa5d.45c53"
             ]
         ]
     },
     {
-        "id": "394930dc.1bf1c",
+        "id": "27573b1a.b0f27c",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3127.75,
-        "y": 1974.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3130.566665649414,
+        "y": 1991.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "2a89d450.3404ec",
-                "667fc503.5791f4"
+                "a50f8795.52de28",
+                "eaade4fd.98f0c8"
             ]
         ]
     },
     {
-        "id": "2a89d450.3404ec",
+        "id": "a50f8795.52de28",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3380.75,
-        "y": 2008.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3383.566665649414,
+        "y": 2025.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "566098c5.d0033"
+                "983a1464.1933a8"
             ]
         ]
     },
     {
-        "id": "667fc503.5791f4",
+        "id": "eaade4fd.98f0c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3380.75,
-        "y": 1952.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3383.566665649414,
+        "y": 1969.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "4eef4aff.e3dcc4"
+                "759c5346.c1b5fc"
             ]
         ]
     },
     {
-        "id": "566098c5.d0033",
+        "id": "983a1464.1933a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3531.75,
-        "y": 2008.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3534.566665649414,
+        "y": 2025.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "72ddf5d3.8c5f4c",
+        "id": "2dd94684.236aba",
         "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": 4407.75,
-        "y": 106.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4410.566665649414,
+        "y": 123.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "be167b48.23b5b",
+        "id": "c4286ac1.cbc618",
         "type": "set",
         "name": "set vpn-bindingB and connectivityB",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
         "comments": "",
-        "x": 3815.75,
-        "y": 1565.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3818.566665649414,
+        "y": 1582.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "65804ebf.2b9b08",
+        "id": "db75345a.2aef48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4098.75,
-        "y": 363.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4101.566665649414,
+        "y": 380.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "72ddf5d3.8c5f4c",
-                "7d98821b.e6839c",
-                "d8047beb.a120a",
-                "c0003a50.a00b1",
-                "d1f1dcb6.1fec3",
-                "251b183d.cbc77",
-                "c978ce8f.5eb918"
+                "2dd94684.236aba",
+                "44bcd2e8.a3bb64",
+                "44c284d2.4d6d3c",
+                "55fb0c25.47026c",
+                "af922307.c203c8",
+                "4cfae106.244c4",
+                "235bcd4f.ba7e9a"
             ]
         ]
     },
     {
-        "id": "4eef4aff.e3dcc4",
+        "id": "759c5346.c1b5fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3531.75,
-        "y": 1951.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3534.566665649414,
+        "y": 1968.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "be167b48.23b5b",
-                "97981e3f.7665d",
-                "ace90237.5528b8",
-                "e4aaac37.9b5738",
-                "1bef475b.0876b9",
-                "8a69ea43.cdd878",
-                "bacb99d3.7d15e8"
+                "c4286ac1.cbc618",
+                "d36679f1.a0d8a",
+                "36fc5af8.9e293e",
+                "dce692d6.26705",
+                "2c2876b1.2b5332",
+                "48b1af9a.8cccf",
+                "80ae8816.7a8d9"
             ]
         ]
     },
     {
-        "id": "8a69ea43.cdd878",
+        "id": "48b1af9a.8cccf",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.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.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
-        "x": 3760.75,
-        "y": 2094.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3763.566665649414,
+        "y": 2111.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "bacb99d3.7d15e8",
+        "id": "80ae8816.7a8d9",
         "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.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"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",
+        "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=\"`$tmp.templateFileNameForEthSrv`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='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": 3914.75,
-        "y": 2142.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3917.566665649414,
+        "y": 2159.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "17e90060.f79b78",
-                "52bf852c.fdb45c"
+                "6a81983c.fef378",
+                "d2e0dc51.a1f3a8"
             ]
         ]
     },
     {
-        "id": "17e90060.f79b78",
+        "id": "6a81983c.fef378",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4260.25,
-        "y": 2123.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4263.066665649414,
+        "y": 2140.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "ea0fe23c.016da8"
+                "928d39b9.50d03"
             ]
         ]
     },
     {
-        "id": "52bf852c.fdb45c",
+        "id": "d2e0dc51.a1f3a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4264.25,
-        "y": 2163.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4267.066665649414,
+        "y": 2180.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "e4c3d59d.96b0f8"
+                "74f00f6c.50f0b"
             ]
         ]
     },
     {
-        "id": "ea0fe23c.016da8",
+        "id": "928d39b9.50d03",
         "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": 4418.25,
-        "y": 2123.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4421.066665649414,
+        "y": 2140.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "e4c3d59d.96b0f8",
+        "id": "74f00f6c.50f0b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4421.75,
-        "y": 2163.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4424.566665649414,
+        "y": 2180.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "22d7dd70.1841ea",
-                "3dfc3096.80b288",
-                "d67d1410.76b2b8",
-                "d6603080.c5623",
-                "31942261.57ab16",
-                "99f2f22d.ceb08"
+                "ec0fb3de.e13b68",
+                "830b8de9.a8f3c",
+                "fcd6e091.3a931"
             ]
         ]
     },
     {
-        "id": "d5f7c980.553e1",
+        "id": "60004e7.5d0113",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 3758.25,
-        "y": 2050.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3761.066665649414,
+        "y": 2067.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "22d7dd70.1841ea",
+        "id": "ec0fb3de.e13b68",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4761.75,
-        "y": 2162.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4764.566665649414,
+        "y": 2179.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6c0853.c278578",
+        "id": "33af8787.6d436",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4619.75,
-        "y": 2120.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4622.566665649414,
+        "y": 2137.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "3dfc3096.80b288",
+        "id": "830b8de9.a8f3c",
         "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.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4690.75,
-        "y": 2211.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4693.566665649414,
+        "y": 2228.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d6d9459c.52e34",
+        "id": "8f77bab8.b50688",
         "type": "set",
         "name": "set attachment_param (gfp-n) for OTN",
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
         "comments": "",
-        "x": 3324.75,
-        "y": 634.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3327.566665649414,
+        "y": 651.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "eec13dad.1221b",
+        "id": "f73cf3dc.062078",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2958.75,
-        "y": 282.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2998.5664672851562,
+        "y": 355.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "6859175e.358ec8",
+        "id": "aa7aa07.5d3eb6",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3919.75,
-        "y": 320.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3922.566665649414,
+        "y": 337.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "cf1e5b9b.e9493",
+        "id": "fd11b1d2.3cd248",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3476.75,
-        "y": 1898.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3479.566665649414,
+        "y": 1915.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "d8995170.21ddb",
+        "id": "edfafa5d.45c53",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3655.75,
-        "y": 482.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3658.566665649414,
+        "y": 499.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "f7ea2bd8.a0e408",
-                "d911a9d9.6b12a8"
+                "c218e346.9ea4d",
+                "e33565a1.63d6b"
             ]
         ]
     },
     {
-        "id": "d911a9d9.6b12a8",
+        "id": "e33565a1.63d6b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3897.75,
-        "y": 1071.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3900.566665649414,
+        "y": 1088.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "60ce8d2.37a5f74"
+                "9097ee15.fd393"
             ]
         ]
     },
     {
-        "id": "f7ea2bd8.a0e408",
+        "id": "c218e346.9ea4d",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3891.75,
-        "y": 362.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3894.566665649414,
+        "y": 379.56666564941406,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "65804ebf.2b9b08"
+                "db75345a.2aef48"
             ]
         ]
     },
     {
-        "id": "60ce8d2.37a5f74",
+        "id": "9097ee15.fd393",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4055.75,
-        "y": 1070.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4058.566665649414,
+        "y": 1087.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "250c851.82c85fa",
-                "3a8c3466.1fa784",
-                "44e0a0bb.d00d2",
-                "17d8e4eb.b52ccb",
-                "dd94b2c2.353ff8"
+                "ac8e986.b5ee5e8",
+                "85348a3.bdf60f8",
+                "89dbacde.e6345",
+                "eef2514e.974cd8",
+                "6b8d5f2b.b2cd68",
+                "34c10c78.6bbca4",
+                "3a7dccd3.a56e8c"
             ]
         ]
     },
     {
-        "id": "3a8c3466.1fa784",
+        "id": "85348a3.bdf60f8",
         "type": "set",
         "name": "set attachment_param for OTN G",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
         "comments": "",
-        "x": 4319.75,
-        "y": 953.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4322.566665649414,
+        "y": 970.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "dd94b2c2.353ff8",
+        "id": "6b8d5f2b.b2cd68",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.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`\" />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te/tunnels'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 4400.75,
-        "y": 1268.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4403.566665649414,
+        "y": 1285.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "d78a59cb.d6e7a",
-                "667608aa.9739d"
+                "d6b99940.16b5a8",
+                "3c3cb614.e99f12"
             ]
         ]
     },
     {
-        "id": "d78a59cb.d6e7a",
+        "id": "d6b99940.16b5a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4710.25,
-        "y": 1237.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4713.066665649414,
+        "y": 1254.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "790b52bf.2108ec"
+                "482c1494.4d9c14"
             ]
         ]
     },
     {
-        "id": "667608aa.9739d",
+        "id": "3c3cb614.e99f12",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4715.25,
-        "y": 1302.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4718.066665649414,
+        "y": 1319.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "5fb9f65f.6d5da"
+                "1fe4c4ca.7d003b"
             ]
         ]
     },
     {
-        "id": "790b52bf.2108ec",
+        "id": "482c1494.4d9c14",
         "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 OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4886.25,
-        "y": 1237.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4889.066665649414,
+        "y": 1254.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "5fb9f65f.6d5da",
+        "id": "1fe4c4ca.7d003b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4881.75,
-        "y": 1302.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4884.566665649414,
+        "y": 1319.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "44e0a0bb.d00d2",
+        "id": "89dbacde.e6345",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4257.75,
-        "y": 1001.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4260.566665649414,
+        "y": 1018.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "17d8e4eb.b52ccb",
+        "id": "eef2514e.974cd8",
         "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.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4283.75,
-        "y": 1118.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4286.566665649414,
+        "y": 1135.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "a8ae3ef3.33406",
-                "fcb06d11.9b839",
-                "1567721b.17fbc6"
+                "1840b00f.6633b",
+                "52eb1a29.ab6b94",
+                "a2e1a20c.caccc8"
             ]
         ]
     },
     {
-        "id": "a8ae3ef3.33406",
+        "id": "1840b00f.6633b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4479.2501220703125,
-        "y": 1070.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4482.066787719727,
+        "y": 1087.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "dc6575fd.da6538"
+                "2e32cb6a.42056c"
             ]
         ]
     },
     {
-        "id": "fcb06d11.9b839",
+        "id": "52eb1a29.ab6b94",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4471.2501220703125,
-        "y": 1125.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4474.066787719727,
+        "y": 1142.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "9508c711.df3318"
+                "e0704884.2a8ec8"
             ]
         ]
     },
     {
-        "id": "dc6575fd.da6538",
+        "id": "2e32cb6a.42056c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4623.6324462890625,
-        "y": 1070.4056701660156,
-        "z": "30d84baa.6f57bc",
+        "x": 4626.449111938477,
+        "y": 1087.2223358154297,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "5887f01d.382f28"
+                "e6880649.657e78"
             ]
         ]
     },
     {
-        "id": "5887f01d.382f28",
+        "id": "e6880649.657e78",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4807.75,
-        "y": 1068.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4810.566665649414,
+        "y": 1085.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "7c993206.50f554"
+                "f47d5963.a5aae8"
             ]
         ]
     },
     {
-        "id": "7c993206.50f554",
+        "id": "f47d5963.a5aae8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5002.75,
-        "y": 1068.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5005.566665649414,
+        "y": 1085.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "f4906a1c.c87a88"
+                "d71be6fc.54edc"
             ]
         ]
     },
     {
-        "id": "1567721b.17fbc6",
+        "id": "a2e1a20c.caccc8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4476.2501220703125,
-        "y": 1182.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4479.066787719727,
+        "y": 1199.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "9c97fc0c.fac84"
+                "7860eb3c.e26464"
             ]
         ]
     },
     {
-        "id": "9c97fc0c.fac84",
+        "id": "7860eb3c.e26464",
         "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": 4628.2501220703125,
-        "y": 1183.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4631.066787719727,
+        "y": 1200.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "9508c711.df3318",
+        "id": "e0704884.2a8ec8",
         "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": 4639.2501220703125,
-        "y": 1126.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4642.066787719727,
+        "y": 1143.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "250c851.82c85fa",
+        "id": "ac8e986.b5ee5e8",
         "type": "set",
         "name": "set vpn-bindingG and connectivityG",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4314.75,
-        "y": 893.75,
-        "z": "30d84baa.6f57bc",
+        "x": 4317.566665649414,
+        "y": 910.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "f4906a1c.c87a88",
+        "id": "d71be6fc.54edc",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5205.75,
-        "y": 1072.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5208.566665649414,
+        "y": 1089.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "f2ceb67e.1c0c"
+                "8e865c0a.70e028"
             ]
         ]
     },
     {
-        "id": "d6942a62.437338",
+        "id": "e2bcdd39.f6521",
         "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": 5590.75,
-        "y": 1085.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5593.566665649414,
+        "y": 1102.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "2bfb5437.ab1884",
-                "14e65a71.083eb6",
-                "1ec347c1.300068"
+                "d9ae01a2.e3b6f8",
+                "51f52094.f625d",
+                "4c1978aa.65c53"
             ]
         ]
     },
     {
-        "id": "f2ceb67e.1c0c",
+        "id": "8e865c0a.70e028",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5384.75,
-        "y": 1072.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5387.566665649414,
+        "y": 1089.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "e257c8b7.b2bd68",
-                "d6942a62.437338"
+                "4f0d3390.ddd854",
+                "e2bcdd39.f6521"
             ]
         ]
     },
     {
-        "id": "e257c8b7.b2bd68",
+        "id": "4f0d3390.ddd854",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5620.75,
-        "y": 1033.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5623.566665649414,
+        "y": 1050.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "2bfb5437.ab1884",
+        "id": "d9ae01a2.e3b6f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5800.75,
-        "y": 1076.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5803.566665649414,
+        "y": 1093.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "c27aaf5c.aef2b8"
+                "8b89bfe6.b56ec8"
             ]
         ]
     },
     {
-        "id": "14e65a71.083eb6",
+        "id": "51f52094.f625d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5792.75,
-        "y": 1131.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5795.566665649414,
+        "y": 1148.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "d07e83df.f79d38"
+                "1d4624ff.2e16fb"
             ]
         ]
     },
     {
-        "id": "1ec347c1.300068",
+        "id": "4c1978aa.65c53",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5797.75,
-        "y": 1188.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5800.566665649414,
+        "y": 1205.566665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "d1674575.d6f7d8"
+                "441a8d9a.7f119c"
             ]
         ]
     },
     {
-        "id": "d1674575.d6f7d8",
+        "id": "441a8d9a.7f119c",
         "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": 5949.75,
-        "y": 1189.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5952.566665649414,
+        "y": 1206.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "d07e83df.f79d38",
+        "id": "1d4624ff.2e16fb",
         "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": 5960.75,
-        "y": 1134.75,
-        "z": "30d84baa.6f57bc",
+        "x": 5963.566665649414,
+        "y": 1151.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "c27aaf5c.aef2b8",
+        "id": "8b89bfe6.b56ec8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5945.13232421875,
-        "y": 1074.4056701660156,
-        "z": "30d84baa.6f57bc",
+        "x": 5947.948989868164,
+        "y": 1091.2223358154297,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "1298a74.3cdd059"
+                "ec42c031.0db228"
             ]
         ]
     },
     {
-        "id": "1298a74.3cdd059",
+        "id": "ec42c031.0db228",
         "type": "set",
         "name": "set controller domainG 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": 6159.75,
-        "y": 1070.75,
-        "z": "30d84baa.6f57bc",
+        "x": 6162.566665649414,
+        "y": 1087.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "8ad3b61d.5ba128",
+        "id": "41dbff35.8798f",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3933.75,
-        "y": 1011.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3936.566665649414,
+        "y": 1028.566665649414,
+        "z": "33354834.16c3b8",
         "wires": []
     },
     {
-        "id": "52401003.e54ba8",
+        "id": "707dc165.f11cc",
         "type": "switchNode",
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2495.75,
-        "y": 738.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2498.566665649414,
+        "y": 755.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "84b154c7.dcfaf",
-                "d81b7512.e15008"
+                "3b50aa73.698686",
+                "889b206a.5a5c18"
             ]
         ]
     },
     {
-        "id": "d81b7512.e15008",
+        "id": "889b206a.5a5c18",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2902.75,
-        "y": 756.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2905.566665649414,
+        "y": 773.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "cf7d3373.5ca978"
+                "90c4533d.860e78"
             ]
         ]
     },
     {
-        "id": "84b154c7.dcfaf",
+        "id": "3b50aa73.698686",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2902.75,
-        "y": 701.75,
-        "z": "30d84baa.6f57bc",
+        "x": 2905.566665649414,
+        "y": 718.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "37e2ea9b.dd967e"
+                "faf60520.cd56a8"
             ]
         ]
     },
     {
-        "id": "37e2ea9b.dd967e",
+        "id": "faf60520.cd56a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3058.75,
-        "y": 699.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3061.566665649414,
+        "y": 716.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             [
-                "d6d9459c.52e34",
-                "ae8dd7ac.9cc1d"
+                "8f77bab8.b50688",
+                "f2b45fb6.a0f76"
             ]
         ]
     },
     {
-        "id": "cf7d3373.5ca978",
+        "id": "90c4533d.860e78",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3035.75,
-        "y": 757.75,
-        "z": "30d84baa.6f57bc",
+        "x": 3038.566665649414,
+        "y": 774.5666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "677bc6cc.c2278",
+        "id": "e634d16b.4c8208",
         "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": 5485.500244140625,
-        "y": 685.25,
-        "z": "30d84baa.6f57bc",
+        "x": 5488.316909790039,
+        "y": 702.0666656494141,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d67d1410.76b2b8",
+        "id": "fcd6e091.3a931",
         "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": 4710.25,
-        "y": 2278,
-        "z": "30d84baa.6f57bc",
+        "x": 4713.066665649414,
+        "y": 2294.816665649414,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fce678f7.abc0e",
+        "id": "885127f5.787348",
         "type": "execute",
         "name": "execute RestApiCallNode Create Performance Monitoring Data",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.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": 5557.667236328125,
-        "y": 764.3333129882812,
-        "z": "30d84baa.6f57bc",
+        "x": 5560.483901977539,
+        "y": 781.1499786376953,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c53e4466.6aae58",
+        "id": "52b5128c.e4a6ec",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishSubscription",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5530.6669921875,
-        "y": 823.3331909179688,
-        "z": "30d84baa.6f57bc",
+        "x": 5533.483657836914,
+        "y": 840.1498565673828,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b53c1cb.8fea68",
+        "id": "c8c41250.a5653",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishPersistentConnection",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5556.667236328125,
-        "y": 877.3331909179688,
-        "z": "30d84baa.6f57bc",
+        "x": 5559.483901977539,
+        "y": 894.1498565673828,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d6603080.c5623",
+        "id": "bbe7a2ae.e5a38",
         "type": "execute",
         "name": "execute RestApiCallNode Create Performance Monitoring Data",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.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": 4783.6669921875,
-        "y": 2380.33349609375,
-        "z": "30d84baa.6f57bc",
+        "x": 4786.483657836914,
+        "y": 2397.150161743164,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "31942261.57ab16",
+        "id": "5abf5b3a.734eb4",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishSubscription",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4756.666748046875,
-        "y": 2439.3333740234375,
-        "z": "30d84baa.6f57bc",
+        "x": 4759.483413696289,
+        "y": 2456.1500396728516,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "99f2f22d.ceb08",
+        "id": "f8459fc1.c514a",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishPersistentConnection",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4782.6669921875,
-        "y": 2493.3333740234375,
-        "z": "30d84baa.6f57bc",
+        "x": 4785.483657836914,
+        "y": 2510.1500396728516,
+        "z": "33354834.16c3b8",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "fd35c490.b8d1d",
+        "type": "save",
+        "name": "update vpn-binding G 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-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5459.500427246094,
+        "y": 1318.533432006836,
+        "z": "33354834.16c3b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2a3498ca.88543",
+        "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.connectivityG.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityG.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5386.500427246094,
+        "y": 1364.533432006836,
+        "z": "33354834.16c3b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f3d97964.1c0ad8",
+        "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": 5406.250427246094,
+        "y": 1425.033432006836,
+        "z": "33354834.16c3b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1f4aee67.ee1e82",
+        "type": "execute",
+        "name": "execute PeriodicDiscoveryNode establishSubscription",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.PeriodicDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/operations/ietf-eth-service-oam:configure-oam'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<!--<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />-->\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />-->\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"p2p-vnf-topology-operation-p2p-callbackdg-notification\" />\n<parameter name=\"version\" value=\"888\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5460.416931152344,
+        "y": 1497.116683959961,
+        "z": "33354834.16c3b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "78eec8fa.d8a828",
+        "type": "execute",
+        "name": "execute PeriodicDiscoveryNode establishPeriodicPullConnection",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.PeriodicDiscoveryNode' method='establishPeriodicPullConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $eth-service-name`\" />\n<!--<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/streams/yang-push-json'`\" />-->\n<parameter name=\"periodicPullURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $eth-service-name`\" />\n<parameter name=\"ethServiceName\" value=\"`$eth-service-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />-->\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"p2p-vnf-topology-operation-p2p-callbackdg-notification\" />\n<parameter name=\"version\" value=\"888\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5477.417419433594,
+        "y": 1617.1166229248047,
+        "z": "33354834.16c3b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "34c10c78.6bbca4",
+        "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.connectivityG.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.connectivityG.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityG.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityG.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityG.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityG.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityG.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingG.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingG.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityG.cvlan`' />\n\n<parameter name='eth-src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='eth-src-ltp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='eth-dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<parameter name='eth-dst-ltp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n",
+        "comments": "",
+        "x": 4281.000183105469,
+        "y": 1409.533432006836,
+        "z": "33354834.16c3b8",
+        "wires": []
+    },
+    {
+        "id": "3a7dccd3.a56e8c",
+        "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-same-domain.templatefile`\" />\n<!--<parameter name=\"templateFileName\" value=\"`$tmp.templateFileNameForEthSrv`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\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": 4435.000183105469,
+        "y": 1457.533432006836,
+        "z": "33354834.16c3b8",
+        "wires": [
+            [
+                "4b952b8e.113f54",
+                "a5fb7d58.4426f"
+            ]
+        ]
+    },
+    {
+        "id": "4b952b8e.113f54",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4780.500183105469,
+        "y": 1438.533432006836,
+        "z": "33354834.16c3b8",
+        "wires": [
+            [
+                "55af739d.c7b194"
+            ]
+        ]
+    },
+    {
+        "id": "a5fb7d58.4426f",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4784.500183105469,
+        "y": 1478.533432006836,
+        "z": "33354834.16c3b8",
+        "wires": [
+            [
+                "6e44f65e.9c29e8"
+            ]
+        ]
+    },
+    {
+        "id": "55af739d.c7b194",
+        "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": 4938.500183105469,
+        "y": 1438.533432006836,
+        "z": "33354834.16c3b8",
+        "wires": []
+    },
+    {
+        "id": "6e44f65e.9c29e8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4942.000183105469,
+        "y": 1478.533432006836,
+        "z": "33354834.16c3b8",
+        "wires": [
+            [
+                "fd35c490.b8d1d",
+                "2a3498ca.88543",
+                "f3d97964.1c0ad8",
+                "1f4aee67.ee1e82",
+                "78eec8fa.d8a828",
+                "eb126609.241a48"
+            ]
+        ]
+    },
+    {
+        "id": "88048959.7c814",
+        "type": "comment",
+        "name": "TODO: FIXME:",
+        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "comments": "",
+        "x": 4278.500183105469,
+        "y": 1365.533432006836,
+        "z": "33354834.16c3b8",
+        "wires": []
+    },
+    {
+        "id": "eb126609.241a48",
+        "type": "execute",
+        "name": "execute RestApiCallNode Create Performance Monitoring Data",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.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": 5491.233337402344,
+        "y": 1549.7335052490234,
+        "z": "33354834.16c3b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1e040c4d.50392c",
+        "type": "switchNode",
+        "name": "switch tmp.aai.connectivity.cbs == null",
+        "xml": "<switch test=\"`length($tmp.aai.connectivity.cbs) == 0`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2197.6331176757812,
+        "y": 253.1333465576172,
+        "z": "33354834.16c3b8",
+        "wires": [
+            [
+                "2e4f00ca.c58f3",
+                "7a3cd7b3.bb0298"
+            ]
+        ]
+    },
+    {
+        "id": "2e4f00ca.c58f3",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2441.6331176757812,
+        "y": 182.13336181640625,
+        "z": "33354834.16c3b8",
+        "wires": [
+            [
+                "68c81580.7a1dfc"
+            ]
+        ]
+    },
+    {
+        "id": "68c81580.7a1dfc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2562.6331176757812,
+        "y": 183.13336181640625,
+        "z": "33354834.16c3b8",
+        "wires": [
+            [
+                "e19b6a3d.635b2",
+                "e3be8d7a.fa711"
+            ]
+        ]
+    },
+    {
+        "id": "e19b6a3d.635b2",
+        "type": "set",
+        "name": "set templateFileNameForEthSrv",
+        "xml": "<set>\n<parameter name='tmp.templateFileNameForEthSrv' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service.templatefile`\" />\n<parameter name='vlan-translation' value=\"\" />\n",
+        "comments": "",
+        "x": 2787.6332397460938,
+        "y": 182.5333251953125,
+        "z": "33354834.16c3b8",
+        "wires": []
+    },
+    {
+        "id": "37909c7a.4f488c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2139.6331176757812,
+        "y": 347.1333465576172,
+        "z": "33354834.16c3b8",
+        "wires": [
+            [
+                "1e040c4d.50392c",
+                "c1f994fa.7ebb78"
+            ]
+        ]
+    },
+    {
+        "id": "7a3cd7b3.bb0298",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2472.4999389648438,
+        "y": 241.1333465576172,
+        "z": "33354834.16c3b8",
+        "wires": [
+            [
+                "80c861e8.a5bbb8"
+            ]
+        ]
+    },
+    {
+        "id": "80c861e8.a5bbb8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2593.4999389648438,
+        "y": 242.1333465576172,
+        "z": "33354834.16c3b8",
+        "wires": [
+            [
+                "29ed907a.c93f68",
+                "f77d6a7b.ede4c8"
+            ]
+        ]
+    },
+    {
+        "id": "29ed907a.c93f68",
+        "type": "set",
+        "name": "set templateFileNameForEthSrv",
+        "xml": "<set>\n<parameter name='tmp.templateFileNameForEthSrv' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service-vlan.templatefile`\" />\n<parameter name='vlan-translation' value=\"`$tmp.aai.connectivity.cbs`\" />\n\n",
+        "comments": "",
+        "x": 2811.4998168945312,
+        "y": 284.53330993652344,
+        "z": "33354834.16c3b8",
+        "wires": []
+    },
+    {
+        "id": "e3be8d7a.fa711",
+        "type": "set",
+        "name": "unset templateFileNameForEthSrv",
+        "xml": "<set>\n<parameter name='tmp.templateFileNameForEthSrv' value=\"\" />\n<parameter name='vlan-translation' value=\"\" />\n",
+        "comments": "",
+        "x": 2784.7665405273438,
+        "y": 131.93336486816406,
+        "z": "33354834.16c3b8",
+        "wires": []
+    },
+    {
+        "id": "f77d6a7b.ede4c8",
+        "type": "set",
+        "name": "unset templateFileNameForEthSrv",
+        "xml": "<set>\n<parameter name='tmp.templateFileNameForEthSrv' value=\"\" />\n<parameter name='vlan-translation' value=\"\" />\n",
+        "comments": "",
+        "x": 2814.7665405273438,
+        "y": 235.93336486816406,
+        "z": "33354834.16c3b8",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.json b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.json
index e2d91c00..258b58a9 100644
--- a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.json
+++ b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-callbackdg-notification.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "146661fc.5f1716",
+        "id": "3a09fc70.fad8d4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 231.3333282470703,
-        "y": 168.33334350585938,
-        "z": "b7370f57.e5898",
+        "x": 149.56666564941406,
+        "y": 131.56666564941406,
+        "z": "b88832a3.96c4c8",
         "wires": [
             [
-                "86a2b61b.9e561"
+                "168caa1c.41dcf6"
             ]
         ]
     },
     {
-        "id": "86a2b61b.9e561",
+        "id": "168caa1c.41dcf6",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API 888",
         "module": "GENERIC-RESOURCE-API",
@@ -22,231 +22,231 @@
         "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='888'>",
         "outputs": 1,
-        "x": 515.6190185546875,
-        "y": 229.5714521408081,
-        "z": "b7370f57.e5898",
+        "x": 433.85235595703125,
+        "y": 192.8047742843628,
+        "z": "b88832a3.96c4c8",
         "wires": [
             [
-                "75333460.3692e4"
+                "952f2b0e.26e698"
             ]
         ]
     },
     {
-        "id": "75333460.3692e4",
+        "id": "952f2b0e.26e698",
         "type": "method",
         "name": "method p2p-vnf-topology-operation-p2p-callbackdg-notification",
         "xml": "<method rpc='p2p-vnf-topology-operation-p2p-callbackdg-notification' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 502.7619171142578,
-        "y": 305.3333740234375,
-        "z": "b7370f57.e5898",
+        "x": 420.99525451660156,
+        "y": 268.5666961669922,
+        "z": "b88832a3.96c4c8",
         "wires": [
             [
-                "a3ba9640.ce2a68"
+                "3e8ccd3.e3636b2"
             ]
         ]
     },
     {
-        "id": "3fe77da.9239682",
+        "id": "aaf25071.bda21",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1090.5713653564453,
-        "y": 530.0000152587891,
-        "z": "b7370f57.e5898",
+        "x": 1008.8047027587891,
+        "y": 493.23333740234375,
+        "z": "b88832a3.96c4c8",
         "wires": [
             [
-                "431c42fb.f6e204",
-                "3460fdb3.e8d272",
-                "730e4c82.49807c",
-                "c0f75bcd.e70238",
-                "11c77827.79f3f8",
-                "467dc2f0.3c1dec",
-                "cea32b3b.64c058"
+                "aa57cf0f.26b688",
+                "db7f4638.552cb8",
+                "45fe05e4.ea10c4",
+                "a0587b08.08777",
+                "fff7b9b7.2af748",
+                "23a47076.84785",
+                "991df3c2.230cc8"
             ]
         ]
     },
     {
-        "id": "5ebdcbc8.001434",
+        "id": "9d09c472.dc19b",
         "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": 1082.3333282470703,
-        "y": 306.3333435058594,
-        "z": "b7370f57.e5898",
+        "x": 1000.5666656494141,
+        "y": 269.56666564941406,
+        "z": "b88832a3.96c4c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "431c42fb.f6e204",
+        "id": "aa57cf0f.26b688",
         "type": "set",
         "name": "set received notification parameters",
         "xml": "<set>\n<!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->\n<parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />\n<parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />\n<parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />\n<parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />",
         "comments": "",
-        "x": 1411.3333282470703,
-        "y": 488.3333282470703,
-        "z": "b7370f57.e5898",
+        "x": 1329.566665649414,
+        "y": 451.566650390625,
+        "z": "b88832a3.96c4c8",
         "wires": []
     },
     {
-        "id": "a593f0c.3d3a59",
+        "id": "4699eb86.540554",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"CallBack DG For SSE CONNECTION is called\"/>\n<!--<parameter name=\"field2\" value=\"`$rcvdNotif`\"/>-->",
         "comments": "",
         "outputs": 1,
-        "x": 1046.3333892822266,
-        "y": 250.33334350585938,
-        "z": "b7370f57.e5898",
+        "x": 964.5667266845703,
+        "y": 213.56666564941406,
+        "z": "b88832a3.96c4c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "467dc2f0.3c1dec",
+        "id": "23a47076.84785",
         "type": "save",
         "name": "save:metadata to AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n AND customer.global-customer-id = 'IBNCustomer' \n AND service-subscription.service-type = 'IBN'\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />\n\n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1349.3333129882812,
-        "y": 698.3333282470703,
-        "z": "b7370f57.e5898",
+        "x": 1267.566650390625,
+        "y": 661.566650390625,
+        "z": "b88832a3.96c4c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c0f75bcd.e70238",
+        "id": "a0587b08.08777",
         "type": "set",
         "name": "set parameters",
         "xml": "<set>\n<parameter name='eventIdUuid' value=\"`'BandwidthChanged_' + $eventId-uuid`\" />\n<parameter name='eventNameUuid' value='`$eventName-uuid`' />\n<parameter name='cclId' value='`$rcvd-service-instance-id`' />\n<parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />\n<parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />\n",
         "comments": "",
-        "x": 1340.3333129882812,
-        "y": 1026.3332977294922,
-        "z": "b7370f57.e5898",
+        "x": 1258.566650390625,
+        "y": 989.5666198730469,
+        "z": "b88832a3.96c4c8",
         "wires": []
     },
     {
-        "id": "11c77827.79f3f8",
+        "id": "fff7b9b7.2af748",
         "type": "execute",
         "name": "execute RestApiCallNode call VES",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-call-ves.templatefile`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.dcaeAddrAndPort + '/eventListener/v7'`\" />-->\n<parameter name=\"restapiUrl\" value=\"https://dcae-ves-collector:8443/eventListener/v7\" />\n<parameter name=\"restapiUser\" value=\"sample1\" />\n<parameter name=\"restapiPassword\" value=\"sample1\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"ves-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<parameter name=\"disableHostVerification\" value=\"true\"/>\n<parameter name=\"ssl\" value=\"false\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1398.3333129882812,
-        "y": 1069.3332977294922,
-        "z": "b7370f57.e5898",
+        "x": 1316.566650390625,
+        "y": 1032.5666198730469,
+        "z": "b88832a3.96c4c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3460fdb3.e8d272",
+        "id": "db7f4638.552cb8",
         "type": "execute",
         "name": "execute UUID generator for eventId",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventId-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1402.3333129882812,
-        "y": 934.3332977294922,
-        "z": "b7370f57.e5898",
+        "x": 1320.566650390625,
+        "y": 897.5666198730469,
+        "z": "b88832a3.96c4c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "730e4c82.49807c",
+        "id": "45fe05e4.ea10c4",
         "type": "execute",
         "name": "execute UUID generator for eventName",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventName-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1415.3333129882812,
-        "y": 976.3332977294922,
-        "z": "b7370f57.e5898",
+        "x": 1333.566650390625,
+        "y": 939.5666198730469,
+        "z": "b88832a3.96c4c8",
         "wires": [
             []
         ]
     },
     {
-        "id": "65d0a166.302088",
+        "id": "3f0e3083.b3f668",
         "type": "comment",
         "name": "Calling VES and passing notification parameters",
         "info": "",
         "comments": "",
-        "x": 1429.3333129882812,
-        "y": 879.3332977294922,
-        "z": "b7370f57.e5898",
+        "x": 1347.566650390625,
+        "y": 842.5666198730469,
+        "z": "b88832a3.96c4c8",
         "wires": []
     },
     {
-        "id": "349d4c54.f7933c",
+        "id": "99a9316.f88035",
         "type": "switchNode",
         "name": "switch change type == upadte",
         "xml": "<switch test=\"`$push-change-update.datastore-changes.type == 'update' `\">\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1107.3333282470703,
-        "y": 381.3333282470703,
-        "z": "b7370f57.e5898",
+        "x": 1025.566665649414,
+        "y": 344.566650390625,
+        "z": "b88832a3.96c4c8",
         "wires": [
             [
-                "fb0217.09e69de8"
+                "86fcedb4.196448"
             ]
         ]
     },
     {
-        "id": "fb0217.09e69de8",
+        "id": "86fcedb4.196448",
         "type": "outcome",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1322.3333282470703,
-        "y": 379.3333282470703,
-        "z": "b7370f57.e5898",
+        "x": 1240.566665649414,
+        "y": 342.566650390625,
+        "z": "b88832a3.96c4c8",
         "wires": [
             [
-                "3fe77da.9239682"
+                "aaf25071.bda21"
             ]
         ]
     },
     {
-        "id": "a3ba9640.ce2a68",
+        "id": "3e8ccd3.e3636b2",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 837.3333282470703,
-        "y": 306.3333282470703,
-        "z": "b7370f57.e5898",
+        "x": 755.5666656494141,
+        "y": 269.566650390625,
+        "z": "b88832a3.96c4c8",
         "wires": [
             [
-                "a593f0c.3d3a59",
-                "5ebdcbc8.001434",
-                "349d4c54.f7933c"
+                "4699eb86.540554",
+                "9d09c472.dc19b",
+                "99a9316.f88035"
             ]
         ]
     },
     {
-        "id": "cea32b3b.64c058",
+        "id": "991df3c2.230cc8",
         "type": "save",
         "name": "update:metadata to AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource=\"service-instance\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n AND customer.global-customer-id = 'IBNCustomer' \n AND service-subscription.service-type = 'IBN'\n AND metadatum.metaname = $rcvd-etht-svc-end-point\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metaval\" value=\"`$rcvd-bandwidth-value`\" />\n\n    \n<!--AND metadatum.metaname = $rcvd-etht-svc-end-point-->\n\n<!--<parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />-->\n<!--    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 1358.3333129882812,
-        "y": 753.3333282470703,
-        "z": "b7370f57.e5898",
+        "x": 1276.566650390625,
+        "y": 716.566650390625,
+        "z": "b88832a3.96c4c8",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.json b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.json
index d08dd5a7..8da8e2cc 100644
--- a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "63d6efcd.91928",
+        "id": "a658bc6d.ee8088",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 117.75,
-        "y": 202.75,
-        "z": "265dc029.a18eb8",
+        "x": 115.56666564941406,
+        "y": 152.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "52717356.ffbb94"
+                "10d00bbf.369ce4"
             ]
         ]
     },
     {
-        "id": "52717356.ffbb94",
+        "id": "10d00bbf.369ce4",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,5147 +22,5480 @@
         "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": 402.0356903076172,
-        "y": 263.98810863494873,
-        "z": "265dc029.a18eb8",
+        "x": 399.85235595703125,
+        "y": 213.8047742843628,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "84b7b306.9f6af8"
+                "975aae08.92fff8"
             ]
         ]
     },
     {
-        "id": "84b7b306.9f6af8",
+        "id": "975aae08.92fff8",
         "type": "method",
         "name": "method p2p-vnf-topology-operation-p2p-create",
         "xml": "<method rpc='p2p-vnf-topology-operation-p2p-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 408.17860412597656,
-        "y": 348.7500305175781,
-        "z": "265dc029.a18eb8",
+        "x": 405.9952697753906,
+        "y": 298.5666961669922,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "7e2299c2.fed878"
+                "3cb40f5f.638d7"
             ]
         ]
     },
     {
-        "id": "7e2299c2.fed878",
+        "id": "3cb40f5f.638d7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 777.988037109375,
-        "y": 373.41668701171875,
-        "z": "265dc029.a18eb8",
+        "x": 775.8047027587891,
+        "y": 323.2333526611328,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "78c59c4d.b8fa2c",
-                "dabba24a.9b138",
-                "8be878cc.82db9"
+                "a98f1d9c.aa0ab8",
+                "bb279275.52b89",
+                "198124d5.bcf04b"
             ]
         ]
     },
     {
-        "id": "78c59c4d.b8fa2c",
+        "id": "a98f1d9c.aa0ab8",
         "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": 1079.321533203125,
-        "y": 644.3469848632812,
-        "z": "265dc029.a18eb8",
+        "x": 1077.138198852539,
+        "y": 594.1636505126953,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "dabba24a.9b138",
+        "id": "bb279275.52b89",
         "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": 1100.75,
-        "y": 346.75,
-        "z": "265dc029.a18eb8",
+        "x": 1098.566665649414,
+        "y": 296.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "bb092529.d25fb8",
-                "4416c12c.f02068",
-                "148b7d66.64da3b"
+                "5db80d1b.7d54d4",
+                "eb1179be.4cc7a8",
+                "25eec14c.b0512e"
             ]
         ]
     },
     {
-        "id": "bb092529.d25fb8",
+        "id": "5db80d1b.7d54d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1325.75,
-        "y": 204.75,
-        "z": "265dc029.a18eb8",
+        "x": 1323.566665649414,
+        "y": 154.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "3a48b7db.b6fde8"
+                "1b98e1c2.5ba336"
             ]
         ]
     },
     {
-        "id": "4416c12c.f02068",
+        "id": "eb1179be.4cc7a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1321.240966796875,
-        "y": 274.32403564453125,
-        "z": "265dc029.a18eb8",
+        "x": 1319.057632446289,
+        "y": 224.1407012939453,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "f3e87723.d8879"
+                "5ef156a8.c7ee68"
             ]
         ]
     },
     {
-        "id": "148b7d66.64da3b",
+        "id": "25eec14c.b0512e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1309.75,
-        "y": 320.75,
-        "z": "265dc029.a18eb8",
+        "x": 1307.566665649414,
+        "y": 270.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "e5cc88dc.b07a2"
+                "e02f0406.ea4b28"
             ]
         ]
     },
     {
-        "id": "3a48b7db.b6fde8",
+        "id": "1b98e1c2.5ba336",
         "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": 1564.75,
-        "y": 201.75,
-        "z": "265dc029.a18eb8",
+        "x": 1562.566665649414,
+        "y": 151.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "604cb7eb.7b1a68",
-                "ce2646b2.7561a"
+                "700e0cca.3f2bdc",
+                "aef98f1d.0aefe8"
             ]
         ]
     },
     {
-        "id": "f3e87723.d8879",
+        "id": "5ef156a8.c7ee68",
         "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": 1474.8123779296875,
-        "y": 277.6097717285156,
-        "z": "265dc029.a18eb8",
+        "x": 1472.6290435791016,
+        "y": 227.4264373779297,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "e5cc88dc.b07a2",
+        "id": "e02f0406.ea4b28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1478.75,
-        "y": 321.75,
-        "z": "265dc029.a18eb8",
+        "x": 1476.566665649414,
+        "y": 271.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "604cb7eb.7b1a68",
+        "id": "700e0cca.3f2bdc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1777.75,
-        "y": 225.75,
-        "z": "265dc029.a18eb8",
+        "x": 1775.566665649414,
+        "y": 175.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b4021335.1e3ac"
+                "43079b41.4e5754"
             ]
         ]
     },
     {
-        "id": "ce2646b2.7561a",
+        "id": "aef98f1d.0aefe8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1779.75,
-        "y": 165.75,
-        "z": "265dc029.a18eb8",
+        "x": 1777.566665649414,
+        "y": 115.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b1f2cfd.e132ac",
+        "id": "8233abbf.86fea8",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1079.75,
-        "y": 234.75,
-        "z": "265dc029.a18eb8",
+        "x": 1077.566665649414,
+        "y": 184.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "b4021335.1e3ac",
+        "id": "43079b41.4e5754",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1762.75,
-        "y": 313.75,
-        "z": "265dc029.a18eb8",
+        "x": 1760.566665649414,
+        "y": 263.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "e47816c1.46d19",
-                "bf3fdeb7.6e1648",
-                "b761fd8.2b6b08",
-                "50d31847.5f509",
-                "9bdaad5a.e56e08"
+                "b571a17a.acc4b8",
+                "f367c816.36c578",
+                "96051d25.052e78",
+                "2bc653ca.37208c",
+                "df1cdf90.7c16c"
             ]
         ]
     },
     {
-        "id": "d40580c2.e45d78",
+        "id": "235a8de8.2ff2e2",
         "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": 2625.75,
-        "y": 913.75,
-        "z": "265dc029.a18eb8",
+        "x": 2623.566665649414,
+        "y": 863.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "b659bcf9.848a1",
+        "id": "3fed0be1.edfb24",
         "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": 2626.75,
-        "y": 968.75,
-        "z": "265dc029.a18eb8",
+        "x": 2624.566665649414,
+        "y": 918.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "2fd2492.76d5db6",
+        "id": "a5dd2e0a.9197a",
         "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": 2248.75,
-        "y": 364.75,
-        "z": "265dc029.a18eb8",
+        "x": 2246.566665649414,
+        "y": 314.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "c9dda2b1.43ab8",
-                "ef111932.8f23",
-                "cbe8fd1f.6baa2"
+                "37ab6cf6.5d8d44",
+                "9d175e12.6e5ba8",
+                "e079f228.d0cd18"
             ]
         ]
     },
     {
-        "id": "c9dda2b1.43ab8",
+        "id": "37ab6cf6.5d8d44",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2464.75,
-        "y": 431.75,
-        "z": "265dc029.a18eb8",
+        "x": 2462.566665649414,
+        "y": 381.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "17fe2d2.f198953"
+                "7ae6e46.d965a1c"
             ]
         ]
     },
     {
-        "id": "ef111932.8f23",
+        "id": "9d175e12.6e5ba8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2465.240966796875,
-        "y": 331.323974609375,
-        "z": "265dc029.a18eb8",
+        "x": 2463.057632446289,
+        "y": 281.14064025878906,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "87a60ba4.535a68"
+                "3926a143.72f6e6"
             ]
         ]
     },
     {
-        "id": "cbe8fd1f.6baa2",
+        "id": "e079f228.d0cd18",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2460.75,
-        "y": 380.75,
-        "z": "265dc029.a18eb8",
+        "x": 2458.566665649414,
+        "y": 330.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "22e5c805.c55278"
+                "556249de.1ffd4"
             ]
         ]
     },
     {
-        "id": "87a60ba4.535a68",
+        "id": "3926a143.72f6e6",
         "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": 2642.8125,
-        "y": 331.6097412109375,
-        "z": "265dc029.a18eb8",
+        "x": 2640.629165649414,
+        "y": 281.42640686035156,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "22e5c805.c55278",
+        "id": "556249de.1ffd4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2642.75,
-        "y": 380.75,
-        "z": "265dc029.a18eb8",
+        "x": 2640.566665649414,
+        "y": 330.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "caff6575.521c18",
+        "id": "bd9c64f3.1ae468",
         "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": 1983.75,
-        "y": 853.75,
-        "z": "265dc029.a18eb8",
+        "x": 1981.566665649414,
+        "y": 803.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b6506162.cc4e28",
-                "aa283f4f.6ff15",
-                "4fc62792.1d1aa"
+                "57c5a50d.faf21c",
+                "1cb5708d.991b9f",
+                "49a8ec91.4b31b4"
             ]
         ]
     },
     {
-        "id": "b6506162.cc4e28",
+        "id": "57c5a50d.faf21c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2275.240966796875,
-        "y": 832.323974609375,
-        "z": "265dc029.a18eb8",
+        "x": 2273.057632446289,
+        "y": 782.1406402587891,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "854cdcdd.af5178"
+                "3d88b251.eb89be"
             ]
         ]
     },
     {
-        "id": "aa283f4f.6ff15",
+        "id": "1cb5708d.991b9f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2263.75,
-        "y": 876.75,
-        "z": "265dc029.a18eb8",
+        "x": 2261.566665649414,
+        "y": 826.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "4317fabe.8b662c"
+                "55bc50fb.83c83"
             ]
         ]
     },
     {
-        "id": "854cdcdd.af5178",
+        "id": "3d88b251.eb89be",
         "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": 2423.8125,
-        "y": 832.6097412109375,
-        "z": "265dc029.a18eb8",
+        "x": 2421.629165649414,
+        "y": 782.4264068603516,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "4317fabe.8b662c",
+        "id": "55bc50fb.83c83",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2422.75,
-        "y": 876.75,
-        "z": "265dc029.a18eb8",
+        "x": 2420.566665649414,
+        "y": 826.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "4fc62792.1d1aa",
+        "id": "49a8ec91.4b31b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2270.75,
-        "y": 955.75,
-        "z": "265dc029.a18eb8",
+        "x": 2268.566665649414,
+        "y": 905.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "ab7c1440.9f704"
+                "75387576.e83e6c"
             ]
         ]
     },
     {
-        "id": "ab7c1440.9f704",
+        "id": "75387576.e83e6c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2409.75,
-        "y": 955.75,
-        "z": "265dc029.a18eb8",
+        "x": 2407.566665649414,
+        "y": 905.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "d40580c2.e45d78",
-                "b659bcf9.848a1",
-                "a136fb28.0b527",
-                "1648afc0.52dbc8",
-                "b920e24f.94b628",
-                "558b33bb.a28914",
-                "14b3fe.dfa6ec02",
-                "cd49f082.fc7e6",
-                "ccca18a2.ea7ad8",
-                "348e2352.849ddc",
-                "631d9619.9d9ee",
-                "c3b37174.45567"
+                "235a8de8.2ff2e2",
+                "3fed0be1.edfb24",
+                "8387d4ba.3387e",
+                "4fec924f.434ca4",
+                "e23ffdc8.d7c0b8",
+                "73820c83.e6bf7c",
+                "4c82daf8.25cd8c",
+                "4141db24.a24a84",
+                "19eb9ce6.88ad83",
+                "dd0ea493.8f50f",
+                "a58bc596.7e7c2",
+                "475ae245.9fc77c"
             ]
         ]
     },
     {
-        "id": "a136fb28.0b527",
+        "id": "8387d4ba.3387e",
         "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": 2638.75,
-        "y": 1036.75,
-        "z": "265dc029.a18eb8",
+        "x": 2636.566665649414,
+        "y": 986.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "1145371f.91a831",
-                "5a2e1129.154e8",
-                "b9792c95.c6cf1"
+                "acba44a3.12e668",
+                "959d66e3.6c573",
+                "38d3f1c1.44147e"
             ]
         ]
     },
     {
-        "id": "1648afc0.52dbc8",
+        "id": "4fec924f.434ca4",
         "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": 2617.75,
-        "y": 1638.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 2615.566665649414,
+        "y": 1588.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "2e980743.252ac8",
-                "1e789473.1cf9ec",
-                "90160a99.2f8a58"
+                "14e1d4b3.a0230b",
+                "49cb0566.838e7c",
+                "8b3b10b2.dfb27"
             ]
         ]
     },
     {
-        "id": "1145371f.91a831",
+        "id": "acba44a3.12e668",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2839.75,
-        "y": 920.75,
-        "z": "265dc029.a18eb8",
+        "x": 2837.566665649414,
+        "y": 870.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "3ed8df93.4273e"
+                "1043b925.e5d5cf"
             ]
         ]
     },
     {
-        "id": "5a2e1129.154e8",
+        "id": "959d66e3.6c573",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2835.259033203125,
-        "y": 970.176025390625,
-        "z": "265dc029.a18eb8",
+        "x": 2833.075698852539,
+        "y": 919.9926910400391,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "33754642.9ad63a"
+                "b6a9c815.e5b5f8"
             ]
         ]
     },
     {
-        "id": "b9792c95.c6cf1",
+        "id": "38d3f1c1.44147e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2839.259033203125,
-        "y": 1021.176025390625,
-        "z": "265dc029.a18eb8",
+        "x": 2837.075698852539,
+        "y": 970.9926910400391,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "64d30532.9bdba4"
+                "efe0781e.b732b"
             ]
         ]
     },
     {
-        "id": "3ed8df93.4273e",
+        "id": "1043b925.e5d5cf",
         "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": 2988.321533203125,
-        "y": 920.0357666015625,
-        "z": "265dc029.a18eb8",
+        "x": 2986.138198852539,
+        "y": 869.8524322509766,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "33754642.9ad63a",
+        "id": "b6a9c815.e5b5f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2978.259033203125,
-        "y": 970.176025390625,
-        "z": "265dc029.a18eb8",
+        "x": 2976.075698852539,
+        "y": 919.9926910400391,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "2e980743.252ac8",
+        "id": "14e1d4b3.a0230b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2840.75,
-        "y": 1608.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 2838.566665649414,
+        "y": 1558.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "9b0a176a.3fd41"
+                "72a5e714.8ebe58"
             ]
         ]
     },
     {
-        "id": "1e789473.1cf9ec",
+        "id": "49cb0566.838e7c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2836.259033203125,
-        "y": 1658.1759033203125,
-        "z": "265dc029.a18eb8",
+        "x": 2834.075698852539,
+        "y": 1607.9925689697266,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b94ccd2f.84b8b8"
+                "700468f2.c31308"
             ]
         ]
     },
     {
-        "id": "90160a99.2f8a58",
+        "id": "8b3b10b2.dfb27",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2840.259033203125,
-        "y": 1709.1759033203125,
-        "z": "265dc029.a18eb8",
+        "x": 2838.075698852539,
+        "y": 1658.9925689697266,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "8f6fd298.ecc1e8"
+                "33eb1eab.026612"
             ]
         ]
     },
     {
-        "id": "9b0a176a.3fd41",
+        "id": "72a5e714.8ebe58",
         "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": 2989.321533203125,
-        "y": 1608.03564453125,
-        "z": "265dc029.a18eb8",
+        "x": 2987.138198852539,
+        "y": 1557.852310180664,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "b94ccd2f.84b8b8",
+        "id": "700468f2.c31308",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2979.259033203125,
-        "y": 1658.1759033203125,
-        "z": "265dc029.a18eb8",
+        "x": 2977.075698852539,
+        "y": 1607.9925689697266,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "da7f1dce.5cb46",
+        "id": "5082eb37.cb5224",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3653.41650390625,
-        "y": 1064.75,
-        "z": "265dc029.a18eb8",
+        "x": 3651.233169555664,
+        "y": 1014.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "826c0f72.a70018",
-                "36f8f99c.c030b6",
-                "57c1cc0d.dcb6ac",
-                "9cbc6da7.b032e",
-                "992f0b42.313448"
+                "77518362.6fdc64",
+                "27c2e224.9c32d6",
+                "aacd8e8b.53bef8",
+                "9482a661.be3818",
+                "85d16e7a.c43b68"
             ]
         ]
     },
     {
-        "id": "b7d2e547.bd45e8",
+        "id": "6570843c.cfb8c4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3480.75,
-        "y": 1065.75,
-        "z": "265dc029.a18eb8",
+        "x": 3478.566665649414,
+        "y": 1015.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "da7f1dce.5cb46"
+                "5082eb37.cb5224"
             ]
         ]
     },
     {
-        "id": "647aea0c.904444",
+        "id": "b053876e.9f87b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3490.240966796875,
-        "y": 1108.3240356445312,
-        "z": "265dc029.a18eb8",
+        "x": 3488.057632446289,
+        "y": 1058.1407012939453,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "99f9ef28.22d7a"
+                "6d09a761.811108"
             ]
         ]
     },
     {
-        "id": "1b3a301d.df26c",
+        "id": "6f406b61.4c227c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3478.75,
-        "y": 1154.75,
-        "z": "265dc029.a18eb8",
+        "x": 3476.566665649414,
+        "y": 1104.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6ff92d51.144e3c"
+                "ac5f2fe4.d56318"
             ]
         ]
     },
     {
-        "id": "99f9ef28.22d7a",
+        "id": "6d09a761.811108",
         "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": 3643.8123779296875,
-        "y": 1111.6097717285156,
-        "z": "265dc029.a18eb8",
+        "x": 3641.6290435791016,
+        "y": 1061.4264373779297,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "6ff92d51.144e3c",
+        "id": "ac5f2fe4.d56318",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3647.75,
-        "y": 1155.75,
-        "z": "265dc029.a18eb8",
+        "x": 3645.566665649414,
+        "y": 1105.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "64d30532.9bdba4",
+        "id": "efe0781e.b732b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3000.75,
-        "y": 1022.75,
-        "z": "265dc029.a18eb8",
+        "x": 2998.566665649414,
+        "y": 972.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "f7fe7886.c5f688",
-                "97630cf9.61551"
+                "877c4cae.f5888",
+                "e258fe66.5163d8"
             ]
         ]
     },
     {
-        "id": "8f6fd298.ecc1e8",
+        "id": "33eb1eab.026612",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2990.75,
-        "y": 1710.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 2988.566665649414,
+        "y": 1660.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "d321b170.fefc18",
-                "ffb149d2.1a2f38"
+                "9b8713d1.08a16",
+                "791ea555.e9b2bc"
             ]
         ]
     },
     {
-        "id": "821eddca.0e3588",
+        "id": "52cec1ff.5fead8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3621.41650390625,
-        "y": 1900.75,
-        "z": "265dc029.a18eb8",
+        "x": 3619.233169555664,
+        "y": 1850.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "e0128afe.007bf",
-                "2edd1a44.e4eb5e",
-                "af1082c8.2a9af",
-                "ebc710f0.247328",
-                "5282e7ba.b5ae6"
+                "a935afd3.7df188",
+                "5b3eb8ce.d19aa",
+                "689f5373.4eba54",
+                "bfc91f6.fd87a6"
             ]
         ]
     },
     {
-        "id": "a826813e.688038",
+        "id": "7672f9e5.3dc8a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3448.75,
-        "y": 1901.75,
-        "z": "265dc029.a18eb8",
+        "x": 3446.566665649414,
+        "y": 1851.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "821eddca.0e3588"
+                "52cec1ff.5fead8"
             ]
         ]
     },
     {
-        "id": "31b9c040.452a38",
+        "id": "21d72a21.09925e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3458.240966796875,
-        "y": 1944.3240356445312,
-        "z": "265dc029.a18eb8",
+        "x": 3456.057632446289,
+        "y": 1894.1407012939453,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "17be006a.5f45e"
+                "885fb4a9.d0e358"
             ]
         ]
     },
     {
-        "id": "28d3d57c.d8ea12",
+        "id": "bb958a3b.91a6d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3446.75,
-        "y": 1990.75,
-        "z": "265dc029.a18eb8",
+        "x": 3444.566665649414,
+        "y": 1940.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "2fae66b5.5bd00a"
+                "aa7f6fd0.80348"
             ]
         ]
     },
     {
-        "id": "17be006a.5f45e",
+        "id": "885fb4a9.d0e358",
         "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": 3611.8123779296875,
-        "y": 1947.6097717285156,
-        "z": "265dc029.a18eb8",
+        "x": 3609.6290435791016,
+        "y": 1897.4264373779297,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "2fae66b5.5bd00a",
+        "id": "aa7f6fd0.80348",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3615.75,
-        "y": 1991.75,
-        "z": "265dc029.a18eb8",
+        "x": 3613.566665649414,
+        "y": 1941.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "826c0f72.a70018",
+        "id": "77518362.6fdc64",
         "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": 3917.75,
-        "y": 1048.75,
-        "z": "265dc029.a18eb8",
+        "x": 3915.566665649414,
+        "y": 998.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "2cce3874.ab433",
-                "ee660e5a.b83a"
+                "ff236f34.3aa398",
+                "b5c782d2.ed439"
             ]
         ]
     },
     {
-        "id": "ee660e5a.b83a",
+        "id": "b5c782d2.ed439",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4140.75,
-        "y": 1003.75,
-        "z": "265dc029.a18eb8",
+        "x": 4138.566665649414,
+        "y": 953.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "5270775.80a9288"
+                "defee4cb.985ef"
             ]
         ]
     },
     {
-        "id": "2cce3874.ab433",
+        "id": "ff236f34.3aa398",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4142.75,
-        "y": 1067.75,
-        "z": "265dc029.a18eb8",
+        "x": 4140.566665649414,
+        "y": 1017.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "838db3c8.831b8"
+                "854e5113.a4ea88"
             ]
         ]
     },
     {
-        "id": "6ce9021f.48b204",
+        "id": "df9bb978.87a088",
         "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": 4475.75,
-        "y": 958.75,
-        "z": "265dc029.a18eb8",
+        "x": 4473.566665649414,
+        "y": 908.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "838db3c8.831b8",
+        "id": "854e5113.a4ea88",
         "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": 4304.75,
-        "y": 1063.75,
-        "z": "265dc029.a18eb8",
+        "x": 4302.566665649414,
+        "y": 1013.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "5270775.80a9288",
+        "id": "defee4cb.985ef",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4305.75,
-        "y": 1000.75,
-        "z": "265dc029.a18eb8",
+        "x": 4303.566665649414,
+        "y": 950.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "a369f63d.8d0208",
-                "6ce9021f.48b204"
+                "d2af571c.5752b8",
+                "df9bb978.87a088"
             ]
         ]
     },
     {
-        "id": "a369f63d.8d0208",
+        "id": "d2af571c.5752b8",
         "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": 4476.75,
-        "y": 1066.75,
-        "z": "265dc029.a18eb8",
+        "x": 4474.566665649414,
+        "y": 1016.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "dc0e098a.8d3498",
+        "id": "5911bfaf.469e68",
         "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": 4477.75,
-        "y": 1015.75,
-        "z": "265dc029.a18eb8",
+        "x": 4475.566665649414,
+        "y": 965.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "57c1cc0d.dcb6ac",
+        "id": "aacd8e8b.53bef8",
         "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",
+        "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='cbs' value='`$tmp.aai.network-route-A.data-owner`' />\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": 3919.75,
-        "y": 1207.75,
-        "z": "265dc029.a18eb8",
+        "x": 3917.566665649414,
+        "y": 1157.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "36f8f99c.c030b6",
+        "id": "27c2e224.9c32d6",
         "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": 3964.75,
-        "y": 1117.75,
-        "z": "265dc029.a18eb8",
+        "x": 3962.566665649414,
+        "y": 1067.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "dbdce200.a0ebf",
+        "id": "c45404dc.ac473",
         "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": 3853.75,
-        "y": 1158.75,
-        "z": "265dc029.a18eb8",
+        "x": 3851.566665649414,
+        "y": 1108.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "e0128afe.007bf",
+        "id": "a935afd3.7df188",
         "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": 3907.75,
-        "y": 1904.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 3905.566665649414,
+        "y": 1854.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "a6039dc8.090cc",
-                "5bb0c93.9199ab8"
+                "d1d56d9d.523c98",
+                "547df734.987198"
             ]
         ]
     },
     {
-        "id": "5bb0c93.9199ab8",
+        "id": "547df734.987198",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4130.75,
-        "y": 1859.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 4128.566665649414,
+        "y": 1809.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "d06cbf2c.85f9c"
+                "a81f7928.f72098"
             ]
         ]
     },
     {
-        "id": "a6039dc8.090cc",
+        "id": "d1d56d9d.523c98",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4132.75,
-        "y": 1923.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 4130.566665649414,
+        "y": 1873.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "9ac2c145.9482"
+                "843e27d6.c22ad8"
             ]
         ]
     },
     {
-        "id": "5b53dee5.e8008",
+        "id": "62f808eb.16107",
         "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": 4465.75,
-        "y": 1817.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 4463.566665649414,
+        "y": 1767.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "9ac2c145.9482",
+        "id": "843e27d6.c22ad8",
         "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": 4291.75,
-        "y": 1942.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 4289.566665649414,
+        "y": 1892.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "d06cbf2c.85f9c",
+        "id": "a81f7928.f72098",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4295.75,
-        "y": 1856.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 4293.566665649414,
+        "y": 1806.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "5b53dee5.e8008",
-                "1365606a.f41bb8"
+                "62f808eb.16107",
+                "157e6153.038477"
             ]
         ]
     },
     {
-        "id": "1365606a.f41bb8",
+        "id": "157e6153.038477",
         "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": 4466.75,
-        "y": 1922.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 4464.566665649414,
+        "y": 1872.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "d703d891.d4c1c",
+        "id": "c751bd0.3161d4",
         "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": 4461.75,
-        "y": 1871.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 4459.566665649414,
+        "y": 1821.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "af1082c8.2a9af",
+        "id": "9eaa7330.d56278",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$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",
+        "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<parameter name='cvlan' value='`$final-vlan`' />\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='cbs' value='`$tmp.aai.network-route-B.data-owner`' />\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": 3909.75,
-        "y": 2063.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 3898.56689453125,
+        "y": 2093.56689453125,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "2edd1a44.e4eb5e",
+        "id": "5b3eb8ce.d19aa",
         "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": 3954.75,
-        "y": 1973.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 3952.566665649414,
+        "y": 1923.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc18d76a.4302d",
+        "id": "d6d1a26d.46be3",
         "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": 3843.75,
-        "y": 2011.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 3841.566665649414,
+        "y": 1961.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "b920e24f.94b628",
+        "id": "e23ffdc8.d7c0b8",
         "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": 2653.75,
-        "y": 2123.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 2651.566665649414,
+        "y": 2073.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "7dfe65de.953a14",
+        "id": "997459da.59786",
         "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": 2619.75,
-        "y": 2057.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 2617.566665649414,
+        "y": 2007.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "9cbc6da7.b032e",
+        "id": "9482a661.be3818",
         "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": 4047.75,
-        "y": 1255.75,
-        "z": "265dc029.a18eb8",
+        "x": 4045.566665649414,
+        "y": 1205.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "ebc710f0.247328",
+        "id": "ea3b6f52.6f2fd8",
         "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": 4036.75,
-        "y": 2128.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 4025.56689453125,
+        "y": 2158.56689453125,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4a52ebd.07da98",
+        "id": "e5456a36.7801c",
         "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": 5091.75,
-        "y": 775.75,
-        "z": "265dc029.a18eb8",
+        "x": 5089.566665649414,
+        "y": 725.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "147a8d1b.1ee80b",
-                "d765c1e1.9d8848",
-                "55e4f273.918784"
+                "805f0385.d78d68",
+                "f2313436.e5c8e8",
+                "b37025f0.b6455"
             ]
         ]
     },
     {
-        "id": "17fe2d2.f198953",
+        "id": "7ae6e46.d965a1c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2644.75,
-        "y": 431.75,
-        "z": "265dc029.a18eb8",
+        "x": 2642.566665649414,
+        "y": 381.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "92c83ff4.32672"
+                "d0751b0.845c568"
             ]
         ]
     },
     {
-        "id": "fa993007.6297d",
+        "id": "496902ef.bae144",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1574.7501220703125,
-        "y": 848.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 1572.5667877197266,
+        "y": 798.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "71dec788.b2b82"
+                "806d1dbe.e6caf8"
             ]
         ]
     },
     {
-        "id": "9822d888.33539",
+        "id": "dfac8bfa.e1a4f8",
         "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": 2312.75,
-        "y": 554.75,
-        "z": "265dc029.a18eb8",
+        "x": 2310.566665649414,
+        "y": 504.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "bb40c414.d4fe5",
-                "986079fe.da93b"
+                "fefd0a3b.0a6c",
+                "e1fca775.5c3dc"
             ]
         ]
     },
     {
-        "id": "986079fe.da93b",
+        "id": "e1fca775.5c3dc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2622.75,
-        "y": 561.75,
-        "z": "265dc029.a18eb8",
+        "x": 2620.566665649414,
+        "y": 511.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "bb40c414.d4fe5",
+        "id": "fefd0a3b.0a6c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2621.75,
-        "y": 615.75,
-        "z": "265dc029.a18eb8",
+        "x": 2619.566665649414,
+        "y": 565.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "7898c9b3.45357"
+                "c2ddd3bf.c4d7b"
             ]
         ]
     },
     {
-        "id": "256c12f1.36937e",
+        "id": "5fd9dbf5.e77414",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 1994.75,
-        "y": 798.75,
-        "z": "265dc029.a18eb8",
+        "x": 1992.566665649414,
+        "y": 748.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "71dec788.b2b82",
+        "id": "806d1dbe.e6caf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1751.75,
-        "y": 841.75,
-        "z": "265dc029.a18eb8",
+        "x": 1749.566665649414,
+        "y": 791.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "256c12f1.36937e",
-                "caff6575.521c18"
+                "5fd9dbf5.e77414",
+                "bd9c64f3.1ae468"
             ]
         ]
     },
     {
-        "id": "b640b2e3.7d557",
+        "id": "25e50f8c.f7b168",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3180.75,
-        "y": 1027.75,
-        "z": "265dc029.a18eb8",
+        "x": 3178.566665649414,
+        "y": 977.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "f7fe7886.c5f688",
+        "id": "877c4cae.f5888",
         "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": 3223.75,
-        "y": 1092.75,
-        "z": "265dc029.a18eb8",
+        "x": 3221.566665649414,
+        "y": 1042.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b7d2e547.bd45e8",
-                "647aea0c.904444",
-                "1b3a301d.df26c"
+                "6570843c.cfb8c4",
+                "b053876e.9f87b",
+                "6f406b61.4c227c"
             ]
         ]
     },
     {
-        "id": "d321b170.fefc18",
+        "id": "9b8713d1.08a16",
         "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": 3220.75,
-        "y": 1936.75,
-        "z": "265dc029.a18eb8",
+        "x": 3218.566665649414,
+        "y": 1886.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "a826813e.688038",
-                "31b9c040.452a38",
-                "28d3d57c.d8ea12"
+                "7672f9e5.3dc8a8",
+                "21d72a21.09925e",
+                "bb958a3b.91a6d8"
             ]
         ]
     },
     {
-        "id": "9ef3c368.db5f5",
+        "id": "ce2cb197.80436",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3181.75,
-        "y": 1880.75,
-        "z": "265dc029.a18eb8",
+        "x": 3179.566665649414,
+        "y": 1830.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "92c83ff4.32672",
+        "id": "d0751b0.845c568",
         "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": 2937.75,
-        "y": 378.75,
-        "z": "265dc029.a18eb8",
+        "x": 2935.566665649414,
+        "y": 328.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "95b0e196.505ca",
-                "18577af2.228375",
-                "e930ed34.7c0138"
+                "ab01dedd.6f763",
+                "8be63891.327ab8",
+                "8203f600.3196d8"
             ]
         ]
     },
     {
-        "id": "18577af2.228375",
+        "id": "8be63891.327ab8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3211.240966796875,
-        "y": 271.323974609375,
-        "z": "265dc029.a18eb8",
+        "x": 3209.057632446289,
+        "y": 221.14064025878906,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "88d8bef2.b299b"
+                "e5ba36e2.ffe35"
             ]
         ]
     },
     {
-        "id": "88d8bef2.b299b",
+        "id": "e5ba36e2.ffe35",
         "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": 3388.8125,
-        "y": 271.6097412109375,
-        "z": "265dc029.a18eb8",
+        "x": 3386.629165649414,
+        "y": 221.42640686035156,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "e930ed34.7c0138",
+        "id": "8203f600.3196d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3206.75,
-        "y": 320.75,
-        "z": "265dc029.a18eb8",
+        "x": 3204.566665649414,
+        "y": 270.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "d9c208e6.92ace8"
+                "2d6e472f.cebd28"
             ]
         ]
     },
     {
-        "id": "d9c208e6.92ace8",
+        "id": "2d6e472f.cebd28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3388.75,
-        "y": 320.75,
-        "z": "265dc029.a18eb8",
+        "x": 3386.566665649414,
+        "y": 270.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "95b0e196.505ca",
+        "id": "ab01dedd.6f763",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3210.75,
-        "y": 371.75,
-        "z": "265dc029.a18eb8",
+        "x": 3208.566665649414,
+        "y": 321.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "1e6206a8.c04df9"
+                "d486eb58.78947"
             ]
         ]
     },
     {
-        "id": "1e6206a8.c04df9",
+        "id": "d486eb58.78947",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3390.75,
-        "y": 371.75,
-        "z": "265dc029.a18eb8",
+        "x": 3388.566665649414,
+        "y": 321.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "9822d888.33539"
+                "dfac8bfa.e1a4f8"
             ]
         ]
     },
     {
-        "id": "7e565315.5e9c94",
+        "id": "f5c84d41.47596",
         "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": 2881.75,
-        "y": 595.75,
-        "z": "265dc029.a18eb8",
+        "x": 2879.566665649414,
+        "y": 545.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "ad48e1c.1164d2"
+                "65ef1c62.c47174"
             ]
         ]
     },
     {
-        "id": "ad48e1c.1164d2",
+        "id": "65ef1c62.c47174",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3161.75,
-        "y": 595.75,
-        "z": "265dc029.a18eb8",
+        "x": 3159.566665649414,
+        "y": 545.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "fa993007.6297d"
+                "496902ef.bae144"
             ]
         ]
     },
     {
-        "id": "f45e9748.7b5398",
+        "id": "caa679b7.88155",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3366.75,
-        "y": 569.75,
-        "z": "265dc029.a18eb8",
+        "x": 3364.566665649414,
+        "y": 519.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "765d29c.dd249d8"
+                "181d6a25.4c8ac6"
             ]
         ]
     },
     {
-        "id": "765d29c.dd249d8",
+        "id": "181d6a25.4c8ac6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3543.7498779296875,
-        "y": 562.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 3541.5665435791016,
+        "y": 512.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "75683ebe.1d381",
-                "bda78544.b92ef8"
+                "2189ab7e.731a5c",
+                "f77218ef.7392f"
             ]
         ]
     },
     {
-        "id": "75683ebe.1d381",
+        "id": "2189ab7e.731a5c",
         "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": 3786.7498779296875,
-        "y": 519.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 3784.5665435791016,
+        "y": 469.56654357910156,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "bda78544.b92ef8",
+        "id": "f77218ef.7392f",
         "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": 3775.7498779296875,
-        "y": 574.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 3773.5665435791016,
+        "y": 524.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "ca6a5b49.f6776",
-                "a806a879.064e2",
-                "e87f6cd7.19d238"
+                "b3c389dc.9ceaa8",
+                "1fd1bab4.03ed05",
+                "1a9ec9f1.53817e"
             ]
         ]
     },
     {
-        "id": "e87f6cd7.19d238",
+        "id": "1a9ec9f1.53817e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4028.75,
-        "y": 460.75,
-        "z": "265dc029.a18eb8",
+        "x": 4026.566665649414,
+        "y": 410.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "8b6c5048.f1e68"
+                "9b368d79.59d868"
             ]
         ]
     },
     {
-        "id": "8b6c5048.f1e68",
+        "id": "9b368d79.59d868",
         "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": 4177.321533203125,
-        "y": 461.0357666015625,
-        "z": "265dc029.a18eb8",
+        "x": 4175.138198852539,
+        "y": 410.85243225097656,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "180d4dab.bdf5aa",
+        "id": "75dbcc67.2d607c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4176.259033203125,
-        "y": 505.176025390625,
-        "z": "265dc029.a18eb8",
+        "x": 4174.075698852539,
+        "y": 454.99269104003906,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "a806a879.064e2",
+        "id": "1fd1bab4.03ed05",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4017.259033203125,
-        "y": 505.176025390625,
-        "z": "265dc029.a18eb8",
+        "x": 4015.075698852539,
+        "y": 454.99269104003906,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "180d4dab.bdf5aa"
+                "75dbcc67.2d607c"
             ]
         ]
     },
     {
-        "id": "ca6a5b49.f6776",
+        "id": "b3c389dc.9ceaa8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4024.259033203125,
-        "y": 584.176025390625,
-        "z": "265dc029.a18eb8",
+        "x": 4022.075698852539,
+        "y": 533.9926910400391,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "64e4dfe7.932de"
+                "d93faa74.adf0b8"
             ]
         ]
     },
     {
-        "id": "64e4dfe7.932de",
+        "id": "d93faa74.adf0b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4163.259033203125,
-        "y": 584.176025390625,
-        "z": "265dc029.a18eb8",
+        "x": 4161.075698852539,
+        "y": 533.9926910400391,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "ee6b0ff5.49f928",
-                "2bb1c801.8cdbe"
+                "14f40ed2.57f431",
+                "3853baa5.6545de"
             ]
         ]
     },
     {
-        "id": "ee6b0ff5.49f928",
+        "id": "14f40ed2.57f431",
         "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": 4368.75,
-        "y": 581.75,
-        "z": "265dc029.a18eb8",
+        "x": 4366.566665649414,
+        "y": 531.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "97630cf9.61551",
+        "id": "e258fe66.5163d8",
         "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": 3224.75,
-        "y": 762.75,
-        "z": "265dc029.a18eb8",
+        "x": 3222.566665649414,
+        "y": 712.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "934ca0f9.e9628",
-                "acb0ef25.bdb28"
+                "b62b2d1b.c54438",
+                "a3a7f1f7.b60138"
             ]
         ]
     },
     {
-        "id": "acb0ef25.bdb28",
+        "id": "a3a7f1f7.b60138",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3447.75,
-        "y": 748.75,
-        "z": "265dc029.a18eb8",
+        "x": 3445.566665649414,
+        "y": 698.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "86c41dd1.cd9b3"
+                "93f8ed33.b51e48"
             ]
         ]
     },
     {
-        "id": "934ca0f9.e9628",
+        "id": "b62b2d1b.c54438",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3449.75,
-        "y": 781.75,
-        "z": "265dc029.a18eb8",
+        "x": 3447.566665649414,
+        "y": 731.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "7c1914e6.7de444"
+                "530ba1d.a0db6e"
             ]
         ]
     },
     {
-        "id": "7c1914e6.7de444",
+        "id": "530ba1d.a0db6e",
         "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": 3592.75,
-        "y": 778.75,
-        "z": "265dc029.a18eb8",
+        "x": 3590.566665649414,
+        "y": 728.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "86c41dd1.cd9b3",
+        "id": "93f8ed33.b51e48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3595.75,
-        "y": 741.75,
-        "z": "265dc029.a18eb8",
+        "x": 3593.566665649414,
+        "y": 691.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "9c125821.e182b8",
-                "15e72cc8.739c23"
+                "38a0b992.4a90b6",
+                "394a5b51.d2050c"
             ]
         ]
     },
     {
-        "id": "9c125821.e182b8",
+        "id": "38a0b992.4a90b6",
         "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": 3757.75,
-        "y": 736.75,
-        "z": "265dc029.a18eb8",
+        "x": 3755.566665649414,
+        "y": 686.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "ffb149d2.1a2f38",
+        "id": "791ea555.e9b2bc",
         "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": 3238.75,
-        "y": 1599.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 3236.566665649414,
+        "y": 1549.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "bf5eff49.e98d88",
-                "54638e9e.e4ced"
+                "5954dedf.36bba",
+                "68d3451a.d84c04"
             ]
         ]
     },
     {
-        "id": "54638e9e.e4ced",
+        "id": "68d3451a.d84c04",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3461.75,
-        "y": 1585.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 3459.566665649414,
+        "y": 1535.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "16f61dc.50bc1e2"
+                "51569fcc.16549"
             ]
         ]
     },
     {
-        "id": "bf5eff49.e98d88",
+        "id": "5954dedf.36bba",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3463.75,
-        "y": 1618.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 3461.566665649414,
+        "y": 1568.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "9dee5daf.af14f"
+                "5d1db6a0.f779b8"
             ]
         ]
     },
     {
-        "id": "9dee5daf.af14f",
+        "id": "5d1db6a0.f779b8",
         "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": 3606.75,
-        "y": 1615.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 3604.566665649414,
+        "y": 1565.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "16f61dc.50bc1e2",
+        "id": "51569fcc.16549",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3609.75,
-        "y": 1578.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 3607.566665649414,
+        "y": 1528.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "8dcdd4c8.096dc8",
-                "d98e4cd6.39d27"
+                "c4906d5e.17fa58",
+                "10a080e8.915427"
             ]
         ]
     },
     {
-        "id": "8dcdd4c8.096dc8",
+        "id": "c4906d5e.17fa58",
         "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": 3803.75,
-        "y": 1581.75,
-        "z": "265dc029.a18eb8",
+        "x": 3801.566665649414,
+        "y": 1531.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "8be878cc.82db9",
+        "id": "198124d5.bcf04b",
         "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": 1067.75,
-        "y": 286.75,
-        "z": "265dc029.a18eb8",
+        "x": 1065.566665649414,
+        "y": 236.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "992f0b42.313448",
+        "id": "85d16e7a.c43b68",
         "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": 3871.75,
-        "y": 1332.75,
-        "z": "265dc029.a18eb8",
+        "x": 3869.566665649414,
+        "y": 1282.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b7afaa03.1d1688"
+                "411baf5.a18ef5"
             ]
         ]
     },
     {
-        "id": "b7afaa03.1d1688",
+        "id": "411baf5.a18ef5",
         "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": 4077.75,
-        "y": 1332.75,
-        "z": "265dc029.a18eb8",
+        "x": 4075.566665649414,
+        "y": 1282.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "40933173.919508"
+                "48572567.53bfbc"
             ]
         ]
     },
     {
-        "id": "40933173.919508",
+        "id": "48572567.53bfbc",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4293.03564453125,
-        "y": 1332.57177734375,
-        "z": "265dc029.a18eb8",
+        "x": 4290.852310180664,
+        "y": 1282.388442993164,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "8a032b26.4ca96"
+                "c42e387b.cded18"
             ]
         ]
     },
     {
-        "id": "8a032b26.4ca96",
+        "id": "c42e387b.cded18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4499.8671875,
-        "y": 1333.09033203125,
-        "z": "265dc029.a18eb8",
+        "x": 4497.683853149414,
+        "y": 1282.906997680664,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "2723496.6122eb6",
-                "e5650eda.402e4",
-                "1295e367.d34e2d"
+                "4d7b3e62.007c48",
+                "c3d39d67.add138",
+                "c7287c92.444148"
             ]
         ]
     },
     {
-        "id": "2723496.6122eb6",
+        "id": "4d7b3e62.007c48",
         "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": 4714.8671875,
-        "y": 1295.09033203125,
-        "z": "265dc029.a18eb8",
+        "x": 4712.683853149414,
+        "y": 1244.906997680664,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "e5650eda.402e4",
+        "id": "c3d39d67.add138",
         "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": 4711.8671875,
-        "y": 1334.09033203125,
-        "z": "265dc029.a18eb8",
+        "x": 4709.683853149414,
+        "y": 1283.906997680664,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "217f847a.1b8f9c"
+                "be0b5cde.2813d"
             ]
         ]
     },
     {
-        "id": "1295e367.d34e2d",
+        "id": "c7287c92.444148",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4667.3671875,
-        "y": 1376.09033203125,
-        "z": "265dc029.a18eb8",
+        "x": 4665.183853149414,
+        "y": 1325.906997680664,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "217f847a.1b8f9c",
+        "id": "be0b5cde.2813d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4892.3671875,
-        "y": 1333.09033203125,
-        "z": "265dc029.a18eb8",
+        "x": 4890.183853149414,
+        "y": 1282.906997680664,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "9a62abd2.875488"
+                "302f8288.cd1b3e"
             ]
         ]
     },
     {
-        "id": "9a62abd2.875488",
+        "id": "302f8288.cd1b3e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5050.3671875,
-        "y": 1333.09033203125,
-        "z": "265dc029.a18eb8",
+        "x": 5048.183853149414,
+        "y": 1282.906997680664,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "84d611e0.38611"
+                "2038ca55.29b4f6"
             ]
         ]
     },
     {
-        "id": "84d611e0.38611",
+        "id": "2038ca55.29b4f6",
         "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": 5257.3671875,
-        "y": 1333.09033203125,
-        "z": "265dc029.a18eb8",
+        "x": 5255.183853149414,
+        "y": 1282.906997680664,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "5282e7ba.b5ae6",
+        "id": "a9c9250a.2de128",
         "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": 3868.75,
-        "y": 2201.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 3857.56689453125,
+        "y": 2231.56689453125,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "bd545475.b3b6c"
+                "b1ff86cb.44495"
             ]
         ]
     },
     {
-        "id": "bd545475.b3b6c",
+        "id": "b1ff86cb.44495",
         "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": 4074.75,
-        "y": 2201.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 4063.56689453125,
+        "y": 2231.56689453125,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "83564e37.d48218"
+                "8aa7adc9.ac30f8"
             ]
         ]
     },
     {
-        "id": "83564e37.d48218",
+        "id": "8aa7adc9.ac30f8",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4290.03564453125,
-        "y": 2201.5718994140625,
-        "z": "265dc029.a18eb8",
+        "x": 4278.8525390625,
+        "y": 2231.388671875,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "93bbce92.5201a"
+                "795c0f2b.18149"
             ]
         ]
     },
     {
-        "id": "93bbce92.5201a",
+        "id": "795c0f2b.18149",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4496.8671875,
-        "y": 2202.0904541015625,
-        "z": "265dc029.a18eb8",
+        "x": 4494.683853149414,
+        "y": 2151.9071197509766,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "fd9657a3.dc9388",
-                "30813f1a.ba22e",
-                "20bd551d.f1ff8a"
+                "10e8dccd.7572f3",
+                "a9b511df.e976a8",
+                "395f2645.3bbfda"
             ]
         ]
     },
     {
-        "id": "fd9657a3.dc9388",
+        "id": "10e8dccd.7572f3",
         "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": 4711.8671875,
-        "y": 2164.0904541015625,
-        "z": "265dc029.a18eb8",
+        "x": 4709.683853149414,
+        "y": 2113.9071197509766,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "30813f1a.ba22e",
+        "id": "a9b511df.e976a8",
         "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": 4708.8671875,
-        "y": 2203.0904541015625,
-        "z": "265dc029.a18eb8",
+        "x": 4706.683853149414,
+        "y": 2152.9071197509766,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "a170e3c8.bc39e8"
+                "9cfd994f.d1bd28"
             ]
         ]
     },
     {
-        "id": "20bd551d.f1ff8a",
+        "id": "395f2645.3bbfda",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4664.3671875,
-        "y": 2245.0904541015625,
-        "z": "265dc029.a18eb8",
+        "x": 4662.183853149414,
+        "y": 2194.9071197509766,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "a170e3c8.bc39e8",
+        "id": "9cfd994f.d1bd28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4889.3671875,
-        "y": 2202.0904541015625,
-        "z": "265dc029.a18eb8",
+        "x": 4887.183853149414,
+        "y": 2151.9071197509766,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "2f28ce6e.7c805a"
+                "fdd3d4ff.12013"
             ]
         ]
     },
     {
-        "id": "2f28ce6e.7c805a",
+        "id": "fdd3d4ff.12013",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5047.3671875,
-        "y": 2202.0904541015625,
-        "z": "265dc029.a18eb8",
+        "x": 5045.183853149414,
+        "y": 2151.9071197509766,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "8acb087c.8a0c18"
+                "b6d40b5b.531198"
             ]
         ]
     },
     {
-        "id": "8acb087c.8a0c18",
+        "id": "b6d40b5b.531198",
         "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": 5254.3671875,
-        "y": 2202.0904541015625,
-        "z": "265dc029.a18eb8",
+        "x": 5252.183853149414,
+        "y": 2151.9071197509766,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "15e72cc8.739c23",
+        "id": "394a5b51.d2050c",
         "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": 3784.75,
-        "y": 808.75,
-        "z": "265dc029.a18eb8",
+        "x": 3782.566665649414,
+        "y": 758.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "4a52b982.f91c28",
-                "a11e568c.3be85",
-                "99ab9191.08f9c8"
+                "5300baf1.a03c3c",
+                "f2f1a539.122",
+                "8c08712.febd69"
             ]
         ]
     },
     {
-        "id": "4a52b982.f91c28",
+        "id": "5300baf1.a03c3c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3980.2501220703125,
-        "y": 760.75,
-        "z": "265dc029.a18eb8",
+        "x": 3978.0667877197266,
+        "y": 710.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b692ef38.8280a"
+                "7958e0c4.8b95e8"
             ]
         ]
     },
     {
-        "id": "a11e568c.3be85",
+        "id": "f2f1a539.122",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3972.2501220703125,
-        "y": 815.75,
-        "z": "265dc029.a18eb8",
+        "x": 3970.0667877197266,
+        "y": 765.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "e2c6f054.dcba8"
+                "1c041508.6dc2cb"
             ]
         ]
     },
     {
-        "id": "99ab9191.08f9c8",
+        "id": "8c08712.febd69",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3977.2501220703125,
-        "y": 872.75,
-        "z": "265dc029.a18eb8",
+        "x": 3975.0667877197266,
+        "y": 822.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b3b61906.89b6c"
+                "a99a27ed.911ae"
             ]
         ]
     },
     {
-        "id": "b3b61906.89b6c",
+        "id": "a99a27ed.911ae",
         "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": 4129.2501220703125,
-        "y": 873.75,
-        "z": "265dc029.a18eb8",
+        "x": 4127.066787719727,
+        "y": 823.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "e2c6f054.dcba8",
+        "id": "1c041508.6dc2cb",
         "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": 4140.2501220703125,
-        "y": 818.75,
-        "z": "265dc029.a18eb8",
+        "x": 4138.066787719727,
+        "y": 768.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "b692ef38.8280a",
+        "id": "7958e0c4.8b95e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4124.6324462890625,
-        "y": 758.4056701660156,
-        "z": "265dc029.a18eb8",
+        "x": 4122.449111938477,
+        "y": 708.2223358154297,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "7c1e7393.5f430c"
+                "1bdb216.efc1b5f"
             ]
         ]
     },
     {
-        "id": "bfce8ca8.7f158",
+        "id": "d62d05cf.176f88",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4706.75,
-        "y": 776.75,
-        "z": "265dc029.a18eb8",
+        "x": 4704.566665649414,
+        "y": 726.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "66e0242c.eca1f4"
+                "bcc38290.1d7998"
             ]
         ]
     },
     {
-        "id": "66e0242c.eca1f4",
+        "id": "bcc38290.1d7998",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4883.75,
-        "y": 768.75,
-        "z": "265dc029.a18eb8",
+        "x": 4881.566665649414,
+        "y": 718.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "bb4e4d04.403498",
-                "a4a52ebd.07da98"
+                "393cf25.7da278e",
+                "e5456a36.7801c"
             ]
         ]
     },
     {
-        "id": "7c1e7393.5f430c",
+        "id": "1bdb216.efc1b5f",
         "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": 4308.75,
-        "y": 772.75,
-        "z": "265dc029.a18eb8",
+        "x": 4306.566665649414,
+        "y": 722.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "fdc19a74.7f3248"
+                "fc8ac316.deab48"
             ]
         ]
     },
     {
-        "id": "fdc19a74.7f3248",
+        "id": "fc8ac316.deab48",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4503.75,
-        "y": 772.75,
-        "z": "265dc029.a18eb8",
+        "x": 4501.566665649414,
+        "y": 722.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "bfce8ca8.7f158",
-                "86b82394.a43d88"
+                "d62d05cf.176f88",
+                "ecccf4af.e2e4f"
             ]
         ]
     },
     {
-        "id": "bb4e4d04.403498",
+        "id": "393cf25.7da278e",
         "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": 5121.75,
-        "y": 723.75,
-        "z": "265dc029.a18eb8",
+        "x": 5119.566665649414,
+        "y": 673.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "147a8d1b.1ee80b",
+        "id": "805f0385.d78d68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5301.75,
-        "y": 766.75,
-        "z": "265dc029.a18eb8",
+        "x": 5299.566665649414,
+        "y": 716.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b87f751d.f3da7"
+                "240537e6.0aafa"
             ]
         ]
     },
     {
-        "id": "d765c1e1.9d8848",
+        "id": "f2313436.e5c8e8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5293.75,
-        "y": 821.75,
-        "z": "265dc029.a18eb8",
+        "x": 5291.566665649414,
+        "y": 771.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "df22bf16.07f7a"
+                "d00a9368.bb6d9"
             ]
         ]
     },
     {
-        "id": "55e4f273.918784",
+        "id": "b37025f0.b6455",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5298.75,
-        "y": 878.75,
-        "z": "265dc029.a18eb8",
+        "x": 5296.566665649414,
+        "y": 828.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6f4ec167.ab122"
+                "cbb11ac0.487e2"
             ]
         ]
     },
     {
-        "id": "6f4ec167.ab122",
+        "id": "cbb11ac0.487e2",
         "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": 5450.75,
-        "y": 879.75,
-        "z": "265dc029.a18eb8",
+        "x": 5448.566665649414,
+        "y": 829.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "df22bf16.07f7a",
+        "id": "d00a9368.bb6d9",
         "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": 5461.75,
-        "y": 824.75,
-        "z": "265dc029.a18eb8",
+        "x": 5459.566665649414,
+        "y": 774.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "b87f751d.f3da7",
+        "id": "240537e6.0aafa",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5446.13232421875,
-        "y": 764.4056701660156,
-        "z": "265dc029.a18eb8",
+        "x": 5443.948989868164,
+        "y": 714.2223358154297,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "65560228.e1b304"
+                "29fd7b34.4131dc"
             ]
         ]
     },
     {
-        "id": "65560228.e1b304",
+        "id": "29fd7b34.4131dc",
         "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": 5660.75,
-        "y": 760.75,
-        "z": "265dc029.a18eb8",
+        "x": 5658.566665649414,
+        "y": 710.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "d98e4cd6.39d27",
+        "id": "10a080e8.915427",
         "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": 3825.75,
-        "y": 1649.75,
-        "z": "265dc029.a18eb8",
+        "x": 3823.566665649414,
+        "y": 1599.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "2868cde5.076bda",
-                "b742f188.d99c98",
-                "7bcbe6e5.b6855"
+                "4b321d82.d208c4",
+                "71f63ca0.f439b4",
+                "6408a65c.9c051"
             ]
         ]
     },
     {
-        "id": "2868cde5.076bda",
+        "id": "4b321d82.d208c4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4021.2501220703125,
-        "y": 1601.75,
-        "z": "265dc029.a18eb8",
+        "x": 4019.0667877197266,
+        "y": 1551.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "ddae6fe1.18737"
+                "ff7035a8.4a4898"
             ]
         ]
     },
     {
-        "id": "b742f188.d99c98",
+        "id": "71f63ca0.f439b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4013.2501220703125,
-        "y": 1656.75,
-        "z": "265dc029.a18eb8",
+        "x": 4011.0667877197266,
+        "y": 1606.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "22adb7ad.9c7eb8"
+                "cedb582a.827cc8"
             ]
         ]
     },
     {
-        "id": "7bcbe6e5.b6855",
+        "id": "6408a65c.9c051",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4018.2501220703125,
-        "y": 1713.75,
-        "z": "265dc029.a18eb8",
+        "x": 4016.0667877197266,
+        "y": 1663.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "8bbca88.4bf3658"
+                "62f85595.8f834c"
             ]
         ]
     },
     {
-        "id": "8bbca88.4bf3658",
+        "id": "62f85595.8f834c",
         "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": 4170.2501220703125,
-        "y": 1714.75,
-        "z": "265dc029.a18eb8",
+        "x": 4168.066787719727,
+        "y": 1664.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "22adb7ad.9c7eb8",
+        "id": "cedb582a.827cc8",
         "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": 4181.2501220703125,
-        "y": 1659.75,
-        "z": "265dc029.a18eb8",
+        "x": 4179.066787719727,
+        "y": 1609.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "ddae6fe1.18737",
+        "id": "ff7035a8.4a4898",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4165.6324462890625,
-        "y": 1599.4056701660156,
-        "z": "265dc029.a18eb8",
+        "x": 4163.449111938477,
+        "y": 1549.2223358154297,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "745549ac.76522"
+                "1cfc281a.8a30b8"
             ]
         ]
     },
     {
-        "id": "6c51f1bb.fdd338",
+        "id": "1b9dcd6c.838143",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4747.75,
-        "y": 1617.75,
-        "z": "265dc029.a18eb8",
+        "x": 4745.566665649414,
+        "y": 1567.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "bec84375.9834d8"
+                "f848858.f890878"
             ]
         ]
     },
     {
-        "id": "bec84375.9834d8",
+        "id": "f848858.f890878",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4924.75,
-        "y": 1609.75,
-        "z": "265dc029.a18eb8",
+        "x": 4922.566665649414,
+        "y": 1559.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "10746af3.442ea5",
-                "c8d59f37.05516"
+                "d6dc5769.a94e5",
+                "8ffaa581.0596e"
             ]
         ]
     },
     {
-        "id": "745549ac.76522",
+        "id": "1cfc281a.8a30b8",
         "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": 4349.75,
-        "y": 1613.75,
-        "z": "265dc029.a18eb8",
+        "x": 4347.566665649414,
+        "y": 1563.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6f4edcf8.0264a4"
+                "a7de5ddc.f741d"
             ]
         ]
     },
     {
-        "id": "6f4edcf8.0264a4",
+        "id": "a7de5ddc.f741d",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4544.75,
-        "y": 1613.75,
-        "z": "265dc029.a18eb8",
+        "x": 4542.566665649414,
+        "y": 1563.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6c51f1bb.fdd338",
-                "bd360057.ae7f88"
+                "1b9dcd6c.838143",
+                "a15038eb.52c2d"
             ]
         ]
     },
     {
-        "id": "c8d59f37.05516",
+        "id": "8ffaa581.0596e",
         "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": 5132.75,
-        "y": 1616.75,
-        "z": "265dc029.a18eb8",
+        "x": 5130.566665649414,
+        "y": 1566.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "cfff8041.7a41a",
-                "e8bb74eb.2b006",
-                "38cb0a35.e7b596"
+                "872d1ff2.ba1a",
+                "fb4371f0.b2d8f8",
+                "7a614704.3d5f48"
             ]
         ]
     },
     {
-        "id": "10746af3.442ea5",
+        "id": "d6dc5769.a94e5",
         "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": 5162.75,
-        "y": 1564.75,
-        "z": "265dc029.a18eb8",
+        "x": 5160.566665649414,
+        "y": 1514.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "cfff8041.7a41a",
+        "id": "872d1ff2.ba1a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5342.75,
-        "y": 1607.75,
-        "z": "265dc029.a18eb8",
+        "x": 5340.566665649414,
+        "y": 1557.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "48760758.d51b1"
+                "7aeb52e4.0a2274"
             ]
         ]
     },
     {
-        "id": "e8bb74eb.2b006",
+        "id": "fb4371f0.b2d8f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5334.75,
-        "y": 1662.75,
-        "z": "265dc029.a18eb8",
+        "x": 5332.566665649414,
+        "y": 1612.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "cd0857ad.373e5"
+                "8969155b.d859f"
             ]
         ]
     },
     {
-        "id": "38cb0a35.e7b596",
+        "id": "7a614704.3d5f48",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5339.75,
-        "y": 1719.75,
-        "z": "265dc029.a18eb8",
+        "x": 5337.566665649414,
+        "y": 1669.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "dc5ac250.081388"
+                "889b3b0a.917628"
             ]
         ]
     },
     {
-        "id": "dc5ac250.081388",
+        "id": "889b3b0a.917628",
         "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": 5491.75,
-        "y": 1720.75,
-        "z": "265dc029.a18eb8",
+        "x": 5489.566665649414,
+        "y": 1670.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "cd0857ad.373e5",
+        "id": "8969155b.d859f",
         "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": 5502.75,
-        "y": 1665.75,
-        "z": "265dc029.a18eb8",
+        "x": 5500.566665649414,
+        "y": 1615.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "48760758.d51b1",
+        "id": "7aeb52e4.0a2274",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5487.13232421875,
-        "y": 1605.4056701660156,
-        "z": "265dc029.a18eb8",
+        "x": 5484.948989868164,
+        "y": 1555.2223358154297,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "4f464150.595d48"
+                "4d040072.97eb48"
             ]
         ]
     },
     {
-        "id": "4f464150.595d48",
+        "id": "4d040072.97eb48",
         "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": 5701.75,
-        "y": 1601.75,
-        "z": "265dc029.a18eb8",
+        "x": 5699.566665649414,
+        "y": 1551.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "7898c9b3.45357",
+        "id": "c2ddd3bf.c4d7b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2785.75,
-        "y": 541.75,
-        "z": "265dc029.a18eb8",
+        "x": 2783.566665649414,
+        "y": 491.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "7e565315.5e9c94",
-                "d1780d52.965428"
+                "f5c84d41.47596",
+                "3ea037de.479638"
             ]
         ]
     },
     {
-        "id": "d1780d52.965428",
+        "id": "3ea037de.479638",
         "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": 3066.75,
-        "y": 497.75,
-        "z": "265dc029.a18eb8",
+        "x": 3064.566665649414,
+        "y": 447.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "3ca961.874bbea"
+                "1936a612.75947a"
             ]
         ]
     },
     {
-        "id": "3ca961.874bbea",
+        "id": "1936a612.75947a",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3328.75,
-        "y": 497.75,
-        "z": "265dc029.a18eb8",
+        "x": 3326.566665649414,
+        "y": 447.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "f45e9748.7b5398"
+                "caa679b7.88155"
             ]
         ]
     },
     {
-        "id": "86b82394.a43d88",
+        "id": "ecccf4af.e2e4f",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4709.75,
-        "y": 850.75,
-        "z": "265dc029.a18eb8",
+        "x": 4707.566665649414,
+        "y": 800.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "d6ae6456.c7b7d"
+                "d34903a3.baac18"
             ]
         ]
     },
     {
-        "id": "d6ae6456.c7b7d",
+        "id": "d34903a3.baac18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4886.75,
-        "y": 842.75,
-        "z": "265dc029.a18eb8",
+        "x": 4884.566665649414,
+        "y": 792.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "e0c26dc1.c6609"
+                "2edc576a.2f5808"
             ]
         ]
     },
     {
-        "id": "e0c26dc1.c6609",
+        "id": "2edc576a.2f5808",
         "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": 5121.75,
-        "y": 966.75,
-        "z": "265dc029.a18eb8",
+        "x": 5119.566665649414,
+        "y": 916.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "d695d085.dfc6b8",
+        "id": "ad9da04e.d2c378",
         "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": 5161.75,
-        "y": 1806.75,
-        "z": "265dc029.a18eb8",
+        "x": 5159.566665649414,
+        "y": 1756.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "d2aa9e81.4a2188",
+        "id": "3474026b.129ff6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4926.75,
-        "y": 1682.75,
-        "z": "265dc029.a18eb8",
+        "x": 4924.566665649414,
+        "y": 1632.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "d695d085.dfc6b8"
+                "ad9da04e.d2c378"
             ]
         ]
     },
     {
-        "id": "bd360057.ae7f88",
+        "id": "a15038eb.52c2d",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4749.75,
-        "y": 1690.75,
-        "z": "265dc029.a18eb8",
+        "x": 4747.566665649414,
+        "y": 1640.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "d2aa9e81.4a2188"
+                "3474026b.129ff6"
             ]
         ]
     },
     {
-        "id": "2bb1c801.8cdbe",
+        "id": "3853baa5.6545de",
         "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": 4367.75,
-        "y": 627.75,
-        "z": "265dc029.a18eb8",
+        "x": 4365.566665649414,
+        "y": 577.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "f8e47c26.52e4d8",
+        "id": "32f8b9ac.1ffbf6",
         "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": 2723.75,
-        "y": 761.75,
-        "z": "265dc029.a18eb8",
+        "x": 2721.566665649414,
+        "y": 711.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "cd49f082.fc7e6",
+        "id": "4141db24.a24a84",
         "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": 2704.75,
-        "y": 811.75,
-        "z": "265dc029.a18eb8",
+        "x": 2702.566665649414,
+        "y": 761.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "e47816c1.46d19",
+        "id": "b571a17a.acc4b8",
         "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": 1965.75,
-        "y": 345.75,
-        "z": "265dc029.a18eb8",
+        "x": 1963.566665649414,
+        "y": 295.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "d88bc8a5.b522",
-                "2fd2492.76d5db6"
+                "e81d387c.246378",
+                "a5dd2e0a.9197a"
             ]
         ]
     },
     {
-        "id": "d88bc8a5.b522",
+        "id": "e81d387c.246378",
         "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": 2245.75,
-        "y": 283.75,
-        "z": "265dc029.a18eb8",
+        "x": 2243.566665649414,
+        "y": 233.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "558b33bb.a28914",
+        "id": "73820c83.e6bf7c",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 2634.75,
-        "y": 2176.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 2632.566665649414,
+        "y": 2126.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "14b3fe.dfa6ec02",
+        "id": "4c82daf8.25cd8c",
         "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": 2604.75,
-        "y": 4019.75,
-        "z": "265dc029.a18eb8",
+        "x": 2602.566665649414,
+        "y": 3969.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "ccca18a2.ea7ad8",
+        "id": "19eb9ce6.88ad83",
         "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": 2661.75,
-        "y": 856.75,
-        "z": "265dc029.a18eb8",
+        "x": 2659.566665649414,
+        "y": 806.5666656494141,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "cca04ac5.91465",
+        "id": "454059c8.1f8fc",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 2960.75,
-        "y": 2573.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 2958.566665649414,
+        "y": 2523.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "632d67d8.477b4"
+                "9289ae0a.6f50b8"
             ]
         ]
     },
     {
-        "id": "509c5188.74c83",
+        "id": "bdbfdefa.d898a",
         "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",
+        "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-ltp-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-ltp-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": 3778.75,
-        "y": 3008.75,
-        "z": "265dc029.a18eb8",
+        "x": 3776.566665649414,
+        "y": 2958.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "47e5c711.f9e42"
+                "4ee8fff5.d7b41"
             ]
         ]
     },
     {
-        "id": "e45b6160.4b64a",
+        "id": "8e0ed487.e42d7",
         "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": 4346.249755859375,
-        "y": 3117.75,
-        "z": "265dc029.a18eb8",
+        "x": 4344.066421508789,
+        "y": 3067.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "47e5c711.f9e42",
+        "id": "4ee8fff5.d7b41",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4084.75,
-        "y": 3007.75,
-        "z": "265dc029.a18eb8",
+        "x": 4082.566665649414,
+        "y": 2957.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "145a15c9.c3f512"
+                "fd74d2bf.3f7ab"
             ]
         ]
     },
     {
-        "id": "145a15c9.c3f512",
+        "id": "fd74d2bf.3f7ab",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4294.25,
-        "y": 3008.00390625,
-        "z": "265dc029.a18eb8",
+        "x": 4292.066665649414,
+        "y": 2957.820571899414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "7555fbf6.cdbdcc",
+        "id": "b7aeb66a.da2a",
         "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": 3811.75,
-        "y": 2487.75,
-        "z": "265dc029.a18eb8",
+        "x": 3809.566665649414,
+        "y": 2437.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "6602c404.9c0314",
+        "id": "17919727.aa0719",
         "type": "switchNode",
         "name": "switch otnidx == 0",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3687.75,
-        "y": 3125.75,
-        "z": "265dc029.a18eb8",
+        "x": 3685.566665649414,
+        "y": 3075.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "ecf5d9ca.029638",
-                "7cbff457.bc10a4"
+                "55f22aaa.a85d4c",
+                "d9550f9f.2910e"
             ]
         ]
     },
     {
-        "id": "ecf5d9ca.029638",
+        "id": "55f22aaa.a85d4c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3870.75,
-        "y": 3125.75,
-        "z": "265dc029.a18eb8",
+        "x": 3868.566665649414,
+        "y": 3075.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "8b66f50b.a495e"
+                "6f87de55.68d3f8"
             ]
         ]
     },
     {
-        "id": "7cbff457.bc10a4",
+        "id": "d9550f9f.2910e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3695.75,
-        "y": 3272.75,
-        "z": "265dc029.a18eb8",
+        "x": 3693.566665649414,
+        "y": 3222.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "98fe960.02a01e8"
+                "d8da513c.d505d8"
             ]
         ]
     },
     {
-        "id": "a6856d07.c2a888",
+        "id": "d53fd4f3.30e108",
         "type": "switchNode",
         "name": "switch otnidx == last",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4036.75,
-        "y": 3353.75,
-        "z": "265dc029.a18eb8",
+        "x": 4034.566665649414,
+        "y": 3303.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "95cc5926.bc205",
-                "51ef39f3.21a02"
+                "ccd79b30.c48ac8",
+                "81229291.49d3d"
             ]
         ]
     },
     {
-        "id": "95cc5926.bc205",
+        "id": "ccd79b30.c48ac8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4221.75,
-        "y": 3354.75,
-        "z": "265dc029.a18eb8",
+        "x": 4219.566665649414,
+        "y": 3304.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "7a243a1b.dc43dc"
+                "662ad553.4604e4"
             ]
         ]
     },
     {
-        "id": "51ef39f3.21a02",
+        "id": "81229291.49d3d",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4240.75,
-        "y": 3620.75,
-        "z": "265dc029.a18eb8",
+        "x": 4238.566665649414,
+        "y": 3570.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "d80d30d2.312238"
+                "c0c1efea.822dc8"
             ]
         ]
     },
     {
-        "id": "5262e36b.131f54",
+        "id": "1aa66b17.8d75f5",
         "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": 4651.75,
-        "y": 3355.75,
-        "z": "265dc029.a18eb8",
+        "x": 4649.566665649414,
+        "y": 3305.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "fe37c597.d52ae8",
+        "id": "e1bc4bbf.1d8018",
         "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": 4725.75,
-        "y": 3653.75,
-        "z": "265dc029.a18eb8",
+        "x": 4723.566665649414,
+        "y": 3603.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "f1eb5c8d.f0efd",
+        "id": "42d4345e.c60ee4",
         "type": "save",
         "name": "save connectivity resource in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='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": 4661.75,
-        "y": 3704.75,
-        "z": "265dc029.a18eb8",
+        "x": 4659.566665649414,
+        "y": 3654.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "269da2fb.91d39e",
+        "id": "ffc4c195.e5a98",
         "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": 4790.75,
-        "y": 3754.75,
-        "z": "265dc029.a18eb8",
+        "x": 4788.566665649414,
+        "y": 3704.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "72735598.b392e4",
+        "id": "8d280419.13bb38",
         "type": "comment",
         "name": "connectivity has not been created for middle domains, so we have to create one",
         "info": "",
         "comments": "",
-        "x": 4800.75,
-        "y": 3597.75,
-        "z": "265dc029.a18eb8",
+        "x": 4798.566665649414,
+        "y": 3547.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "c95e91b6.ee604",
+        "id": "ab9a4509.1c756",
         "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": 4758.75,
-        "y": 3813.75,
-        "z": "265dc029.a18eb8",
+        "x": 4756.566665649414,
+        "y": 3763.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "d80d30d2.312238",
+        "id": "c0c1efea.822dc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4397.75,
-        "y": 3621.75,
-        "z": "265dc029.a18eb8",
+        "x": 4395.566665649414,
+        "y": 3571.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "fe37c597.d52ae8",
-                "f1eb5c8d.f0efd",
-                "269da2fb.91d39e",
-                "c95e91b6.ee604",
-                "e869dcfa.21d6a"
+                "e1bc4bbf.1d8018",
+                "42d4345e.c60ee4",
+                "ffc4c195.e5a98",
+                "ab9a4509.1c756",
+                "d4ea603c.b425d8"
             ]
         ]
     },
     {
-        "id": "632d67d8.477b4",
+        "id": "9289ae0a.6f50b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3229.75,
-        "y": 2573.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 3227.566665649414,
+        "y": 2523.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "7555fbf6.cdbdcc",
-                "509c5188.74c83",
-                "6602c404.9c0314",
-                "a7981473.cca18",
-                "67f8bed4.589038",
-                "84f21d5d.cb936",
-                "cf841c7f.9aedb"
+                "b7aeb66a.da2a",
+                "bdbfdefa.d898a",
+                "17919727.aa0719",
+                "95f5c4e3.614088",
+                "b6d3651d.4b2128",
+                "fe8a7144.adc7d8",
+                "162254fa.d7f113"
             ]
         ]
     },
     {
-        "id": "355e2bbf.8d08b4",
+        "id": "ab727fcb.09998",
         "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": 4275.75,
-        "y": 3169.75,
-        "z": "265dc029.a18eb8",
+        "x": 4273.566665649414,
+        "y": 3119.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "5e65478a.e55ec8",
+        "id": "118a71a6.05f0f6",
         "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": 4328.75,
-        "y": 3213.75,
-        "z": "265dc029.a18eb8",
+        "x": 4326.566665649414,
+        "y": 3163.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6aa94454.63c71c",
-                "8b32fc97.557eb"
+                "e0f8cea0.4a9908",
+                "3c7e45bc.067942"
             ]
         ]
     },
     {
-        "id": "8b32fc97.557eb",
+        "id": "3c7e45bc.067942",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4599.75,
-        "y": 3198.75,
-        "z": "265dc029.a18eb8",
+        "x": 4597.566665649414,
+        "y": 3148.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "25abbf8d.056b1"
+                "a8f23bb.c77ec48"
             ]
         ]
     },
     {
-        "id": "6aa94454.63c71c",
+        "id": "e0f8cea0.4a9908",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4597.750213623047,
-        "y": 3256.74990940094,
-        "z": "265dc029.a18eb8",
+        "x": 4595.566879272461,
+        "y": 3206.566575050354,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "e943d471.fc5ba"
+                "d71a2665.7073"
             ]
         ]
     },
     {
-        "id": "25abbf8d.056b1",
+        "id": "a8f23bb.c77ec48",
         "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": 4739.750247955322,
-        "y": 3198.7500009536743,
-        "z": "265dc029.a18eb8",
+        "x": 4737.566913604736,
+        "y": 3148.5666666030884,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "e943d471.fc5ba",
+        "id": "d71a2665.7073",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4745.77725982666,
-        "y": 3247.495394706726,
-        "z": "265dc029.a18eb8",
+        "x": 4743.593925476074,
+        "y": 3197.31206035614,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "8b66f50b.a495e",
+        "id": "6f87de55.68d3f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4011.75,
-        "y": 3115.75,
-        "z": "265dc029.a18eb8",
+        "x": 4009.566665649414,
+        "y": 3065.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "e45b6160.4b64a",
-                "355e2bbf.8d08b4"
+                "8e0ed487.e42d7",
+                "ab727fcb.09998"
             ]
         ]
     },
     {
-        "id": "7a243a1b.dc43dc",
+        "id": "662ad553.4604e4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4355.75,
-        "y": 3355.75,
-        "z": "265dc029.a18eb8",
+        "x": 4353.566665649414,
+        "y": 3305.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "5262e36b.131f54",
-                "74f9fcf1.d739a4"
+                "1aa66b17.8d75f5",
+                "c0b9b434.8e9d68"
             ]
         ]
     },
     {
-        "id": "74f9fcf1.d739a4",
+        "id": "c0b9b434.8e9d68",
         "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": 4575.75,
-        "y": 3399.75,
-        "z": "265dc029.a18eb8",
+        "x": 4573.566665649414,
+        "y": 3349.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "14bf600d.e67a7",
+        "id": "301e3c75.5bbc74",
         "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": 4626.75,
-        "y": 3443.75,
-        "z": "265dc029.a18eb8",
+        "x": 4624.566665649414,
+        "y": 3393.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b9df2951.d6312",
-                "2675c857.253648"
+                "a09528f5.629fe",
+                "14dc5b75.dea77d"
             ]
         ]
     },
     {
-        "id": "2675c857.253648",
+        "id": "14dc5b75.dea77d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4889.75,
-        "y": 3423.75,
-        "z": "265dc029.a18eb8",
+        "x": 4887.566665649414,
+        "y": 3373.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "ee37ae98.df0788"
+                "5042c1df.677818"
             ]
         ]
     },
     {
-        "id": "b9df2951.d6312",
+        "id": "a09528f5.629fe",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4890.750213623047,
-        "y": 3474.74990940094,
-        "z": "265dc029.a18eb8",
+        "x": 4888.566879272461,
+        "y": 3424.566575050354,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6b1e1b93.fd4064"
+                "33874991.bee64e"
             ]
         ]
     },
     {
-        "id": "ee37ae98.df0788",
+        "id": "5042c1df.677818",
         "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": 5029.750247955322,
-        "y": 3423.7500009536743,
-        "z": "265dc029.a18eb8",
+        "x": 5027.566913604736,
+        "y": 3373.5666666030884,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "6b1e1b93.fd4064",
+        "id": "33874991.bee64e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5035.77725982666,
-        "y": 3472.495394706726,
-        "z": "265dc029.a18eb8",
+        "x": 5033.593925476074,
+        "y": 3422.31206035614,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "e869dcfa.21d6a",
+        "id": "d4ea603c.b425d8",
         "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": 4672.75,
-        "y": 3873.75,
-        "z": "265dc029.a18eb8",
+        "x": 4670.566665649414,
+        "y": 3823.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "7226b3cc.67998c",
+        "id": "595a55d4.c6d114",
         "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": 1991.75,
-        "y": 4220.75,
-        "z": "265dc029.a18eb8",
+        "x": 1989.566665649414,
+        "y": 4170.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "afb2b4e.a4009c8",
-                "c2c67e99.895238",
-                "f60b7df.b2997"
+                "a51dbe92.37237",
+                "3a1bef9e.09d96",
+                "3c9654f7.84efec"
             ]
         ]
     },
     {
-        "id": "afb2b4e.a4009c8",
+        "id": "a51dbe92.37237",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2179.75,
-        "y": 4233.75,
-        "z": "265dc029.a18eb8",
+        "x": 2177.566665649414,
+        "y": 4183.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "81feb431.c2cd38"
+                "2ff802e6.3e618e"
             ]
         ]
     },
     {
-        "id": "c2c67e99.895238",
+        "id": "3a1bef9e.09d96",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2180.240966796875,
-        "y": 4279.324035644531,
-        "z": "265dc029.a18eb8",
+        "x": 2178.057632446289,
+        "y": 4229.140701293945,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "63caf3db.7d3514"
+                "796f31f7.3192a"
             ]
         ]
     },
     {
-        "id": "f60b7df.b2997",
+        "id": "3c9654f7.84efec",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2177.75,
-        "y": 4322.75,
-        "z": "265dc029.a18eb8",
+        "x": 2175.566665649414,
+        "y": 4272.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "bc2cc67c.a26e68"
+                "c3c766ba.769dc"
             ]
         ]
     },
     {
-        "id": "81feb431.c2cd38",
+        "id": "2ff802e6.3e618e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2352.75,
-        "y": 4231.75,
-        "z": "265dc029.a18eb8",
+        "x": 2350.566665649414,
+        "y": 4181.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "799860e4.4d402"
+                "f3904f81.c3271"
             ]
         ]
     },
     {
-        "id": "63caf3db.7d3514",
+        "id": "796f31f7.3192a",
         "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": 2342.8123779296875,
-        "y": 4279.609771728516,
-        "z": "265dc029.a18eb8",
+        "x": 2340.6290435791016,
+        "y": 4229.42643737793,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "bc2cc67c.a26e68",
+        "id": "c3c766ba.769dc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2344.75,
-        "y": 4321.75,
-        "z": "265dc029.a18eb8",
+        "x": 2342.566665649414,
+        "y": 4271.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "e9edd1fa.062c48",
+        "id": "453ae034.8e8bd",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1980.75,
-        "y": 4411.75,
-        "z": "265dc029.a18eb8",
+        "x": 1978.566665649414,
+        "y": 4361.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "213a40e6.50fa5"
+                "117eef78.4f86d1"
             ]
         ]
     },
     {
-        "id": "ef976188.656f28",
+        "id": "61e418c6.05702",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2790.75,
-        "y": 4411.75,
-        "z": "265dc029.a18eb8",
+        "x": 2788.566665649414,
+        "y": 4361.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "17b05ad0.008d15"
+                "ddbfd88a.9c9a8"
             ]
         ]
     },
     {
-        "id": "21007b2.f080e84",
+        "id": "f5da17e3.f4f82",
         "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": 2562.75,
-        "y": 4411.75,
-        "z": "265dc029.a18eb8",
+        "x": 2560.566665649414,
+        "y": 4361.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "ef976188.656f28"
+                "61e418c6.05702"
             ]
         ]
     },
     {
-        "id": "51229269.4b1c8c",
+        "id": "2dc803c6.2ce1ec",
         "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": 3682.75,
-        "y": 4178.75,
-        "z": "265dc029.a18eb8",
+        "x": 3680.566665649414,
+        "y": 4128.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "35c690e7.fe6c",
+        "id": "2436e4ee.8823ac",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
         "comments": "",
-        "x": 3984.75,
-        "y": 3304.75,
-        "z": "265dc029.a18eb8",
+        "x": 3982.566665649414,
+        "y": 3254.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "98fe960.02a01e8",
+        "id": "d8da513c.d505d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3819.75,
-        "y": 3279.75,
-        "z": "265dc029.a18eb8",
+        "x": 3817.566665649414,
+        "y": 3229.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "35c690e7.fe6c",
-                "a6856d07.c2a888"
+                "2436e4ee.8823ac",
+                "d53fd4f3.30e108"
             ]
         ]
     },
     {
-        "id": "50d31847.5f509",
+        "id": "2bc653ca.37208c",
         "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\n",
         "comments": "",
-        "x": 1939.75,
-        "y": 295.75,
-        "z": "265dc029.a18eb8",
+        "x": 1937.566665649414,
+        "y": 245.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "799860e4.4d402",
+        "id": "f3904f81.c3271",
         "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": 2581.75,
-        "y": 4232.75,
-        "z": "265dc029.a18eb8",
+        "x": 2579.566665649414,
+        "y": 4182.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "abc14f3.125f83"
+                "ab95770a.fdf8d8"
             ]
         ]
     },
     {
-        "id": "abc14f3.125f83",
+        "id": "ab95770a.fdf8d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2796.75,
-        "y": 4233.75,
-        "z": "265dc029.a18eb8",
+        "x": 2794.566665649414,
+        "y": 4183.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "cf481547.940d"
+                "4572270e.4cc878"
             ]
         ]
     },
     {
-        "id": "22357a40.6f5826",
+        "id": "7657e809.bd4338",
         "type": "for",
         "name": "for arridx in tmp.arr",
         "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4249.75,
-        "y": 4153.75,
-        "z": "265dc029.a18eb8",
+        "x": 4247.566665649414,
+        "y": 4103.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6890c215.76779c"
+                "2d5e8bfa.4e34c4"
             ]
         ]
     },
     {
-        "id": "a03f6736.1a323",
+        "id": "348ff77c.2874e",
         "type": "switchNode",
         "name": "switch $tmp.arr_length != 0",
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3715.75,
-        "y": 4233.75,
-        "z": "265dc029.a18eb8",
+        "x": 3713.566665649414,
+        "y": 4183.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "9db4f6d6.d9ce7",
-                "6099e33b.8b2e7c"
+                "aaec96ed.8fc3f8",
+                "345640e2.a4f5"
             ]
         ]
     },
     {
-        "id": "9db4f6d6.d9ce7",
+        "id": "aaec96ed.8fc3f8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3911.75,
-        "y": 4203.75,
-        "z": "265dc029.a18eb8",
+        "x": 3909.566665649414,
+        "y": 4153.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6cbffd71.0d955c"
+                "ef034c52.313218"
             ]
         ]
     },
     {
-        "id": "6099e33b.8b2e7c",
+        "id": "345640e2.a4f5",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3912.75,
-        "y": 4274.75,
-        "z": "265dc029.a18eb8",
+        "x": 3910.566665649414,
+        "y": 4224.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "cb3a25fd.09afe8"
+                "4615fa47.ce995c"
             ]
         ]
     },
     {
-        "id": "6cbffd71.0d955c",
+        "id": "ef034c52.313218",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4062.75,
-        "y": 4201.75,
-        "z": "265dc029.a18eb8",
+        "x": 4060.566665649414,
+        "y": 4151.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "22357a40.6f5826",
-                "691995c9.4a5b7c"
+                "7657e809.bd4338",
+                "99ff2572.ae5bd8"
             ]
         ]
     },
     {
-        "id": "6890c215.76779c",
+        "id": "2d5e8bfa.4e34c4",
         "type": "switchNode",
         "name": "switch tmp.arr[$arridx] == $providerValue",
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4540.75,
-        "y": 4153.75,
-        "z": "265dc029.a18eb8",
+        "x": 4538.566665649414,
+        "y": 4103.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "31547cc0.03bc84",
-                "df9fb700.28a918"
+                "74d52764.8968e",
+                "422a321a.b2832c"
             ]
         ]
     },
     {
-        "id": "31547cc0.03bc84",
+        "id": "74d52764.8968e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4815.75,
-        "y": 4122.75,
-        "z": "265dc029.a18eb8",
+        "x": 4813.566665649414,
+        "y": 4072.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "bf755b2.9db4a28"
+                "a103a093.ac31f"
             ]
         ]
     },
     {
-        "id": "df9fb700.28a918",
+        "id": "422a321a.b2832c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4816.75,
-        "y": 4193.75,
-        "z": "265dc029.a18eb8",
+        "x": 4814.566665649414,
+        "y": 4143.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "7fbeef42.b23dd"
+                "21b48848.76a4e8"
             ]
         ]
     },
     {
-        "id": "bf755b2.9db4a28",
+        "id": "a103a093.ac31f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4966.75,
-        "y": 4120.75,
-        "z": "265dc029.a18eb8",
+        "x": 4964.566665649414,
+        "y": 4070.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "a9bad327.3607d8",
-                "47f11e50.783bc8",
-                "c8d8ebb6.b093d8",
-                "aab03464.9d75e",
-                "aa4f54f.319aaa8"
+                "1399831a.95817d",
+                "a97a9bc.95aee68",
+                "9a54915d.342ba",
+                "45c78650.ee321",
+                "6d2b0039.7ed8f8"
             ]
         ]
     },
     {
-        "id": "a9bad327.3607d8",
+        "id": "1399831a.95817d",
         "type": "set",
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 5154.75,
-        "y": 4080.75,
-        "z": "265dc029.a18eb8",
+        "x": 5152.566665649414,
+        "y": 4030.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "47f11e50.783bc8",
+        "id": "a97a9bc.95aee68",
         "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": 5226.75,
-        "y": 4125.75,
-        "z": "265dc029.a18eb8",
+        "x": 5224.566665649414,
+        "y": 4075.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa4f54f.319aaa8",
+        "id": "6d2b0039.7ed8f8",
         "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": 5141.75,
-        "y": 4252.75,
-        "z": "265dc029.a18eb8",
+        "x": 5139.566665649414,
+        "y": 4202.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "aab03464.9d75e",
+        "id": "45c78650.ee321",
         "type": "set",
         "name": "set sizeOfSliceList",
         "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
         "comments": "",
-        "x": 5162.75,
-        "y": 4188.75,
-        "z": "265dc029.a18eb8",
+        "x": 5160.566665649414,
+        "y": 4138.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "cb3a25fd.09afe8",
+        "id": "4615fa47.ce995c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4064.75,
-        "y": 4274.75,
-        "z": "265dc029.a18eb8",
+        "x": 4062.566665649414,
+        "y": 4224.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6bbef268.dd7bec",
-                "a07fd57f.628ce8"
+                "5a456a9a.ca9fe4",
+                "40274316.6c2efc"
             ]
         ]
     },
     {
-        "id": "6bbef268.dd7bec",
+        "id": "5a456a9a.ca9fe4",
         "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": 4319.75,
-        "y": 4267.75,
-        "z": "265dc029.a18eb8",
+        "x": 4317.566665649414,
+        "y": 4217.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "a07fd57f.628ce8",
+        "id": "40274316.6c2efc",
         "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": 4247.75,
-        "y": 4314.75,
-        "z": "265dc029.a18eb8",
+        "x": 4245.566665649414,
+        "y": 4264.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "691995c9.4a5b7c",
+        "id": "99ff2572.ae5bd8",
         "type": "switchNode",
         "name": "switch found?",
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4240.75,
-        "y": 4198.75,
-        "z": "265dc029.a18eb8",
+        "x": 4238.566665649414,
+        "y": 4148.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "62e3ceb.ffa193",
-                "b6d5bce1.09744"
+                "87cdada5.109e78",
+                "3257173b.764f"
             ]
         ]
     },
     {
-        "id": "62e3ceb.ffa193",
+        "id": "87cdada5.109e78",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4400.75,
-        "y": 4190.75,
-        "z": "265dc029.a18eb8",
+        "x": 4398.566665649414,
+        "y": 4140.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "1a17890a.8f540f"
+                "7591082d.c8b188"
             ]
         ]
     },
     {
-        "id": "b6d5bce1.09744",
+        "id": "3257173b.764f",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4398.75,
-        "y": 4227.75,
-        "z": "265dc029.a18eb8",
+        "x": 4396.566665649414,
+        "y": 4177.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "5a545bc0.7dd69c"
+                "961d3382.a894a"
             ]
         ]
     },
     {
-        "id": "1a17890a.8f540f",
+        "id": "7591082d.c8b188",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4525.75,
-        "y": 4190.75,
-        "z": "265dc029.a18eb8",
+        "x": 4523.566665649414,
+        "y": 4140.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "f0fb3ac4.b3f8f",
+        "id": "5f6e1c86.8e0944",
         "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": 4832.75,
-        "y": 4248.75,
-        "z": "265dc029.a18eb8",
+        "x": 4830.566665649414,
+        "y": 4198.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "5a545bc0.7dd69c",
+        "id": "961d3382.a894a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4558.75,
-        "y": 4235.75,
-        "z": "265dc029.a18eb8",
+        "x": 4556.566665649414,
+        "y": 4185.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "f0fb3ac4.b3f8f",
-                "bad15fff.31fcb8"
+                "5f6e1c86.8e0944",
+                "7721321d.e1d404"
             ]
         ]
     },
     {
-        "id": "bad15fff.31fcb8",
+        "id": "7721321d.e1d404",
         "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": 4749.75,
-        "y": 4294.75,
-        "z": "265dc029.a18eb8",
+        "x": 4747.566665649414,
+        "y": 4244.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "7fbeef42.b23dd",
+        "id": "21b48848.76a4e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4949.75,
-        "y": 4192.75,
-        "z": "265dc029.a18eb8",
+        "x": 4947.566665649414,
+        "y": 4142.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "c8d8ebb6.b093d8",
+        "id": "9a54915d.342ba",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5120.75,
-        "y": 4319.75,
-        "z": "265dc029.a18eb8",
+        "x": 5118.566665649414,
+        "y": 4269.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "a7981473.cca18",
+        "id": "95f5c4e3.614088",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3521.75,
-        "y": 2577.7501220703125,
-        "z": "265dc029.a18eb8",
+        "x": 3519.566665649414,
+        "y": 2527.5667877197266,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "c33d9535.8046e8",
-                "63062baf.1fbb34"
+                "4a77c65a.c74ba8",
+                "25e326d1.6ed842"
             ]
         ]
     },
     {
-        "id": "c33d9535.8046e8",
+        "id": "4a77c65a.c74ba8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3891.75,
-        "y": 2538.75,
-        "z": "265dc029.a18eb8",
+        "x": 3889.566665649414,
+        "y": 2488.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "45a9cb43.516104"
+                "2629aacf.e119ee"
             ]
         ]
     },
     {
-        "id": "63062baf.1fbb34",
+        "id": "25e326d1.6ed842",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3892.75,
-        "y": 2584.75,
-        "z": "265dc029.a18eb8",
+        "x": 3890.566665649414,
+        "y": 2534.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "f89446bd.e3f558"
+                "8acfbdff.4211d"
             ]
         ]
     },
     {
-        "id": "45a9cb43.516104",
+        "id": "2629aacf.e119ee",
         "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": 4105.75,
-        "y": 2537.75,
-        "z": "265dc029.a18eb8",
+        "x": 4103.566665649414,
+        "y": 2487.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "f89446bd.e3f558",
+        "id": "8acfbdff.4211d",
         "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": 4103.75,
-        "y": 2582.75,
-        "z": "265dc029.a18eb8",
+        "x": 4101.566665649414,
+        "y": 2532.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "17b05ad0.008d15",
+        "id": "ddbfd88a.9c9a8",
         "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": 3043.75,
-        "y": 4409.75,
-        "z": "265dc029.a18eb8",
+        "x": 3041.566665649414,
+        "y": 4359.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "7cf6092b.1331b",
+        "id": "51e14abb.56c3cc",
         "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": 2628.75,
-        "y": 4517.75,
-        "z": "265dc029.a18eb8",
+        "x": 2626.566665649414,
+        "y": 4467.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "37bbe2d.a04a59e",
-                "ec906b95.a9e49"
+                "fe5cfaf0.e7454",
+                "ad93ca1a.fadb5"
             ]
         ]
     },
     {
-        "id": "ec906b95.a9e49",
+        "id": "ad93ca1a.fadb5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2911.75,
-        "y": 4497.75,
-        "z": "265dc029.a18eb8",
+        "x": 2909.566665649414,
+        "y": 4447.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "4e96bd46.3d74cc"
+                "414cbf7e.8e5b68"
             ]
         ]
     },
     {
-        "id": "37bbe2d.a04a59e",
+        "id": "fe5cfaf0.e7454",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2912.750213623047,
-        "y": 4548.74990940094,
-        "z": "265dc029.a18eb8",
+        "x": 2910.566879272461,
+        "y": 4498.566575050354,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "9691327c.3cba08"
+                "4b1e5bf7.658ebc"
             ]
         ]
     },
     {
-        "id": "4e96bd46.3d74cc",
+        "id": "414cbf7e.8e5b68",
         "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": 3051.7502479553223,
-        "y": 4497.750000953674,
-        "z": "265dc029.a18eb8",
+        "x": 3049.5669136047363,
+        "y": 4447.566666603088,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "9691327c.3cba08",
+        "id": "4b1e5bf7.658ebc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3057.77725982666,
-        "y": 4546.495394706726,
-        "z": "265dc029.a18eb8",
+        "x": 3055.593925476074,
+        "y": 4496.31206035614,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "67f8bed4.589038",
+        "id": "b6d3651d.4b2128",
         "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": 3701.75,
-        "y": 2651.75,
-        "z": "265dc029.a18eb8",
+        "x": 3699.566665649414,
+        "y": 2601.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "84f21d5d.cb936",
+        "id": "fe8a7144.adc7d8",
         "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": 3745.75,
-        "y": 2699.75,
-        "z": "265dc029.a18eb8",
+        "x": 3743.566665649414,
+        "y": 2649.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "843896b4.ca2438",
-                "ac8c03cf.0b987",
-                "317bf09e.750c58"
+                "b714ba8d.c5ffb8",
+                "a60d7d36.823ed8",
+                "a5a24671.692cf"
             ]
         ]
     },
     {
-        "id": "843896b4.ca2438",
+        "id": "b714ba8d.c5ffb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3958.25,
-        "y": 2646.75,
-        "z": "265dc029.a18eb8",
+        "x": 3956.066665649414,
+        "y": 2596.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6887d40d.f6aafc"
+                "d2742bb.34f15d8"
             ]
         ]
     },
     {
-        "id": "ac8c03cf.0b987",
+        "id": "a60d7d36.823ed8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3970.25,
-        "y": 2696.75,
-        "z": "265dc029.a18eb8",
+        "x": 3968.066665649414,
+        "y": 2646.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "1adffb9b.f04b4c"
+                "bdd55fbe.5d6ad"
             ]
         ]
     },
     {
-        "id": "317bf09e.750c58",
+        "id": "a5a24671.692cf",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3961.25,
-        "y": 2751.75,
-        "z": "265dc029.a18eb8",
+        "x": 3959.066665649414,
+        "y": 2701.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "1d79ff10.1f9c61"
+                "ab51c20f.833f78"
             ]
         ]
     },
     {
-        "id": "1d79ff10.1f9c61",
+        "id": "ab51c20f.833f78",
         "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": 4106.25,
-        "y": 2750.75,
-        "z": "265dc029.a18eb8",
+        "x": 4104.066665649414,
+        "y": 2700.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "1adffb9b.f04b4c",
+        "id": "bdd55fbe.5d6ad",
         "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": 4117.25,
-        "y": 2693.75,
-        "z": "265dc029.a18eb8",
+        "x": 4115.066665649414,
+        "y": 2643.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "6887d40d.f6aafc",
+        "id": "d2742bb.34f15d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4083.6324462890625,
-        "y": 2640.4056701660156,
-        "z": "265dc029.a18eb8",
+        "x": 4081.4491119384766,
+        "y": 2590.2223358154297,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b8e05e44.e79d2"
+                "8f6f5e70.e20c98"
             ]
         ]
     },
     {
-        "id": "9d661556.4c1148",
+        "id": "312ea2fc.0d315e",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4642.75,
-        "y": 2658.75,
-        "z": "265dc029.a18eb8",
+        "x": 4640.566665649414,
+        "y": 2608.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "2a2f98dd.6349d"
+                "3e733270.8b1bbe"
             ]
         ]
     },
     {
-        "id": "2a2f98dd.6349d",
+        "id": "3e733270.8b1bbe",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4819.75,
-        "y": 2650.75,
-        "z": "265dc029.a18eb8",
+        "x": 4817.566665649414,
+        "y": 2600.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "8fec35b6.fb7118",
-                "8057ed3d.b8b71"
+                "9e837f8d.cf1ae8",
+                "43b4fd14.fc62c4"
             ]
         ]
     },
     {
-        "id": "b8e05e44.e79d2",
+        "id": "8f6f5e70.e20c98",
         "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": 4244.75,
-        "y": 2654.75,
-        "z": "265dc029.a18eb8",
+        "x": 4242.566665649414,
+        "y": 2604.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "20794f9a.c05a58"
+                "f9825a64.03425"
             ]
         ]
     },
     {
-        "id": "20794f9a.c05a58",
+        "id": "f9825a64.03425",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4439.75,
-        "y": 2654.75,
-        "z": "265dc029.a18eb8",
+        "x": 4437.566665649414,
+        "y": 2604.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "9d661556.4c1148"
+                "312ea2fc.0d315e"
             ]
         ]
     },
     {
-        "id": "8057ed3d.b8b71",
+        "id": "43b4fd14.fc62c4",
         "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": 5027.75,
-        "y": 2657.75,
-        "z": "265dc029.a18eb8",
+        "x": 5025.566665649414,
+        "y": 2607.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "326bc8b9.4e89f8",
-                "c42e4071.ccae88",
-                "2f974d9f.6edb3a"
+                "a51a4275.e6efc",
+                "1b79b7.465ad64a",
+                "1ec56b27.96893d"
             ]
         ]
     },
     {
-        "id": "8fec35b6.fb7118",
+        "id": "9e837f8d.cf1ae8",
         "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": 5057.75,
-        "y": 2605.75,
-        "z": "265dc029.a18eb8",
+        "x": 5055.566665649414,
+        "y": 2555.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "326bc8b9.4e89f8",
+        "id": "a51a4275.e6efc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5237.75,
-        "y": 2648.75,
-        "z": "265dc029.a18eb8",
+        "x": 5235.566665649414,
+        "y": 2598.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "bbcf0dbb.ad16f8"
+                "891ba052.ed05"
             ]
         ]
     },
     {
-        "id": "c42e4071.ccae88",
+        "id": "1b79b7.465ad64a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5229.75,
-        "y": 2703.75,
-        "z": "265dc029.a18eb8",
+        "x": 5227.566665649414,
+        "y": 2653.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "5371f364.6c9824"
+                "46385009.ed8b1"
             ]
         ]
     },
     {
-        "id": "2f974d9f.6edb3a",
+        "id": "1ec56b27.96893d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5234.75,
-        "y": 2760.75,
-        "z": "265dc029.a18eb8",
+        "x": 5232.566665649414,
+        "y": 2710.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "32c39ad7.59b1f6"
+                "1a9be7a.401fb18"
             ]
         ]
     },
     {
-        "id": "32c39ad7.59b1f6",
+        "id": "1a9be7a.401fb18",
         "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": 5386.75,
-        "y": 2761.75,
-        "z": "265dc029.a18eb8",
+        "x": 5384.566665649414,
+        "y": 2711.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "5371f364.6c9824",
+        "id": "46385009.ed8b1",
         "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": 5397.75,
-        "y": 2706.75,
-        "z": "265dc029.a18eb8",
+        "x": 5395.566665649414,
+        "y": 2656.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "bbcf0dbb.ad16f8",
+        "id": "891ba052.ed05",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5382.13232421875,
-        "y": 2646.4056701660156,
-        "z": "265dc029.a18eb8",
+        "x": 5379.948989868164,
+        "y": 2596.2223358154297,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "3a973226.73340e"
+                "4f6c7f97.54ddd8"
             ]
         ]
     },
     {
-        "id": "3a973226.73340e",
+        "id": "4f6c7f97.54ddd8",
         "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": 5596.75,
-        "y": 2642.75,
-        "z": "265dc029.a18eb8",
+        "x": 5594.566665649414,
+        "y": 2592.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "213a40e6.50fa5",
+        "id": "117eef78.4f86d1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2212.75,
-        "y": 4409.75,
-        "z": "265dc029.a18eb8",
+        "x": 2210.566665649414,
+        "y": 4359.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "21007b2.f080e84",
-                "7cf6092b.1331b"
+                "f5da17e3.f4f82",
+                "51e14abb.56c3cc"
             ]
         ]
     },
     {
-        "id": "cf841c7f.9aedb",
+        "id": "162254fa.d7f113",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3715.75,
-        "y": 2868.75,
-        "z": "265dc029.a18eb8",
+        "x": 3713.566665649414,
+        "y": 2818.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "1b951b0e.92335d",
-                "f7aacac2.db3d8"
+                "4ba218c1.83488",
+                "bbf91ed2.3d1698"
             ]
         ]
     },
     {
-        "id": "1b951b0e.92335d",
+        "id": "4ba218c1.83488",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3916.75,
-        "y": 2866.75,
-        "z": "265dc029.a18eb8",
+        "x": 3914.566665649414,
+        "y": 2816.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "9efec827.a86c9"
+                "c5a6daa.df89d28"
             ]
         ]
     },
     {
-        "id": "8c34835c.e791b",
+        "id": "b51d81a7.df9ce8",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 4197.75,
-        "y": 2816.75,
-        "z": "265dc029.a18eb8",
+        "x": 4195.566665649414,
+        "y": 2766.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "b7bb7b24.1b292",
+        "id": "cc08c38c.ee0da",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4133.75,
-        "y": 2917.75,
-        "z": "265dc029.a18eb8",
+        "x": 4131.566665649414,
+        "y": 2867.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "fd4b8583.fd9098",
-                "bed77cd6.05b48"
+                "cc3f7988.cb629",
+                "a10beb4c.1d2f6"
             ]
         ]
     },
     {
-        "id": "fd4b8583.fd9098",
+        "id": "cc3f7988.cb629",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4363.75,
-        "y": 2913.75,
-        "z": "265dc029.a18eb8",
+        "x": 4361.566665649414,
+        "y": 2863.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "16a0b639.60baea"
+                "ba88a8bc.8452c"
             ]
         ]
     },
     {
-        "id": "b96f50fd.127ab8",
+        "id": "c32b6bd2.d5291",
         "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": 4700.75,
-        "y": 2857.75,
-        "z": "265dc029.a18eb8",
+        "x": 4698.566665649414,
+        "y": 2807.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "f7aacac2.db3d8",
+        "id": "bbf91ed2.3d1698",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3916.75,
-        "y": 2915.75,
-        "z": "265dc029.a18eb8",
+        "x": 3914.566665649414,
+        "y": 2865.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b7bb7b24.1b292"
+                "cc08c38c.ee0da"
             ]
         ]
     },
     {
-        "id": "bed77cd6.05b48",
+        "id": "a10beb4c.1d2f6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4364.75,
-        "y": 2959.75,
-        "z": "265dc029.a18eb8",
+        "x": 4362.566665649414,
+        "y": 2909.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "6600d5fa.31b8fc"
+                "3bd22ad4.011c86"
             ]
         ]
     },
     {
-        "id": "6600d5fa.31b8fc",
+        "id": "3bd22ad4.011c86",
         "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": 4578.75,
-        "y": 2959.75,
-        "z": "265dc029.a18eb8",
+        "x": 4576.566665649414,
+        "y": 2909.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "3048e42b.381204",
+        "id": "f534100b.d3913",
         "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": 4476.75,
-        "y": 3008.75,
-        "z": "265dc029.a18eb8",
+        "x": 4474.566665649414,
+        "y": 2958.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "cf481547.940d",
+        "id": "4572270e.4cc878",
         "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\n",
         "comments": "",
         "outputs": 1,
-        "x": 3040.75,
-        "y": 4232.75,
-        "z": "265dc029.a18eb8",
+        "x": 3038.566665649414,
+        "y": 4182.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "8d7304cc.0aa318",
-                "ffcae489.323bb8"
+                "57ff5eb5.4d2a88",
+                "7d25dc2d.180224"
             ]
         ]
     },
     {
-        "id": "8d7304cc.0aa318",
+        "id": "57ff5eb5.4d2a88",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3257.75,
-        "y": 4211.75,
-        "z": "265dc029.a18eb8",
+        "x": 3255.566665649414,
+        "y": 4161.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "c5705cb.18e75a"
+                "c169753b.e6b0a8"
             ]
         ]
     },
     {
-        "id": "ffcae489.323bb8",
+        "id": "7d25dc2d.180224",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3257.75,
-        "y": 4260.75,
-        "z": "265dc029.a18eb8",
+        "x": 3255.566665649414,
+        "y": 4210.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "c5705cb.18e75a",
+        "id": "c169753b.e6b0a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3425.75,
-        "y": 4211.75,
-        "z": "265dc029.a18eb8",
+        "x": 3423.566665649414,
+        "y": 4161.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "51229269.4b1c8c",
-                "a03f6736.1a323"
+                "2dc803c6.2ce1ec",
+                "348ff77c.2874e"
             ]
         ]
     },
     {
-        "id": "a574d94d.6c4aa8",
+        "id": "2d3c440e.e71da4",
         "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": 4252.75,
-        "y": 2863.75,
-        "z": "265dc029.a18eb8",
+        "x": 4250.566665649414,
+        "y": 2813.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "9efec827.a86c9",
+        "id": "c5a6daa.df89d28",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4040.75,
-        "y": 2857.75,
-        "z": "265dc029.a18eb8",
+        "x": 4038.566665649414,
+        "y": 2807.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "a574d94d.6c4aa8"
+                "2d3c440e.e71da4"
             ]
         ]
     },
     {
-        "id": "d2a8a4e9.34f1c8",
+        "id": "f9603c79.8ed218",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 4652.75,
-        "y": 2905.75,
-        "z": "265dc029.a18eb8",
+        "x": 4650.566665649414,
+        "y": 2855.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "16a0b639.60baea",
+        "id": "ba88a8bc.8452c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4496.75,
-        "y": 2889.75,
-        "z": "265dc029.a18eb8",
+        "x": 4494.566665649414,
+        "y": 2839.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "b96f50fd.127ab8"
+                "c32b6bd2.d5291"
             ]
         ]
     },
     {
-        "id": "bf3fdeb7.6e1648",
+        "id": "f367c816.36c578",
         "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": 1982.75,
-        "y": 154.75,
-        "z": "265dc029.a18eb8",
+        "x": 1980.566665649414,
+        "y": 104.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "b761fd8.2b6b08",
+        "id": "96051d25.052e78",
         "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": 1994.75,
-        "y": 195.75,
-        "z": "265dc029.a18eb8",
+        "x": 1992.566665649414,
+        "y": 145.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "a66f6106.d6897",
+        "id": "aa05516d.d6c1f",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
-        "x": 2018.75,
-        "y": 117.75,
-        "z": "265dc029.a18eb8",
+        "x": 2016.566665649414,
+        "y": 67.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "8f7720f3.7aae9",
+        "id": "c12ef49d.c23818",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
         "comments": "",
-        "x": 1939.75,
-        "y": 241.75,
-        "z": "265dc029.a18eb8",
+        "x": 1937.566665649414,
+        "y": 191.56666564941406,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "631d9619.9d9ee",
+        "id": "dd0ea493.8f50f",
         "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": 1592.75,
-        "y": 2373.7496337890625,
-        "z": "265dc029.a18eb8",
+        "x": 1590.566665649414,
+        "y": 2323.5662994384766,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "1cbcaef8.fee281",
+        "id": "4ae38bdf.37b3b4",
         "type": "set",
         "name": "set maxtpn",
         "xml": "<set>\n<parameter name='maxtpn' value='`($maxtpn + $gfp)`' />",
         "comments": "",
-        "x": 3656.75,
-        "y": 3056.75,
-        "z": "265dc029.a18eb8",
+        "x": 3654.566665649414,
+        "y": 3006.566665649414,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "c3b37174.45567",
+        "id": "a58bc596.7e7c2",
         "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": 1791.75,
-        "y": 2421.7498779296875,
-        "z": "265dc029.a18eb8",
+        "x": 1789.566665649414,
+        "y": 2371.5665435791016,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "348e2352.849ddc",
+        "id": "475ae245.9fc77c",
         "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    \n    `\n\n",
+        "xml": "<switch test=\"`$param-prefix-domainA[$param-prefix-domainA_length -9] == $param-prefix-domainB[$param-prefix-domainB_length -9]`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1607.3334350585938,
-        "y": 2483.3336181640625,
-        "z": "265dc029.a18eb8",
+        "x": 1551.1502075195312,
+        "y": 2452.150390625,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "4a5bbbb8.21f4f4",
-                "f0483d5d.c65838"
+                "e6c172a1.d8f858",
+                "82600db3.cf71b"
             ]
         ]
     },
     {
-        "id": "4a5bbbb8.21f4f4",
+        "id": "e6c172a1.d8f858",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1802.3333129882812,
-        "y": 2597.3336181640625,
-        "z": "265dc029.a18eb8",
+        "x": 1722.149917602539,
+        "y": 2562.1502838134766,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "277d2781.ec4fb8"
+                "dd4809a0.0c713"
             ]
         ]
     },
     {
-        "id": "f0483d5d.c65838",
+        "id": "82600db3.cf71b",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1821.3333740234375,
-        "y": 2496.33349609375,
-        "z": "265dc029.a18eb8",
+        "x": 1785.1500396728516,
+        "y": 2439.1502838134766,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "69fab2f3.f4d724"
+                "5a6f4a6c.780d2c"
             ]
         ]
     },
     {
-        "id": "69fab2f3.f4d724",
+        "id": "4a4cb8a7.53237",
         "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",
+        "name": "call GENERIC-RESOURCE-API:p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2228.6668701171875,
-        "y": 2502.6666259765625,
-        "z": "265dc029.a18eb8",
+        "x": 2375.4832916259766,
+        "y": 2427.4832916259766,
+        "z": "44fca1a5.1b442",
         "wires": [
-            [
-                "41433a02.61754c"
-            ]
-        ]
-    },
-    {
-        "id": "277d2781.ec4fb8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1952.666748046875,
-        "y": 2597.6666259765625,
-        "z": "265dc029.a18eb8",
-        "wires": [
-            [
-                "db17525b.9cda9",
-                "98634dfa.681d6",
-                "59852974.659be",
-                "f9710261.9f9158"
-            ]
+            []
         ]
     },
     {
-        "id": "41433a02.61754c",
+        "id": "dd4809a0.0c713",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2655,
-        "y": 2502.3336181640625,
-        "z": "265dc029.a18eb8",
+        "x": 1904.483413696289,
+        "y": 2565.4832916259766,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "cca04ac5.91465"
+                "a3db40f.f56a64",
+                "3ed4dcd6.dacdc4",
+                "9f3ef30c.c3c62",
+                "10ca65f.d30799a"
             ]
         ]
     },
     {
-        "id": "db17525b.9cda9",
+        "id": "a3db40f.f56a64",
         "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": 2236.6666259765625,
-        "y": 2603.33349609375,
-        "z": "265dc029.a18eb8",
+        "x": 2234.4832916259766,
+        "y": 2553.150161743164,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "98634dfa.681d6",
+        "id": "3ed4dcd6.dacdc4",
         "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",
+        "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<parameter name='tmp.sameDomain-src-access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='tmp.sameDomain-dst-access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 2204.6666259765625,
-        "y": 2663.66650390625,
-        "z": "265dc029.a18eb8",
+        "x": 2202.4832916259766,
+        "y": 2613.483169555664,
+        "z": "44fca1a5.1b442",
         "wires": []
     },
     {
-        "id": "59852974.659be",
+        "id": "9f3ef30c.c3c62",
         "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",
+        "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.sameDomain-src-access-ltp-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.sameDomain-dst-access-ltp-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<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": 2269.9998779296875,
-        "y": 2719.66650390625,
-        "z": "265dc029.a18eb8",
+        "x": 2267.8165435791016,
+        "y": 2669.483169555664,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "733c1bcc.d90d64"
+                "ec87cb9c.11295"
             ]
         ]
     },
     {
-        "id": "733c1bcc.d90d64",
+        "id": "ec87cb9c.11295",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2586.9998779296875,
-        "y": 2721.66650390625,
-        "z": "265dc029.a18eb8",
+        "x": 2584.8165435791016,
+        "y": 2671.483169555664,
+        "z": "44fca1a5.1b442",
         "wires": [
             [
-                "c2cbdd5e.c4e688"
+                "d89df417.ae3c78"
             ]
         ]
     },
     {
-        "id": "c2cbdd5e.c4e688",
+        "id": "d89df417.ae3c78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2750.4998779296875,
-        "y": 2720.92041015625,
-        "z": "265dc029.a18eb8",
+        "x": 2748.3165435791016,
+        "y": 2670.737075805664,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "9bdaad5a.e56e08",
+        "id": "df1cdf90.7c16c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:p2p-vnf-topology-operation-p2p-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='p2p-vnf-topology-operation-p2p-activate' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2186.666748046875,
-        "y": 4145.3330078125,
-        "z": "265dc029.a18eb8",
+        "x": 2184.483413696289,
+        "y": 4095.149673461914,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
     },
     {
-        "id": "f9710261.9f9158",
+        "id": "10ca65f.d30799a",
         "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": 2318.666259765625,
-        "y": 2774.333251953125,
-        "z": "265dc029.a18eb8",
+        "x": 2316.482925415039,
+        "y": 2724.149917602539,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5a6f4a6c.780d2c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1955.1500396728516,
+        "y": 2438.1502838134766,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "4a4cb8a7.53237",
+                "454059c8.1f8fc"
+            ]
+        ]
+    },
+    {
+        "id": "2c4795df.bc53ba",
+        "type": "switchNode",
+        "name": "switch tmp.aai.network-route-A.data-owner == null",
+        "xml": "<switch test=\"`length($tmp.aai.network-route-A.data-owner) == 0`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2719.300048828125,
+        "y": 1239.1666259765625,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "4f29043.7cddffc"
+            ]
+        ]
+    },
+    {
+        "id": "4f29043.7cddffc",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2994.1668701171875,
+        "y": 1227.1666259765625,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "e7abfd13.e0f26"
+            ]
+        ]
+    },
+    {
+        "id": "e7abfd13.e0f26",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3115.1668701171875,
+        "y": 1228.1666259765625,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "2ffba978.2724fe"
+            ]
+        ]
+    },
+    {
+        "id": "2ffba978.2724fe",
+        "type": "set",
+        "name": "set final-vlan",
+        "xml": "<set>\n<parameter name='final-vlan' value=\"`$tmp.aai.network-route-A.data-owner`\" />\n\n",
+        "comments": "",
+        "x": 3269.166748046875,
+        "y": 1227.566650390625,
+        "z": "44fca1a5.1b442",
+        "wires": []
+    },
+    {
+        "id": "da97768b.de449",
+        "type": "switchNode",
+        "name": "switch tmp.aai.network-route-B.data-owner == null",
+        "xml": "<switch test=\"`length($tmp.aai.network-route-B.data-owner) == 0`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2739.300048828125,
+        "y": 1300.1666259765625,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "68665f18.022eb"
+            ]
+        ]
+    },
+    {
+        "id": "68665f18.022eb",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3014.1668701171875,
+        "y": 1288.1666259765625,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "5b5b9e57.59631"
+            ]
+        ]
+    },
+    {
+        "id": "5b5b9e57.59631",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3135.1668701171875,
+        "y": 1289.1666259765625,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "65f1c257.fa1e1c"
+            ]
+        ]
+    },
+    {
+        "id": "65f1c257.fa1e1c",
+        "type": "set",
+        "name": "set final-vlan",
+        "xml": "<set>\n<parameter name='final-vlan' value=\"`$tmp.aai.network-route-B.data-owner`\" />\n\n",
+        "comments": "",
+        "x": 3289.166748046875,
+        "y": 1288.566650390625,
+        "z": "44fca1a5.1b442",
+        "wires": []
+    },
+    {
+        "id": "98cc92a0.50792",
+        "type": "set",
+        "name": "unset final-vlan",
+        "xml": "<set>\n<parameter name='final-vlan' value=\"\" />\n\n",
+        "comments": "",
+        "x": 2603.300048828125,
+        "y": 1193.1666259765625,
+        "z": "44fca1a5.1b442",
+        "wires": []
+    },
+    {
+        "id": "689f5373.4eba54",
+        "type": "switchNode",
+        "name": "switch $tmp.aai.network-route-A.data-owner == null",
+        "xml": "<switch test=\"`length($tmp.aai.network-route-A.data-owner) == 0`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3956.433349609375,
+        "y": 2018.566650390625,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "806fd0a9.5f009",
+                "cfea3d9c.4ce5a8"
+            ]
+        ]
+    },
+    {
+        "id": "806fd0a9.5f009",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4235.30078125,
+        "y": 2003.566650390625,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "60798819.bfd6e"
+            ]
+        ]
+    },
+    {
+        "id": "60798819.bfd6e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4393.30078125,
+        "y": 1999.566650390625,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "4cbae1c1.273ca"
+            ]
+        ]
+    },
+    {
+        "id": "4cbae1c1.273ca",
+        "type": "set",
+        "name": "set final-vlan",
+        "xml": "<set>\n<parameter name='final-vlan' value=\"`$tmp.aai.network-route-A.data-owner`\" />\n",
+        "comments": "",
+        "x": 4558.30029296875,
+        "y": 1999.9666748046875,
+        "z": "44fca1a5.1b442",
+        "wires": []
+    },
+    {
+        "id": "d72c4c5b.0543b8",
+        "type": "set",
+        "name": "set final-vlan",
+        "xml": "<set>\n<parameter name='final-vlan' value=\"`$tmp.aai.network-route-B.logical-interface-id`\" />\n",
+        "comments": "",
+        "x": 4561.7333984375,
+        "y": 2058.36669921875,
+        "z": "44fca1a5.1b442",
+        "wires": []
+    },
+    {
+        "id": "ea82b437.1459e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4396.73388671875,
+        "y": 2057.9666748046875,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "d72c4c5b.0543b8"
+            ]
+        ]
+    },
+    {
+        "id": "cfea3d9c.4ce5a8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4238.73388671875,
+        "y": 2061.9666748046875,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "ea82b437.1459e"
+            ]
+        ]
+    },
+    {
+        "id": "bfc91f6.fd87a6",
+        "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": 3204.933349609375,
+        "y": 2114.1663818359375,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "605caba5.b05b8c",
+                "68fb876d.4a2b18"
+            ]
+        ]
+    },
+    {
+        "id": "68fb876d.4a2b18",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3429.93310546875,
+        "y": 2092.1663818359375,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "3e3ad7ef.fe4e8"
+            ]
+        ]
+    },
+    {
+        "id": "605caba5.b05b8c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3427.93310546875,
+        "y": 2154.1663818359375,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "8abea7d8.35f5b8"
+            ]
+        ]
+    },
+    {
+        "id": "3e3ad7ef.fe4e8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3575.9331817626953,
+        "y": 2092.1663970947266,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "9eaa7330.d56278",
+                "ea3b6f52.6f2fd8",
+                "a9c9250a.2de128"
+            ]
+        ]
+    },
+    {
+        "id": "8abea7d8.35f5b8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3572.2666015625,
+        "y": 2154.4993896484375,
+        "z": "44fca1a5.1b442",
+        "wires": [
+            [
+                "f9b9a837.a6982"
+            ]
+        ]
+    },
+    {
+        "id": "f9b9a837.a6982",
+        "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 = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='color-aware' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='coupling-flag' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3663.2335205078125,
+        "y": 2280.7664794921875,
+        "z": "44fca1a5.1b442",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.json b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.json
index 10db6b40..4c24b917 100644
--- a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.json
@@ -1,20 +1,38 @@
 [
     {
-        "id": "9559f36c.7d99",
+        "id": "1f49a1e2.d37fce",
+        "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": 1823.566650390625,
+        "y": 439.99998474121094,
+        "z": "d636c085.d73a1",
+        "wires": [
+            [
+                "1fcd10a0.78eacf",
+                "af997914.ad5bb",
+                "df414e18.a198"
+            ]
+        ]
+    },
+    {
+        "id": "bf5bb76d.137da8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 210.3333282470703,
-        "y": 176.33334350585938,
-        "z": "9455099.1e285f8",
+        "x": 113.566650390625,
+        "y": 191.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "589aff20.58fdd8"
+                "b3126319.e564d"
             ]
         ]
     },
     {
-        "id": "589aff20.58fdd8",
+        "id": "b3126319.e564d",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1034 +40,933 @@
         "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": 341.6190185546875,
-        "y": 225.5714521408081,
-        "z": "9455099.1e285f8",
+        "x": 244.8523406982422,
+        "y": 241.23809337615967,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "7be85682.4a664"
+                "21b7d070.b838c"
             ]
         ]
     },
     {
-        "id": "7be85682.4a664",
+        "id": "21b7d070.b838c",
         "type": "method",
         "name": "method p2p-vnf-topology-operation-p2p-delete",
         "xml": "<method rpc='p2p-vnf-topology-operation-p2p-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 344.76194763183594,
-        "y": 310.33337593078613,
-        "z": "9455099.1e285f8",
+        "x": 247.99526977539062,
+        "y": 326.0000171661377,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "75b89bd3.b7035c"
+                "25a34ff7.c51178"
             ]
         ]
     },
     {
-        "id": "75b89bd3.b7035c",
+        "id": "25a34ff7.c51178",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 494.5713653564453,
-        "y": 440,
-        "z": "9455099.1e285f8",
+        "x": 397.8046875,
+        "y": 455.66664123535156,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "b92c8346.1030c",
-                "d4055fd6.d46db",
-                "6a8d6043.e67918"
+                "bc193176.895b3",
+                "9155a503.b6cfd",
+                "73cdc1fc.bb1028"
             ]
         ]
     },
     {
-        "id": "b92c8346.1030c",
+        "id": "bc193176.895b3",
         "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": 790.9049835205078,
-        "y": 716.9305114746094,
-        "z": "9455099.1e285f8",
-        "wires": []
-    },
-    {
-        "id": "ee6a8ea4.1c7198",
-        "type": "comment",
-        "name": "new for TransportSlicing",
-        "info": "",
-        "comments": "",
-        "x": 822.3333282470703,
-        "y": 391.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 694.1383056640625,
+        "y": 732.5971527099609,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "d4055fd6.d46db",
+        "id": "9155a503.b6cfd",
         "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[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.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 = $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<!--vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 842.3333282470703,
-        "y": 487.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 745.566650390625,
+        "y": 502.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "381d7bc0.f1068c",
-                "4a8a0c1b.ab698c",
-                "31b9c3f9.83b5cc"
+                "943d66a1.464c58",
+                "67ba5020.7d7dc8",
+                "6580f4fc.25d5b4"
             ]
         ]
     },
     {
-        "id": "381d7bc0.f1068c",
+        "id": "943d66a1.464c58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1061.3333282470703,
-        "y": 425.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 964.566650390625,
+        "y": 440.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "78172321.e32f04"
+                "7c9fba64.f3390c"
             ]
         ]
     },
     {
-        "id": "4a8a0c1b.ab698c",
+        "id": "67ba5020.7d7dc8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1070.8242950439453,
-        "y": 467.9073791503906,
-        "z": "9455099.1e285f8",
+        "x": 974.0576171875,
+        "y": 483.5740203857422,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "fb661f4a.a35e88"
+                "cebe0efe.964978"
             ]
         ]
     },
     {
-        "id": "31b9c3f9.83b5cc",
+        "id": "6580f4fc.25d5b4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1059.3333282470703,
-        "y": 514.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 962.566650390625,
+        "y": 529.9999847412109,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "c596dceb.f440c8"
+                "cd9120ae.e9db68"
             ]
         ]
     },
     {
-        "id": "fb661f4a.a35e88",
+        "id": "cebe0efe.964978",
         "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": 1224.3957061767578,
-        "y": 471.193115234375,
-        "z": "9455099.1e285f8",
+        "x": 1127.6290283203125,
+        "y": 486.85975646972656,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "c596dceb.f440c8",
+        "id": "cd9120ae.e9db68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1228.3333282470703,
-        "y": 515.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 1131.566650390625,
+        "y": 530.9999847412109,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "78172321.e32f04",
+        "id": "7c9fba64.f3390c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1258.3333282470703,
-        "y": 421.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 1161.566650390625,
+        "y": 436.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "2b97696b.7fb036"
+                "57fd8c7c.534adc"
             ]
         ]
     },
     {
-        "id": "2b97696b.7fb036",
+        "id": "57fd8c7c.534adc",
         "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": 1481.6668243408203,
-        "y": 421.3332824707031,
-        "z": "9455099.1e285f8",
+        "x": 1384.900146484375,
+        "y": 436.9999237060547,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "42c2b0bd.f47dd"
+                "a44a2c9.e47245"
             ]
         ]
     },
     {
-        "id": "42c2b0bd.f47dd",
+        "id": "a44a2c9.e47245",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1682.3334617614746,
-        "y": 422.33336448669434,
-        "z": "9455099.1e285f8",
+        "x": 1585.5667839050293,
+        "y": 438.0000057220459,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "2d4b22d.3ad5fde"
+                "1f49a1e2.d37fce"
             ]
         ]
     },
     {
-        "id": "6a8d6043.e67918",
+        "id": "73cdc1fc.bb1028",
         "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": 808.3333282470703,
-        "y": 435.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 711.566650390625,
+        "y": 450.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d4b22d.3ad5fde",
-        "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": 1920.3333282470703,
-        "y": 424.3333435058594,
-        "z": "9455099.1e285f8",
-        "wires": [
-            [
-                "767f3312.da0fc4",
-                "6e6e816a.046da8",
-                "7240a2d3.cdb52c"
-            ]
-        ]
-    },
-    {
-        "id": "767f3312.da0fc4",
+        "id": "1fcd10a0.78eacf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2128.3333282470703,
-        "y": 388.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2031.566650390625,
+        "y": 403.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "9782a1c0.c96908"
+                "f10666fd.9fb61"
             ]
         ]
     },
     {
-        "id": "6e6e816a.046da8",
+        "id": "af997914.ad5bb",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2128.8242950439453,
-        "y": 433.9073791503906,
-        "z": "9455099.1e285f8",
+        "x": 2032.0576171875,
+        "y": 449.5740203857422,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "2e176049.379ac8"
+                "621b676d.f2f748"
             ]
         ]
     },
     {
-        "id": "7240a2d3.cdb52c",
+        "id": "df414e18.a198",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2126.3333282470703,
-        "y": 477.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2029.566650390625,
+        "y": 492.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "33c68883.4e4dd8"
+                "2ffd86d2.d8ed3a"
             ]
         ]
     },
     {
-        "id": "2e176049.379ac8",
+        "id": "621b676d.f2f748",
         "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": 2291.395706176758,
-        "y": 434.193115234375,
-        "z": "9455099.1e285f8",
+        "x": 2194.6290283203125,
+        "y": 449.85975646972656,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "33c68883.4e4dd8",
+        "id": "2ffd86d2.d8ed3a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2295.3333282470703,
-        "y": 478.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2198.566650390625,
+        "y": 493.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "2a05bc5b.b08dc4",
+        "id": "943d4b65.0e3ed8",
         "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": 2601.3333282470703,
-        "y": 477.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2504.566650390625,
+        "y": 492.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "efe59340.81f6b",
-                "9ec2589f.db3418",
-                "4f5683a7.464474"
+                "e86769c3.1f7ba8",
+                "52744dfb.375364",
+                "9acb7ba.125dc08"
             ]
         ]
     },
     {
-        "id": "37afe5ee.53cc62",
+        "id": "daba1f0.a622ce",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2985.3333282470703,
-        "y": 477.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2888.566650390625,
+        "y": 492.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "e3b2dd80.eef1a8",
-                "a9ed431c.c281c",
-                "d4052d30.ad8718",
-                "fddd2ea9.355138",
-                "9f2982f0.62eef8",
-                "3eed71af.4521b6"
+                "5e452d03.7532ac",
+                "d53b6e96.aa8aa",
+                "518fe175.a505a8",
+                "df0df658.a887a",
+                "1a0c1f4d.51b981",
+                "67de0813.c55918"
             ]
         ]
     },
     {
-        "id": "efe59340.81f6b",
+        "id": "e86769c3.1f7ba8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2812.3333282470703,
-        "y": 479.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2715.566650390625,
+        "y": 494.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "37afe5ee.53cc62"
+                "daba1f0.a622ce"
             ]
         ]
     },
     {
-        "id": "9ec2589f.db3418",
+        "id": "52744dfb.375364",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2812.8242950439453,
-        "y": 524.9073791503906,
-        "z": "9455099.1e285f8",
+        "x": 2716.0576171875,
+        "y": 540.5740203857422,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "597b7a11.444784"
+                "cdeba8e7.bdb358"
             ]
         ]
     },
     {
-        "id": "4f5683a7.464474",
+        "id": "9acb7ba.125dc08",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2810.3333282470703,
-        "y": 568.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2713.566650390625,
+        "y": 583.9999847412109,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "7e03ef7b.cd722"
+                "ba8b118c.cfdf4"
             ]
         ]
     },
     {
-        "id": "7e03ef7b.cd722",
+        "id": "ba8b118c.cfdf4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2977.3333282470703,
-        "y": 567.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2880.566650390625,
+        "y": 582.9999847412109,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "597b7a11.444784",
+        "id": "cdeba8e7.bdb358",
         "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": 2975.395706176758,
-        "y": 525.193115234375,
-        "z": "9455099.1e285f8",
+        "x": 2878.6290283203125,
+        "y": 540.8597564697266,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "9782a1c0.c96908",
+        "id": "f10666fd.9fb61",
         "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": 2329.3333282470703,
-        "y": 383.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2232.566650390625,
+        "y": 398.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "650cd08b.3ade4"
+                "ad67608d.23d4e"
             ]
         ]
     },
     {
-        "id": "650cd08b.3ade4",
+        "id": "ad67608d.23d4e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2534.3333282470703,
-        "y": 383.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2437.566650390625,
+        "y": 398.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "aa3600cc.a7aae8"
+                "3a1dfd90.21e892"
             ]
         ]
     },
     {
-        "id": "aa3600cc.a7aae8",
+        "id": "3a1dfd90.21e892",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2700.3333282470703,
-        "y": 383.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2603.566650390625,
+        "y": 398.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "fb75e488.be7c5"
+                "d3885a9d.410b8"
             ]
         ]
     },
     {
-        "id": "fb75e488.be7c5",
+        "id": "d3885a9d.410b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2863.3333282470703,
-        "y": 383.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 2766.566650390625,
+        "y": 398.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "2a05bc5b.b08dc4"
+                "943d4b65.0e3ed8"
             ]
         ]
     },
     {
-        "id": "e3b2dd80.eef1a8",
+        "id": "5e452d03.7532ac",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3200.3333282470703,
-        "y": 187.33334350585938,
-        "z": "9455099.1e285f8",
+        "x": 3103.566650390625,
+        "y": 202.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "a9ed431c.c281c",
+        "id": "d53b6e96.aa8aa",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3226.3333282470703,
-        "y": 304.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3129.566650390625,
+        "y": 319.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "886463ef.2aa938",
-                "42b42c71.803e4c",
-                "a6449502.70e2c8"
+                "f7dcf778.7bdca8",
+                "b91a9a3e.7f6078",
+                "2aa7aeb.8d97cd2"
             ]
         ]
     },
     {
-        "id": "886463ef.2aa938",
+        "id": "f7dcf778.7bdca8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3421.833450317383,
-        "y": 256.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3325.0667724609375,
+        "y": 271.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "c18c6719.20bd2"
+                "859282ad.13c2f8"
             ]
         ]
     },
     {
-        "id": "42b42c71.803e4c",
+        "id": "b91a9a3e.7f6078",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3413.833450317383,
-        "y": 311.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3317.0667724609375,
+        "y": 326.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "30a99a18.cda186"
+                "6f10df6c.e42f08"
             ]
         ]
     },
     {
-        "id": "c18c6719.20bd2",
+        "id": "859282ad.13c2f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3566.215774536133,
-        "y": 255.989013671875,
-        "z": "9455099.1e285f8",
+        "x": 3469.4490966796875,
+        "y": 271.65565490722656,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "c69e4003.7eb5b8"
+                "a786a7ab.e92098"
             ]
         ]
     },
     {
-        "id": "c69e4003.7eb5b8",
+        "id": "a786a7ab.e92098",
         "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": 3750.3333282470703,
-        "y": 254.33334350585938,
-        "z": "9455099.1e285f8",
+        "x": 3653.566650390625,
+        "y": 269.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "690e98ca.6414f8"
+                "7f3accce.b227c4"
             ]
         ]
     },
     {
-        "id": "690e98ca.6414f8",
+        "id": "7f3accce.b227c4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3945.3333282470703,
-        "y": 254.33334350585938,
-        "z": "9455099.1e285f8",
+        "x": 3848.566650390625,
+        "y": 269.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "2770cf70.6b8d58"
+                "19e0629f.42ef95"
             ]
         ]
     },
     {
-        "id": "a6449502.70e2c8",
+        "id": "2aa7aeb.8d97cd2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3418.833450317383,
-        "y": 368.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3322.0667724609375,
+        "y": 383.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "6503d576.73a654"
+                "1ba67878.91583"
             ]
         ]
     },
     {
-        "id": "6503d576.73a654",
+        "id": "1ba67878.91583",
         "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": 3570.833450317383,
-        "y": 369.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3474.0667724609375,
+        "y": 384.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "30a99a18.cda186",
+        "id": "6f10df6c.e42f08",
         "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": 3581.833450317383,
-        "y": 312.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3485.0667724609375,
+        "y": 327.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "9068d2cf.278dc8",
+        "id": "15438b5f.4f2f6d",
         "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.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4533.33332824707,
-        "y": 271.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4436.566650390625,
+        "y": 286.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "1fca2290.06e8dd",
-                "c7116ee2.229ee",
-                "d17cbdef.3c1178"
+                "297b9c32.2d4884",
+                "7eedc05d.0fcd8",
+                "3b0dcd14.e168c2"
             ]
         ]
     },
     {
-        "id": "7354c66b.f20a",
+        "id": "e30d1b98.1b734",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4327.33332824707,
-        "y": 258.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4230.566650390625,
+        "y": 273.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "3bcdb5b2.4a3a62",
-                "9068d2cf.278dc8",
-                "99f73767.79f228"
+                "58f742d9.00369c",
+                "15438b5f.4f2f6d",
+                "fad5fc58.bb076"
             ]
         ]
     },
     {
-        "id": "3bcdb5b2.4a3a62",
+        "id": "58f742d9.00369c",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4563.33332824707,
-        "y": 219.33334350585938,
-        "z": "9455099.1e285f8",
+        "x": 4466.566650390625,
+        "y": 234.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "1fca2290.06e8dd",
+        "id": "297b9c32.2d4884",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4743.33332824707,
-        "y": 262.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4646.566650390625,
+        "y": 277.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "243ff6d9.66256a"
+                "c10ae523.198538"
             ]
         ]
     },
     {
-        "id": "c7116ee2.229ee",
+        "id": "7eedc05d.0fcd8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4735.33332824707,
-        "y": 317.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4638.566650390625,
+        "y": 332.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "bfdc168b.3ce728"
+                "dce2b694.d3656"
             ]
         ]
     },
     {
-        "id": "d17cbdef.3c1178",
+        "id": "3b0dcd14.e168c2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4740.33332824707,
-        "y": 374.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4643.566650390625,
+        "y": 389.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "77929148.a8a1"
+                "8ca6611c.54635"
             ]
         ]
     },
     {
-        "id": "77929148.a8a1",
+        "id": "8ca6611c.54635",
         "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": 4892.33332824707,
-        "y": 375.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4795.566650390625,
+        "y": 390.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "bfdc168b.3ce728",
+        "id": "dce2b694.d3656",
         "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": 4903.33332824707,
-        "y": 320.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4806.566650390625,
+        "y": 335.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "243ff6d9.66256a",
+        "id": "c10ae523.198538",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4887.71565246582,
-        "y": 259.989013671875,
-        "z": "9455099.1e285f8",
+        "x": 4790.948974609375,
+        "y": 275.65565490722656,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "ea25b28e.9d40c"
+                "e4f0bb63.5bbd98"
             ]
         ]
     },
     {
-        "id": "2770cf70.6b8d58",
+        "id": "19e0629f.42ef95",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4148.33332824707,
-        "y": 258.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4051.566650390625,
+        "y": 273.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "7354c66b.f20a"
+                "e30d1b98.1b734"
             ]
         ]
     },
     {
-        "id": "ea25b28e.9d40c",
+        "id": "e4f0bb63.5bbd98",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.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": 5102.33332824707,
-        "y": 256.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 5005.566650390625,
+        "y": 271.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "99f73767.79f228",
+        "id": "fad5fc58.bb076",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4483.33332824707,
-        "y": 335.3333435058594,
-        "z": "9455099.1e285f8",
-        "wires": []
-    },
-    {
-        "id": "774630ef.e09c58",
-        "type": "execute",
-        "name": "execute RestApiCallNode Delete transport slice without token",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url +  '/restconf/operations/ietf-optical-slice:deallocate-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3350.3333282470703,
-        "y": 602.3333435058594,
-        "z": "9455099.1e285f8",
-        "wires": [
-            [
-                "8a18cee3.35ffe",
-                "99cc1156.473278"
-            ]
-        ]
-    },
-    {
-        "id": "8a18cee3.35ffe",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3693.8333282470703,
-        "y": 597.3333435058594,
-        "z": "9455099.1e285f8",
-        "wires": [
-            [
-                "a2ed508f.5c119"
-            ]
-        ]
-    },
-    {
-        "id": "99cc1156.473278",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3697.8333282470703,
-        "y": 637.3333435058594,
-        "z": "9455099.1e285f8",
-        "wires": [
-            [
-                "912161a0.cf7bf"
-            ]
-        ]
-    },
-    {
-        "id": "912161a0.cf7bf",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3855.3333282470703,
-        "y": 637.3333435058594,
-        "z": "9455099.1e285f8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a2ed508f.5c119",
-        "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 deallocate transport slice rest api\" />\n",
-        "comments": "",
-        "x": 3851.8333282470703,
-        "y": 597.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4386.566650390625,
+        "y": 350.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "3eed71af.4521b6",
+        "id": "67de0813.c55918",
         "type": "set",
         "name": "set attachment_param for TN NSSSI deleteion in PNC",
         "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 3326.3333282470703,
-        "y": 477.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3229.566650390625,
+        "y": 492.99998474121094,
+        "z": "d636c085.d73a1",
         "wires": []
     },
     {
-        "id": "d4052d30.ad8718",
+        "id": "518fe175.a505a8",
         "type": "save",
         "name": "delete connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3256.3333282470703,
-        "y": 912.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3169.5667724609375,
+        "y": 1148.9999237060547,
+        "z": "d636c085.d73a1",
         "wires": [
             []
         ]
     },
     {
-        "id": "fddd2ea9.355138",
+        "id": "df0df658.a887a",
         "type": "save",
         "name": "delete vpn-binding resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3252.3333282470703,
-        "y": 956.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3165.5667724609375,
+        "y": 1192.9999237060547,
+        "z": "d636c085.d73a1",
         "wires": [
             []
         ]
     },
     {
-        "id": "81312607.6bb828",
-        "type": "execute",
-        "name": "execute RestApiCallNode domain UNI deColoring",
-        "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.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\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",
+        "id": "1a0c1f4d.51b981",
+        "type": "switchNode",
+        "name": "switch connectivity has ethernet service",
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3836.3333282470703,
-        "y": 776.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3188.566650390625,
+        "y": 808.9999847412109,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "cd905ee1.eaa9b8",
-                "3271c447.28d454"
+                "e3688e85.c3b",
+                "622706a9.cb2ed8"
             ]
         ]
     },
     {
-        "id": "3271c447.28d454",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "622706a9.cb2ed8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4102.33332824707,
-        "y": 756.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 3426.566650390625,
+        "y": 791.9999847412109,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "e043f0ae.c34d08"
+                "ab255dec.d38548"
             ]
         ]
     },
     {
-        "id": "cd905ee1.eaa9b8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "e3688e85.c3b",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4103.333541870117,
-        "y": 807.3332529067993,
-        "z": "9455099.1e285f8",
+        "x": 3438.566650390625,
+        "y": 858.9999847412109,
+        "z": "d636c085.d73a1",
         "wires": [
-            [
-                "a5def9d3.538c"
-            ]
+            []
         ]
     },
     {
-        "id": "e043f0ae.c34d08",
-        "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 decoloring UNI rest api\" />\n",
+        "id": "ab255dec.d38548",
+        "type": "execute",
+        "name": "execute RestApiCallNode Delete ethernet Service without token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\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": "",
-        "x": 4242.333576202393,
-        "y": 756.3333444595337,
-        "z": "9455099.1e285f8",
-        "wires": []
+        "outputs": 1,
+        "x": 3801.900146484375,
+        "y": 781.6000213623047,
+        "z": "d636c085.d73a1",
+        "wires": [
+            [
+                "63e51e3.aa5156",
+                "5038fd41.e83c2c"
+            ]
+        ]
     },
     {
-        "id": "a5def9d3.538c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
+        "id": "63e51e3.aa5156",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4248.3605880737305,
-        "y": 805.0787382125854,
-        "z": "9455099.1e285f8",
+        "x": 4145.666748046875,
+        "y": 756.6000213623047,
+        "z": "d636c085.d73a1",
         "wires": [
             []
         ]
     },
     {
-        "id": "9f2982f0.62eef8",
-        "type": "switchNode",
-        "name": "switch connectivity has ethernet service",
-        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
+        "id": "5038fd41.e83c2c",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3285.3333282470703,
-        "y": 793.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4146.666961669922,
+        "y": 807.5999307632446,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "e2b757bb.931bf8",
-                "73b037b.7f08a48"
+                "3bc9737b.ab47c4"
             ]
         ]
     },
     {
-        "id": "73b037b.7f08a48",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "3bc9737b.ab47c4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3523.3333282470703,
-        "y": 776.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4291.694007873535,
+        "y": 805.3454160690308,
+        "z": "d636c085.d73a1",
         "wires": [
             [
-                "81312607.6bb828"
+                "cda2227f.a4536"
             ]
         ]
     },
     {
-        "id": "e2b757bb.931bf8",
-        "type": "outcome",
-        "name": "Null",
-        "xml": "<outcome value=''>\n",
+        "id": "cda2227f.a4536",
+        "type": "execute",
+        "name": "execute Terminate Periodic Pull Connection",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.PeriodicDiscoveryNode' method='deleteSubscription' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />-->\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"p2p-vnf-topology-operation-p2p-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3535.3333282470703,
-        "y": 843.3333435058594,
-        "z": "9455099.1e285f8",
+        "x": 4563.933837890625,
+        "y": 812.566650390625,
+        "z": "d636c085.d73a1",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof.json
new file mode 100644
index 00000000..84af6020
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof.json
@@ -0,0 +1,3589 @@
+[
+    {
+        "id": "6c2aabab.e93664",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 175.56666564941406,
+        "y": 177,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "591c3fc8.9e7608"
+            ]
+        ]
+    },
+    {
+        "id": "591c3fc8.9e7608",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 322.56666564941406,
+        "y": 752.0000152587891,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "44270cff.075ffc"
+            ]
+        ]
+    },
+    {
+        "id": "44270cff.075ffc",
+        "type": "method",
+        "name": "p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof",
+        "xml": "<method rpc='p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 386.56678771972656,
+        "y": 845,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f251f976.64ff3"
+            ]
+        ]
+    },
+    {
+        "id": "8f693cfb.d505d",
+        "type": "execute",
+        "name": "execute RestApiCallNode getPath from OOF",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url + '?ethsrvType=' + $prop.ethsrvType`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 432.53973388671875,
+        "y": 363.996000289917,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "cb486fd5.830b",
+                "906dd9e3.75cef"
+            ]
+        ]
+    },
+    {
+        "id": "cb486fd5.830b",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 672.5398750305176,
+        "y": 387.99596977233887,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "797aa06c.00938"
+            ]
+        ]
+    },
+    {
+        "id": "c1ee6ad8.83ca08",
+        "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 OOF api\" />\n",
+        "comments": "",
+        "x": 842.539794921875,
+        "y": 327.99606132507324,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "906dd9e3.75cef",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 671.5396614074707,
+        "y": 336.9960603713989,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "c1ee6ad8.83ca08"
+            ]
+        ]
+    },
+    {
+        "id": "25cab887.227a6",
+        "type": "comment",
+        "name": "OTN tunnel path computation",
+        "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",
+        "comments": "",
+        "x": 404.0435333251953,
+        "y": 320,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "882d42af.d08248",
+        "type": "for",
+        "name": "for vidx..otn-oof.solutions_length[]",
+        "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 860.5395660400391,
+        "y": 813.2457275390625,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "40e93722.e40d08"
+            ]
+        ]
+    },
+    {
+        "id": "1db851ea.af50ee",
+        "type": "comment",
+        "name": "Loop through OTN links",
+        "info": "",
+        "comments": "",
+        "x": 944.0398712158203,
+        "y": 892.74609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "40e93722.e40d08",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 965.0667877197266,
+        "y": 1004.2864990234375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "2c0f74ca.54d50c",
+                "af5275b3.dbb6f8",
+                "1130b3f7.365ee4",
+                "8c1b9eaf.ad5cc8",
+                "f4071c85.a9878",
+                "6ced391e.ea212"
+            ]
+        ]
+    },
+    {
+        "id": "2c0f74ca.54d50c",
+        "type": "set",
+        "name": "set otn-oof.link-name and etc.",
+        "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].original_link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].src_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].dst_node`' />",
+        "comments": "",
+        "x": 1211.5667877197266,
+        "y": 897.2864990234375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "797aa06c.00938",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 817.5669212341309,
+        "y": 385.741455078125,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f251f976.64ff3",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 627.5355491638184,
+        "y": 771.7416372299194,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "882d42af.d08248",
+                "dbf43529.a6b38",
+                "e683f633.c5efe8",
+                "b39a241.90443d8"
+            ]
+        ]
+    },
+    {
+        "id": "2980fcb1.5caccc",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2379.0665435791016,
+        "y": 1330,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "f4071c85.a9878",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1175.0667724609375,
+        "y": 1145.999984741211,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e16e4301.473108",
+                "89d8c6ec.f54d3"
+            ]
+        ]
+    },
+    {
+        "id": "7513b61f.c8bc28",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2703.5665435791016,
+        "y": 821,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "356d916a.866316"
+            ]
+        ]
+    },
+    {
+        "id": "42e994b9.4c76c4",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2736.566665649414,
+        "y": 879,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "9fbe687d.f821e"
+            ]
+        ]
+    },
+    {
+        "id": "bf4c0e40.d53578",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2739.566665649414,
+        "y": 931,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "ff1d0e5e.8b2818"
+            ]
+        ]
+    },
+    {
+        "id": "9fbe687d.f821e",
+        "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": 2921.566665649414,
+        "y": 883,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "ff1d0e5e.8b2818",
+        "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": 2909.566665649414,
+        "y": 934,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "1fb76b15.27110d",
+        "type": "set",
+        "name": "set domain A node ttp-id",
+        "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4040.0665435791016,
+        "y": 736,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "f2aacb85.c592b8",
+        "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.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4048.0665435791016,
+        "y": 788,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "6548f220.2e2714"
+            ]
+        ]
+    },
+    {
+        "id": "6548f220.2e2714",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4254.566543579102,
+        "y": 766,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "fd3a1da9.a1e0c8"
+            ]
+        ]
+    },
+    {
+        "id": "356d916a.866316",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3670.066650390625,
+        "y": 800.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "30dabaf0.4be9d6",
+                "6fa7548f.d740bc"
+            ]
+        ]
+    },
+    {
+        "id": "e16e4301.473108",
+        "type": "get-resource",
+        "name": "get-resource dst tp",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2460.066665649414,
+        "y": 1226,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "ed8f0b24.2715b8",
+                "88ace869.b9ed8",
+                "2de04b36.3c829c"
+            ]
+        ]
+    },
+    {
+        "id": "ed8f0b24.2715b8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2682.5665435791016,
+        "y": 1368,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e0836e7b.28886"
+            ]
+        ]
+    },
+    {
+        "id": "88ace869.b9ed8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2666.5665435791016,
+        "y": 1419,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "a934ded3.a1905"
+            ]
+        ]
+    },
+    {
+        "id": "2de04b36.3c829c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2669.5665435791016,
+        "y": 1471,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "4f45c45b.037e24"
+            ]
+        ]
+    },
+    {
+        "id": "4f45c45b.037e24",
+        "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": 2839.5665435791016,
+        "y": 1474,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "a934ded3.a1905",
+        "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": 2851.5665435791016,
+        "y": 1423,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "8f268c3f.a32388",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5048.066543579102,
+        "y": 1179,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "b41bc1fd.7d3fe8",
+                "eb5ec4f3.1b9e58",
+                "ac0a66fa.f1ae18"
+            ]
+        ]
+    },
+    {
+        "id": "8d1d7a12.af2fb",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4835.066543579102,
+        "y": 1178,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "8f268c3f.a32388"
+            ]
+        ]
+    },
+    {
+        "id": "e0836e7b.28886",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3838.0665435791016,
+        "y": 1375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "d619c7c5.f21df",
+                "792e65b5.101e74"
+            ]
+        ]
+    },
+    {
+        "id": "8aedfe5b.118e88",
+        "type": "set",
+        "name": "set domain B node ttp-id",
+        "xml": "<set>\n<parameter name='tmp.domain-B.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4080.0665435791016,
+        "y": 1329,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "67f189a9.7533f",
+        "type": "get-resource",
+        "name": "get-resource dst 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.domain-B.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4070.0665435791016,
+        "y": 1380,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "ed9511b0.3861b"
+            ]
+        ]
+    },
+    {
+        "id": "ed9511b0.3861b",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4257.566543579102,
+        "y": 1378,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "d3635511.caa0e8"
+            ]
+        ]
+    },
+    {
+        "id": "b41bc1fd.7d3fe8",
+        "type": "set",
+        "name": "set domain B network-id",
+        "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5318.066543579102,
+        "y": 1155,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "eb5ec4f3.1b9e58",
+        "type": "get-resource",
+        "name": "get-resource dst network-resource",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5328.066543579102,
+        "y": 1201,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "36929426.507164"
+            ]
+        ]
+    },
+    {
+        "id": "36929426.507164",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5543.566543579102,
+        "y": 1192,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "c48d5abb.c3e938"
+            ]
+        ]
+    },
+    {
+        "id": "c48d5abb.c3e938",
+        "type": "set",
+        "name": "set domain B network-id, topo-id, client-id, etc",
+        "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 5798.066543579102,
+        "y": 1198,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "fd3a1da9.a1e0c8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4429.566543579102,
+        "y": 762,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "5f6936aa.a972"
+            ]
+        ]
+    },
+    {
+        "id": "d3635511.caa0e8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4446.566543579102,
+        "y": 1367,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "eda918a0.8449d8"
+            ]
+        ]
+    },
+    {
+        "id": "89d8c6ec.f54d3",
+        "type": "get-resource",
+        "name": "get-resource src tp",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2506.066665649414,
+        "y": 860,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "7513b61f.c8bc28",
+                "42e994b9.4c76c4",
+                "bf4c0e40.d53578"
+            ]
+        ]
+    },
+    {
+        "id": "30dabaf0.4be9d6",
+        "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-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3909.5665435791016,
+        "y": 606,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e4a733f.4bc16d",
+                "532ed172.f842b8",
+                "525afcbb.b25284"
+            ]
+        ]
+    },
+    {
+        "id": "e4a733f.4bc16d",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4105.066665649414,
+        "y": 558,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "86620d3e.1a119"
+            ]
+        ]
+    },
+    {
+        "id": "532ed172.f842b8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4097.066665649414,
+        "y": 613,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f8caa53b.d2789"
+            ]
+        ]
+    },
+    {
+        "id": "525afcbb.b25284",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4102.066665649414,
+        "y": 670,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "2783b89d.d20958"
+            ]
+        ]
+    },
+    {
+        "id": "2783b89d.d20958",
+        "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": 4254.066665649414,
+        "y": 671,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "f8caa53b.d2789",
+        "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": 4265.066665649414,
+        "y": 616,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "86620d3e.1a119",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4249.448989868164,
+        "y": 555.6556701660156,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e93e8b81.9ca2f",
+                "51152d30.8b729c"
+            ]
+        ]
+    },
+    {
+        "id": "e93e8b81.9ca2f",
+        "type": "set",
+        "name": "set domain A node-id and tpn",
+        "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",
+        "comments": "",
+        "x": 4474.566543579102,
+        "y": 511,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "838b8fb.d2dddf",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 3996.5665435791016,
+        "y": 853,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "5f6936aa.a972",
+        "type": "set",
+        "name": "set domain A tunnel tp ip",
+        "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n",
+        "comments": "",
+        "x": 4690.566543579102,
+        "y": 759,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "d619c7c5.f21df",
+        "type": "get-resource",
+        "name": "get-resource dst pnf",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3906.5665435791016,
+        "y": 1209,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "33ea4656.cee232",
+                "f355875f.873ba8",
+                "30542edc.d15092"
+            ]
+        ]
+    },
+    {
+        "id": "30542edc.d15092",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4102.066665649414,
+        "y": 1161,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f2ee29cc.e27708"
+            ]
+        ]
+    },
+    {
+        "id": "f355875f.873ba8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4094.066665649414,
+        "y": 1216,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "75aed15c.2299b8"
+            ]
+        ]
+    },
+    {
+        "id": "33ea4656.cee232",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4099.066665649414,
+        "y": 1273,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "7a3461ec.969fb"
+            ]
+        ]
+    },
+    {
+        "id": "f2ee29cc.e27708",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4246.448989868164,
+        "y": 1158.6556701660156,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "3864d34f.e845ac",
+                "932626a4.31e948"
+            ]
+        ]
+    },
+    {
+        "id": "75aed15c.2299b8",
+        "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": 4262.066665649414,
+        "y": 1219,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "7a3461ec.969fb",
+        "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": 4251.066665649414,
+        "y": 1274,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "3864d34f.e845ac",
+        "type": "set",
+        "name": "set domain B node-id and tpn",
+        "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 4455.566543579102,
+        "y": 1126,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "bb4d74f7.f1ae1",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4025.5665435791016,
+        "y": 1421,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "eda918a0.8449d8",
+        "type": "set",
+        "name": "set domain B tunnel tp id",
+        "xml": "<set>\n<parameter name='domain-B.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 4679.566543579102,
+        "y": 1366,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "dd289b7.b4700e8",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4831.566543579102,
+        "y": 574,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "cf9ce500.f50458"
+            ]
+        ]
+    },
+    {
+        "id": "cf9ce500.f50458",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5008.566543579102,
+        "y": 566,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "a88075c1.8c729",
+                "581a1998.3ec1d",
+                "7ccf368b.de5b58"
+            ]
+        ]
+    },
+    {
+        "id": "a88075c1.8c729",
+        "type": "set",
+        "name": "set domain A network-id",
+        "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5223.566543579102,
+        "y": 547,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "581a1998.3ec1d",
+        "type": "get-resource",
+        "name": "get-resource src network-resource",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5240.566543579102,
+        "y": 611,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f64c3af.f06e3c8"
+            ]
+        ]
+    },
+    {
+        "id": "f64c3af.f06e3c8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5464.066543579102,
+        "y": 612,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "cb2bd0a2.0f0d1"
+            ]
+        ]
+    },
+    {
+        "id": "cb2bd0a2.0f0d1",
+        "type": "set",
+        "name": "set domain A network-id, topo-id, client-id, etc",
+        "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n\n\n",
+        "comments": "",
+        "x": 5728.566543579102,
+        "y": 601,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "51152d30.8b729c",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4433.566543579102,
+        "y": 570,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "57449123.f2a71"
+            ]
+        ]
+    },
+    {
+        "id": "57449123.f2a71",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4628.566543579102,
+        "y": 570,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "dd289b7.b4700e8"
+            ]
+        ]
+    },
+    {
+        "id": "7ccf368b.de5b58",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 5167.566543579102,
+        "y": 664,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "932626a4.31e948",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4434.566543579102,
+        "y": 1177,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "d9ee893b.7d30f8"
+            ]
+        ]
+    },
+    {
+        "id": "d9ee893b.7d30f8",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4629.566543579102,
+        "y": 1177,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "8d1d7a12.af2fb"
+            ]
+        ]
+    },
+    {
+        "id": "ac0a66fa.f1ae18",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 5253.566543579102,
+        "y": 1257,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "6fa7548f.d740bc",
+        "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.src-tp`'/>-->\n<parameter name=\"original_string\" value='`$tmp.aai.src-tp.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3937.5665435791016,
+        "y": 400,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "74f4b0f6.47056",
+                "27b4b2a9.b21e2e"
+            ]
+        ]
+    },
+    {
+        "id": "27b4b2a9.b21e2e",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4158.566543579102,
+        "y": 368,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e49dd.c9c7fe23"
+            ]
+        ]
+    },
+    {
+        "id": "74f4b0f6.47056",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4158.566543579102,
+        "y": 415,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "1f79b.4a313865b"
+            ]
+        ]
+    },
+    {
+        "id": "e49dd.c9c7fe23",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4323.566543579102,
+        "y": 365,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "10ef5ee6.6f4e21"
+            ]
+        ]
+    },
+    {
+        "id": "10ef5ee6.6f4e21",
+        "type": "set",
+        "name": "set domain-A.ltpId",
+        "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value=\"`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",
+        "comments": "",
+        "x": 4505.566543579102,
+        "y": 369,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "1f79b.4a313865b",
+        "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": 4325.566543579102,
+        "y": 415,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "792e65b5.101e74",
+        "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.dst-tp.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3945.5665435791016,
+        "y": 1024,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "4265b65.dccf548",
+                "c497a629.64a3f"
+            ]
+        ]
+    },
+    {
+        "id": "c497a629.64a3f",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4166.566543579102,
+        "y": 992,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "30cfd60a.db8e02"
+            ]
+        ]
+    },
+    {
+        "id": "4265b65.dccf548",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4166.566543579102,
+        "y": 1039,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e09c0587.7b6dd8"
+            ]
+        ]
+    },
+    {
+        "id": "30cfd60a.db8e02",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4331.566543579102,
+        "y": 989,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "155f39c7.d2eb06"
+            ]
+        ]
+    },
+    {
+        "id": "155f39c7.d2eb06",
+        "type": "set",
+        "name": "set domain-B.ltpId",
+        "xml": "<set>\n<parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value=\"`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 4527.566543579102,
+        "y": 986,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "e09c0587.7b6dd8",
+        "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": 4333.566543579102,
+        "y": 1039,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "af5275b3.dbb6f8",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='otn-oof.link-name' value='' />\n<!--<parameter name='tmp.aai.cross-link' value='' />-->\n<parameter name='tmp.aai.cross-link.' value='' />\n<!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->",
+        "comments": "",
+        "x": 1202.566665649414,
+        "y": 826,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "a45815b.d857f68",
+        "type": "comment",
+        "name": "Not useful anymore",
+        "info": "this domain-A.ltpId is not used anymore",
+        "comments": "",
+        "x": 4548.566543579102,
+        "y": 345,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "6fa83178.5fd4d",
+        "type": "comment",
+        "name": "Not useful anymore",
+        "info": "this domain-B.ltpId is not used anymore",
+        "comments": "",
+        "x": 4570.566543579102,
+        "y": 958,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "dbf43529.a6b38",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='`tmp.otninfo.`' value='' />\n<!--<parameter name='`tmp.otninfo_length`' value='0' />-->\n<parameter name='`tmp.otninfoProtect.`' value='' />",
+        "comments": "",
+        "x": 843.5666656494141,
+        "y": 754,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "2a69c653.73aafa",
+        "type": "comment",
+        "name": "May not be necessary",
+        "info": "",
+        "comments": "",
+        "x": 854.5666656494141,
+        "y": 707,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "e683f633.c5efe8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 834.5666656494141,
+        "y": 504,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "193d39a9.b3e826",
+                "f78dfd48.3a3768",
+                "24ab8c42.ef544c",
+                "790240fb.3634a8",
+                "b11fbbc8.b831",
+                "d4108c1f.7fe08",
+                "8e33755a.1ba57",
+                "cc2f02e3.4faf38",
+                "ad3a0e96.973f7",
+                "22c2c20a.05cf8e",
+                "cf17500b.fb131",
+                "e68ab165.5e6938",
+                "428ceff6.b61fb8"
+            ]
+        ]
+    },
+    {
+        "id": "e9fd00e5.f905a",
+        "type": "execute",
+        "name": "execute PCE in ccsdk/sli/core",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePaths' >\n<parameter name=\"pnfs-pfx\" value='ccsdkTopopnfs'/>\n<parameter name=\"links-pfx\" value=\"ccsdkTopologicalLinks\"/>\n<parameter name=\"response-pfx\" value=\"otn-oof\"/>\n<parameter name=\"output-end-to-end-path\" value=\"false\"/>\n<!--<parameter name=\"src-node\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"dst-node\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"src-node\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"dst-node\" value=\"`$tmp.pce-dst-node`\"/>\n<parameter name=\"dst-node-backup\" value=\"`$tmp.pce-dst-node-backup`\"/>\n<parameter name=\"require-backuppath\" value=\"`$hasSecondary`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1708.566665649414,
+        "y": 643.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "bb6df733.3f44d",
+                "d77e65bd.2b2398",
+                "f53ab3c0.9af598"
+            ]
+        ]
+    },
+    {
+        "id": "193d39a9.b3e826",
+        "type": "record",
+        "name": "record tmp.pce-src and dst node and backup",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<!--<parameter name=\"field1\" value=\"Path computation succeed!\"/>-->\n<!--<parameter name=\"field2\" value=\"`$ccsdkTopo.resp.solutions_length`\"/>-->\n\n<!--<parameter name=\"field1\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"field2\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"field1\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"field2\" value=\"`$tmp.pce-dst-node`\"/>\n<parameter name=\"field3\" value=\"`$tmp.pce-dst-node-backup`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1130.566665649414,
+        "y": 537,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bb6df733.3f44d",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1953.566665649414,
+        "y": 675.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d77e65bd.2b2398",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1960.566665649414,
+        "y": 717.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f53ab3c0.9af598",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1955.566665649414,
+        "y": 638.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f78dfd48.3a3768",
+        "type": "set",
+        "name": "set tmp.pce-src-node",
+        "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' 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                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
+        "comments": "",
+        "x": 1051.566665649414,
+        "y": 409,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "24ab8c42.ef544c",
+        "type": "set",
+        "name": "set tmp.pce-dst-node",
+        "xml": "<set>\n<!--<parameter name='$tmp.pce-dst-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.pce-dst-node' 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                                                   $otnTopoIdDst + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />",
+        "comments": "",
+        "x": 1051.566665649414,
+        "y": 449,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "1130b3f7.365ee4",
+        "type": "set",
+        "name": "set src-ltpId",
+        "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$otn-oof.solutions[$vidx].src_pinterface`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$otn-oof.solutions[$vidx].src_node`\" />\n",
+        "comments": "",
+        "x": 1184.566665649414,
+        "y": 957,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "8c1b9eaf.ad5cc8",
+        "type": "set",
+        "name": "set dst-ltpId",
+        "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$otn-oof.solutions[$vidx].dst_pinterface`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$otn-oof.solutions[$vidx].dst_node`\" />\n\n\n",
+        "comments": "",
+        "x": 1185.566665649414,
+        "y": 1007,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "790240fb.3634a8",
+        "type": "get-resource",
+        "name": "get-resource network-resources-list",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1108.566665649414,
+        "y": 133,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "321f874b.15ea38",
+                "c35ee9e4.47e1e8",
+                "e499a9a9.0e01"
+            ]
+        ]
+    },
+    {
+        "id": "c35ee9e4.47e1e8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1341.566665649414,
+        "y": 157,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e499a9a9.0e01",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1355.566665649414,
+        "y": 197,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "321f874b.15ea38",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1344.566665649414,
+        "y": 116,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b11fbbc8.b831",
+        "type": "for",
+        "name": "for netwidx..allNetworksList_length",
+        "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1100.566665649414,
+        "y": 179,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "37e56864.c384a8"
+            ]
+        ]
+    },
+    {
+        "id": "37e56864.c384a8",
+        "type": "switchNode",
+        "name": "switch provider-id domainA",
+        "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1421.566665649414,
+        "y": 255,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f31c0e54.58cfb8",
+                "5dd15fcb.a313c8"
+            ]
+        ]
+    },
+    {
+        "id": "f31c0e54.58cfb8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1645.566665649414,
+        "y": 317,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "ed4148.5a48a6b8"
+            ]
+        ]
+    },
+    {
+        "id": "ed4148.5a48a6b8",
+        "type": "switchNode",
+        "name": "switch te-topo-id",
+        "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1858.566665649414,
+        "y": 317,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "ded6fc8b.e35ca"
+            ]
+        ]
+    },
+    {
+        "id": "ded6fc8b.e35ca",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2023.566665649414,
+        "y": 317,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "78504a68.544f74"
+            ]
+        ]
+    },
+    {
+        "id": "78504a68.544f74",
+        "type": "set",
+        "name": "set otnTopoIdSrc",
+        "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 2192.566665649414,
+        "y": 317,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "5dd15fcb.a313c8",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1645.566665649414,
+        "y": 370,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "2f4e5806.bb24d8"
+            ]
+        ]
+    },
+    {
+        "id": "2f4e5806.bb24d8",
+        "type": "switchNode",
+        "name": "switch provider-id domainB",
+        "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainB-pnfName[2]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1833.566665649414,
+        "y": 370,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "27eb21a8.ffa636",
+                "122e2aea.eb72ed"
+            ]
+        ]
+    },
+    {
+        "id": "27eb21a8.ffa636",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2023.566665649414,
+        "y": 370,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f3653aa0.5d2ad"
+            ]
+        ]
+    },
+    {
+        "id": "f3653aa0.5d2ad",
+        "type": "switchNode",
+        "name": "switch te-topo-id",
+        "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainB-pnfName[6]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2191.566665649414,
+        "y": 370,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "fd147531.b78cd8"
+            ]
+        ]
+    },
+    {
+        "id": "fd147531.b78cd8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2347.566665649414,
+        "y": 370,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "3d9b6343.bf83b4"
+            ]
+        ]
+    },
+    {
+        "id": "bb09be53.6788e",
+        "type": "set",
+        "name": "set otnTopoIdDst",
+        "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 3081.566665649414,
+        "y": 353.99998474121094,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "d4108c1f.7fe08",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<!--<parameter name='`otn-oof`' value='' />-->\n<parameter name='otn-oof.' value='' />\n<!--<parameter name='`otn-oof.solutions`' value='' />-->\n<!--<parameter name='`otn-oof.solutions.`' value='' />-->\n<!--<parameter name='`otn-oof.solutions_length`' value='0' />-->",
+        "comments": "",
+        "x": 1045.566665649414,
+        "y": 350,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "8e33755a.1ba57",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
+        "comments": "",
+        "x": 1054.566665649414,
+        "y": 232,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "cc2f02e3.4faf38",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='tmp.pce-dst-node.' value='' />\n",
+        "comments": "",
+        "x": 1052.566665649414,
+        "y": 274,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "ad3a0e96.973f7",
+        "type": "record",
+        "name": "record otn-oof.",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$otn-oof.`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1041.566665649414,
+        "y": 585,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "64986c6c.bc6cbc",
+        "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": 1063.566665649414,
+        "y": 658,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "22c2c20a.05cf8e",
+        "type": "set",
+        "name": "set filename",
+        "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='filenamemm' value=\"`$tmp.pce-src-node + $tmp.pce-dst-node + $tmp.pce-dst-node-backup`\" />",
+        "comments": "",
+        "x": 1037.566665649414,
+        "y": 621,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "122e2aea.eb72ed",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2013.566665649414,
+        "y": 434,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f2ff8fde.f8f5"
+            ]
+        ]
+    },
+    {
+        "id": "f2ff8fde.f8f5",
+        "type": "switchNode",
+        "name": "switch provider-id domainC",
+        "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainC-pnfName[2]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2214.566665649414,
+        "y": 435,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "5914550b.42ac7c"
+            ]
+        ]
+    },
+    {
+        "id": "5914550b.42ac7c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2424.566665649414,
+        "y": 435,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "8ad70e62.96436"
+            ]
+        ]
+    },
+    {
+        "id": "951109a8.a2d568",
+        "type": "set",
+        "name": "set otnTopoIdDstBackup",
+        "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 3197.566665649414,
+        "y": 525.0000457763672,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "cf17500b.fb131",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='tmp.pce-dst-node-backup.' value='' />\n",
+        "comments": "",
+        "x": 1050.566665649414,
+        "y": 312,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "e68ab165.5e6938",
+        "type": "set",
+        "name": "set tmp.pce-dst-node-backup",
+        "xml": "<set>\n<!--<parameter name='$tmp.pce-dst-node' 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<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.pce-dst-node-backup' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $otnTopoIdDstBackup + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />",
+        "comments": "",
+        "x": 1082.566665649414,
+        "y": 490,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "428ceff6.b61fb8",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1086.566665649414,
+        "y": 737,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "2dd23358.7a4f8c",
+                "d85ed40b.18e0d8"
+            ]
+        ]
+    },
+    {
+        "id": "2dd23358.7a4f8c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1329.566665649414,
+        "y": 633.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e501702c.102908"
+            ]
+        ]
+    },
+    {
+        "id": "e501702c.102908",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1456.566665649414,
+        "y": 632.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e9fd00e5.f905a"
+            ]
+        ]
+    },
+    {
+        "id": "51c8728f.9b3dc4",
+        "type": "execute",
+        "name": "execute PCE in ccsdk/sli/core",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >\n<parameter name=\"pnfs-pfx\" value='ccsdkTopopnfs'/>\n<parameter name=\"links-pfx\" value=\"ccsdkTopologicalLinks\"/>\n<parameter name=\"response-pfx\" value=\"otn-oof\"/>\n<parameter name=\"output-end-to-end-path\" value=\"false\"/>\n<!--<parameter name=\"src-node\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"dst-node\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"src-node\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"dst-node\" value=\"`$tmp.pce-dst-node`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1708.566665649414,
+        "y": 785.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "840d6ce4.86fa98",
+                "e998e819.af2e6",
+                "e1b72b55.dd4808"
+            ]
+        ]
+    },
+    {
+        "id": "840d6ce4.86fa98",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1953.566665649414,
+        "y": 817.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e998e819.af2e6",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1960.566665649414,
+        "y": 859.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e1b72b55.dd4808",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1955.566665649414,
+        "y": 780.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ad3f16cb.c3aec",
+        "type": "for",
+        "name": "for vidx..otn-oof.secondarySolutions_length[]",
+        "xml": "<for index='vidx' start='0' end='`$otn-oof.secondarySolutions_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 851.5666656494141,
+        "y": 2155,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "72549b66.8616bc"
+            ]
+        ]
+    },
+    {
+        "id": "72549b66.8616bc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 956.0938873291016,
+        "y": 2346.040771484375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "2c2c9198.c50c3e",
+                "ac7c42a0.7e38d",
+                "d84b858c.9ebcd8",
+                "7b4c76e2.5f3b3",
+                "8d10bcb0.3c6cd"
+            ]
+        ]
+    },
+    {
+        "id": "2c2c9198.c50c3e",
+        "type": "set",
+        "name": "set otn-oof.link-name and etc.",
+        "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.secondarySolutions[$vidx].original_link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.secondarySolutions[$vidx].src_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.secondarySolutions[$vidx].dst_node`' />",
+        "comments": "",
+        "x": 1202.5938873291016,
+        "y": 2239.040771484375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "8d10bcb0.3c6cd",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1169.0938873291016,
+        "y": 2427.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "aa69eaa5.3a021",
+                "fca0adae.ec58d"
+            ]
+        ]
+    },
+    {
+        "id": "ac7c42a0.7e38d",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='otn-oof.link-name' value='' />\n<!--<parameter name='tmp.aai.cross-link' value='' />-->\n<parameter name='tmp.aai.cross-link.' value='' />\n<!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->\n\n<parameter name='tmp.src-pnf-name' value='' />\n<parameter name='tmp.cross-link.' value='' />\n<parameter name='tmp.dst-pnf-name' value='' />\n<parameter name='tmp.aai.src-tp.' value='' />\n<parameter name='param-prefix-src-tp.' value='' />\n<parameter name='tmp.aai.src-pnf.' value='' />\n<parameter name='tmp.domain-A.network-id' value='' />\n<parameter name='tmp.aai.src-network-resource.' value='' />\n<parameter name='tmp.domain-A.ttp-id' value='' />\n<parameter name='tmp.aai.src-ttp.' value='' />\n\n<parameter name='tmp.aai.dst-tp.' value='' />\n<parameter name='param-prefix-dst-tp.' value='' />\n<parameter name='tmp.aai.dst-pnf.' value='' />\n<parameter name='tmp.domain-C.network-id' value='' />\n<parameter name='tmp.aai.dst-network-resource.' value='' />\n<parameter name='tmp.domain-C.ttp-id' value='' />\n<parameter name='tmp.aai.dst-ttp.' value='' />\n\n",
+        "comments": "",
+        "x": 1193.593765258789,
+        "y": 2167.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "d84b858c.9ebcd8",
+        "type": "set",
+        "name": "set src-ltpId",
+        "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$otn-oof.secondarySolutions[$vidx].src_pinterface`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$otn-oof.secondarySolutions[$vidx].src_node`\" />\n",
+        "comments": "",
+        "x": 1175.593765258789,
+        "y": 2298.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "7b4c76e2.5f3b3",
+        "type": "set",
+        "name": "set dst-ltpId",
+        "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$otn-oof.secondarySolutions[$vidx].dst_pinterface`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$otn-oof.secondarySolutions[$vidx].dst_node`\" />\n\n\n",
+        "comments": "",
+        "x": 1176.593765258789,
+        "y": 2348.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "e9bb736e.56fa8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2694.5936431884766,
+        "y": 2162.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "ec0798cb.1533d"
+            ]
+        ]
+    },
+    {
+        "id": "dcb58752.9af25",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2727.593765258789,
+        "y": 2220.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "b9704f1a.b2d23"
+            ]
+        ]
+    },
+    {
+        "id": "292261ad.c3ebbe",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2730.593765258789,
+        "y": 2272.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "25bfbaf5.9753ce"
+            ]
+        ]
+    },
+    {
+        "id": "b9704f1a.b2d23",
+        "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": 2912.593765258789,
+        "y": 2224.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "25bfbaf5.9753ce",
+        "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": 2900.593765258789,
+        "y": 2275.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "fca0adae.ec58d",
+        "type": "get-resource",
+        "name": "get-resource src tp",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2497.093765258789,
+        "y": 2201.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e9bb736e.56fa8",
+                "dcb58752.9af25",
+                "292261ad.c3ebbe"
+            ]
+        ]
+    },
+    {
+        "id": "601e2b2c.1242bc",
+        "type": "set",
+        "name": "set domain A node ttp-id",
+        "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4031.0936431884766,
+        "y": 2077.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "4bb17f13.2cb71",
+        "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.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4039.0936431884766,
+        "y": 2129.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "c2621b79.2537a8"
+            ]
+        ]
+    },
+    {
+        "id": "c2621b79.2537a8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4245.593643188477,
+        "y": 2107.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "6ccb8a24.97b474"
+            ]
+        ]
+    },
+    {
+        "id": "ec0798cb.1533d",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3810.0936431884766,
+        "y": 2144.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f9a3f20b.186cc",
+                "ff2ca881.6e80f"
+            ]
+        ]
+    },
+    {
+        "id": "6ccb8a24.97b474",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4420.593643188477,
+        "y": 2103.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "82ff29ba.0fae6"
+            ]
+        ]
+    },
+    {
+        "id": "f9a3f20b.186cc",
+        "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-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3900.5936431884766,
+        "y": 1947.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "57016828.7a9698",
+                "65b4f33e.0e081c",
+                "be25b5b.9a149c8"
+            ]
+        ]
+    },
+    {
+        "id": "57016828.7a9698",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4096.093765258789,
+        "y": 1899.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "9fdba29.534c3e"
+            ]
+        ]
+    },
+    {
+        "id": "65b4f33e.0e081c",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4088.093765258789,
+        "y": 1954.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "4b002c39.a49434"
+            ]
+        ]
+    },
+    {
+        "id": "be25b5b.9a149c8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4093.093765258789,
+        "y": 2011.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "25f8b7d.3afb4c8"
+            ]
+        ]
+    },
+    {
+        "id": "25f8b7d.3afb4c8",
+        "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": 4245.093765258789,
+        "y": 2012.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "4b002c39.a49434",
+        "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": 4256.093765258789,
+        "y": 1957.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "9fdba29.534c3e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4240.476089477539,
+        "y": 1897.4099426269531,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "a19b2d56.1ea388",
+                "797cc960.582008"
+            ]
+        ]
+    },
+    {
+        "id": "a19b2d56.1ea388",
+        "type": "set",
+        "name": "set domain A node-id and tpn",
+        "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />",
+        "comments": "",
+        "x": 4465.593643188477,
+        "y": 1852.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "c3f67f95.429dc8",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 3987.5936431884766,
+        "y": 2194.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "797cc960.582008",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4424.593643188477,
+        "y": 1911.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "344ff0b9.5a6638"
+            ]
+        ]
+    },
+    {
+        "id": "ff2ca881.6e80f",
+        "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.src-tp`'/>-->\n<parameter name=\"original_string\" value='`$tmp.aai.src-tp.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3928.5936431884766,
+        "y": 1741.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "17b2ffb3.2d4f28",
+                "d4ff8e2b.b4c1a"
+            ]
+        ]
+    },
+    {
+        "id": "d4ff8e2b.b4c1a",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4149.593643188477,
+        "y": 1709.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "59d0ac44.c2fd5c"
+            ]
+        ]
+    },
+    {
+        "id": "17b2ffb3.2d4f28",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4149.593643188477,
+        "y": 1756.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "9ebc4b55.62965"
+            ]
+        ]
+    },
+    {
+        "id": "59d0ac44.c2fd5c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4314.593643188477,
+        "y": 1706.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "1a379e27.92df22"
+            ]
+        ]
+    },
+    {
+        "id": "1a379e27.92df22",
+        "type": "set",
+        "name": "set domain-A.ltpId",
+        "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-ltp-id`' value=\"`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />",
+        "comments": "",
+        "x": 4496.593643188477,
+        "y": 1710.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "9ebc4b55.62965",
+        "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": 4316.593643188477,
+        "y": 1756.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "2ed9f2e5.dc7796",
+        "type": "comment",
+        "name": "Not useful anymore",
+        "info": "this domain-A.ltpId is not used anymore",
+        "comments": "",
+        "x": 4539.593643188477,
+        "y": 1686.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "82ff29ba.0fae6",
+        "type": "set",
+        "name": "set domain A tunnel tp ip",
+        "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-tunnel-tp-id`' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />\n",
+        "comments": "",
+        "x": 4681.593643188477,
+        "y": 2100.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "d5728c31.d60e58",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4822.593643188477,
+        "y": 1915.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "b69c1030.9f819"
+            ]
+        ]
+    },
+    {
+        "id": "344ff0b9.5a6638",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4619.593643188477,
+        "y": 1911.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "d5728c31.d60e58"
+            ]
+        ]
+    },
+    {
+        "id": "b69c1030.9f819",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4999.593643188477,
+        "y": 1907.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "166dece1.2a1d83",
+                "f5802fed.00b688",
+                "9da4f014.ed916"
+            ]
+        ]
+    },
+    {
+        "id": "166dece1.2a1d83",
+        "type": "set",
+        "name": "set domain A network-id",
+        "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5214.593643188477,
+        "y": 1888.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "f5802fed.00b688",
+        "type": "get-resource",
+        "name": "get-resource src network-resource",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5231.593643188477,
+        "y": 1952.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "70174310.ef21fc"
+            ]
+        ]
+    },
+    {
+        "id": "70174310.ef21fc",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5455.093643188477,
+        "y": 1953.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "a7e50d88.6d2e68"
+            ]
+        ]
+    },
+    {
+        "id": "a7e50d88.6d2e68",
+        "type": "set",
+        "name": "set domain A network-id, topo-id, client-id, etc",
+        "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-id`' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-provider-id`' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-client-id`' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-topology-id`' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-type`' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n<parameter name='`tmp.otninfoProtect`' value='`$vidx + 1`' />\n\n\n",
+        "comments": "",
+        "x": 5719.593643188477,
+        "y": 1942.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "9da4f014.ed916",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 5158.593643188477,
+        "y": 2005.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "32a11f41.1ed8d",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2370.0936431884766,
+        "y": 2671.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "aa69eaa5.3a021",
+        "type": "get-resource",
+        "name": "get-resource dst tp",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2451.093765258789,
+        "y": 2567.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "152c1e2a.f51b3a",
+                "7865573.9e8f528",
+                "eadd04f2.0d2bb"
+            ]
+        ]
+    },
+    {
+        "id": "152c1e2a.f51b3a",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2673.5936431884766,
+        "y": 2709.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "356cecf3.c4ea5c"
+            ]
+        ]
+    },
+    {
+        "id": "7865573.9e8f528",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2657.5936431884766,
+        "y": 2760.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "c6fabcec.420a88"
+            ]
+        ]
+    },
+    {
+        "id": "eadd04f2.0d2bb",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2660.5936431884766,
+        "y": 2812.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "38ceedcf.b5335a"
+            ]
+        ]
+    },
+    {
+        "id": "38ceedcf.b5335a",
+        "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": 2830.5936431884766,
+        "y": 2815.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "c6fabcec.420a88",
+        "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": 2842.5936431884766,
+        "y": 2764.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "356cecf3.c4ea5c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3829.0936431884766,
+        "y": 2716.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "4fed46ef.674408",
+                "3084850b.df6bda"
+            ]
+        ]
+    },
+    {
+        "id": "a44d6b1a.d3f79",
+        "type": "set",
+        "name": "set domain C node ttp-id",
+        "xml": "<set>\n<parameter name='tmp.domain-C.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4071.0936431884766,
+        "y": 2670.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "c5d0aabe.bbcdd",
+        "type": "get-resource",
+        "name": "get-resource dst 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.domain-C.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4061.0936431884766,
+        "y": 2721.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "a5108f92.47e008"
+            ]
+        ]
+    },
+    {
+        "id": "a5108f92.47e008",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4248.593643188477,
+        "y": 2719.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "3f6a4418.f345e4"
+            ]
+        ]
+    },
+    {
+        "id": "3f6a4418.f345e4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4437.593643188477,
+        "y": 2708.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f349b322.df08"
+            ]
+        ]
+    },
+    {
+        "id": "4fed46ef.674408",
+        "type": "get-resource",
+        "name": "get-resource dst pnf",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3897.5936431884766,
+        "y": 2550.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "bd5f8459.3729e",
+                "4c983cea.380204",
+                "22ff4b86.f0d134"
+            ]
+        ]
+    },
+    {
+        "id": "22ff4b86.f0d134",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4093.093765258789,
+        "y": 2502.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f7516a99.fda6b8"
+            ]
+        ]
+    },
+    {
+        "id": "4c983cea.380204",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4085.093765258789,
+        "y": 2557.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "295923ec.beece4"
+            ]
+        ]
+    },
+    {
+        "id": "bd5f8459.3729e",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4090.093765258789,
+        "y": 2614.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e1270f4a.ad2a4"
+            ]
+        ]
+    },
+    {
+        "id": "f7516a99.fda6b8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4237.476089477539,
+        "y": 2500.409942626953,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "bed1ec55.99743",
+                "1fe2d8e1.fee497"
+            ]
+        ]
+    },
+    {
+        "id": "295923ec.beece4",
+        "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": 4253.093765258789,
+        "y": 2560.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "e1270f4a.ad2a4",
+        "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": 4242.093765258789,
+        "y": 2615.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "bed1ec55.99743",
+        "type": "set",
+        "name": "set domain C node-id and tpn",
+        "xml": "<set>\n<parameter name='domain-C.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-C.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-node-id`' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 4446.593643188477,
+        "y": 2467.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "b4276d76.e5bd28",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4016.5936431884766,
+        "y": 2762.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "1fe2d8e1.fee497",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4425.593643188477,
+        "y": 2518.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "160d6eb7.8ffc29"
+            ]
+        ]
+    },
+    {
+        "id": "3084850b.df6bda",
+        "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.dst-tp.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3936.5936431884766,
+        "y": 2365.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "8b1f9e78.fc6b08",
+                "3fee13c1.19280c"
+            ]
+        ]
+    },
+    {
+        "id": "3fee13c1.19280c",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4157.593643188477,
+        "y": 2333.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "6b3391c6.a98da8"
+            ]
+        ]
+    },
+    {
+        "id": "8b1f9e78.fc6b08",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4157.593643188477,
+        "y": 2380.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "14daeb1e.72349d"
+            ]
+        ]
+    },
+    {
+        "id": "6b3391c6.a98da8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4322.593643188477,
+        "y": 2330.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "1cd577a8.988b1"
+            ]
+        ]
+    },
+    {
+        "id": "1cd577a8.988b1",
+        "type": "set",
+        "name": "set domain-C.ltpId",
+        "xml": "<set>\n<parameter name='domain-C.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-ltp-id`' value=\"`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 4518.593643188477,
+        "y": 2327.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "14daeb1e.72349d",
+        "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": 4324.593643188477,
+        "y": 2380.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "4bc21155.9e35b8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5039.093643188477,
+        "y": 2520.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "847f7adf.63e62",
+                "d5d38231.3c54c8",
+                "34664c18.fc324c"
+            ]
+        ]
+    },
+    {
+        "id": "a98c3e69.f90ce",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4826.093643188477,
+        "y": 2519.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "4bc21155.9e35b8"
+            ]
+        ]
+    },
+    {
+        "id": "f349b322.df08",
+        "type": "set",
+        "name": "set domain C tunnel tp id",
+        "xml": "<set>\n<parameter name='domain-C.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-tunnel-tp-id`' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 4670.593643188477,
+        "y": 2707.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "160d6eb7.8ffc29",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4620.593643188477,
+        "y": 2518.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "a98c3e69.f90ce"
+            ]
+        ]
+    },
+    {
+        "id": "34664c18.fc324c",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 5244.593643188477,
+        "y": 2598.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "ae34b806.fa03b",
+        "type": "comment",
+        "name": "Not useful anymore",
+        "info": "this domain-B.ltpId is not used anymore",
+        "comments": "",
+        "x": 4561.593643188477,
+        "y": 2299.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "847f7adf.63e62",
+        "type": "set",
+        "name": "set domain C network-id",
+        "xml": "<set>\n<parameter name='tmp.domain-C.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5309.093643188477,
+        "y": 2496.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "d5d38231.3c54c8",
+        "type": "get-resource",
+        "name": "get-resource dst network-resource",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-C.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5319.093643188477,
+        "y": 2542.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "c8249671.c35c4"
+            ]
+        ]
+    },
+    {
+        "id": "c8249671.c35c4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5534.593643188477,
+        "y": 2533.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "e7dfb060.d731a"
+            ]
+        ]
+    },
+    {
+        "id": "e7dfb060.d731a",
+        "type": "set",
+        "name": "set domain B network-id, topo-id, client-id, etc",
+        "xml": "<set>\n<parameter name='domain-C.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-C.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-C.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-C.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-C.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-id`' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-provider-id`' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-client-id`' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-topology-id`' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-type`' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n<parameter name='`tmp.otninfoProtect`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 5789.093643188477,
+        "y": 2539.7542724609375,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "f489a007.b1fc48",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2695.766616821289,
+        "y": 358.0833282470703,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "c262fde8.437148",
+                "6b716591.83bdfc"
+            ]
+        ]
+    },
+    {
+        "id": "c262fde8.437148",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2844.766616821289,
+        "y": 255.08331298828125,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "c793aa2a.5c74e"
+            ]
+        ]
+    },
+    {
+        "id": "c793aa2a.5c74e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2977.766616821289,
+        "y": 257.08331298828125,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f2810acd.c58fe8"
+            ]
+        ]
+    },
+    {
+        "id": "f2810acd.c58fe8",
+        "type": "switchNode",
+        "name": "switch 2-ROOTS in same domain?",
+        "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3212.649917602539,
+        "y": 266.9666748046875,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "1e64454.01debbb",
+                "769cd65e.c95b38"
+            ]
+        ]
+    },
+    {
+        "id": "1e64454.01debbb",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3443.649917602539,
+        "y": 292.9666442871094,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "3dcfd2e9.8e3c46"
+            ]
+        ]
+    },
+    {
+        "id": "769cd65e.c95b38",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3373.649917602539,
+        "y": 483.9666748046875,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "10e6181e.3d4e78"
+            ]
+        ]
+    },
+    {
+        "id": "3dcfd2e9.8e3c46",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3585.649917602539,
+        "y": 282.9666442871094,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "9ff11e86.dc4bb",
+                "8227d2b1.488338"
+            ]
+        ]
+    },
+    {
+        "id": "10e6181e.3d4e78",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3499.649917602539,
+        "y": 483.9666748046875,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "a1c4eb1b.b4754"
+            ]
+        ]
+    },
+    {
+        "id": "3d9b6343.bf83b4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2496.533462524414,
+        "y": 361.0833435058594,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "f489a007.b1fc48"
+            ]
+        ]
+    },
+    {
+        "id": "9ff11e86.dc4bb",
+        "type": "set",
+        "name": "set otnTopoIdDst",
+        "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 3744.233413696289,
+        "y": 262.0833282470703,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "8227d2b1.488338",
+        "type": "set",
+        "name": "set otnTopoIdDstBackup",
+        "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 3766.233413696289,
+        "y": 310.0833282470703,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "a1c4eb1b.b4754",
+        "type": "set",
+        "name": "set otnTopoIdDst",
+        "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 3670.233413696289,
+        "y": 484.0833435058594,
+        "z": "4e0409b8.f91f",
+        "wires": []
+    },
+    {
+        "id": "8ad70e62.96436",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2565.250015258789,
+        "y": 435.8833312988281,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "5780b97a.59b558"
+            ]
+        ]
+    },
+    {
+        "id": "5780b97a.59b558",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2764.483169555664,
+        "y": 432.88331604003906,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "fef9cbe1.25a228"
+            ]
+        ]
+    },
+    {
+        "id": "fef9cbe1.25a228",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2955.483169555664,
+        "y": 436.88331604003906,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "ec1ef68a.ed26c8"
+            ]
+        ]
+    },
+    {
+        "id": "ec1ef68a.ed26c8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3082.483169555664,
+        "y": 435.88331604003906,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "951109a8.a2d568"
+            ]
+        ]
+    },
+    {
+        "id": "dcb40ac9.18c4f",
+        "type": "switchNode",
+        "name": "switch secondarySolutions empty?",
+        "xml": "<switch test='`length($otn-oof.secondarySolutions) == 0`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1426.133316040039,
+        "y": 1739.566650390625,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "b4326611.a83f7",
+                "fc540bcd.ddd198"
+            ]
+        ]
+    },
+    {
+        "id": "b4326611.a83f7",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1652.0333404541016,
+        "y": 1711.566650390625,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "11284bee.dffd4c"
+            ]
+        ]
+    },
+    {
+        "id": "fc540bcd.ddd198",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1650.0333404541016,
+        "y": 1761.566650390625,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "11284bee.dffd4c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1794.133316040039,
+        "y": 1711.566650390625,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b39a241.90443d8",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 805.0333404541016,
+        "y": 1928.566650390625,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "549781c.cb0618"
+            ]
+        ]
+    },
+    {
+        "id": "549781c.cb0618",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 991.0333404541016,
+        "y": 1929.566650390625,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "d885ede8.5b658"
+            ]
+        ]
+    },
+    {
+        "id": "d885ede8.5b658",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1121.0333404541016,
+        "y": 1929.566650390625,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "ad3f16cb.c3aec"
+            ]
+        ]
+    },
+    {
+        "id": "d85ed40b.18e0d8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1327.566665649414,
+        "y": 739.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "2d158257.c6b36e"
+            ]
+        ]
+    },
+    {
+        "id": "2d158257.c6b36e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1467.566665649414,
+        "y": 739.9999847412109,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "51c8728f.9b3dc4"
+            ]
+        ]
+    },
+    {
+        "id": "6b716591.83bdfc",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2890.566665649414,
+        "y": 358.99998474121094,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            [
+                "bb09be53.6788e"
+            ]
+        ]
+    },
+    {
+        "id": "6ced391e.ea212",
+        "type": "record",
+        "name": "record cross-link",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<!--<parameter name=\"field1\" value=\"Path computation succeed!\"/>-->\n<!--<parameter name=\"field2\" value=\"`$ccsdkTopo.resp.solutions_length`\"/>-->\n\n<!--<parameter name=\"field1\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"field2\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"field1\" value=\"`$tmp.cross-link.src-ltpId`\"/>\n<parameter name=\"field2\" value=\"`$tmp.src-pnf-name`\"/>\n<parameter name=\"field3\" value=\"`$tmp.cross-link.dst-ltpId`\"/>\n<parameter name=\"field4\" value=\"`$tmp.dst-pnf-name`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1200.566650390625,
+        "y": 1068.999984741211,
+        "z": "4e0409b8.f91f",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
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 651d55ce..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": "2211395a.011d9e",
+        "id": "7ed82570.98fbdc",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 163.3333282470703,
-        "y": 160.33334350585938,
-        "z": "1f8b432c.7b707d",
+        "x": 128.56666564941406,
+        "y": 178.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "76c66690.98a45"
+                "391afd32.1d09aa"
             ]
         ]
     },
     {
-        "id": "76c66690.98a45",
+        "id": "391afd32.1d09aa",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,5810 +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": 388.6190185546875,
-        "y": 234.5714521408081,
-        "z": "1f8b432c.7b707d",
+        "x": 353.85235595703125,
+        "y": 252.8047742843628,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b63d123d.97032"
+                "90765c89.647058"
             ]
         ]
     },
     {
-        "id": "b63d123d.97032",
+        "id": "90765c89.647058",
         "type": "method",
         "name": "method p2p-vnf-topology-operation-p2p-modify",
         "xml": "<method rpc='p2p-vnf-topology-operation-p2p-modify' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 394.7619323730469,
-        "y": 319.3333740234375,
-        "z": "1f8b432c.7b707d",
+        "x": 359.9952697753906,
+        "y": 337.5666961669922,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8673b8f9.6a3da8"
+                "9cde6295.2d0718"
             ]
         ]
     },
     {
-        "id": "8673b8f9.6a3da8",
+        "id": "9cde6295.2d0718",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 764.5713653564453,
-        "y": 344.0000305175781,
-        "z": "1f8b432c.7b707d",
+        "x": 729.8047027587891,
+        "y": 362.2333526611328,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ae3ebf6e.ef0d08",
-                "ab777fe6.923ff8",
-                "74df18ed.a4e518"
+                "4ae0dd2a.d94ce4",
+                "79738588.734b34",
+                "1f3c8c44.a01cfc"
             ]
         ]
     },
     {
-        "id": "ae3ebf6e.ef0d08",
+        "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": 1019.9048614501953,
-        "y": 497.9303283691406,
-        "z": "1f8b432c.7b707d",
+        "x": 985.1381988525391,
+        "y": 516.1636505126953,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ab777fe6.923ff8",
+        "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": 1087.3333282470703,
-        "y": 317.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1052.566665649414,
+        "y": 335.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "aea97b8e.023f8",
-                "722dfa8c.b5ceac",
-                "9688fc7c.73aaf"
+                "8962e75e.00261",
+                "4fd36492.b80aa4",
+                "9a3dacb1.190568"
             ]
         ]
     },
     {
-        "id": "aea97b8e.023f8",
+        "id": "8962e75e.00261",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1312.3333282470703,
-        "y": 175.33334350585938,
-        "z": "1f8b432c.7b707d",
+        "x": 1277.566665649414,
+        "y": 193.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ef41f2be.ad3298"
+                "3deda3f.9bf2e5c"
             ]
         ]
     },
     {
-        "id": "722dfa8c.b5ceac",
+        "id": "4fd36492.b80aa4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1307.8242950439453,
-        "y": 244.90737915039062,
-        "z": "1f8b432c.7b707d",
+        "x": 1273.057632446289,
+        "y": 263.1407012939453,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1d2d7b8b.bf556c"
+                "3f0b2c08.7bc00c"
             ]
         ]
     },
     {
-        "id": "9688fc7c.73aaf",
+        "id": "9a3dacb1.190568",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1296.3333282470703,
-        "y": 291.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1261.566665649414,
+        "y": 309.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8b1a56ec.d55058"
+                "9b28e102.0626c"
             ]
         ]
     },
     {
-        "id": "ef41f2be.ad3298",
+        "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": 1551.3333282470703,
-        "y": 172.33334350585938,
-        "z": "1f8b432c.7b707d",
+        "x": 1516.566665649414,
+        "y": 190.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "34ae60f0.b22a",
-                "2322bdf8.c6bb02"
+                "20af607b.68774",
+                "3658cbc.aa6dfb4"
             ]
         ]
     },
     {
-        "id": "1d2d7b8b.bf556c",
+        "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": 1461.3957061767578,
-        "y": 248.193115234375,
-        "z": "1f8b432c.7b707d",
+        "x": 1426.6290435791016,
+        "y": 266.4264373779297,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "8b1a56ec.d55058",
+        "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": 1465.3333282470703,
-        "y": 292.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1430.566665649414,
+        "y": 310.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "34ae60f0.b22a",
+        "id": "20af607b.68774",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1764.3333282470703,
-        "y": 196.33334350585938,
-        "z": "1f8b432c.7b707d",
+        "x": 1729.566665649414,
+        "y": 214.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3d51a7bc.14e5d"
+                "be8ab5c2.2f32"
             ]
         ]
     },
     {
-        "id": "2322bdf8.c6bb02",
+        "id": "3658cbc.aa6dfb4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1766.3333282470703,
-        "y": 136.33334350585938,
-        "z": "1f8b432c.7b707d",
+        "x": 1731.566665649414,
+        "y": 154.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "660e6b22.7f394c",
+        "id": "1f591d09.2d25db",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1066.3333282470703,
-        "y": 205.33334350585938,
-        "z": "1f8b432c.7b707d",
+        "x": 1031.566665649414,
+        "y": 223.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "3d51a7bc.14e5d",
+        "id": "be8ab5c2.2f32",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1709.3333282470703,
-        "y": 378.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1674.566665649414,
+        "y": 396.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5c997953.c5b528",
-                "38f52a4e.84a6be",
-                "efd37c2f.4ac7f",
-                "ba577b94.b0dc8"
+                "d30b8bfe.c0acd",
+                "b8b8c8f9.3c3308",
+                "86a1c6ac.aa4d9",
+                "57401e8a.a8ecc"
             ]
         ]
     },
     {
-        "id": "c943499a.5fba18",
+        "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": 4278.33332824707,
-        "y": 885.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4243.566665649414,
+        "y": 903.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "a02a2dea.0be938",
+        "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": 4279.33332824707,
-        "y": 940.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4244.566665649414,
+        "y": 958.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "b14c900.06de0f",
+        "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": 2235.3333282470703,
-        "y": 335.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2200.566665649414,
+        "y": 353.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "dfed5f78.dacb98",
-                "5582b318.e9d204",
-                "2fce3c04.1858e4"
+                "b8507b63.6f6868",
+                "67c1af9f.10fa88",
+                "7ec43e4c.6fd9e"
             ]
         ]
     },
     {
-        "id": "dfed5f78.dacb98",
+        "id": "b8507b63.6f6868",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2451.3333282470703,
-        "y": 402.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2416.566665649414,
+        "y": 420.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "782c069d.e39358"
+                "5fc7bb3c.8d1c74"
             ]
         ]
     },
     {
-        "id": "5582b318.e9d204",
+        "id": "67c1af9f.10fa88",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2451.8242950439453,
-        "y": 301.9073181152344,
-        "z": "1f8b432c.7b707d",
+        "x": 2417.057632446289,
+        "y": 320.14064025878906,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6fdc0c14.bf49ec"
+                "4da82d11.2ee7a4"
             ]
         ]
     },
     {
-        "id": "2fce3c04.1858e4",
+        "id": "7ec43e4c.6fd9e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2447.3333282470703,
-        "y": 351.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2412.566665649414,
+        "y": 369.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "40e570f4.a7125"
+                "32e3d071.7e8958"
             ]
         ]
     },
     {
-        "id": "6fdc0c14.bf49ec",
+        "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": 2629.3958282470703,
-        "y": 302.1930847167969,
-        "z": "1f8b432c.7b707d",
+        "x": 2594.629165649414,
+        "y": 320.42640686035156,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "40e570f4.a7125",
+        "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": 2629.3333282470703,
-        "y": 351.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2594.566665649414,
+        "y": 369.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "c63be28d.8bf768",
+        "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": 3504.3333282470703,
-        "y": 856.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3469.566665649414,
+        "y": 874.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "fe4eb74e.b16da8",
-                "f1a8adba.61278",
-                "1668ffd4.4ff0c"
+                "737046f3.901008",
+                "c17a2f42.f8ce5",
+                "6c18d1b1.1fb02"
             ]
         ]
     },
     {
-        "id": "fe4eb74e.b16da8",
+        "id": "737046f3.901008",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3795.8242950439453,
-        "y": 834.9073181152344,
-        "z": "1f8b432c.7b707d",
+        "x": 3761.057632446289,
+        "y": 853.1406402587891,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1a4b644b.4c6e64"
+                "d252d89c.bf824"
             ]
         ]
     },
     {
-        "id": "f1a8adba.61278",
+        "id": "c17a2f42.f8ce5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3784.3333282470703,
-        "y": 879.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3749.566665649414,
+        "y": 897.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9213678.fc93898"
+                "ac4aea44.3a1468"
             ]
         ]
     },
     {
-        "id": "1a4b644b.4c6e64",
+        "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": 3944.3958282470703,
-        "y": 835.1930847167969,
-        "z": "1f8b432c.7b707d",
+        "x": 3909.629165649414,
+        "y": 853.4264068603516,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "9213678.fc93898",
+        "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": 3943.3333282470703,
-        "y": 879.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3908.566665649414,
+        "y": 897.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "1668ffd4.4ff0c",
+        "id": "6c18d1b1.1fb02",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3790.3333282470703,
-        "y": 926.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3755.566665649414,
+        "y": 944.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "498e3ba4.cbc914",
+        "id": "9334f6e1.75bd8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3944.3333282470703,
-        "y": 965.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3909.566665649414,
+        "y": 983.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c943499a.5fba18",
-                "a02a2dea.0be938",
-                "baaef2d3.b5b91",
-                "217d122e.216aae",
-                "f7348f80.aa12e8",
-                "7a252ae2.45ae64",
-                "9446dea5.335408",
-                "adfb9d4f.ef8fd8",
-                "586bfbbd.46cc14",
-                "2a7b5024.c32ac8",
-                "8e0823d9.c3d5f",
-                "642b12a.3e870ec",
-                "f34b01.8e0f75"
+                "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": "baaef2d3.b5b91",
+        "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": 4291.33332824707,
-        "y": 1008.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4256.566665649414,
+        "y": 1026.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d4cc395.cbcc8c8",
-                "73709604.b968f",
-                "7296162a.34f3c8"
+                "feb2378a.2af25",
+                "cbad9eb.a48376",
+                "4fed791d.880998"
             ]
         ]
     },
     {
-        "id": "217d122e.216aae",
+        "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": 4270.33332824707,
-        "y": 1610.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 4235.566665649414,
+        "y": 1628.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "33c50f98.788ad",
-                "41cb8574.dd9304",
-                "d536577b.eef8e8"
+                "2518a058.abd538",
+                "6ec44045.1b76e",
+                "3ecdb083.b8e9c8"
             ]
         ]
     },
     {
-        "id": "d4cc395.cbcc8c8",
+        "id": "feb2378a.2af25",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4492.33332824707,
-        "y": 892.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4457.566665649414,
+        "y": 910.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d86c12e3.b2275"
+                "edb5d5b7.00d9d8"
             ]
         ]
     },
     {
-        "id": "73709604.b968f",
+        "id": "cbad9eb.a48376",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4487.842361450195,
-        "y": 941.7593688964844,
-        "z": "1f8b432c.7b707d",
+        "x": 4453.075698852539,
+        "y": 959.9926910400391,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "800e46e3.3573a"
+                "302f34fb.b2cccc"
             ]
         ]
     },
     {
-        "id": "7296162a.34f3c8",
+        "id": "4fed791d.880998",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4491.842361450195,
-        "y": 992.7593688964844,
-        "z": "1f8b432c.7b707d",
+        "x": 4457.075698852539,
+        "y": 1010.9926910400391,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a34e2377.27ccd8"
+                "a17dcb43.36654"
             ]
         ]
     },
     {
-        "id": "d86c12e3.b2275",
+        "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": 4640.904861450195,
-        "y": 891.6191101074219,
-        "z": "1f8b432c.7b707d",
+        "x": 4606.138198852539,
+        "y": 909.8524322509766,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "800e46e3.3573a",
+        "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": 4630.842361450195,
-        "y": 941.7593688964844,
-        "z": "1f8b432c.7b707d",
+        "x": 4596.075698852539,
+        "y": 959.9926910400391,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "33c50f98.788ad",
+        "id": "2518a058.abd538",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4493.33332824707,
-        "y": 1580.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 4458.566665649414,
+        "y": 1598.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4a962304.a215f4"
+                "ae2f5ea5.ffcca8"
             ]
         ]
     },
     {
-        "id": "41cb8574.dd9304",
+        "id": "6ec44045.1b76e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4488.842361450195,
-        "y": 1629.7592468261719,
-        "z": "1f8b432c.7b707d",
+        "x": 4454.075698852539,
+        "y": 1647.9925689697266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "310d3fa7.cc4238"
+                "8fe524e0.344e88"
             ]
         ]
     },
     {
-        "id": "d536577b.eef8e8",
+        "id": "3ecdb083.b8e9c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4492.842361450195,
-        "y": 1680.7592468261719,
-        "z": "1f8b432c.7b707d",
+        "x": 4458.075698852539,
+        "y": 1698.9925689697266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c757b760.b406b"
+                "55939baf.cd26bc"
             ]
         ]
     },
     {
-        "id": "4a962304.a215f4",
+        "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": 4641.904861450195,
-        "y": 1579.6189880371094,
-        "z": "1f8b432c.7b707d",
+        "x": 4607.138198852539,
+        "y": 1597.852310180664,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "310d3fa7.cc4238",
+        "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": 4631.842361450195,
-        "y": 1629.7592468261719,
-        "z": "1f8b432c.7b707d",
+        "x": 4597.075698852539,
+        "y": 1647.9925689697266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "62da33ab.561f8c",
+        "id": "4f9233a2.7d7c54",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5305.99983215332,
-        "y": 1036.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5271.233169555664,
+        "y": 1054.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "70f308bc.05dc48",
-                "a4aed251.f9b08",
-                "d868e9d5.e95cb",
-                "2078a502.9da27a",
-                "8465e4fd.6de0a"
+                "633cbeb7.169858",
+                "bab31b18.59cf48",
+                "a317ded0.bb3c4",
+                "ab06c276.223ba8",
+                "cc9240f8.8f7cd"
             ]
         ]
     },
     {
-        "id": "24a2bf70.dd5f6",
+        "id": "316e9aaa.7c7b56",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5133.33332824707,
-        "y": 1037.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5098.566665649414,
+        "y": 1055.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "62da33ab.561f8c"
+                "4f9233a2.7d7c54"
             ]
         ]
     },
     {
-        "id": "b92bac73.6c9778",
+        "id": "71d04631.299a38",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5142.824295043945,
-        "y": 1079.9073791503906,
-        "z": "1f8b432c.7b707d",
+        "x": 5108.057632446289,
+        "y": 1098.1407012939453,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e76a7bba.50458"
+                "92bf2c3c.4b1f48"
             ]
         ]
     },
     {
-        "id": "4c3b9d0a.797a8c",
+        "id": "ec19e5df.bfee3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5131.33332824707,
-        "y": 1126.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5096.566665649414,
+        "y": 1144.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "24a51d5a.eb4b0a"
+                "97714895.6880b8"
             ]
         ]
     },
     {
-        "id": "e76a7bba.50458",
+        "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": 5296.395706176758,
-        "y": 1083.193115234375,
-        "z": "1f8b432c.7b707d",
+        "x": 5261.629043579102,
+        "y": 1101.4264373779297,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "24a51d5a.eb4b0a",
+        "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": 5300.33332824707,
-        "y": 1127.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5265.566665649414,
+        "y": 1145.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "a34e2377.27ccd8",
+        "id": "a17dcb43.36654",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4653.33332824707,
-        "y": 994.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4618.566665649414,
+        "y": 1012.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "709f1167.bbcf68",
-                "77da836c.7c453c"
+                "655303f9.8975f4",
+                "9b0960f2.c7d238"
             ]
         ]
     },
     {
-        "id": "c757b760.b406b",
+        "id": "55939baf.cd26bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4643.33332824707,
-        "y": 1682.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 4608.566665649414,
+        "y": 1700.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e832df40.3cb4e8",
-                "e46caf0e.563478"
+                "b454ce1a.9a4dd",
+                "ee0171c8.01d89"
             ]
         ]
     },
     {
-        "id": "e7fcac87.3713a",
+        "id": "5175d7af.72a12",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5273.99983215332,
-        "y": 1872.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5239.233169555664,
+        "y": 1890.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "53c6fb5d.111ec4",
-                "34b35dcd.443f82",
-                "3a858051.3cdb98",
-                "a5489f79.fd4018",
-                "a9a1085f.9d214"
+                "211166d6.cdaa9a",
+                "47621f66.6345e",
+                "f6c10bde.dea908",
+                "6cfa339.cd5cfcc",
+                "3ea9d16d.7e59be"
             ]
         ]
     },
     {
-        "id": "d0bf9af7.9310c",
+        "id": "81d2e905.09274",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5101.33332824707,
-        "y": 1873.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5066.566665649414,
+        "y": 1891.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e7fcac87.3713a"
+                "5175d7af.72a12"
             ]
         ]
     },
     {
-        "id": "26c8c3e3.b7c694",
+        "id": "55a1f73d.5c93d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5110.824295043945,
-        "y": 1915.9073791503906,
-        "z": "1f8b432c.7b707d",
+        "x": 5076.057632446289,
+        "y": 1934.1407012939453,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a82c31f6.750ae8"
+                "17672cb7.bdb783"
             ]
         ]
     },
     {
-        "id": "dbc3af7a.2f9fb8",
+        "id": "5050329c.16639c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5099.33332824707,
-        "y": 1962.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5064.566665649414,
+        "y": 1980.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "10e75613.88aafa"
+                "2763dbec.eed664"
             ]
         ]
     },
     {
-        "id": "a82c31f6.750ae8",
+        "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": 5264.395706176758,
-        "y": 1919.193115234375,
-        "z": "1f8b432c.7b707d",
+        "x": 5229.629043579102,
+        "y": 1937.4264373779297,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "10e75613.88aafa",
+        "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": 5268.33332824707,
-        "y": 1963.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5233.566665649414,
+        "y": 1981.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "70f308bc.05dc48",
+        "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": 5570.33332824707,
-        "y": 1020.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5535.566665649414,
+        "y": 1038.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6bbffa2e.46690c",
-                "77cd07cb.ebdf78"
+                "ecc11d6d.c862e",
+                "365f4120.012e4e"
             ]
         ]
     },
     {
-        "id": "77cd07cb.ebdf78",
+        "id": "365f4120.012e4e",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5793.33332824707,
-        "y": 975.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5758.566665649414,
+        "y": 993.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e975bc36.28a99"
+                "ed0cfcb5.6f799"
             ]
         ]
     },
     {
-        "id": "6bbffa2e.46690c",
+        "id": "ecc11d6d.c862e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5795.33332824707,
-        "y": 1039.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5760.566665649414,
+        "y": 1057.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8466cb9d.f4bc28"
+                "15da62b1.5ec4c5"
             ]
         ]
     },
     {
-        "id": "d8fed17b.7e481",
+        "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": 6128.33332824707,
-        "y": 930.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6093.566665649414,
+        "y": 948.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "8466cb9d.f4bc28",
+        "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": 5957.33332824707,
-        "y": 1035.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5922.566665649414,
+        "y": 1053.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e975bc36.28a99",
+        "id": "ed0cfcb5.6f799",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5958.33332824707,
-        "y": 972.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5923.566665649414,
+        "y": 990.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "34be39c3.d02096",
-                "d8fed17b.7e481"
+                "af8cf87c.3e959",
+                "477c6bc0.f92bb4"
             ]
         ]
     },
     {
-        "id": "34be39c3.d02096",
+        "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": 6129.33332824707,
-        "y": 1038.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6094.566665649414,
+        "y": 1056.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "becbdb78.8c28c",
+        "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": 6130.33332824707,
-        "y": 987.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6095.566665649414,
+        "y": 1005.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "a4aed251.f9b08",
+        "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": 5617.33332824707,
-        "y": 1089.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5582.566665649414,
+        "y": 1107.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e8d2c8e.4a5dbb",
+        "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": 5506.33332824707,
-        "y": 1130.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5471.566665649414,
+        "y": 1148.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "53c6fb5d.111ec4",
+        "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": 5560.33332824707,
-        "y": 1876.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 5525.566665649414,
+        "y": 1894.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "46b3e138.d3f2e8",
-                "cddf08d4.ef0a5"
+                "cebb0d50.db953",
+                "688b6aa8.d1c6fc"
             ]
         ]
     },
     {
-        "id": "cddf08d4.ef0a5",
+        "id": "688b6aa8.d1c6fc",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5783.33332824707,
-        "y": 1831.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 5748.566665649414,
+        "y": 1849.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f20f3066.a035b8"
+                "d72320d8.a0b208"
             ]
         ]
     },
     {
-        "id": "46b3e138.d3f2e8",
+        "id": "cebb0d50.db953",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5785.33332824707,
-        "y": 1895.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 5750.566665649414,
+        "y": 1913.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2b8acdb2.b50cfa"
+                "bbeb85e7.eaaa98"
             ]
         ]
     },
     {
-        "id": "db0e4a6.96bfeb8",
+        "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": 6118.33332824707,
-        "y": 1789.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 6083.566665649414,
+        "y": 1807.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "2b8acdb2.b50cfa",
+        "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": 5944.33332824707,
-        "y": 1914.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 5909.566665649414,
+        "y": 1932.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "f20f3066.a035b8",
+        "id": "d72320d8.a0b208",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5948.33332824707,
-        "y": 1828.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 5913.566665649414,
+        "y": 1846.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "db0e4a6.96bfeb8",
-                "aa82495b.a24c98"
+                "1350a764.a43111",
+                "56aea40d.d80c4c"
             ]
         ]
     },
     {
-        "id": "aa82495b.a24c98",
+        "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": 6119.33332824707,
-        "y": 1894.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 6084.566665649414,
+        "y": 1912.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "76704f22.ba3f58",
+        "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": 6114.33332824707,
-        "y": 1843.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 6079.566665649414,
+        "y": 1861.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "3a858051.3cdb98",
+        "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": 5562.33332824707,
-        "y": 2035.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 5527.566665649414,
+        "y": 2053.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "34b35dcd.443f82",
+        "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": 5607.33332824707,
-        "y": 1945.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 5572.566665649414,
+        "y": 1963.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "c373fb4d.a3a7f",
+        "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": 5496.33332824707,
-        "y": 1983.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 5461.566665649414,
+        "y": 2001.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "f7348f80.aa12e8",
+        "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": 4491.33332824707,
-        "y": 2280.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4456.566665649414,
+        "y": 2298.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a252ae2.45ae64",
+        "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": 4285.33332824707,
-        "y": 2181.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4250.566665649414,
+        "y": 2199.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "c4146d99.a600e",
+        "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": 4259.33332824707,
-        "y": 2134.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4224.566665649414,
+        "y": 2152.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "d868e9d5.e95cb",
+        "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": 5700.33332824707,
-        "y": 1227.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5665.566665649414,
+        "y": 1245.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5489f79.fd4018",
+        "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": 5689.33332824707,
-        "y": 2100.333465576172,
-        "z": "1f8b432c.7b707d",
+        "x": 5654.566665649414,
+        "y": 2118.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "e38e7099.4c1268",
+        "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": 6744.33332824707,
-        "y": 747.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6709.566665649414,
+        "y": 765.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "60adc82e.ec907",
-                "ef6befb7.25ec38",
-                "2514309d.ea219"
+                "cd3a2dd3.05e5a8",
+                "1bf85ef.2838b21",
+                "420343c3.3589dc"
             ]
         ]
     },
     {
-        "id": "782c069d.e39358",
+        "id": "5fc7bb3c.8d1c74",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2631.3333282470703,
-        "y": 402.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2596.566665649414,
+        "y": 420.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5b7c0727.9a035"
+                "a84decbd.fa4a3"
             ]
         ]
     },
     {
-        "id": "47d4cad8.17d52c",
+        "id": "aeab2187.904e6",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1028.3334503173828,
-        "y": 797.3334655761719,
-        "z": "1f8b432c.7b707d",
+        "x": 993.5667877197266,
+        "y": 815.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6079a4cf.66fe14"
+                "d7c3541f.d6d0a"
             ]
         ]
     },
     {
-        "id": "21c0e3fe.82515c",
+        "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": 2194.3333282470703,
-        "y": 496.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2159.566665649414,
+        "y": 514.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8d2ba343.63f8c8",
-                "ae4416d5.ca7b4"
+                "e252c083.ada758",
+                "8a02442.5502738"
             ]
         ]
     },
     {
-        "id": "ae4416d5.ca7b4",
+        "id": "8a02442.5502738",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2515.3333282470703,
-        "y": 478.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2480.566665649414,
+        "y": 496.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "8d2ba343.63f8c8",
+        "id": "e252c083.ada758",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2497.3333282470703,
-        "y": 576.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2462.566665649414,
+        "y": 594.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b6502203.02c108"
+                "2a9b5bea.92ec14"
             ]
         ]
     },
     {
-        "id": "8bb28c9b.5b048",
+        "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": 1451.3333282470703,
-        "y": 700.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1416.566665649414,
+        "y": 718.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "6079a4cf.66fe14",
+        "id": "d7c3541f.d6d0a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1205.3333282470703,
-        "y": 790.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1170.566665649414,
+        "y": 808.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8bb28c9b.5b048",
-                "b7e06d6e.f371a",
-                "9653963e.b4d7a8"
+                "f770d866.8cfe48",
+                "67e01b15.d67c64"
             ]
         ]
     },
     {
-        "id": "485e027f.e391bc",
+        "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": 4833.33332824707,
-        "y": 999.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4798.566665649414,
+        "y": 1017.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "709f1167.bbcf68",
+        "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": 4876.33332824707,
-        "y": 1064.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4841.566665649414,
+        "y": 1082.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "24a2bf70.dd5f6",
-                "b92bac73.6c9778",
-                "4c3b9d0a.797a8c"
+                "316e9aaa.7c7b56",
+                "71d04631.299a38",
+                "ec19e5df.bfee3"
             ]
         ]
     },
     {
-        "id": "e832df40.3cb4e8",
+        "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": 4873.33332824707,
-        "y": 1908.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4838.566665649414,
+        "y": 1926.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d0bf9af7.9310c",
-                "26c8c3e3.b7c694",
-                "dbc3af7a.2f9fb8"
+                "81d2e905.09274",
+                "55a1f73d.5c93d8",
+                "5050329c.16639c"
             ]
         ]
     },
     {
-        "id": "a33a2969.97acc",
+        "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": 4834.33332824707,
-        "y": 1852.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4799.566665649414,
+        "y": 1870.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "5b7c0727.9a035",
+        "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": 2924.3333282470703,
-        "y": 349.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2889.566665649414,
+        "y": 367.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ca1aef51.5c2e6",
-                "fa2abd46.be79a8",
-                "6dcd89ce.d8f7b8"
+                "139101d.c6544fe",
+                "39ec14f9.5d95cc",
+                "e120429c.bc5038"
             ]
         ]
     },
     {
-        "id": "fa2abd46.be79a8",
+        "id": "39ec14f9.5d95cc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3197.8242950439453,
-        "y": 241.90731811523438,
-        "z": "1f8b432c.7b707d",
+        "x": 3163.057632446289,
+        "y": 260.14064025878906,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3cf8b5c.596c24a"
+                "b220c2f2.2811f8"
             ]
         ]
     },
     {
-        "id": "3cf8b5c.596c24a",
+        "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": 3375.3958282470703,
-        "y": 242.19308471679688,
-        "z": "1f8b432c.7b707d",
+        "x": 3340.629165649414,
+        "y": 260.42640686035156,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "6dcd89ce.d8f7b8",
+        "id": "e120429c.bc5038",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3193.3333282470703,
-        "y": 291.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3158.566665649414,
+        "y": 309.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "143224ce.735913"
+                "b527f79c.27eb58"
             ]
         ]
     },
     {
-        "id": "143224ce.735913",
+        "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": 3375.3333282470703,
-        "y": 291.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3340.566665649414,
+        "y": 309.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ca1aef51.5c2e6",
+        "id": "139101d.c6544fe",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3197.3333282470703,
-        "y": 342.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3162.566665649414,
+        "y": 360.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "eadcd586.811458"
+                "5a7a1590.04f2a4"
             ]
         ]
     },
     {
-        "id": "eadcd586.811458",
+        "id": "5a7a1590.04f2a4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3377.3333282470703,
-        "y": 342.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3342.566665649414,
+        "y": 360.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "21c0e3fe.82515c"
+                "e7f6967b.1fb18"
             ]
         ]
     },
     {
-        "id": "d8bf1877.11fa58",
+        "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": 803.3333282470703,
-        "y": 726.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 768.5666656494141,
+        "y": 744.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a6f98a69.92187"
+                "53465e88.bf1338"
             ]
         ]
     },
     {
-        "id": "a6f98a69.92187",
+        "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": 1074.3333282470703,
-        "y": 722.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1039.566665649414,
+        "y": 740.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "47d4cad8.17d52c"
+                "aeab2187.904e6"
             ]
         ]
     },
     {
-        "id": "a15de96b.529998",
+        "id": "2acc7de6.ba44da",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3353.3333282470703,
-        "y": 540.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3318.566665649414,
+        "y": 558.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d0adfe64.da86a8"
+                "1ba0c2fe.530a7d"
             ]
         ]
     },
     {
-        "id": "d0adfe64.da86a8",
+        "id": "1ba0c2fe.530a7d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3530.333206176758,
-        "y": 533.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 3495.5665435791016,
+        "y": 551.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d9045bb1.a62d4",
-                "d7d4dfac.f8ef88"
+                "36b4ef1.f78561",
+                "689094f0.f3db04"
             ]
         ]
     },
     {
-        "id": "d9045bb1.a62d4",
+        "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": 3773.333206176758,
-        "y": 490.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 3738.5665435791016,
+        "y": 508.56654357910156,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "d7d4dfac.f8ef88",
+        "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": 3762.333206176758,
-        "y": 545.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 3727.5665435791016,
+        "y": 563.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "641b6dc1.ae62a4",
-                "e8473ac4.f5e678",
-                "d854cd7f.05151"
+                "e75fbbb3.7fba2",
+                "2fda6ca1.8207e4",
+                "df158bbf.d20168"
             ]
         ]
     },
     {
-        "id": "d854cd7f.05151",
+        "id": "df158bbf.d20168",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4015.3333282470703,
-        "y": 431.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3980.566665649414,
+        "y": 449.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d89f7cfd.a998c"
+                "528123.112cfedc"
             ]
         ]
     },
     {
-        "id": "d89f7cfd.a998c",
+        "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": 4163.904861450195,
-        "y": 431.6191101074219,
-        "z": "1f8b432c.7b707d",
+        "x": 4129.138198852539,
+        "y": 449.85243225097656,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "40195b62.cb5874",
+        "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": 4162.842361450195,
-        "y": 475.7593688964844,
-        "z": "1f8b432c.7b707d",
+        "x": 4128.075698852539,
+        "y": 493.99269104003906,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e8473ac4.f5e678",
+        "id": "2fda6ca1.8207e4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4003.8423614501953,
-        "y": 475.7593688964844,
-        "z": "1f8b432c.7b707d",
+        "x": 3969.075698852539,
+        "y": 493.99269104003906,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "40195b62.cb5874"
+                "401b1dd2.2d0c84"
             ]
         ]
     },
     {
-        "id": "641b6dc1.ae62a4",
+        "id": "e75fbbb3.7fba2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4010.8423614501953,
-        "y": 554.7593688964844,
-        "z": "1f8b432c.7b707d",
+        "x": 3976.075698852539,
+        "y": 572.9926910400391,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "cfb2b016.ca50d"
+                "29685226.26d7b6"
             ]
         ]
     },
     {
-        "id": "cfb2b016.ca50d",
+        "id": "29685226.26d7b6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4149.842361450195,
-        "y": 554.7593688964844,
-        "z": "1f8b432c.7b707d",
+        "x": 4115.075698852539,
+        "y": 572.9926910400391,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4e1d40ab.8f7c48",
-                "6ab22d0b.607efc"
+                "b7f6ee59.c1f0a",
+                "4f4b77bb.effd9"
             ]
         ]
     },
     {
-        "id": "4e1d40ab.8f7c48",
+        "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": 4355.33332824707,
-        "y": 552.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4320.566665649414,
+        "y": 570.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "77da836c.7c453c",
+        "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": 4877.33332824707,
-        "y": 734.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4842.566665649414,
+        "y": 752.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f644ca88.cc84",
-                "e4420296.1dde4"
+                "94c0e823.bd83",
+                "b5a5d52e.8f7da8"
             ]
         ]
     },
     {
-        "id": "e4420296.1dde4",
+        "id": "b5a5d52e.8f7da8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5100.33332824707,
-        "y": 720.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5065.566665649414,
+        "y": 738.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1b75d3d5.946174"
+                "d2c19564.10c95"
             ]
         ]
     },
     {
-        "id": "f644ca88.cc84",
+        "id": "94c0e823.bd83",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5102.33332824707,
-        "y": 753.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5067.566665649414,
+        "y": 771.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ccf559e8.ec486"
+                "77422c58.e2ca74"
             ]
         ]
     },
     {
-        "id": "ccf559e8.ec486",
+        "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": 5245.33332824707,
-        "y": 750.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5210.566665649414,
+        "y": 768.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "1b75d3d5.946174",
+        "id": "d2c19564.10c95",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5248.33332824707,
-        "y": 713.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5213.566665649414,
+        "y": 731.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a48b4f87.115f58",
-                "eae40c98.29734"
+                "86b3b06a.5fafe8",
+                "532eff46.9b467"
             ]
         ]
     },
     {
-        "id": "a48b4f87.115f58",
+        "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": 5410.33332824707,
-        "y": 708.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5375.566665649414,
+        "y": 726.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e46caf0e.563478",
+        "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": 4891.33332824707,
-        "y": 1571.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 4856.566665649414,
+        "y": 1589.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "970472a2.405aa8",
-                "224c4d4.84eea32"
+                "35d69142.81ac16",
+                "31d8fff7.b254e"
             ]
         ]
     },
     {
-        "id": "224c4d4.84eea32",
+        "id": "31d8fff7.b254e",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5114.33332824707,
-        "y": 1557.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 5079.566665649414,
+        "y": 1575.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1f5eda96.09790d"
+                "3036014d.a3b5f6"
             ]
         ]
     },
     {
-        "id": "970472a2.405aa8",
+        "id": "35d69142.81ac16",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5116.33332824707,
-        "y": 1590.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 5081.566665649414,
+        "y": 1608.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "66cb0f3.6d8da7"
+                "58956fb.abac91"
             ]
         ]
     },
     {
-        "id": "66cb0f3.6d8da7",
+        "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": 5259.33332824707,
-        "y": 1587.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 5224.566665649414,
+        "y": 1605.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "1f5eda96.09790d",
+        "id": "3036014d.a3b5f6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5262.33332824707,
-        "y": 1550.3332214355469,
-        "z": "1f8b432c.7b707d",
+        "x": 5227.566665649414,
+        "y": 1568.5665435791016,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a035c695.e5c6c8",
-                "ce893d50.59c348"
+                "ad167193.a62748",
+                "3753ad56.c9003a"
             ]
         ]
     },
     {
-        "id": "a035c695.e5c6c8",
+        "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": 5456.33332824707,
-        "y": 1553.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5421.566665649414,
+        "y": 1571.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "74df18ed.a4e518",
+        "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": 1054.3333282470703,
-        "y": 257.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1019.5666656494141,
+        "y": 275.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "2078a502.9da27a",
+        "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": 5524.33332824707,
-        "y": 1304.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5489.566665649414,
+        "y": 1322.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "34f7a0cd.8f1da"
+                "ea9f29c0.504f38"
             ]
         ]
     },
     {
-        "id": "34f7a0cd.8f1da",
+        "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": 5730.33332824707,
-        "y": 1304.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5695.566665649414,
+        "y": 1322.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9675c47c.3f1e28"
+                "f9452712.6e7898"
             ]
         ]
     },
     {
-        "id": "9675c47c.3f1e28",
+        "id": "f9452712.6e7898",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5945.61897277832,
-        "y": 1304.1551208496094,
-        "z": "1f8b432c.7b707d",
+        "x": 5910.852310180664,
+        "y": 1322.388442993164,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c3bcfe29.7893b"
+                "2ef61702.ff9d28"
             ]
         ]
     },
     {
-        "id": "c3bcfe29.7893b",
+        "id": "2ef61702.ff9d28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6152.45051574707,
-        "y": 1304.6736755371094,
-        "z": "1f8b432c.7b707d",
+        "x": 6117.683853149414,
+        "y": 1322.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "69e0123c.36df34",
-                "c9b70802.7fae28",
-                "bff980ae.51a118"
+                "ad35cc1f.1df8c8",
+                "fdae5377.6e0e68",
+                "3c7c23ae.86ecbc"
             ]
         ]
     },
     {
-        "id": "69e0123c.36df34",
+        "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": 6367.45051574707,
-        "y": 1266.6736755371094,
-        "z": "1f8b432c.7b707d",
+        "x": 6332.683853149414,
+        "y": 1284.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "c9b70802.7fae28",
+        "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": 6364.45051574707,
-        "y": 1305.6736755371094,
-        "z": "1f8b432c.7b707d",
+        "x": 6329.683853149414,
+        "y": 1323.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f008b798.fbfc48"
+                "fb285ef7.1b4a58"
             ]
         ]
     },
     {
-        "id": "bff980ae.51a118",
+        "id": "3c7c23ae.86ecbc",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6319.95051574707,
-        "y": 1347.6736755371094,
-        "z": "1f8b432c.7b707d",
+        "x": 6285.183853149414,
+        "y": 1365.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "f008b798.fbfc48",
+        "id": "fb285ef7.1b4a58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6544.95051574707,
-        "y": 1304.6736755371094,
-        "z": "1f8b432c.7b707d",
+        "x": 6510.183853149414,
+        "y": 1322.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d5a58693.57d22"
+                "e8c4036a.c50bb8"
             ]
         ]
     },
     {
-        "id": "d5a58693.57d22",
+        "id": "e8c4036a.c50bb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6702.95051574707,
-        "y": 1304.6736755371094,
-        "z": "1f8b432c.7b707d",
+        "x": 6668.183853149414,
+        "y": 1322.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "396517b4.b44f88"
+                "5ff1493f.72bdd"
             ]
         ]
     },
     {
-        "id": "396517b4.b44f88",
+        "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": 6909.95051574707,
-        "y": 1304.6736755371094,
-        "z": "1f8b432c.7b707d",
+        "x": 6875.183853149414,
+        "y": 1322.906997680664,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "a9a1085f.9d214",
+        "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": 5521.33332824707,
-        "y": 2173.333465576172,
-        "z": "1f8b432c.7b707d",
+        "x": 5486.566665649414,
+        "y": 2191.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a77b3a4c.0b52a"
+                "bfbafb18.47d55"
             ]
         ]
     },
     {
-        "id": "a77b3a4c.0b52a",
+        "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": 5727.33332824707,
-        "y": 2173.333465576172,
-        "z": "1f8b432c.7b707d",
+        "x": 5692.566665649414,
+        "y": 2191.5667877197266,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "db3ff85.e969d08"
+                "4b1bcb13.657274"
             ]
         ]
     },
     {
-        "id": "db3ff85.e969d08",
+        "id": "4b1bcb13.657274",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5942.61897277832,
-        "y": 2173.155242919922,
-        "z": "1f8b432c.7b707d",
+        "x": 5907.852310180664,
+        "y": 2191.3885650634766,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9bb2d2a8.a44c98"
+                "25238122.c9549e"
             ]
         ]
     },
     {
-        "id": "9bb2d2a8.a44c98",
+        "id": "25238122.c9549e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6149.45051574707,
-        "y": 2173.673797607422,
-        "z": "1f8b432c.7b707d",
+        "x": 6114.683853149414,
+        "y": 2191.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c3db954c.458008",
-                "bccacc6d.699c5",
-                "cc6698ed.a3038"
+                "3cddf86c.952478",
+                "82ecbff8.c2935",
+                "7c6dea89.5156fc"
             ]
         ]
     },
     {
-        "id": "c3db954c.458008",
+        "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": 6364.45051574707,
-        "y": 2135.673797607422,
-        "z": "1f8b432c.7b707d",
+        "x": 6329.683853149414,
+        "y": 2153.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "bccacc6d.699c5",
+        "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": 6361.45051574707,
-        "y": 2174.673797607422,
-        "z": "1f8b432c.7b707d",
+        "x": 6326.683853149414,
+        "y": 2192.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "534b81c9.17a2c"
+                "f35bec69.fa6618"
             ]
         ]
     },
     {
-        "id": "cc6698ed.a3038",
+        "id": "7c6dea89.5156fc",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6316.95051574707,
-        "y": 2216.673797607422,
-        "z": "1f8b432c.7b707d",
+        "x": 6282.183853149414,
+        "y": 2234.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "534b81c9.17a2c",
+        "id": "f35bec69.fa6618",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6541.95051574707,
-        "y": 2173.673797607422,
-        "z": "1f8b432c.7b707d",
+        "x": 6507.183853149414,
+        "y": 2191.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "faa75b91.1af87"
+                "bca90be9.eb3b4"
             ]
         ]
     },
     {
-        "id": "faa75b91.1af87",
+        "id": "bca90be9.eb3b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6699.95051574707,
-        "y": 2173.673797607422,
-        "z": "1f8b432c.7b707d",
+        "x": 6665.183853149414,
+        "y": 2191.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ba3c4c7d.18cfc"
+                "cc4e410.f7e474"
             ]
         ]
     },
     {
-        "id": "ba3c4c7d.18cfc",
+        "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": 6906.95051574707,
-        "y": 2173.673797607422,
-        "z": "1f8b432c.7b707d",
+        "x": 6872.183853149414,
+        "y": 2191.9071197509766,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "eae40c98.29734",
+        "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": 5437.33332824707,
-        "y": 780.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5402.566665649414,
+        "y": 798.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6fc687f8.9a3218",
-                "d8b6607b.4ee438",
-                "5c6d770a.c0fbc8"
+                "cfac27d1.f56fb",
+                "98843042.abae5",
+                "ad4bc4fb.4375a8"
             ]
         ]
     },
     {
-        "id": "6fc687f8.9a3218",
+        "id": "cfac27d1.f56fb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5632.833450317383,
-        "y": 732.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5598.066787719727,
+        "y": 750.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ee2e2b2e.648d3"
+                "42953eb.d2e8cc"
             ]
         ]
     },
     {
-        "id": "d8b6607b.4ee438",
+        "id": "98843042.abae5",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5624.833450317383,
-        "y": 787.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5590.066787719727,
+        "y": 805.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "7003cbf4.1f7a3c"
+                "b64afde.27ba6"
             ]
         ]
     },
     {
-        "id": "5c6d770a.c0fbc8",
+        "id": "ad4bc4fb.4375a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5629.833450317383,
-        "y": 844.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5595.066787719727,
+        "y": 862.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4cd59828.2f4188"
+                "36f7d7a0.66c5f"
             ]
         ]
     },
     {
-        "id": "4cd59828.2f4188",
+        "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": 5781.833450317383,
-        "y": 845.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5747.066787719727,
+        "y": 863.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "7003cbf4.1f7a3c",
+        "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": 5792.833450317383,
-        "y": 790.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5758.066787719727,
+        "y": 808.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ee2e2b2e.648d3",
+        "id": "42953eb.d2e8cc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5777.215774536133,
-        "y": 729.989013671875,
-        "z": "1f8b432c.7b707d",
+        "x": 5742.449111938477,
+        "y": 748.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "76f14509.f7c67c"
+                "4bb018ae.9365f"
             ]
         ]
     },
     {
-        "id": "85f22617.8c77a",
+        "id": "12009159.0799bf",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6359.33332824707,
-        "y": 748.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6324.566665649414,
+        "y": 766.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ee84357b.71ae88"
+                "2ed9d78.0097928"
             ]
         ]
     },
     {
-        "id": "ee84357b.71ae88",
+        "id": "2ed9d78.0097928",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6536.33332824707,
-        "y": 740.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6501.566665649414,
+        "y": 758.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "cd9128cb.f1f28",
-                "e38e7099.4c1268"
+                "63498f0d.93d68",
+                "c6a5d055.f8bb1"
             ]
         ]
     },
     {
-        "id": "76f14509.f7c67c",
+        "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": 5961.33332824707,
-        "y": 744.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5926.566665649414,
+        "y": 762.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c8a88cd4.d8034"
+                "4e52f1e.bbcdb1"
             ]
         ]
     },
     {
-        "id": "c8a88cd4.d8034",
+        "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": 6156.33332824707,
-        "y": 744.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6121.566665649414,
+        "y": 762.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "85f22617.8c77a",
-                "bf124b63.5099c"
+                "12009159.0799bf",
+                "66f34217.bc91ec"
             ]
         ]
     },
     {
-        "id": "cd9128cb.f1f28",
+        "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": 6774.33332824707,
-        "y": 695.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6739.566665649414,
+        "y": 713.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "60adc82e.ec907",
+        "id": "cd3a2dd3.05e5a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6954.33332824707,
-        "y": 738.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6919.566665649414,
+        "y": 756.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "dbbdd720.ee73d"
+                "b3c8e8eb.ab9658"
             ]
         ]
     },
     {
-        "id": "ef6befb7.25ec38",
+        "id": "1bf85ef.2838b21",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6946.33332824707,
-        "y": 793.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6911.566665649414,
+        "y": 811.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3ad0c537.936882"
+                "f4a0a941.e6174"
             ]
         ]
     },
     {
-        "id": "2514309d.ea219",
+        "id": "420343c3.3589dc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6951.33332824707,
-        "y": 850.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6916.566665649414,
+        "y": 868.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2203278b.ee8d48"
+                "57b6c192.31833"
             ]
         ]
     },
     {
-        "id": "2203278b.ee8d48",
+        "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": 7103.33332824707,
-        "y": 851.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 7068.566665649414,
+        "y": 869.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "3ad0c537.936882",
+        "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": 7114.33332824707,
-        "y": 796.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 7079.566665649414,
+        "y": 814.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "dbbdd720.ee73d",
+        "id": "b3c8e8eb.ab9658",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7098.71565246582,
-        "y": 735.989013671875,
-        "z": "1f8b432c.7b707d",
+        "x": 7063.948989868164,
+        "y": 754.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3a2f5b08.ae9d74"
+                "a03bd3df.8ec05"
             ]
         ]
     },
     {
-        "id": "3a2f5b08.ae9d74",
+        "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": 7313.33332824707,
-        "y": 732.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 7278.566665649414,
+        "y": 750.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ce893d50.59c348",
+        "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": 5478.33332824707,
-        "y": 1621.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5443.566665649414,
+        "y": 1639.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "11d6f276.27b5f6",
-                "da24ed5d.ec28b8",
-                "60f19c6c.a06434"
+                "a7301f2a.402338",
+                "5484e700.5c89d",
+                "215a5bb9.bd15a4"
             ]
         ]
     },
     {
-        "id": "11d6f276.27b5f6",
+        "id": "a7301f2a.402338",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5673.833450317383,
-        "y": 1573.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5639.066787719727,
+        "y": 1591.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "888d9251.ae059"
+                "7fc657c9.5c7cc8"
             ]
         ]
     },
     {
-        "id": "da24ed5d.ec28b8",
+        "id": "5484e700.5c89d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5665.833450317383,
-        "y": 1628.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5631.066787719727,
+        "y": 1646.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6f593c1a.aa4654"
+                "474d315c.5dded"
             ]
         ]
     },
     {
-        "id": "60f19c6c.a06434",
+        "id": "215a5bb9.bd15a4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5670.833450317383,
-        "y": 1685.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5636.066787719727,
+        "y": 1703.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9d43ea5b.7c699"
+                "4e1d6af8.1ffc14"
             ]
         ]
     },
     {
-        "id": "9d43ea5b.7c699",
+        "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": 5822.833450317383,
-        "y": 1686.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5788.066787719727,
+        "y": 1704.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "6f593c1a.aa4654",
+        "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": 5833.833450317383,
-        "y": 1631.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5799.066787719727,
+        "y": 1649.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "888d9251.ae059",
+        "id": "7fc657c9.5c7cc8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5818.215774536133,
-        "y": 1570.989013671875,
-        "z": "1f8b432c.7b707d",
+        "x": 5783.449111938477,
+        "y": 1589.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ca25d5e8.786f18"
+                "5a87fca6.7b1764"
             ]
         ]
     },
     {
-        "id": "ad6fdb4e.87cfb",
+        "id": "8a681c82.4147c8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6400.33332824707,
-        "y": 1589.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6365.566665649414,
+        "y": 1607.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4ceff195.e94608"
+                "25c0f761.e40b7"
             ]
         ]
     },
     {
-        "id": "4ceff195.e94608",
+        "id": "25c0f761.e40b7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6577.33332824707,
-        "y": 1581.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6542.566665649414,
+        "y": 1599.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d9a17cf0.5ffca8",
-                "76506084.c842f8"
+                "dc2cab92.383e5",
+                "5874b3af.124b94"
             ]
         ]
     },
     {
-        "id": "ca25d5e8.786f18",
+        "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": 6002.33332824707,
-        "y": 1585.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5967.566665649414,
+        "y": 1603.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "52693a86.8017bc"
+                "71c1ea6.16ca194"
             ]
         ]
     },
     {
-        "id": "52693a86.8017bc",
+        "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": 6197.33332824707,
-        "y": 1585.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6162.566665649414,
+        "y": 1603.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ad6fdb4e.87cfb",
-                "6c3438b4.5be28"
+                "8a681c82.4147c8",
+                "15c438a7.4c22d7"
             ]
         ]
     },
     {
-        "id": "76506084.c842f8",
+        "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": 6785.33332824707,
-        "y": 1588.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6750.566665649414,
+        "y": 1606.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "aefba90d.b82758",
-                "3df8e74b.556d28",
-                "a16ee96.560b218"
+                "6cc22362.6b5aa4",
+                "dbd01d5b.37e41",
+                "f57a568d.3942"
             ]
         ]
     },
     {
-        "id": "d9a17cf0.5ffca8",
+        "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": 6815.33332824707,
-        "y": 1536.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6780.566665649414,
+        "y": 1554.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "aefba90d.b82758",
+        "id": "6cc22362.6b5aa4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6995.33332824707,
-        "y": 1579.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6960.566665649414,
+        "y": 1597.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3639d79a.d4db38"
+                "57bfbb8e.7f8e04"
             ]
         ]
     },
     {
-        "id": "3df8e74b.556d28",
+        "id": "dbd01d5b.37e41",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6987.33332824707,
-        "y": 1634.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6952.566665649414,
+        "y": 1652.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "185761cf.ebd5ee"
+                "396bc1e7.c35d2e"
             ]
         ]
     },
     {
-        "id": "a16ee96.560b218",
+        "id": "f57a568d.3942",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6992.33332824707,
-        "y": 1691.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6957.566665649414,
+        "y": 1709.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6f08e25f.8ff0f4"
+                "68626ec4.afefc8"
             ]
         ]
     },
     {
-        "id": "6f08e25f.8ff0f4",
+        "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": 7144.33332824707,
-        "y": 1692.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 7109.566665649414,
+        "y": 1710.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "185761cf.ebd5ee",
+        "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": 7155.33332824707,
-        "y": 1637.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 7120.566665649414,
+        "y": 1655.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "3639d79a.d4db38",
+        "id": "57bfbb8e.7f8e04",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7139.71565246582,
-        "y": 1576.989013671875,
-        "z": "1f8b432c.7b707d",
+        "x": 7104.948989868164,
+        "y": 1595.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "27770afe.2fe37e"
+                "183ddb54.5f2965"
             ]
         ]
     },
     {
-        "id": "27770afe.2fe37e",
+        "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": 7354.33332824707,
-        "y": 1573.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 7319.566665649414,
+        "y": 1591.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "b6502203.02c108",
+        "id": "2a9b5bea.92ec14",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 351.3333282470703,
-        "y": 702.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 316.56666564941406,
+        "y": 720.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ae72f64.7ced288",
-                "d8bf1877.11fa58"
+                "3a6bcd00.26c4c4",
+                "868ff940.3c40b8"
             ]
         ]
     },
     {
-        "id": "ae72f64.7ced288",
+        "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": 797.3333282470703,
-        "y": 561.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 762.5666656494141,
+        "y": 579.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "56a6a6ce.1c9e38"
+                "22d238c4.fa2b2"
             ]
         ]
     },
     {
-        "id": "56a6a6ce.1c9e38",
+        "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": 3162.3333282470703,
-        "y": 543.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 3127.566665649414,
+        "y": 561.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a15de96b.529998"
+                "2acc7de6.ba44da"
             ]
         ]
     },
     {
-        "id": "bf124b63.5099c",
+        "id": "66f34217.bc91ec",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 6362.33332824707,
-        "y": 822.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6327.566665649414,
+        "y": 840.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "cf9d9db9.ed34d8"
+                "8e17eafe.169168"
             ]
         ]
     },
     {
-        "id": "cf9d9db9.ed34d8",
+        "id": "8e17eafe.169168",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6539.33332824707,
-        "y": 814.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6504.566665649414,
+        "y": 832.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e093ed3f.1bfe98"
+                "39419ce1.8622b4"
             ]
         ]
     },
     {
-        "id": "e093ed3f.1bfe98",
+        "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": 6774.33332824707,
-        "y": 938.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6739.566665649414,
+        "y": 956.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "f8b7be24.4e873",
+        "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": 6814.33332824707,
-        "y": 1778.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6779.566665649414,
+        "y": 1796.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "796da710.8b0ab8",
+        "id": "63d86b29.fe0a8c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6579.33332824707,
-        "y": 1654.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6544.566665649414,
+        "y": 1672.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f8b7be24.4e873"
+                "2bb9adc0.ca5fca"
             ]
         ]
     },
     {
-        "id": "6c3438b4.5be28",
+        "id": "15c438a7.4c22d7",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 6402.33332824707,
-        "y": 1662.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6367.566665649414,
+        "y": 1680.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "796da710.8b0ab8"
+                "63d86b29.fe0a8c"
             ]
         ]
     },
     {
-        "id": "6ab22d0b.607efc",
+        "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": 4354.33332824707,
-        "y": 598.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4319.566665649414,
+        "y": 616.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "45cbb167.26c3e8",
+        "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": 4376.33332824707,
-        "y": 733.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4341.566665649414,
+        "y": 751.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "586bfbbd.46cc14",
+        "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": 4357.33332824707,
-        "y": 783.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4322.566665649414,
+        "y": 801.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "5c997953.c5b528",
+        "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": 1967.3333282470703,
-        "y": 331.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1932.566665649414,
+        "y": 349.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e42627f6.b8767",
-                "b14c900.06de0f"
+                "bb8d5638.aa00f",
+                "1ad24ca8.e833c3"
             ]
         ]
     },
     {
-        "id": "e42627f6.b8767",
+        "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": 2232.3333282470703,
-        "y": 254.33334350585938,
-        "z": "1f8b432c.7b707d",
+        "x": 2197.566665649414,
+        "y": 272.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "9446dea5.335408",
+        "id": "e8bc0d88.0a94d",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 4274.33332824707,
-        "y": 2233.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4239.566665649414,
+        "y": 2251.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "adfb9d4f.ef8fd8",
+        "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": 4257.33332824707,
-        "y": 3991.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4222.566665649414,
+        "y": 4009.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "2a7b5024.c32ac8",
+        "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": 4314.33332824707,
-        "y": 828.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4279.566665649414,
+        "y": 846.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e65eb704.1a5ee",
+        "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": 4303.33332824707,
-        "y": 2473.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4268.566665649414,
+        "y": 2491.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "70d68732.b14c"
+                "bc62ddbe.40b578"
             ]
         ]
     },
     {
-        "id": "9fe431f7.1a7068",
+        "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": 5431.33332824707,
-        "y": 2980.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5396.566665649414,
+        "y": 2998.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9da9527c.fe7dd"
+                "bd40be8c.dbbe2"
             ]
         ]
     },
     {
-        "id": "36a781af.2ddb3e",
+        "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": 6003.83332824707,
-        "y": 3084.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5969.066665649414,
+        "y": 3102.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "9da9527c.fe7dd",
+        "id": "bd40be8c.dbbe2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5737.33332824707,
-        "y": 2979.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5702.566665649414,
+        "y": 2997.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3d5ff1a1.a7195e"
+                "62dd0574.924774"
             ]
         ]
     },
     {
-        "id": "3d5ff1a1.a7195e",
+        "id": "62dd0574.924774",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5946.83332824707,
-        "y": 2979.5872497558594,
-        "z": "1f8b432c.7b707d",
+        "x": 5912.066665649414,
+        "y": 2997.820571899414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "dfe4a3e1.5f7a28",
+        "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": 5467.33332824707,
-        "y": 2444.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5432.566665649414,
+        "y": 2462.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "d4a2c427.226738",
+        "id": "7a29235.bdc29dc",
         "type": "switchNode",
         "name": "switch otnidx == 0",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5340.33332824707,
-        "y": 3097.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5305.566665649414,
+        "y": 3115.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e5869a7d.a035e8",
-                "4f7fb15.bbc855"
+                "9e040fdf.4e1908",
+                "afd9af18.cbf68"
             ]
         ]
     },
     {
-        "id": "e5869a7d.a035e8",
+        "id": "9e040fdf.4e1908",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5523.33332824707,
-        "y": 3097.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5488.566665649414,
+        "y": 3115.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "11b27338.362ff5"
+                "4d493b22.a954ac"
             ]
         ]
     },
     {
-        "id": "4f7fb15.bbc855",
+        "id": "afd9af18.cbf68",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5348.33332824707,
-        "y": 3244.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5313.566665649414,
+        "y": 3262.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5e731523.edaba4"
+                "48643fac.9b7948"
             ]
         ]
     },
     {
-        "id": "df75995c.9d6d7",
+        "id": "2165c5b.74a7eba",
         "type": "switchNode",
         "name": "switch otnidx == last",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5689.33332824707,
-        "y": 3325.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5654.566665649414,
+        "y": 3343.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8d4f5504.9d4348",
-                "dc78732e.2c80d8"
+                "be7f13b1.86e45",
+                "d545210.3bcece"
             ]
         ]
     },
     {
-        "id": "8d4f5504.9d4348",
+        "id": "be7f13b1.86e45",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5874.33332824707,
-        "y": 3326.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5839.566665649414,
+        "y": 3344.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "48ad14bc.45fb34"
+                "fa774d24.89417"
             ]
         ]
     },
     {
-        "id": "dc78732e.2c80d8",
+        "id": "d545210.3bcece",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5893.33332824707,
-        "y": 3592.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5858.566665649414,
+        "y": 3610.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1d8019eb.b8f316"
+                "a5e2b559.bb92b8"
             ]
         ]
     },
     {
-        "id": "c9167223.c48c5",
+        "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": 6304.33332824707,
-        "y": 3327.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6269.566665649414,
+        "y": 3345.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "82593f3c.44e9a",
+        "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": 6378.33332824707,
-        "y": 3625.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6343.566665649414,
+        "y": 3643.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5aff8c7.dcc0d",
+        "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": 6314.33332824707,
-        "y": 3676.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6279.566665649414,
+        "y": 3694.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "48179575.56acdc",
+        "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": 6443.33332824707,
-        "y": 3726.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6408.566665649414,
+        "y": 3744.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "4fc515a8.51d2e4",
+        "id": "36a913e9.1aa2ec",
         "type": "comment",
         "name": "connectivity has not been created for middle domains, so we have to create one",
         "info": "",
         "comments": "",
-        "x": 6453.33332824707,
-        "y": 3569.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6418.566665649414,
+        "y": 3587.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "c0955063.7c75f",
+        "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": 6411.33332824707,
-        "y": 3785.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6376.566665649414,
+        "y": 3803.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d8019eb.b8f316",
+        "id": "a5e2b559.bb92b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6050.33332824707,
-        "y": 3593.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6015.566665649414,
+        "y": 3611.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "82593f3c.44e9a",
-                "a5aff8c7.dcc0d",
-                "48179575.56acdc",
-                "c0955063.7c75f",
-                "ab63214f.ab52e"
+                "70c2d887.ebd89",
+                "6dff6f96.bdd14",
+                "da14d71e.29e388",
+                "e8dd53ff.bedac8",
+                "74474f32.496d08"
             ]
         ]
     },
     {
-        "id": "70d68732.b14c",
+        "id": "bc62ddbe.40b578",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4560.33332824707,
-        "y": 2473.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4525.566665649414,
+        "y": 2491.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "dfe4a3e1.5f7a28",
-                "9fe431f7.1a7068",
-                "d4a2c427.226738",
-                "6c1ad513.ca11a4",
-                "ddb6267f.2382f",
-                "39bce85.43eb118",
-                "e250e406.45b0b8"
+                "dfdbadd6.a714c8",
+                "a84a4901.ab0e28",
+                "7a29235.bdc29dc",
+                "ea78e7b3.e08de",
+                "d3bd92d0.f9c398",
+                "a0d9c335.32979",
+                "df425f50.085b58"
             ]
         ]
     },
     {
-        "id": "7dffa406.706e6c",
+        "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": 5928.33332824707,
-        "y": 3141.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5893.566665649414,
+        "y": 3159.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "7214f15c.14004",
+        "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": 5981.33332824707,
-        "y": 3185.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5946.566665649414,
+        "y": 3203.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d7742ed9.525e08",
-                "f96706f6.1edf38"
+                "5032251f.1cf2d4",
+                "be6cefef.c756f"
             ]
         ]
     },
     {
-        "id": "f96706f6.1edf38",
+        "id": "be6cefef.c756f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6252.33332824707,
-        "y": 3170.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6217.566665649414,
+        "y": 3188.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "70a27353.90bdbc"
+                "9820d829.628f68"
             ]
         ]
     },
     {
-        "id": "d7742ed9.525e08",
+        "id": "5032251f.1cf2d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6250.333541870117,
-        "y": 3228.3332529067993,
-        "z": "1f8b432c.7b707d",
+        "x": 6215.566879272461,
+        "y": 3246.566575050354,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "eb2a823e.260b78"
+                "d853eef3.2531b"
             ]
         ]
     },
     {
-        "id": "70a27353.90bdbc",
+        "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": 6392.333576202393,
-        "y": 3170.3333444595337,
-        "z": "1f8b432c.7b707d",
+        "x": 6357.566913604736,
+        "y": 3188.5666666030884,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "eb2a823e.260b78",
+        "id": "d853eef3.2531b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6398.3605880737305,
-        "y": 3219.0787382125854,
-        "z": "1f8b432c.7b707d",
+        "x": 6363.593925476074,
+        "y": 3237.31206035614,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "11b27338.362ff5",
+        "id": "4d493b22.a954ac",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5664.33332824707,
-        "y": 3087.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5629.566665649414,
+        "y": 3105.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "36a781af.2ddb3e",
-                "7dffa406.706e6c"
+                "e8742cf6.070f98",
+                "e594bba7.4a822"
             ]
         ]
     },
     {
-        "id": "48ad14bc.45fb34",
+        "id": "fa774d24.89417",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6008.33332824707,
-        "y": 3327.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5973.566665649414,
+        "y": 3345.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c9167223.c48c5",
-                "c8df83a3.bc227"
+                "76fed0d3.50c2b8",
+                "1f8bf5f5.3f985a"
             ]
         ]
     },
     {
-        "id": "c8df83a3.bc227",
+        "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": 6228.33332824707,
-        "y": 3371.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6193.566665649414,
+        "y": 3389.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "d358673f.8a632",
+        "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": 6279.33332824707,
-        "y": 3415.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6244.566665649414,
+        "y": 3433.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c74c0688.e153c8",
-                "bbe92e0a.776158"
+                "c11f4412.596988",
+                "3d65e0af.86bdc"
             ]
         ]
     },
     {
-        "id": "bbe92e0a.776158",
+        "id": "3d65e0af.86bdc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6542.33332824707,
-        "y": 3395.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6507.566665649414,
+        "y": 3413.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "745303bf.c36e14"
+                "ab4947b8.f3efc8"
             ]
         ]
     },
     {
-        "id": "c74c0688.e153c8",
+        "id": "c11f4412.596988",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6543.333541870117,
-        "y": 3446.3332529067993,
-        "z": "1f8b432c.7b707d",
+        "x": 6508.566879272461,
+        "y": 3464.566575050354,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "16fe3b7.bef5ac5"
+                "42fcaa4.0e80754"
             ]
         ]
     },
     {
-        "id": "745303bf.c36e14",
+        "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": 6682.333576202393,
-        "y": 3395.3333444595337,
-        "z": "1f8b432c.7b707d",
+        "x": 6647.566913604736,
+        "y": 3413.5666666030884,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "16fe3b7.bef5ac5",
+        "id": "42fcaa4.0e80754",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6688.3605880737305,
-        "y": 3444.0787382125854,
-        "z": "1f8b432c.7b707d",
+        "x": 6653.593925476074,
+        "y": 3462.31206035614,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab63214f.ab52e",
+        "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": 6325.33332824707,
-        "y": 3845.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6290.566665649414,
+        "y": 3863.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "758165ab.6ede0c",
+        "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": 3644.3333282470703,
-        "y": 4192.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 3609.566665649414,
+        "y": 4210.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "342e9d1a.c50cf2",
-                "85e441ba.70e1e",
-                "cd45d3e5.a8a2f"
+                "46b1e3df.d037b4",
+                "12132e54.c462e2",
+                "bec1d9b0.34cbd8"
             ]
         ]
     },
     {
-        "id": "342e9d1a.c50cf2",
+        "id": "46b1e3df.d037b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3832.3333282470703,
-        "y": 4205.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 3797.566665649414,
+        "y": 4223.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "24a9c2eb.e19b9e"
+                "57bca9f.85d5a58"
             ]
         ]
     },
     {
-        "id": "85e441ba.70e1e",
+        "id": "12132e54.c462e2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3832.8242950439453,
-        "y": 4250.907379150391,
-        "z": "1f8b432c.7b707d",
+        "x": 3798.057632446289,
+        "y": 4269.140701293945,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "abf9be0d.a5d62"
+                "6123f77d.b84b7"
             ]
         ]
     },
     {
-        "id": "cd45d3e5.a8a2f",
+        "id": "bec1d9b0.34cbd8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3830.3333282470703,
-        "y": 4294.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 3795.566665649414,
+        "y": 4312.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5bf5c027.26df9"
+                "c1bcff3.65bc5"
             ]
         ]
     },
     {
-        "id": "24a9c2eb.e19b9e",
+        "id": "57bca9f.85d5a58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4005.3333282470703,
-        "y": 4203.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 3970.566665649414,
+        "y": 4221.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5543848d.3b0414"
+                "48f214f2.afe82c"
             ]
         ]
     },
     {
-        "id": "abf9be0d.a5d62",
+        "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": 3995.395706176758,
-        "y": 4251.193115234375,
-        "z": "1f8b432c.7b707d",
+        "x": 3960.6290435791016,
+        "y": 4269.42643737793,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "5bf5c027.26df9",
+        "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": 3997.3333282470703,
-        "y": 4293.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 3962.566665649414,
+        "y": 4311.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "b32c7a7e.680c18",
+        "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": 3633.3333282470703,
-        "y": 4383.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 3598.566665649414,
+        "y": 4401.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e206a705.651b58"
+                "d21b0d43.234748"
             ]
         ]
     },
     {
-        "id": "aad93e89.0d91f",
+        "id": "5a7ba4c6.c66bd4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4443.33332824707,
-        "y": 4383.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 4408.566665649414,
+        "y": 4401.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "aa320024.3f29d"
+                "d757ef24.d8b4b8"
             ]
         ]
     },
     {
-        "id": "371672f7.af2966",
+        "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": 4215.33332824707,
-        "y": 4383.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 4180.566665649414,
+        "y": 4401.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "aad93e89.0d91f"
+                "5a7ba4c6.c66bd4"
             ]
         ]
     },
     {
-        "id": "b7b629ca.699bf",
+        "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": 5335.33332824707,
-        "y": 4150.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5300.566665649414,
+        "y": 4168.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "278fac8.6485754",
+        "id": "820ac720.b45068",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
         "comments": "",
-        "x": 5637.33332824707,
-        "y": 3276.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5602.566665649414,
+        "y": 3294.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "5e731523.edaba4",
+        "id": "48643fac.9b7948",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5472.33332824707,
-        "y": 3251.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5437.566665649414,
+        "y": 3269.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "278fac8.6485754",
-                "df75995c.9d6d7"
+                "820ac720.b45068",
+                "2165c5b.74a7eba"
             ]
         ]
     },
     {
-        "id": "38f52a4e.84a6be",
+        "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": 1926.3333282470703,
-        "y": 281.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1891.566665649414,
+        "y": 299.56666564941406,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "5543848d.3b0414",
+        "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": 4234.33332824707,
-        "y": 4204.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 4199.566665649414,
+        "y": 4222.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f4fb2913.3f08e8"
+                "13a3ad3e.ce4b03"
             ]
         ]
     },
     {
-        "id": "f4fb2913.3f08e8",
+        "id": "13a3ad3e.ce4b03",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4449.33332824707,
-        "y": 4205.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 4414.566665649414,
+        "y": 4223.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b4dc52fa.e41dc8"
+                "aaee7064.6ec4a8"
             ]
         ]
     },
     {
-        "id": "59decc03.5b792c",
+        "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": 5902.33332824707,
-        "y": 4125.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5867.566665649414,
+        "y": 4143.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "12c019ee.a843ee"
+                "1cad0dda.a27a62"
             ]
         ]
     },
     {
-        "id": "97c70d48.16fe38",
+        "id": "5f82b085.2694c",
         "type": "switchNode",
         "name": "switch $tmp.arr_length != 0",
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5368.33332824707,
-        "y": 4205.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5333.566665649414,
+        "y": 4223.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6bfc5feb.67a1e",
-                "f9517302.701ea"
+                "64f08945.d78fe",
+                "c8f5bcb9.62dc"
             ]
         ]
     },
     {
-        "id": "6bfc5feb.67a1e",
+        "id": "64f08945.d78fe",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5564.33332824707,
-        "y": 4175.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5529.566665649414,
+        "y": 4193.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8987adcc.4e1008"
+                "bfcf40e9.39a97"
             ]
         ]
     },
     {
-        "id": "f9517302.701ea",
+        "id": "c8f5bcb9.62dc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5565.33332824707,
-        "y": 4246.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5530.566665649414,
+        "y": 4264.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "35a88f3a.b6ac08"
+                "f29be22.ac73ba"
             ]
         ]
     },
     {
-        "id": "8987adcc.4e1008",
+        "id": "bfcf40e9.39a97",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5715.33332824707,
-        "y": 4173.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5680.566665649414,
+        "y": 4191.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "59decc03.5b792c",
-                "6882fe7c.6197e8"
+                "54a1b0ce.796af",
+                "5025eb6e.6416ac"
             ]
         ]
     },
     {
-        "id": "12c019ee.a843ee",
+        "id": "1cad0dda.a27a62",
         "type": "switchNode",
         "name": "switch tmp.arr[$arridx] == $providerValue",
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6193.33332824707,
-        "y": 4125.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6158.566665649414,
+        "y": 4143.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e5c18223.e30628",
-                "cba25abe.848d6"
+                "ef1aab2d.dfd7e",
+                "c7951c87.3f94f8"
             ]
         ]
     },
     {
-        "id": "e5c18223.e30628",
+        "id": "ef1aab2d.dfd7e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6468.33332824707,
-        "y": 4094.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6433.566665649414,
+        "y": 4112.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4b465147.34a4b"
+                "3158c3e7.0f4f1c"
             ]
         ]
     },
     {
-        "id": "cba25abe.848d6",
+        "id": "c7951c87.3f94f8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6469.33332824707,
-        "y": 4165.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6434.566665649414,
+        "y": 4183.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ace0f3a2.ba867"
+                "18af5fa5.bfa388"
             ]
         ]
     },
     {
-        "id": "4b465147.34a4b",
+        "id": "3158c3e7.0f4f1c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6619.33332824707,
-        "y": 4092.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6584.566665649414,
+        "y": 4110.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2155a1a2.b1abbe",
-                "f005c04e.d898a8",
-                "4fb6d7b7.ecc78",
-                "46824160.b1d988",
-                "1e06ac9b.2a6bc3"
+                "c68342ac.2196d8",
+                "a6f93050.eee23",
+                "cc632799.cbb108",
+                "245ca61c.76b612",
+                "939302e5.823e3"
             ]
         ]
     },
     {
-        "id": "2155a1a2.b1abbe",
+        "id": "c68342ac.2196d8",
         "type": "set",
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 6807.33332824707,
-        "y": 4052.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6772.566665649414,
+        "y": 4070.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "f005c04e.d898a8",
+        "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": 6879.33332824707,
-        "y": 4097.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6844.566665649414,
+        "y": 4115.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e06ac9b.2a6bc3",
+        "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": 6794.33332824707,
-        "y": 4224.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6759.566665649414,
+        "y": 4242.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "46824160.b1d988",
+        "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": 6815.33332824707,
-        "y": 4160.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6780.566665649414,
+        "y": 4178.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "35a88f3a.b6ac08",
+        "id": "f29be22.ac73ba",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5717.33332824707,
-        "y": 4246.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5682.566665649414,
+        "y": 4264.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "bec1bd98.095008",
-                "6bef5837.fb58f"
+                "b939d5a3.62c49",
+                "19ae4c6e.0e8cdc"
             ]
         ]
     },
     {
-        "id": "bec1bd98.095008",
+        "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": 5972.33332824707,
-        "y": 4239.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5937.566665649414,
+        "y": 4257.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "6bef5837.fb58f",
+        "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": 5900.33332824707,
-        "y": 4286.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5865.566665649414,
+        "y": 4304.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "6882fe7c.6197e8",
+        "id": "5025eb6e.6416ac",
         "type": "switchNode",
         "name": "switch found?",
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5893.33332824707,
-        "y": 4170.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5858.566665649414,
+        "y": 4188.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "fe294cd.9421bb",
-                "65b4ebb1.845464"
+                "5f0ac92a.2af9f8",
+                "5a001e78.4b9ed8"
             ]
         ]
     },
     {
-        "id": "fe294cd.9421bb",
+        "id": "5f0ac92a.2af9f8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6053.33332824707,
-        "y": 4162.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6018.566665649414,
+        "y": 4180.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e093232d.0ab56"
+                "26dc24b4.633a24"
             ]
         ]
     },
     {
-        "id": "65b4ebb1.845464",
+        "id": "5a001e78.4b9ed8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6051.33332824707,
-        "y": 4199.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6016.566665649414,
+        "y": 4217.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ab13fab7.3aabe"
+                "77dbb1e6.82cb3"
             ]
         ]
     },
     {
-        "id": "e093232d.0ab56",
+        "id": "26dc24b4.633a24",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6178.33332824707,
-        "y": 4162.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6143.566665649414,
+        "y": 4180.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "62438f19.a66048",
+        "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": 6485.33332824707,
-        "y": 4220.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6450.566665649414,
+        "y": 4238.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab13fab7.3aabe",
+        "id": "77dbb1e6.82cb3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 6211.33332824707,
-        "y": 4207.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6176.566665649414,
+        "y": 4225.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "62438f19.a66048",
-                "f4afeb0e.ae0db"
+                "88be3e5.2470dc",
+                "7d97455b.7a4494"
             ]
         ]
     },
     {
-        "id": "f4afeb0e.ae0db",
+        "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": 6402.33332824707,
-        "y": 4266.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6367.566665649414,
+        "y": 4284.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ace0f3a2.ba867",
+        "id": "18af5fa5.bfa388",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6602.33332824707,
-        "y": 4164.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6567.566665649414,
+        "y": 4182.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "4fb6d7b7.ecc78",
+        "id": "cc632799.cbb108",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6773.33332824707,
-        "y": 4291.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 6738.566665649414,
+        "y": 4309.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "6c1ad513.ca11a4",
+        "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": 5170.33332824707,
-        "y": 2503.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5135.566665649414,
+        "y": 2521.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e5311d8f.316e3",
-                "377e7dc.719a502"
+                "11f77bdc.5c21c4",
+                "4e61ac39.13325c"
             ]
         ]
     },
     {
-        "id": "e5311d8f.316e3",
+        "id": "11f77bdc.5c21c4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5559.33332824707,
-        "y": 2481.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5524.566665649414,
+        "y": 2499.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "53a0d07b.9ddd2"
+                "7430e7ea.530e58"
             ]
         ]
     },
     {
-        "id": "377e7dc.719a502",
+        "id": "4e61ac39.13325c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5560.33332824707,
-        "y": 2527.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5525.566665649414,
+        "y": 2545.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "bda8eef7.7834b"
+                "40bd7840.ab6ab8"
             ]
         ]
     },
     {
-        "id": "53a0d07b.9ddd2",
+        "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": 5773.33332824707,
-        "y": 2480.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5738.566665649414,
+        "y": 2498.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "bda8eef7.7834b",
+        "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": 5771.33332824707,
-        "y": 2525.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5736.566665649414,
+        "y": 2543.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "aa320024.3f29d",
+        "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": 4696.33332824707,
-        "y": 4381.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 4661.566665649414,
+        "y": 4399.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "582f4b19.cbc35c",
+        "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": 4281.33332824707,
-        "y": 4489.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 4246.566665649414,
+        "y": 4507.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2ee5af11.6c1e68",
-                "dcd2689e.43975"
+                "ba44af6e.91f5c8",
+                "3bd2b367.4ad41c"
             ]
         ]
     },
     {
-        "id": "dcd2689e.43975",
+        "id": "3bd2b367.4ad41c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4564.33332824707,
-        "y": 4469.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 4529.566665649414,
+        "y": 4487.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "226131b5.dcdb56"
+                "37d6233a.1b0304"
             ]
         ]
     },
     {
-        "id": "2ee5af11.6c1e68",
+        "id": "ba44af6e.91f5c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4565.333541870117,
-        "y": 4520.333252906799,
-        "z": "1f8b432c.7b707d",
+        "x": 4530.566879272461,
+        "y": 4538.566575050354,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9a360786.0f7708"
+                "37a623d1.3ee5dc"
             ]
         ]
     },
     {
-        "id": "226131b5.dcdb56",
+        "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": 4704.333576202393,
-        "y": 4469.333344459534,
-        "z": "1f8b432c.7b707d",
+        "x": 4669.566913604736,
+        "y": 4487.566666603088,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "9a360786.0f7708",
+        "id": "37a623d1.3ee5dc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4710.3605880737305,
-        "y": 4518.078738212585,
-        "z": "1f8b432c.7b707d",
+        "x": 4675.593925476074,
+        "y": 4536.31206035614,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "ddb6267f.2382f",
+        "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": 5354.33332824707,
-        "y": 2623.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5319.566665649414,
+        "y": 2641.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "39bce85.43eb118",
+        "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": 5398.33332824707,
-        "y": 2671.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5363.566665649414,
+        "y": 2689.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e3200e7d.1b6158",
-                "a27bf097.a61688",
-                "aed031.10f8e7d"
+                "36774af5.729fc6",
+                "692ec606.1c0bf",
+                "a64279c9.e169f8"
             ]
         ]
     },
     {
-        "id": "e3200e7d.1b6158",
+        "id": "36774af5.729fc6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5610.83332824707,
-        "y": 2618.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5576.066665649414,
+        "y": 2636.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ec0b5318.bd94a"
+                "24f01093.ed22"
             ]
         ]
     },
     {
-        "id": "a27bf097.a61688",
+        "id": "692ec606.1c0bf",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5622.83332824707,
-        "y": 2668.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5588.066665649414,
+        "y": 2686.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "194dd3a5.9683ac"
+                "b3f7be01.e6de6"
             ]
         ]
     },
     {
-        "id": "aed031.10f8e7d",
+        "id": "a64279c9.e169f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5613.83332824707,
-        "y": 2723.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5579.066665649414,
+        "y": 2741.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "121802d5.075bad"
+                "4198105e.daee7"
             ]
         ]
     },
     {
-        "id": "121802d5.075bad",
+        "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": 5758.83332824707,
-        "y": 2722.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5724.066665649414,
+        "y": 2740.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "194dd3a5.9683ac",
+        "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": 5769.83332824707,
-        "y": 2665.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5735.066665649414,
+        "y": 2683.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ec0b5318.bd94a",
+        "id": "24f01093.ed22",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5736.215774536133,
-        "y": 2611.989013671875,
-        "z": "1f8b432c.7b707d",
+        "x": 5701.449111938477,
+        "y": 2630.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6ffb5206.ab40dc"
+                "96aa274b.2af748"
             ]
         ]
     },
     {
-        "id": "a75d0b14.3b6cd8",
+        "id": "70fdda05.22abe4",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6295.33332824707,
-        "y": 2630.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6260.566665649414,
+        "y": 2648.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5ed989fd.7ba3d8"
+                "5724269.b9bddd8"
             ]
         ]
     },
     {
-        "id": "5ed989fd.7ba3d8",
+        "id": "5724269.b9bddd8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6472.33332824707,
-        "y": 2622.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6437.566665649414,
+        "y": 2640.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4b327d9f.7fa68c",
-                "a56c9b9d.4b71c"
+                "29fcda51.42b766",
+                "d5b1f1ff.e7e908"
             ]
         ]
     },
     {
-        "id": "6ffb5206.ab40dc",
+        "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": 5897.33332824707,
-        "y": 2626.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5862.566665649414,
+        "y": 2644.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "157a7f1c.cef0f9"
+                "c5ea1030.bae808"
             ]
         ]
     },
     {
-        "id": "157a7f1c.cef0f9",
+        "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": 6092.33332824707,
-        "y": 2626.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6057.566665649414,
+        "y": 2644.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a75d0b14.3b6cd8"
+                "70fdda05.22abe4"
             ]
         ]
     },
     {
-        "id": "a56c9b9d.4b71c",
+        "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": 6680.33332824707,
-        "y": 2629.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6645.566665649414,
+        "y": 2647.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5942c841.aa6ee8",
-                "9c93c9ac.788a48",
-                "6429f071.39b59"
+                "56bf4e9f.3968f8",
+                "437d47d9.20134",
+                "1f059162.8a738f"
             ]
         ]
     },
     {
-        "id": "4b327d9f.7fa68c",
+        "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": 6710.33332824707,
-        "y": 2577.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6675.566665649414,
+        "y": 2595.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "5942c841.aa6ee8",
+        "id": "56bf4e9f.3968f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6890.33332824707,
-        "y": 2620.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6855.566665649414,
+        "y": 2638.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f8702def.d95bc8"
+                "1dc1cb6d.3c36b5"
             ]
         ]
     },
     {
-        "id": "9c93c9ac.788a48",
+        "id": "437d47d9.20134",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6882.33332824707,
-        "y": 2675.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6847.566665649414,
+        "y": 2693.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "440237ad.5da15"
+                "7f43de09.864508"
             ]
         ]
     },
     {
-        "id": "6429f071.39b59",
+        "id": "1f059162.8a738f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6887.33332824707,
-        "y": 2732.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6852.566665649414,
+        "y": 2750.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2304d14f.3cde06"
+                "b0293f66.5c8dc"
             ]
         ]
     },
     {
-        "id": "2304d14f.3cde06",
+        "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": 7039.33332824707,
-        "y": 2733.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 7004.566665649414,
+        "y": 2751.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "440237ad.5da15",
+        "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": 7050.33332824707,
-        "y": 2678.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 7015.566665649414,
+        "y": 2696.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "f8702def.d95bc8",
+        "id": "1dc1cb6d.3c36b5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7034.71565246582,
-        "y": 2617.989013671875,
-        "z": "1f8b432c.7b707d",
+        "x": 6999.948989868164,
+        "y": 2636.2223358154297,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f24381a1.f5a1a8"
+                "966090bf.048df8"
             ]
         ]
     },
     {
-        "id": "f24381a1.f5a1a8",
+        "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": 7249.33332824707,
-        "y": 2614.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 7214.566665649414,
+        "y": 2632.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e206a705.651b58",
+        "id": "d21b0d43.234748",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3865.3333282470703,
-        "y": 4381.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 3830.566665649414,
+        "y": 4399.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "371672f7.af2966",
-                "582f4b19.cbc35c"
+                "7025e4fd.b3ba94",
+                "b77c6069.584e4"
             ]
         ]
     },
     {
-        "id": "e250e406.45b0b8",
+        "id": "df425f50.085b58",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5368.33332824707,
-        "y": 2840.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5333.566665649414,
+        "y": 2858.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "7ec634eb.fd12e4",
-                "72b43008.da4948"
+                "f12d2166.2196f",
+                "682813b1.580324"
             ]
         ]
     },
     {
-        "id": "7ec634eb.fd12e4",
+        "id": "f12d2166.2196f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5569.33332824707,
-        "y": 2838.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5534.566665649414,
+        "y": 2856.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9a8afed8.5944c"
+                "c9eeec2d.e136b"
             ]
         ]
     },
     {
-        "id": "9a8afed8.5944c",
+        "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": 5783.33332824707,
-        "y": 2840.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5748.566665649414,
+        "y": 2858.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "a2a5b281.9fc21",
+        "id": "cb7ac096.290b9",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5786.33332824707,
-        "y": 2889.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5751.566665649414,
+        "y": 2907.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "51c23d0e.7b05dc",
-                "905f334d.4416a8"
+                "69e4928.c222dec",
+                "f0c4a8ec.842b18"
             ]
         ]
     },
     {
-        "id": "51c23d0e.7b05dc",
+        "id": "69e4928.c222dec",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6016.33332824707,
-        "y": 2885.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5981.566665649414,
+        "y": 2903.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6e6ce692.530ee8"
+                "2b076d1.a6bcd92"
             ]
         ]
     },
     {
-        "id": "6e6ce692.530ee8",
+        "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": 6230.33332824707,
-        "y": 2888.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6195.566665649414,
+        "y": 2906.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "72b43008.da4948",
+        "id": "682813b1.580324",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5569.33332824707,
-        "y": 2887.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5534.566665649414,
+        "y": 2905.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "a2a5b281.9fc21"
+                "cb7ac096.290b9"
             ]
         ]
     },
     {
-        "id": "905f334d.4416a8",
+        "id": "f0c4a8ec.842b18",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6017.33332824707,
-        "y": 2931.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5982.566665649414,
+        "y": 2949.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "17f66f36.7df949"
+                "707799e0.88ec2"
             ]
         ]
     },
     {
-        "id": "17f66f36.7df949",
+        "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": 6231.33332824707,
-        "y": 2931.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6196.566665649414,
+        "y": 2949.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "31ff32a6.490d6e",
+        "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": 6129.33332824707,
-        "y": 2980.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 6094.566665649414,
+        "y": 2998.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "b4dc52fa.e41dc8",
+        "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": 4693.33332824707,
-        "y": 4204.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 4658.566665649414,
+        "y": 4222.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "ddeec6d8.2b66d",
-                "ad3e1b09.a7dd3"
+                "89261301.f79ae",
+                "bc254e44.388f98"
             ]
         ]
     },
     {
-        "id": "ddeec6d8.2b66d",
+        "id": "89261301.f79ae",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4910.33332824707,
-        "y": 4183.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 4875.566665649414,
+        "y": 4201.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "faf87a35.78eb88"
+                "b99882e3.9c25b8"
             ]
         ]
     },
     {
-        "id": "ad3e1b09.a7dd3",
+        "id": "bc254e44.388f98",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4910.33332824707,
-        "y": 4232.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 4875.566665649414,
+        "y": 4250.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "faf87a35.78eb88",
+        "id": "b99882e3.9c25b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5078.33332824707,
-        "y": 4183.333343505859,
-        "z": "1f8b432c.7b707d",
+        "x": 5043.566665649414,
+        "y": 4201.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b7b629ca.699bf",
-                "97c70d48.16fe38"
+                "714d6791.87f3b8",
+                "5f82b085.2694c"
             ]
         ]
     },
     {
-        "id": "b7e06d6e.f371a",
+        "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": 1418.3333282470703,
-        "y": 814.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1380.566650390625,
+        "y": 835.566650390625,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "16c2412b.16deaf",
-                "ae26bbae.e630b8",
-                "e8c1e05c.a0ff5"
+                "fdf74857.41608",
+                "ee4e91c.5d8d17",
+                "855c696.c46c118"
             ]
         ]
     },
     {
-        "id": "16c2412b.16deaf",
+        "id": "fdf74857.41608",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1630.8242950439453,
-        "y": 780.9073181152344,
-        "z": "1f8b432c.7b707d",
+        "x": 1596.057632446289,
+        "y": 799.1406402587891,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "28aa8e7b.7b6a9a"
+                "43b6bc30.e8a804"
             ]
         ]
     },
     {
-        "id": "ae26bbae.e630b8",
+        "id": "ee4e91c.5d8d17",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1619.3333282470703,
-        "y": 825.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1584.566665649414,
+        "y": 843.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d31e63f3.254"
+                "a4b65a55.9111d"
             ]
         ]
     },
     {
-        "id": "28aa8e7b.7b6a9a",
+        "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": 1779.3958282470703,
-        "y": 781.1930847167969,
-        "z": "1f8b432c.7b707d",
+        "x": 1744.629165649414,
+        "y": 799.4264068603516,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "d31e63f3.254",
+        "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": 1778.3333282470703,
-        "y": 825.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1743.566665649414,
+        "y": 843.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "e8c1e05c.a0ff5",
+        "id": "855c696.c46c118",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1624.3333282470703,
-        "y": 868.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1589.566665649414,
+        "y": 886.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c3b9530.73a28b"
+                "2b531922.e9da96"
             ]
         ]
     },
     {
-        "id": "c3b9530.73a28b",
+        "id": "2b531922.e9da96",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 770.3333282470703,
-        "y": 1207.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 735.5666656494141,
+        "y": 1225.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "3e859b6c.a626d4"
+                "7c91e56b.1594b4"
             ]
         ]
     },
     {
-        "id": "3e859b6c.a626d4",
+        "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": 1044.3333282470703,
-        "y": 1207.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1009.5666656494141,
+        "y": 1225.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9fdac28f.05e248"
+                "bfa4ee31.b57fd"
             ]
         ]
     },
     {
-        "id": "9fdac28f.05e248",
+        "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": 1279.6668243408203,
-        "y": 1208.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1244.900161743164,
+        "y": 1226.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "6b8b4db1.78e19c"
+                "ccebaa1.97cf958"
             ]
         ]
     },
     {
-        "id": "6b8b4db1.78e19c",
+        "id": "ccebaa1.97cf958",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 563.3335723876953,
-        "y": 1361.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 528.5669097900391,
+        "y": 1379.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2aa5f521.f24e92"
+                "6f5f9c23.47e85c"
             ]
         ]
     },
     {
-        "id": "83814db5.2acc38",
+        "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": 952.3333282470703,
-        "y": 1366.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 917.5666656494141,
+        "y": 1384.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f08fdd90.4c3b48",
-                "74408ee8.7c8248",
-                "bddcb73f.c2f73"
+                "f72960d6.00c9a8",
+                "cf896404.076eb8",
+                "8c05370a.85ef68"
             ]
         ]
     },
     {
-        "id": "f08fdd90.4c3b48",
+        "id": "f72960d6.00c9a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1148.3333282470703,
-        "y": 1331.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1113.566665649414,
+        "y": 1349.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b8ac9b43.4a9818"
+                "3b76e03e.4509b"
             ]
         ]
     },
     {
-        "id": "74408ee8.7c8248",
+        "id": "cf896404.076eb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1148.8242950439453,
-        "y": 1376.9073791503906,
-        "z": "1f8b432c.7b707d",
+        "x": 1114.057632446289,
+        "y": 1395.1407012939453,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "dda3b631.5e1b9"
+                "c0ebf57b.8932c"
             ]
         ]
     },
     {
-        "id": "bddcb73f.c2f73",
+        "id": "8c05370a.85ef68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1113.3333282470703,
-        "y": 1422.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1078.566665649414,
+        "y": 1440.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "c0397cda.3cd818"
+                "ac014ec8.afc2c"
             ]
         ]
     },
     {
-        "id": "dda3b631.5e1b9",
+        "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": 1308.3958282470703,
-        "y": 1374.1930847167969,
-        "z": "1f8b432c.7b707d",
+        "x": 1273.629165649414,
+        "y": 1392.4264068603516,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "c0397cda.3cd818",
+        "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": 1266.3333282470703,
-        "y": 1424.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1231.566665649414,
+        "y": 1442.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "4d852904.6e1e58",
+        "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": 1541.3333282470703,
-        "y": 1314.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1506.566665649414,
+        "y": 1332.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "28fd1bef.755efc",
-                "5889d337.e7ce3c"
+                "743d201b.02ef4",
+                "96c2bcb9.b7be6"
             ]
         ]
     },
     {
-        "id": "28fd1bef.755efc",
+        "id": "743d201b.02ef4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1752.3333282470703,
-        "y": 1279.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1717.566665649414,
+        "y": 1297.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "b34d6866.bc5698"
+                "bc409e2e.3633b"
             ]
         ]
     },
     {
-        "id": "5889d337.e7ce3c",
+        "id": "96c2bcb9.b7be6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.3333282470703,
-        "y": 1340.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1714.566665649414,
+        "y": 1358.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "2876f138.d4a73e",
+        "id": "b2c89b06.1d18",
         "type": "set",
         "name": "set currLinkIsFound",
         "xml": "<set>\n<parameter name='currLinkIsFound' value=\"true\" />\n\n\n",
         "comments": "",
-        "x": 2090.3333282470703,
-        "y": 1252.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2055.566665649414,
+        "y": 1270.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "b34d6866.bc5698",
+        "id": "bc409e2e.3633b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1904.3333282470703,
-        "y": 1280.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1869.566665649414,
+        "y": 1298.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "2876f138.d4a73e"
+                "b2c89b06.1d18"
             ]
         ]
     },
     {
-        "id": "6674b61e.a06d68",
+        "id": "8e75c992.3dcad8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2057.3333282470703,
-        "y": 1308.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2022.566665649414,
+        "y": 1326.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ee2fec7a.bb72",
+        "id": "aabee6e1.198dd8",
         "type": "comment",
         "name": "currLinkIsFound. Go to the next logical-link",
         "info": "",
         "comments": "",
-        "x": 2062.3333282470703,
-        "y": 1202.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2027.566665649414,
+        "y": 1220.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "9653963e.b4d7a8",
+        "id": "ef9e5601.232bf8",
         "type": "switchNode",
         "name": "switch currLinkIsFound",
         "xml": "<switch test='`$currLinkIsFound`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1344.3333282470703,
-        "y": 932.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1309.566665649414,
+        "y": 950.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "78ad0a60.3340ec",
-                "c4221fd4.9cf0f8"
+                "b3aa3ada.f160e8",
+                "b7eb38ae.e82468"
             ]
         ]
     },
     {
-        "id": "78ad0a60.3340ec",
+        "id": "b3aa3ada.f160e8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1530.3333282470703,
-        "y": 911.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1495.566665649414,
+        "y": 929.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9a111eaa.a49b48"
+                "92e1cebb.b308b8"
             ]
         ]
     },
     {
-        "id": "c4221fd4.9cf0f8",
+        "id": "b7eb38ae.e82468",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1527.3333282470703,
-        "y": 1047.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1492.566665649414,
+        "y": 1065.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "498e3ba4.cbc914"
+                "9334f6e1.75bd8"
             ]
         ]
     },
     {
-        "id": "9a111eaa.a49b48",
+        "id": "92e1cebb.b308b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1772.3333282470703,
-        "y": 906.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1737.566665649414,
+        "y": 924.5666656494141,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "bd09e3c8.ced5f8",
+        "id": "33f6edc7.c109aa",
         "type": "comment",
         "name": "A new logical-link has been found: modify process should be triggered",
         "info": "",
         "comments": "",
-        "x": 1718.3333282470703,
-        "y": 1010.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1683.566665649414,
+        "y": 1028.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "b8ac9b43.4a9818",
+        "id": "3b76e03e.4509b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1312.3333282470703,
-        "y": 1315.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1277.566665649414,
+        "y": 1333.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "4d852904.6e1e58",
-                "275b774d.5d0718"
+                "ab34961f.f94a7",
+                "1c716952.137bb7"
             ]
         ]
     },
     {
-        "id": "275b774d.5d0718",
+        "id": "1c716952.137bb7",
         "type": "switchNode",
         "name": "switch connectivityBW == gfp",
         "xml": "<switch test='`$tmp.aai.connectivity.bandwidth-profile-name == $gfp`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1542.3333282470703,
-        "y": 1405.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1507.566665649414,
+        "y": 1423.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "8ffa4f79.ade61",
-                "c4dfc850.994ac"
+                "7f55db50.0bbafc",
+                "ba68eea1.e9a338"
             ]
         ]
     },
     {
-        "id": "8ffa4f79.ade61",
+        "id": "7f55db50.0bbafc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1747.3333282470703,
-        "y": 1401.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1712.566665649414,
+        "y": 1419.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "c4dfc850.994ac",
+        "id": "ba68eea1.e9a338",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1749.3333282470703,
-        "y": 1451.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1714.566665649414,
+        "y": 1469.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "30c2ae4.1f45052"
+                "94ed181a.25fe8"
             ]
         ]
     },
     {
-        "id": "30007844.075cd",
+        "id": "e266b7f2.fe727",
         "type": "set",
         "name": "set bwModified",
         "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
         "comments": "",
-        "x": 2098.3333282470703,
-        "y": 1429.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 2063.566665649414,
+        "y": 1447.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "30c2ae4.1f45052",
+        "id": "94ed181a.25fe8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1903.3333282470703,
-        "y": 1450.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1868.566665649414,
+        "y": 1468.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "30007844.075cd",
-                "b1f43ea6.58c508"
+                "e266b7f2.fe727",
+                "c9ff8521.2183a8"
             ]
         ]
     },
     {
-        "id": "b1f43ea6.58c508",
+        "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": 923.3333282470703,
-        "y": 1655.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 888.5666656494141,
+        "y": 1673.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5f59c5b8.8000ec"
+                "2fcf0107.404b9e"
             ]
         ]
     },
     {
-        "id": "5f59c5b8.8000ec",
+        "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": 1128.3333282470703,
-        "y": 1655.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1093.566665649414,
+        "y": 1673.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "d7cb533e.bd93a"
+                "f620da7d.b85a28"
             ]
         ]
     },
     {
-        "id": "d7cb533e.bd93a",
+        "id": "f620da7d.b85a28",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1294.3333282470703,
-        "y": 1655.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1259.566665649414,
+        "y": 1673.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5c501362.927b6c"
+                "5afceee0.e00098"
             ]
         ]
     },
     {
-        "id": "5c501362.927b6c",
+        "id": "5afceee0.e00098",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1457.3333282470703,
-        "y": 1655.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1422.566665649414,
+        "y": 1673.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "53a207fe.affe78",
-                "2105f763.ee4f68"
+                "da12db00.5b12d",
+                "a52b001a.5c9b18"
             ]
         ]
     },
     {
-        "id": "2105f763.ee4f68",
+        "id": "a52b001a.5c9b18",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 1686.3333282470703,
-        "y": 1595.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1651.566665649414,
+        "y": 1613.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "53a207fe.affe78",
+        "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": 1195.3333282470703,
-        "y": 1749.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1160.566665649414,
+        "y": 1767.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "96d7c193.8b3058",
-                "915fad51.2fe24",
-                "52119562.4019b4"
+                "88650b88.fc30d",
+                "ec560486.50e96",
+                "25b4ff2b.4b18b8"
             ]
         ]
     },
     {
-        "id": "e9bb6625.bf214",
+        "id": "e1e2e790.cb03a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1579.3333282470703,
-        "y": 1749.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1544.566665649414,
+        "y": 1767.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "aea8b329.30e9d",
-                "4aaf718e.250ab8"
+                "37781926.bbe2d6",
+                "76e90665.699c78",
+                "ce24e399.073d3"
             ]
         ]
     },
     {
-        "id": "96d7c193.8b3058",
+        "id": "88650b88.fc30d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1406.3333282470703,
-        "y": 1751.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1371.566665649414,
+        "y": 1769.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "e9bb6625.bf214"
+                "e1e2e790.cb03a8"
             ]
         ]
     },
     {
-        "id": "915fad51.2fe24",
+        "id": "ec560486.50e96",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1406.8242950439453,
-        "y": 1796.9073791503906,
-        "z": "1f8b432c.7b707d",
+        "x": 1372.057632446289,
+        "y": 1815.1407012939453,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "9471576f.097388"
+                "3ccd5736.62782"
             ]
         ]
     },
     {
-        "id": "52119562.4019b4",
+        "id": "25b4ff2b.4b18b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1404.3333282470703,
-        "y": 1840.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1369.566665649414,
+        "y": 1858.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "18330305.6a2a7d"
+                "704847a.0ccbeb8"
             ]
         ]
     },
     {
-        "id": "18330305.6a2a7d",
+        "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": 1571.3333282470703,
-        "y": 1857.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1536.566665649414,
+        "y": 1875.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "9471576f.097388",
+        "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": 1569.3957061767578,
-        "y": 1797.193115234375,
-        "z": "1f8b432c.7b707d",
+        "x": 1534.6290435791016,
+        "y": 1815.4264373779297,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "2aa5f521.f24e92",
+        "id": "6f5f9c23.47e85c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 735.3333282470703,
-        "y": 1361.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 700.5666656494141,
+        "y": 1379.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "83814db5.2acc38",
-                "4cdc6ff0.28b37"
+                "36292c23.d5bad4",
+                "96bb2834.ab4d4"
             ]
         ]
     },
     {
-        "id": "4cdc6ff0.28b37",
+        "id": "96bb2834.ab4d4",
         "type": "set",
         "name": "unset tmp.aai.connectivity",
         "xml": "<set>\n<parameter name='tmp.aai.connectivity.' value='' />\n",
         "comments": "",
-        "x": 955.3333282470703,
-        "y": 1309.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 920.5666656494141,
+        "y": 1327.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "aea8b329.30e9d",
+        "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": 1929.8333282470703,
-        "y": 1744.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1895.066665649414,
+        "y": 1762.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "4aaf718e.250ab8",
+        "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": 1856.8333282470703,
-        "y": 1808.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 1822.066665649414,
+        "y": 1826.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "301a3cc6.e828c4",
+        "id": "9be1948a.b31058",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
-        "x": 2001.3333282470703,
-        "y": 136.33334350585938,
-        "z": "1f8b432c.7b707d",
+        "x": 1971.566650390625,
+        "y": 46.566673278808594,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "ba577b94.b0dc8",
+        "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": 1961.3333282470703,
-        "y": 180.33334350585938,
-        "z": "1f8b432c.7b707d",
+        "x": 1921.566650390625,
+        "y": 99.5666732788086,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "efd37c2f.4ac7f",
+        "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": 1974.3333282470703,
-        "y": 225.33334350585938,
-        "z": "1f8b432c.7b707d",
+        "x": 1931.566650390625,
+        "y": 138.56668090820312,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "8e0823d9.c3d5f",
+        "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": 4281.33332824707,
-        "y": 2342.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 4246.566665649414,
+        "y": 2360.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "8465e4fd.6de0a",
+        "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": 5572.33332824707,
-        "y": 1179.3333435058594,
-        "z": "1f8b432c.7b707d",
+        "x": 5537.566665649414,
+        "y": 1197.566665649414,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "642b12a.3e870ec",
+        "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": 4470.333740234375,
-        "y": 2399.3333740234375,
-        "z": "1f8b432c.7b707d",
+        "x": 4435.567077636719,
+        "y": 2417.566696166992,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "f34b01.8e0f75",
+        "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    \n    `\n\n",
+        "xml": "<switch test=\"`$param-prefix-domainA[$param-prefix-domainA_length -9] == $param-prefix-domainB[$param-prefix-domainB_length -9]`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2923.666748046875,
-        "y": 2446.33349609375,
-        "z": "1f8b432c.7b707d",
+        "x": 2888.9000854492188,
+        "y": 2464.5668182373047,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "db4fc7e3.ebc94",
-                "5ec8edee.aa3afc"
+                "21c7a96f.230fc6",
+                "a4bfb1a.7ba14d"
             ]
         ]
     },
     {
-        "id": "5ec8edee.aa3afc",
+        "id": "a4bfb1a.7ba14d",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3137.6666870117188,
-        "y": 2459.3333740234375,
-        "z": "1f8b432c.7b707d",
+        "x": 3102.9000244140625,
+        "y": 2477.566696166992,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "42219b91.01efdc"
+                "591ba76d.52253"
             ]
         ]
     },
     {
-        "id": "db4fc7e3.ebc94",
+        "id": "21c7a96f.230fc6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3118.6666259765625,
-        "y": 2560.33349609375,
-        "z": "1f8b432c.7b707d",
+        "x": 3083.8999633789062,
+        "y": 2578.5668182373047,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "5c61900d.2cdc2"
+                "791966ec.7cb7a"
             ]
         ]
     },
     {
-        "id": "42219b91.01efdc",
+        "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": 3545.0001831054688,
-        "y": 2465.66650390625,
-        "z": "1f8b432c.7b707d",
+        "x": 3677.2332153320312,
+        "y": 2420.899948120117,
+        "z": "7a2c5977.5cc868",
         "wires": [
-            [
-                "50b64f95.e5fb98"
-            ]
+            []
         ]
     },
     {
-        "id": "5c61900d.2cdc2",
+        "id": "791966ec.7cb7a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3269.0000610351562,
-        "y": 2560.66650390625,
-        "z": "1f8b432c.7b707d",
+        "x": 3234.2333984375,
+        "y": 2578.8998260498047,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "f027aef7.634db8",
-                "7a63eedd.e32c3",
-                "2b5a38a.97b3448",
-                "7fefe031.312d88"
+                "5c02cdd2.3ba3bc",
+                "6d7db185.f222a",
+                "4a5a5654.7a3e18",
+                "1ef4d127.0e3e8f"
             ]
         ]
     },
     {
-        "id": "50b64f95.e5fb98",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3971.3333129882812,
-        "y": 2465.33349609375,
-        "z": "1f8b432c.7b707d",
-        "wires": [
-            [
-                "e65eb704.1a5ee"
-            ]
-        ]
-    },
-    {
-        "id": "f027aef7.634db8",
+        "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": 3552.9999389648438,
-        "y": 2566.3333740234375,
-        "z": "1f8b432c.7b707d",
+        "x": 3518.2332763671875,
+        "y": 2584.566696166992,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a63eedd.e32c3",
+        "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": 3520.9999389648438,
-        "y": 2626.6663818359375,
-        "z": "1f8b432c.7b707d",
+        "x": 3486.2332763671875,
+        "y": 2644.899703979492,
+        "z": "7a2c5977.5cc868",
         "wires": []
     },
     {
-        "id": "2b5a38a.97b3448",
+        "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": 3586.3331909179688,
-        "y": 2682.6663818359375,
-        "z": "1f8b432c.7b707d",
+        "x": 3551.5665283203125,
+        "y": 2700.899703979492,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "1b626686.9373e9"
+                "9d7de4f8.93c768"
             ]
         ]
     },
     {
-        "id": "1b626686.9373e9",
+        "id": "9d7de4f8.93c768",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3903.3331909179688,
-        "y": 2684.6663818359375,
-        "z": "1f8b432c.7b707d",
+        "x": 3868.5665283203125,
+        "y": 2702.899703979492,
+        "z": "7a2c5977.5cc868",
         "wires": [
             [
-                "de4818c6.968eb8"
+                "3ccad972.8b2556"
             ]
         ]
     },
     {
-        "id": "de4818c6.968eb8",
+        "id": "3ccad972.8b2556",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4066.8331909179688,
-        "y": 2683.9202880859375,
-        "z": "1f8b432c.7b707d",
+        "x": 4032.0665283203125,
+        "y": 2702.153610229492,
+        "z": "7a2c5977.5cc868",
         "wires": [
             []
         ]
     },
     {
-        "id": "7fefe031.312d88",
+        "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": 3634.9995727539062,
-        "y": 2737.3331298828125,
-        "z": "1f8b432c.7b707d",
+        "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
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index 936f88dc..1e4095bb 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -308,4 +308,5 @@ GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-activate ${project.version}
 GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-deactivate ${project.version} sync
 GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-delete ${project.version} sync
 GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-modify ${project.version} sync
-GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-callbackdg-notification 888 sync
\ No newline at end of file
+GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-callbackdg-notification 888 sync
+GENERIC-RESOURCE-API p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof ${project.version} sync
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
index 4399bd68..b9d5ce07 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
@@ -179,6 +179,9 @@
                             <outcome value='CreateCloudLeasedLineInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync' ></call>
                             </outcome>
+                            <outcome value='CreateCloudLeasedLineInstanceByEline'>
+                                <call module='GENERIC-RESOURCE-API' rpc='p2p-vnf-topology-operation-p2p-create' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <block></block>
                             </outcome>
@@ -242,6 +245,9 @@
                             <outcome value='DeleteCloudLeasedLineInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete' mode='sync' ></call>
                             </outcome>
+                            <outcome value='DeleteCloudLeasedLineInstanceByEline'>
+                                <call module='GENERIC-RESOURCE-API' rpc='p2p-vnf-topology-operation-p2p-delete' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <block></block>
                             </outcome>
@@ -269,6 +275,9 @@
                         <outcome value='ModifyCloudLeasedLineInstance'>
                             <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-modify' mode='sync' ></call>
                         </outcome>
+                        <outcome value='ModifyCloudLeasedLineInstanceByEline'>
+                            <call module='GENERIC-RESOURCE-API' rpc='p2p-vnf-topology-operation-p2p-modify' mode='sync' ></call>
+                        </outcome>
                     </switch>
                 </outcome>
                 <outcome value='Other'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-activate.xml b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-activate.xml
index 2d3237a9..0df6a58b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-activate.xml
@@ -32,692 +32,723 @@
                                               local-only="false"
                                               pfx="tmp.aai.connectivity" >
                                     <outcome value='success'>
-                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
-                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
-                                                <outcome value='vpn-binding'>
-                                                    <block atomic="true">
+                                        <block atomic="true">
+                                            <switch test="`length($tmp.aai.connectivity.cbs) == 0`">
+                                                <outcome value='true'>
+                                                    <block>
                                                         <set>
-                                                            <parameter name='tmp.aai.vpn-binding.' value='' />
+                                                            <parameter name='tmp.templateFileNameForEthSrv' value="" />
+                                                            <parameter name='vlan-translation' value="" />
                                                         </set>
-                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                      resource="vpn-binding"
-                                                                      key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
-                                                                      local-only="false"
-                                                                      pfx="tmp.aai.vpn-binding" >
-                                                            <outcome value='not-found'>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                </return>
-                                                            </outcome>
-                                                            <outcome value='failure'>
-                                                                <return status='failure'>
-                                                                    <parameter name='error-code' value='' />
-                                                                    <parameter name='error-message' value='' />
-                                                                </return>
-                                                            </outcome>
-                                                            <outcome value='success'>
-                                                                <block atomic="true">
-                                                                    <switch test="`$tmp.aai.vpn-binding.operational-status != 'Activated' `">
-                                                                        <outcome value='true'>
-                                                                            <block atomic="true">
-                                                                                <set>
-                                                                                    <parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />
-                                                                                </set>
-                                                                                <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
-                                                                                    <outcome value='Other'>
-                                                                                        <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
-                                                                                            <outcome value=''>
-                                                                                                <block atomic="true">
-                                                                                                    <set>
-                                                                                                        <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
-                                                                                                        <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
-                                                                                                    </set>
-                                                                                                    <set>
-                                                                                                        <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />
-                                                                                                        <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
-                                                                                                        <!--<parameter name='dst-tpn-id' value='1' />-->
-                                                                                                        <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />
-                                                                                                        <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
-                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                        <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                                        <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
-                                                                                                        <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
-                                                                                                        <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
-                                                                                                    </set>
-                                                                                                    <set>
-                                                                                                        <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
+                                                        <set>
+                                                            <parameter name='tmp.templateFileNameForEthSrv' value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service.templatefile`" />
+                                                            <parameter name='vlan-translation' value="" />
+                                                        </set>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='false'>
+                                                    <block>
+                                                        <set>
+                                                            <parameter name='tmp.templateFileNameForEthSrv' value="" />
+                                                            <parameter name='vlan-translation' value="" />
+                                                        </set>
+                                                        <set>
+                                                            <parameter name='tmp.templateFileNameForEthSrv' value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service-vlan.templatefile`" />
+                                                            <parameter name='vlan-translation' value="`$tmp.aai.connectivity.cbs`" />
+                                                        </set>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                            <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                    <outcome value='vpn-binding'>
+                                                        <block atomic="true">
+                                                            <set>
+                                                                <parameter name='tmp.aai.vpn-binding.' value='' />
+                                                            </set>
+                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                          resource="vpn-binding"
+                                                                          key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                          local-only="false"
+                                                                          pfx="tmp.aai.vpn-binding" >
+                                                                <outcome value='not-found'>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                    </return>
+                                                                </outcome>
+                                                                <outcome value='failure'>
+                                                                    <return status='failure'>
+                                                                        <parameter name='error-code' value='' />
+                                                                        <parameter name='error-message' value='' />
+                                                                    </return>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block atomic="true">
+                                                                        <switch test="`$tmp.aai.vpn-binding.operational-status != 'Activated' `">
+                                                                            <outcome value='true'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />
+                                                                                    </set>
+                                                                                    <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
+                                                                                        <outcome value='Other'>
+                                                                                            <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
+                                                                                                <outcome value=''>
+                                                                                                    <block atomic="true">
+                                                                                                        <set>
+                                                                                                            <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                                            <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
+                                                                                                        </set>
+                                                                                                        <set>
+                                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />
+                                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
+                                                                                                            <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                                                            <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />
+                                                                                                            <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
+                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                            <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
+                                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
+                                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
+                                                                                                        </set>
+                                                                                                        <set>
+                                                                                                            <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-bindingA.src-access-node-id`" />
-                                                                                                    </set>
-                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                  resource="pnf"
-                                                                                                                  key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
-                                                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >
-                                                                                                        <!--AND depth = '0'"-->
-                                                                                                        <outcome value='success'>
-                                                                                                            <block>
-                                                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
-                                                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                                                        <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                            <block atomic="true">
-                                                                                                                                <set>
-                                                                                                                                    <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                </set>
-                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                              resource="esr-thirdparty-sdnc"
-                                                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
+                                                                                                        </set>
+                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                      resource="pnf"
+                                                                                                                      key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
+                                                                                                                      pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                                            <!--AND depth = '0'"-->
+                                                                                                            <outcome value='success'>
+                                                                                                                <block>
+                                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                                                        <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                <block atomic="true">
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                    </set>
+                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                  resource="esr-thirdparty-sdnc"
+                                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                                                              pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                    <outcome value='success'>
-                                                                                                                                        <block>
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                            </set>
-                                                                                                                                        </block>
-                                                                                                                                    </outcome>
-                                                                                                                                    <outcome value='not-found'>
-                                                                                                                                        <return status='failure'>
-                                                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                        </return>
-                                                                                                                                    </outcome>
-                                                                                                                                    <outcome value='Other'>
-                                                                                                                                        <return status='failure'>
-                                                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                        </return>
-                                                                                                                                    </outcome>
-                                                                                                                                </get-resource>
-                                                                                                                            </block>
-                                                                                                                        </outcome>
-                                                                                                                    </switch>
-                                                                                                                </for>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='not-found'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='Other'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                    </get-resource>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />
-                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`" />
-                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                                        <parameter name="format" value="json"/>
-                                                                                                        <parameter name="httpMethod" value="patch"/>
-                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                        <outcome value='failure'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block atomic="true"></block>
-                                                                                                        </outcome>
-                                                                                                    </execute>
-                                                                                                    <set>
-                                                                                                        <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
-                                                                                                        <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
-                                                                                                        <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
-                                                                                                        <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
-                                                                                                        <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
-                                                                                                        <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
-                                                                                                        <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                                        <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
-                                                                                                        <parameter name='index-number' value='0' />
-                                                                                                        <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
-                                                                                                        <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
-                                                                                                        <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
-                                                                                                        <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
-                                                                                                        <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
-                                                                                                    </set>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
-                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
-                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
-                                                                                                        <parameter name="format" value="json"/>
-                                                                                                        <parameter name="httpMethod" value="patch"/>
-                                                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                        <outcome value='failure'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="Error executing Create ethernet service rest api" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block atomic="true">
-                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
-                                                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
-                                                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
-                                                                                                                    <parameter name='operational-status' value='Activated' />
-                                                                                                                </update>
-                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>
-                                                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
-                                                                                                                    <parameter name='operational-status' value='Activated' />
-                                                                                                                </update>
-                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
-                                                                                                                        key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+                                                                                                                                                  pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                        <outcome value='success'>
+                                                                                                                                            <block>
+                                                                                                                                                <set>
+                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                    <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                </set>
+                                                                                                                                            </block>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                            <return status='failure'>
+                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                            </return>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='Other'>
+                                                                                                                                            <return status='failure'>
+                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                            </return>
+                                                                                                                                        </outcome>
+                                                                                                                                    </get-resource>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                        </switch>
+                                                                                                                    </for>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='not-found'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='Other'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                        </get-resource>
+                                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-otn-src-domain-creation.templatefile`" />
+                                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te/tunnels'`" />
+                                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                                            <parameter name="format" value="json"/>
+                                                                                                            <parameter name="httpMethod" value="post"/>
+                                                                                                            <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            <!--<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />-->
+                                                                                                            <outcome value='failure'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='success'>
+                                                                                                                <block atomic="true"></block>
+                                                                                                            </outcome>
+                                                                                                        </execute>
+                                                                                                        <set>
+                                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
+                                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                                                            <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
+                                                                                                            <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
+                                                                                                            <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
+                                                                                                            <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                            <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                                            <parameter name='index-number' value='0' />
+                                                                                                            <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
+                                                                                                            <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
+                                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
+                                                                                                        </set>
+                                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                            <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service.templatefile`" />-->
+                                                                                                            <parameter name="templateFileName" value="`$tmp.templateFileNameForEthSrv`" />
+                                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                                            <parameter name="format" value="json"/>
+                                                                                                            <parameter name="httpMethod" value="post"/>
+                                                                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                                            <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            <outcome value='failure'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="Error executing Create ethernet service rest api" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='success'>
+                                                                                                                <block atomic="true">
+                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
+                                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
+                                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                                    </update>
+                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>
+                                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                                    </update>
+                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+                                                                                                                            key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
          AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
          AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>
-                                                                                                                    <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                    <parameter name='orchestration-status' value='Activated' />
-                                                                                                                </update>
-                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-create-pm-data.templatefile`" />
-                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`" />
-                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                                                                    <parameter name="format" value="json"/>
-                                                                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                                                                    <parameter name="responsePrefix" value="vpn-result"/>
-                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                                </execute>
-                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >
-                                                                                                                    <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
-                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`" />
-                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
-                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                                                                    <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
-                                                                                                                    <!--<parameter name="deviceIp" value="192.168.198.6" />-->
-                                                                                                                    <!--<parameter name="devicePort" value="18181" />-->
-                                                                                                                    <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
-                                                                                                                    <parameter name="format" value="json" />
-                                                                                                                    <parameter name="httpMethod" value="post" />
-                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                                    <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
-                                                                                                                    <parameter name="module" value="GENERIC-RESOURCE-API" />
-                                                                                                                    <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
-                                                                                                                    <parameter name="version" value="777" />
-                                                                                                                    <parameter name="mode" value="sync" />
-                                                                                                                    <!--<parameter name="version" value="sync" />-->
-                                                                                                                    <!--<parameter name="mode" value="777" />-->
-                                                                                                                    <parameter name="responsePrefix" value="restapi-result"/>
-                                                                                                                </execute>
-                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >
-                                                                                                                    <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
-                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`" />
-                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
-                                                                                                                    <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
-                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                                                                    <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
-                                                                                                                    <parameter name="format" value="json" />
-                                                                                                                    <parameter name="httpMethod" value="get" />
-                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                                    <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
-                                                                                                                    <parameter name="module" value="GENERIC-RESOURCE-API" />
-                                                                                                                    <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
-                                                                                                                    <parameter name="version" value="777" />
-                                                                                                                    <parameter name="mode" value="sync" />
-                                                                                                                    <!--<parameter name="version" value="sync" />-->
-                                                                                                                    <!--<parameter name="mode" value="777" />-->
-                                                                                                                    <parameter name="responsePrefix" value="notification-get-result"/>
-                                                                                                                </execute>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                    </execute>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                            <outcome value='Other'>
-                                                                                                <block atomic="true">
-                                                                                                    <set>
-                                                                                                        <parameter name='tmp.aai.vpn-bindingG.' value="`$tmp.aai.vpn-binding.`" />
-                                                                                                        <parameter name='tmp.aai.connectivityG.' value="`$tmp.aai.connectivity.`" />
-                                                                                                    </set>
-                                                                                                    <set>
-                                                                                                        <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />
-                                                                                                        <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />
-                                                                                                        <!--<parameter name='dst-tpn-id' value='1' />-->
-                                                                                                        <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
-                                                                                                        <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
-                                                                                                        <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />
-                                                                                                        <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />
-                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                        <parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />
-                                                                                                        <parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />
-                                                                                                        <parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />
-                                                                                                        <parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />
-                                                                                                    </set>
-                                                                                                    <set>
-                                                                                                        <parameter name='tmp.domainG.pnf-name' value="`'networkId-providerId-' +
+                                                                                                                        <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                        <parameter name='orchestration-status' value='Activated' />
+                                                                                                                    </update>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                        </execute>
+                                                                                                    </block>
+                                                                                                </outcome>
+                                                                                                <outcome value='Other'>
+                                                                                                    <block atomic="true">
+                                                                                                        <set>
+                                                                                                            <parameter name='tmp.aai.vpn-bindingG.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                                            <parameter name='tmp.aai.connectivityG.' value="`$tmp.aai.connectivity.`" />
+                                                                                                        </set>
+                                                                                                        <set>
+                                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />
+                                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />
+                                                                                                            <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                                                            <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
+                                                                                                            <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
+                                                                                                            <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />
+                                                                                                            <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />
+                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                            <parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />
+                                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />
+                                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />
+                                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />
+                                                                                                        </set>
+                                                                                                        <set>
+                                                                                                            <parameter name='tmp.domainG.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-bindingG.src-access-node-id`" />
-                                                                                                    </set>
-                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                  resource="pnf"
-                                                                                                                  key="pnf.pnf-name = $tmp.domainG.pnf-name"
-                                                                                                                  pfx='tmp.aai.domainG-pnf' local-only='false' >
-                                                                                                        <!--AND depth = '0'"-->
-                                                                                                        <outcome value='success'>
-                                                                                                            <block>
-                                                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >
-                                                                                                                    <switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                                                        <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                            <block atomic="true">
-                                                                                                                                <set>
-                                                                                                                                    <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                </set>
-                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                              resource="esr-thirdparty-sdnc"
-                                                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
+                                                                                                        </set>
+                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                      resource="pnf"
+                                                                                                                      key="pnf.pnf-name = $tmp.domainG.pnf-name"
+                                                                                                                      pfx='tmp.aai.domainG-pnf' local-only='false' >
+                                                                                                            <!--AND depth = '0'"-->
+                                                                                                            <outcome value='success'>
+                                                                                                                <block>
+                                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >
+                                                                                                                        <switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                <block atomic="true">
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                    </set>
+                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                  resource="esr-thirdparty-sdnc"
+                                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                                                              pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                    <outcome value='success'>
-                                                                                                                                        <block>
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                            </set>
-                                                                                                                                        </block>
-                                                                                                                                    </outcome>
-                                                                                                                                    <outcome value='not-found'>
-                                                                                                                                        <return status='failure'>
-                                                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                        </return>
-                                                                                                                                    </outcome>
-                                                                                                                                    <outcome value='Other'>
-                                                                                                                                        <return status='failure'>
-                                                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                        </return>
-                                                                                                                                    </outcome>
-                                                                                                                                </get-resource>
-                                                                                                                            </block>
-                                                                                                                        </outcome>
-                                                                                                                    </switch>
-                                                                                                                </for>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='not-found'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='Other'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                    </get-resource>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`" />
-                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`" />
-                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
-                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />
-                                                                                                        <parameter name="format" value="json"/>
-                                                                                                        <parameter name="httpMethod" value="patch"/>
-                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                        <outcome value='failure'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block atomic="true"></block>
-                                                                                                        </outcome>
-                                                                                                    </execute>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                        </switch>
-                                                                                    </outcome>
-                                                                                    <outcome value=''>
-                                                                                        <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
-                                                                                            <outcome value='Other'>
-                                                                                                <block atomic="true">
-                                                                                                    <set>
-                                                                                                        <parameter name='tmp.aai.vpn-bindingB.' value="`$tmp.aai.vpn-binding.`" />
-                                                                                                        <parameter name='tmp.aai.connectivityB.' value="`$tmp.aai.connectivity.`" />
-                                                                                                    </set>
-                                                                                                    <set>
-                                                                                                        <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />
-                                                                                                        <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
-                                                                                                        <!--<parameter name='src-tpn-id' value='1' />-->
-                                                                                                        <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />
-                                                                                                        <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />
-                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                        <parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
-                                                                                                        <parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
-                                                                                                        <parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
-                                                                                                        <parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
-                                                                                                    </set>
-                                                                                                    <set>
-                                                                                                        <parameter name='tmp.dst.domainB.pnf-name' value="`'networkId-providerId-' +
+                                                                                                                                                  pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                        <outcome value='success'>
+                                                                                                                                            <block>
+                                                                                                                                                <set>
+                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                    <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                </set>
+                                                                                                                                            </block>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                            <return status='failure'>
+                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                            </return>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='Other'>
+                                                                                                                                            <return status='failure'>
+                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                            </return>
+                                                                                                                                        </outcome>
+                                                                                                                                    </get-resource>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                        </switch>
+                                                                                                                    </for>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='not-found'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='Other'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                        </get-resource>
+                                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-otn-domainG-creation.templatefile`" />
+                                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te/tunnels'`" />
+                                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
+                                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />
+                                                                                                            <parameter name="format" value="json"/>
+                                                                                                            <parameter name="httpMethod" value="post"/>
+                                                                                                            <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            <!--<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />-->
+                                                                                                            <outcome value='failure'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='success'>
+                                                                                                                <block atomic="true"></block>
+                                                                                                            </outcome>
+                                                                                                        </execute>
+                                                                                                        <set>
+                                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityG.etht-svc-name`' />
+                                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                                                            <parameter name='provider-id' value='`$tmp.aai.connectivityG.access-provider-id`' />
+                                                                                                            <parameter name='client-id' value='`$tmp.aai.connectivityG.access-client-id`' />
+                                                                                                            <parameter name='topology-id' value='`$tmp.aai.connectivityG.access-topology-id`' />
+                                                                                                            <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />
+                                                                                                            <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityG.connectivity-id`' />
+                                                                                                            <parameter name='index-number' value='0' />
+                                                                                                            <parameter name='eth-node-id' value='`$tmp.aai.connectivityG.access-node-id`' />
+                                                                                                            <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityG.access-ltp-id`' />
+                                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingG.route-distinguisher *1000000`' />
+                                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingG.route-distinguisher *1000000`' />
+                                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityG.cvlan`' />
+                                                                                                            <parameter name='eth-src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />
+                                                                                                            <parameter name='eth-src-ltp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />
+                                                                                                            <parameter name='eth-dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />
+                                                                                                            <parameter name='eth-dst-ltp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />
+                                                                                                        </set>
+                                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service-same-domain.templatefile`" />
+                                                                                                            <!--<parameter name="templateFileName" value="`$tmp.templateFileNameForEthSrv`" />-->
+                                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
+                                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />
+                                                                                                            <parameter name="format" value="json"/>
+                                                                                                            <parameter name="httpMethod" value="post"/>
+                                                                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                                            <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            <outcome value='failure'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="Error executing Create ethernet service rest api" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='success'>
+                                                                                                                <block atomic="true">
+                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >
+                                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />
+                                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />
+                                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                                    </update>
+                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivityG.connectivity-id'>
+                                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivityG.connectivity-id`' />
+                                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                                    </update>
+                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+                                                                                                                            key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>
+                                                                                                                        <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                        <parameter name='orchestration-status' value='Activated' />
+                                                                                                                    </update>
+                                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.PeriodicDiscoveryNode' method='establishSubscriptionOnly' >
+                                                                                                                        <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url`" />
+                                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`" />
+                                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/operations/ietf-eth-service-oam:configure-oam'`" />
+                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
+                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />
+                                                                                                                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                                                        <!--<parameter name="deviceIp" value="192.168.198.6" />-->
+                                                                                                                        <!--<parameter name="devicePort" value="18181" />-->
+                                                                                                                        <!--<parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />-->
+                                                                                                                        <parameter name="format" value="json" />
+                                                                                                                        <parameter name="httpMethod" value="post" />
+                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                        <!--<parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />-->
+                                                                                                                        <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                                                        <parameter name="rpc" value="p2p-vnf-topology-operation-p2p-callbackdg-notification" />
+                                                                                                                        <parameter name="version" value="888" />
+                                                                                                                        <parameter name="mode" value="sync" />
+                                                                                                                        <parameter name="responsePrefix" value="restapi-result"/>
+                                                                                                                    </execute>
+                                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-create-pm-data.templatefile`" />
+                                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-service-pm:performance-monitoring'`" />
+                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
+                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />
+                                                                                                                        <parameter name="format" value="json"/>
+                                                                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                                                        <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                    </execute>
+                                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.PeriodicDiscoveryNode' method='establishPeriodicPullConnection' >
+                                                                                                                        <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url`" />
+                                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`" />
+                                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $eth-service-name`" />
+                                                                                                                        <!--<parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/streams/yang-push-json'`" />-->
+                                                                                                                        <parameter name="periodicPullURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $eth-service-name`" />
+                                                                                                                        <parameter name="ethServiceName" value="`$eth-service-name`" />
+                                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
+                                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />
+                                                                                                                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                                                        <parameter name="format" value="json" />
+                                                                                                                        <parameter name="httpMethod" value="get" />
+                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                        <!--<parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />-->
+                                                                                                                        <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                                                        <parameter name="rpc" value="p2p-vnf-topology-operation-p2p-callbackdg-notification" />
+                                                                                                                        <parameter name="version" value="888" />
+                                                                                                                        <parameter name="mode" value="sync" />
+                                                                                                                        <parameter name="responsePrefix" value="notification-get-result"/>
+                                                                                                                    </execute>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                        </execute>
+                                                                                                    </block>
+                                                                                                </outcome>
+                                                                                            </switch>
+                                                                                        </outcome>
+                                                                                        <outcome value=''>
+                                                                                            <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
+                                                                                                <outcome value='Other'>
+                                                                                                    <block atomic="true">
+                                                                                                        <set>
+                                                                                                            <parameter name='tmp.aai.vpn-bindingB.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                                            <parameter name='tmp.aai.connectivityB.' value="`$tmp.aai.connectivity.`" />
+                                                                                                        </set>
+                                                                                                        <set>
+                                                                                                            <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />
+                                                                                                            <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
+                                                                                                            <!--<parameter name='src-tpn-id' value='1' />-->
+                                                                                                            <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />
+                                                                                                            <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />
+                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                            <parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                                                            <parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
+                                                                                                            <parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
+                                                                                                            <parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
+                                                                                                        </set>
+                                                                                                        <set>
+                                                                                                            <parameter name='tmp.dst.domainB.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-bindingB.dst-access-node-id`" />
-                                                                                                    </set>
-                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                  resource="pnf"
-                                                                                                                  key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
-                                                                                                                  pfx='tmp.aai.destination-pnf' local-only='false' >
-                                                                                                        <!--AND depth = '0'"-->
-                                                                                                        <outcome value='success'>
-                                                                                                            <block>
-                                                                                                                <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
-                                                                                                                    <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
-                                                                                                                        <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                            <block atomic="true">
-                                                                                                                                <set>
-                                                                                                                                    <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                </set>
-                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                              resource="esr-thirdparty-sdnc"
-                                                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
+                                                                                                        </set>
+                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                      resource="pnf"
+                                                                                                                      key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
+                                                                                                                      pfx='tmp.aai.destination-pnf' local-only='false' >
+                                                                                                            <!--AND depth = '0'"-->
+                                                                                                            <outcome value='success'>
+                                                                                                                <block>
+                                                                                                                    <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
+                                                                                                                        <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                <block atomic="true">
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                    </set>
+                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                  resource="esr-thirdparty-sdnc"
+                                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                                                              pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                    <outcome value='success'>
-                                                                                                                                        <block>
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                            </set>
-                                                                                                                                        </block>
-                                                                                                                                    </outcome>
-                                                                                                                                    <outcome value='not-found'>
-                                                                                                                                        <return status='failure'>
-                                                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                        </return>
-                                                                                                                                    </outcome>
-                                                                                                                                    <outcome value='Other'>
-                                                                                                                                        <return status='failure'>
-                                                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                        </return>
-                                                                                                                                    </outcome>
-                                                                                                                                </get-resource>
-                                                                                                                            </block>
-                                                                                                                        </outcome>
-                                                                                                                    </switch>
-                                                                                                                </for>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='not-found'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='Other'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                    </get-resource>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`" />
-                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`" />
-                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
-                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
-                                                                                                        <parameter name="format" value="json"/>
-                                                                                                        <parameter name="httpMethod" value="patch"/>
-                                                                                                        <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                                        <outcome value='failure'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block atomic="true"></block>
-                                                                                                        </outcome>
-                                                                                                    </execute>
-                                                                                                    <set>
-                                                                                                        <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->
-                                                                                                        <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />
-                                                                                                        <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
-                                                                                                        <parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />
-                                                                                                        <parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />
-                                                                                                        <parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />
-                                                                                                        <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
-                                                                                                        <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />
-                                                                                                        <parameter name='index-number' value='0' />
-                                                                                                        <parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />
-                                                                                                        <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />
-                                                                                                        <parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
-                                                                                                        <parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
-                                                                                                        <parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />
-                                                                                                    </set>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
-                                                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
-                                                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
-                                                                                                        <parameter name="format" value="json"/>
-                                                                                                        <parameter name="httpMethod" value="patch"/>
-                                                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                                                        <parameter name="responsePrefix" value="vpn-result"/>
-                                                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                        <outcome value='failure'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="Error executing Create ethernet service rest api" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block atomic="true">
-                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >
-                                                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
-                                                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
-                                                                                                                    <parameter name='operational-status' value='Activated' />
-                                                                                                                </update>
-                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                        key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>
-                                                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />
-                                                                                                                    <parameter name='operational-status' value='Activated' />
-                                                                                                                </update>
-                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
-                                                                                                                        key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+                                                                                                                                                  pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                        <outcome value='success'>
+                                                                                                                                            <block>
+                                                                                                                                                <set>
+                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                    <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                </set>
+                                                                                                                                            </block>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                            <return status='failure'>
+                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                            </return>
+                                                                                                                                        </outcome>
+                                                                                                                                        <outcome value='Other'>
+                                                                                                                                            <return status='failure'>
+                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                            </return>
+                                                                                                                                        </outcome>
+                                                                                                                                    </get-resource>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                        </switch>
+                                                                                                                    </for>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='not-found'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='Other'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                        </get-resource>
+                                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-otn-dst-domain-creation.templatefile`" />
+                                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te/tunnels'`" />
+                                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                                                            <parameter name="format" value="json"/>
+                                                                                                            <parameter name="httpMethod" value="post"/>
+                                                                                                            <parameter name="responsePrefix" value="otn-oof"/>
+                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            <!--<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />-->
+                                                                                                            <outcome value='failure'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='success'>
+                                                                                                                <block atomic="true"></block>
+                                                                                                            </outcome>
+                                                                                                        </execute>
+                                                                                                        <set>
+                                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->
+                                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />
+                                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                                                            <parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />
+                                                                                                            <parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />
+                                                                                                            <parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />
+                                                                                                            <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                                                            <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />
+                                                                                                            <parameter name='index-number' value='0' />
+                                                                                                            <parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />
+                                                                                                            <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />
+                                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
+                                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
+                                                                                                            <parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />
+                                                                                                        </set>
+                                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                            <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service.templatefile`" />-->
+                                                                                                            <parameter name="templateFileName" value="`$tmp.templateFileNameForEthSrv`" />
+                                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                                                            <parameter name="format" value="json"/>
+                                                                                                            <parameter name="httpMethod" value="post"/>
+                                                                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                                            <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            <outcome value='failure'>
+                                                                                                                <return status='failure'>
+                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                    <parameter name="error-message" value="Error executing Create ethernet service rest api" />
+                                                                                                                </return>
+                                                                                                            </outcome>
+                                                                                                            <outcome value='success'>
+                                                                                                                <block atomic="true">
+                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >
+                                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
+                                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                                    </update>
+                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>
+                                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />
+                                                                                                                        <parameter name='operational-status' value='Activated' />
+                                                                                                                    </update>
+                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+                                                                                                                            key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
          AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
          AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>
-                                                                                                                    <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                    <parameter name='orchestration-status' value='Activated' />
-                                                                                                                </update>
-                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-create-pm-data.templatefile`" />
-                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`" />
-                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                                                                    <parameter name="format" value="json"/>
-                                                                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                                                                    <parameter name="responsePrefix" value="vpn-result"/>
-                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                                </execute>
-                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >
-                                                                                                                    <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
-                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`" />
-                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
-                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                                                                    <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
-                                                                                                                    <!--<parameter name="deviceIp" value="192.168.198.6" />-->
-                                                                                                                    <!--<parameter name="devicePort" value="18181" />-->
-                                                                                                                    <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
-                                                                                                                    <parameter name="format" value="json" />
-                                                                                                                    <parameter name="httpMethod" value="post" />
-                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                                    <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
-                                                                                                                    <parameter name="module" value="GENERIC-RESOURCE-API" />
-                                                                                                                    <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
-                                                                                                                    <parameter name="version" value="777" />
-                                                                                                                    <parameter name="mode" value="sync" />
-                                                                                                                    <!--<parameter name="version" value="sync" />-->
-                                                                                                                    <!--<parameter name="mode" value="777" />-->
-                                                                                                                    <parameter name="responsePrefix" value="restapi-result"/>
-                                                                                                                </execute>
-                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >
-                                                                                                                    <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
-                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-subscribe-notification.templatefile`" />
-                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
-                                                                                                                    <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
-                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                                                                    <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
-                                                                                                                    <parameter name="format" value="json" />
-                                                                                                                    <parameter name="httpMethod" value="get" />
-                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                                                    <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
-                                                                                                                    <parameter name="module" value="GENERIC-RESOURCE-API" />
-                                                                                                                    <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
-                                                                                                                    <parameter name="version" value="777" />
-                                                                                                                    <parameter name="mode" value="sync" />
-                                                                                                                    <!--<parameter name="version" value="sync" />-->
-                                                                                                                    <!--<parameter name="mode" value="777" />-->
-                                                                                                                    <parameter name="responsePrefix" value="notification-get-result"/>
-                                                                                                                </execute>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                    </execute>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                            <outcome value=''>
-                                                                                                <return status='failure'>
-                                                                                                    <parameter name='error-code' value='' />
-                                                                                                    <parameter name='error-message' value='' />
-                                                                                                </return>
-                                                                                            </outcome>
-                                                                                        </switch>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                            </block>
-                                                                        </outcome>
-                                                                        <outcome value='false'>
-                                                                            <block></block>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </block>
-                                                            </outcome>
-                                                        </get-resource>
-                                                    </block>
-                                                </outcome>
-                                            </switch>
-                                        </for>
+                                                                                                                        <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                        <parameter name='orchestration-status' value='Activated' />
+                                                                                                                    </update>
+                                                                                                                </block>
+                                                                                                            </outcome>
+                                                                                                        </execute>
+                                                                                                    </block>
+                                                                                                </outcome>
+                                                                                                <outcome value=''>
+                                                                                                    <return status='failure'>
+                                                                                                        <parameter name='error-code' value='' />
+                                                                                                        <parameter name='error-message' value='' />
+                                                                                                    </return>
+                                                                                                </outcome>
+                                                                                            </switch>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </block>
+                                                                            </outcome>
+                                                                            <outcome value='false'>
+                                                                                <block></block>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </block>
+                                                                </outcome>
+                                                            </get-resource>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </for>
+                                        </block>
                                     </outcome>
                                     <outcome value='not-found'>
                                         <return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.xml b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.xml
index 82c22637..a07cee26 100644
--- a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-create.xml
@@ -381,7 +381,8 @@
                                                                                                                                 <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
                                                                                                                                 <parameter name='cir' value='`$gfp *1000000`' />
                                                                                                                                 <parameter name='eir' value='`$gfp *1000000`' />
-                                                                                                                                <parameter name='cbs' value='`$prop.sotn.cbs`' />
+                                                                                                                                <!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->
+                                                                                                                                <parameter name='cbs' value='`$tmp.aai.network-route-A.data-owner`' />
                                                                                                                                 <parameter name='ebs' value='`$prop.sotn.ebs`' />
                                                                                                                                 <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                 <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
@@ -622,75 +623,109 @@
                                                                                                                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
                                                                                                                                 <parameter name="ctx-destination" value="prop.connectivity-domainB-uuid"/>
                                                                                                                             </execute>
-                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                  key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
-                                                                                                                                <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
-                                                                                                                                <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
-                                                                                                                                <parameter name='operational-status' value='Created' />
-                                                                                                                                <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
-                                                                                                                                <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
-                                                                                                                                <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
-                                                                                                                                <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                                <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                                                <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
-                                                                                                                                <parameter name='bandwidth-profile-name' value='`$gfp`' />
-                                                                                                                                <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
-                                                                                                                                <parameter name='cir' value='`$gfp *1000000`' />
-                                                                                                                                <parameter name='eir' value='`$gfp *1000000`' />
-                                                                                                                                <parameter name='cbs' value='`$prop.sotn.cbs`' />
-                                                                                                                                <parameter name='ebs' value='`$prop.sotn.ebs`' />
-                                                                                                                                <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
-                                                                                                                                <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
-                                                                                                                                <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
-                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
-                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
-                                                                                                                                <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/'` " />
-                                                                                                                            </save>
-                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-                                                                                                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+                                                                                                                            <switch test="`length($tmp.aai.network-route-A.data-owner) == 0`">
+                                                                                                                                <outcome value='false'>
+                                                                                                                                    <block>
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='final-vlan' value="`$tmp.aai.network-route-A.data-owner`" />
+                                                                                                                                        </set>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='true'>
+                                                                                                                                    <block>
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='final-vlan' value="`$tmp.aai.network-route-B.logical-interface-id`" />
+                                                                                                                                        </set>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                            <switch test="`$param-prefix-domainA[$param-prefix-domainA_length -9] == $param-prefix-domainB[$param-prefix-domainB_length -9]`">
+                                                                                                                                <outcome value='false'>
+                                                                                                                                    <block atomic='true'>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                              key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
+                                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+                                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                                                                                                                            <parameter name='operational-status' value='Created' />
+                                                                                                                                            <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
+                                                                                                                                            <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
+                                                                                                                                            <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
+                                                                                                                                            <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                                            <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                                            <!--<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />-->
+                                                                                                                                            <parameter name='cvlan' value='`$final-vlan`' />
+                                                                                                                                            <parameter name='bandwidth-profile-name' value='`$gfp`' />
+                                                                                                                                            <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
+                                                                                                                                            <parameter name='cir' value='`$gfp *1000000`' />
+                                                                                                                                            <parameter name='eir' value='`$gfp *1000000`' />
+                                                                                                                                            <!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->
+                                                                                                                                            <parameter name='cbs' value='`$tmp.aai.network-route-B.data-owner`' />
+                                                                                                                                            <parameter name='ebs' value='`$prop.sotn.ebs`' />
+                                                                                                                                            <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
+                                                                                                                                            <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
+                                                                                                                                            <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                                                                                                            <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                            <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                            <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
+                                                                                                                                            <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/'` " />
+                                                                                                                                        </save>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
          AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
          AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
-                                                                                                                                  force="true" pfx="tmp.AnAI-data">
-                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
-                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
-                                                                                                                                <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                                                <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                                                <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                                                <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                                                <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                                            </save>
-                                                                                                                            <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >
-                                                                                                                                <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
-                                                                                                                                    <outcome value='tunnel-termination-point'>
-                                                                                                                                        <block atomic="true">
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`" />
-                                                                                                                                            </set>
-                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                          resource="tunnel-termination-point"
-                                                                                                                                                          key="tunnel-termination-point.ttp-id = $tmp.destination.ttp-id
-		AND depth = '0'"
-                                                                                                                                                          pfx='tmp.aai.destination-ttp' local-only='false' >
-                                                                                                                                                <outcome value='success'>
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
+                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                                        </save>
+                                                                                                                                        <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >
+                                                                                                                                            <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
+                                                                                                                                                <outcome value='tunnel-termination-point'>
                                                                                                                                                     <block atomic="true">
                                                                                                                                                         <set>
-                                                                                                                                                            <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
+                                                                                                                                                            <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`" />
                                                                                                                                                         </set>
+                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                      resource="tunnel-termination-point"
+                                                                                                                                                                      key="tunnel-termination-point.ttp-id = $tmp.destination.ttp-id
+		AND depth = '0'"
+                                                                                                                                                                      pfx='tmp.aai.destination-ttp' local-only='false' >
+                                                                                                                                                            <outcome value='success'>
+                                                                                                                                                                <block atomic="true">
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
+                                                                                                                                                                    </set>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </get-resource>
+                                                                                                                                                        <break/>
                                                                                                                                                     </block>
                                                                                                                                                 </outcome>
-                                                                                                                                            </get-resource>
-                                                                                                                                            <break/>
-                                                                                                                                        </block>
-                                                                                                                                    </outcome>
-                                                                                                                                </switch>
-                                                                                                                            </for>
+                                                                                                                                            </switch>
+                                                                                                                                        </for>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='true'>
+                                                                                                                                    <block atomic='true'>
+                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
+                                                                                                                                            <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+                                                                                                                                            <parameter name='color-aware' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                                            <parameter name='coupling-flag' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                                        </update>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
                                                                                                                         </block>
                                                                                                                     </outcome>
                                                                                                                     <outcome value='not-found'>
@@ -735,295 +770,292 @@
                                                                                                     </execute>
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>
                                                                                                     <switch test="`$param-prefix-domainA[$param-prefix-domainA_length -9] == $param-prefix-domainB[$param-prefix-domainB_length -9]`">
-
-                                                                                                        `
-
-
                                                                                                         <outcome value='false'>
-                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >
-                                                                                                                <block atomic='true'>
-                                                                                                                    <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >
-                                                                                                                        <block atomic='true'>
-                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                                <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>
-                                                                                                                            </execute>
-                                                                                                                            <switch test="`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`">
-                                                                                                                                <outcome value='true'>
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />
-                                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />
-                                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />
-                                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
-                                                                                                                                    </set>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='false'>
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />
-                                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />
-                                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />
-                                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
-                                                                                                                                    </set>
-                                                                                                                                </outcome>
-                                                                                                                            </switch>
-                                                                                                                            <set>
-                                                                                                                                <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +
+                                                                                                            <block atomic='true'>
+                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof' mode='sync' ></call>
+                                                                                                                <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >
+                                                                                                                    <block atomic='true'>
+                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                            <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>
+                                                                                                                        </execute>
+                                                                                                                        <switch test="`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`">
+                                                                                                                            <outcome value='true'>
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />
+                                                                                                                                    <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />
+                                                                                                                                    <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />
+                                                                                                                                    <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
+                                                                                                                                </set>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='false'>
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />
+                                                                                                                                    <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />
+                                                                                                                                    <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />
+                                                                                                                                    <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
+                                                                                                                                </set>
+                                                                                                                            </outcome>
+                                                                                                                        </switch>
+                                                                                                                        <set>
+                                                                                                                            <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +
                                              $tmp.access-provider-id + '-clientId-' +
                                              $tmp.access-client-id + '-topologyId-' +
                                              $tmp.access-topology-id + '-nodeId-' +
                                              $tmp.srcdstpnf-id`" />
-                                                                                                                            </set>
-                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                          resource="pnf"
-                                                                                                                                          key="pnf.pnf-name = $tmp.srcdstpnf-name"
-                                                                                                                                          pfx='tmp.aai.srcdst-pnf' local-only='false' >
-                                                                                                                                <!--AND depth = '0'"-->
-                                                                                                                                <outcome value='success'>
-                                                                                                                                    <block>
-                                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >
-                                                                                                                                            <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                                                    <block atomic="true">
-                                                                                                                                                        <set>
-                                                                                                                                                            <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                        </set>
-                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                                      resource="esr-thirdparty-sdnc"
-                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
+                                                                                                                        </set>
+                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                      resource="pnf"
+                                                                                                                                      key="pnf.pnf-name = $tmp.srcdstpnf-name"
+                                                                                                                                      pfx='tmp.aai.srcdst-pnf' local-only='false' >
+                                                                                                                            <!--AND depth = '0'"-->
+                                                                                                                            <outcome value='success'>
+                                                                                                                                <block>
+                                                                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >
+                                                                                                                                        <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                                            <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                    </set>
+                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                  resource="esr-thirdparty-sdnc"
+                                                                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                                                                                      pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                                            <outcome value='success'>
-                                                                                                                                                                <block>
-                                                                                                                                                                    <set>
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                    </set>
-                                                                                                                                                                </block>
-                                                                                                                                                            </outcome>
-                                                                                                                                                            <outcome value='not-found'>
-                                                                                                                                                                <return status='failure'>
-                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                                </return>
-                                                                                                                                                            </outcome>
-                                                                                                                                                            <outcome value='Other'>
-                                                                                                                                                                <return status='failure'>
-                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                                </return>
-                                                                                                                                                            </outcome>
-                                                                                                                                                        </get-resource>
-                                                                                                                                                    </block>
-                                                                                                                                                </outcome>
-                                                                                                                                            </switch>
-                                                                                                                                        </for>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='not-found'>
-                                                                                                                                    <return status='failure'>
-                                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                    </return>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='Other'>
-                                                                                                                                    <return status='failure'>
-                                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                    </return>
-                                                                                                                                </outcome>
-                                                                                                                            </get-resource>
-                                                                                                                            <switch test='`$otnidx == 0`'>
-                                                                                                                                <outcome value='true'>
-                                                                                                                                    <block>
+                                                                                                                                                                  pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                        <outcome value='success'>
+                                                                                                                                                            <block>
+                                                                                                                                                                <set>
+                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                                    <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                </set>
+                                                                                                                                                            </block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='Other'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </get-resource>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                        </switch>
+                                                                                                                                    </for>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='not-found'>
+                                                                                                                                <return status='failure'>
+                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                </return>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='Other'>
+                                                                                                                                <return status='failure'>
+                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                </return>
+                                                                                                                            </outcome>
+                                                                                                                        </get-resource>
+                                                                                                                        <switch test='`$otnidx == 0`'>
+                                                                                                                            <outcome value='true'>
+                                                                                                                                <block>
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
+                                                                                                                                    </set>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='false'>
+                                                                                                                                <switch test='`$otnidx == $tmp.otninfo_length - 1`'>
+                                                                                                                                    <outcome value='true'>
+                                                                                                                                        <block>
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
+                                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                    <outcome value='false'>
                                                                                                                                         <set>
-                                                                                                                                            <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                                            <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
                                                                                                                                             <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
                                                                                                                                         </set>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='false'>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </outcome>
+                                                                                                                        </switch>
+                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                              key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >
+                                                                                                                            <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />
+                                                                                                                            <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
+                                                                                                                            <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->
+                                                                                                                            <parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />
+                                                                                                                            <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
+                                                                                                                            <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />
+                                                                                                                            <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
+                                                                                                                            <parameter name='access-client-id' value='`$tmp.access-client-id`' />
+                                                                                                                            <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
+                                                                                                                            <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />
+                                                                                                                            <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                                                                                            <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />
+                                                                                                                            <parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-ltp-id`' />
+                                                                                                                            <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
+                                                                                                                            <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />
+                                                                                                                            <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-ltp-id`' />
+                                                                                                                            <parameter name='route-distinguisher' value='`$gfp`' />
+                                                                                                                            <parameter name='operational-status' value='Created' />
+                                                                                                                            <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                            <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                            <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
+                                                                                                                            <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
+                                                                                                                            <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
+                                                                                                                            <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
+                                                                                                                            <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->
+                                                                                                                            <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                            <outcome value='success'>
+                                                                                                                                <block></block>
+                                                                                                                            </outcome>
+                                                                                                                        </save>
+                                                                                                                        <switch test='`$otnidx == 0`'>
+                                                                                                                            <outcome value='true'>
+                                                                                                                                <block>
+                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
+                                                                                                                                          force="true" pfx="tmp.AnAI-data">
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
+                                                                                                                                    </save>
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                                    </set>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                            <outcome value='false'>
+                                                                                                                                <block>
+                                                                                                                                    <set>
+                                                                                                                                        <parameter name='testingvalue' value='$tmp.otninfo_length -1' />
+                                                                                                                                    </set>
                                                                                                                                     <switch test='`$otnidx == $tmp.otninfo_length - 1`'>
                                                                                                                                         <outcome value='true'>
                                                                                                                                             <block>
+                                                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
+                                                                                                                                                      force="true" pfx="tmp.AnAI-data">
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
+                                                                                                                                                </save>
                                                                                                                                                 <set>
-                                                                                                                                                    <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
-                                                                                                                                                    <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
                                                                                                                                                 </set>
                                                                                                                                             </block>
                                                                                                                                         </outcome>
                                                                                                                                         <outcome value='false'>
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
-                                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
-                                                                                                                                            </set>
-                                                                                                                                        </outcome>
-                                                                                                                                    </switch>
-                                                                                                                                </outcome>
-                                                                                                                            </switch>
-                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >
-                                                                                                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />
-                                                                                                                                <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
-                                                                                                                                <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->
-                                                                                                                                <parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />
-                                                                                                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
-                                                                                                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />
-                                                                                                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
-                                                                                                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />
-                                                                                                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
-                                                                                                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />
-                                                                                                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
-                                                                                                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />
-                                                                                                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />
-                                                                                                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
-                                                                                                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />
-                                                                                                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
-                                                                                                                                <parameter name='route-distinguisher' value='`$gfp`' />
-                                                                                                                                <parameter name='operational-status' value='Created' />
-                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
-                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
-                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
-                                                                                                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
-                                                                                                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
-                                                                                                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
-                                                                                                                                <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->
-                                                                                                                                <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                                <outcome value='success'>
-                                                                                                                                    <block></block>
-                                                                                                                                </outcome>
-                                                                                                                            </save>
-                                                                                                                            <switch test='`$otnidx == 0`'>
-                                                                                                                                <outcome value='true'>
-                                                                                                                                    <block>
-                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                                                              key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
-                                                                                                                                              force="true" pfx="tmp.AnAI-data">
-                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
-                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
-                                                                                                                                        </save>
-                                                                                                                                        <set>
-                                                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                                        </set>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='false'>
-                                                                                                                                    <block>
-                                                                                                                                        <set>
-                                                                                                                                            <parameter name='testingvalue' value='$tmp.otninfo_length -1' />
-                                                                                                                                        </set>
-                                                                                                                                        <switch test='`$otnidx == $tmp.otninfo_length - 1`'>
-                                                                                                                                            <outcome value='true'>
-                                                                                                                                                <block>
-                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
-                                                                                                                                                          force="true" pfx="tmp.AnAI-data">
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
-                                                                                                                                                    </save>
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                            <outcome value='false'>
-                                                                                                                                                <block atomic='true'>
-                                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                                                        <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>
-                                                                                                                                                    </execute>
-                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                          key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>
-                                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />
-                                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->
-                                                                                                                                                        <parameter name='operational-status' value='Created' />
-                                                                                                                                                        <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
-                                                                                                                                                        <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
-                                                                                                                                                        <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
-                                                                                                                                                        <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
-                                                                                                                                                        <!--<parameter name='access-ltp-id' value='``' />-->
-                                                                                                                                                        <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->
-                                                                                                                                                        <!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                                        <parameter name='bandwidth-profile-name' value='`$gfp`' />
-                                                                                                                                                        <parameter name='vpn-type' value='dummy' />
-                                                                                                                                                        <parameter name='cir' value='`$gfp *1000000`' />
-                                                                                                                                                        <parameter name='eir' value='`$gfp *1000000`' />
-                                                                                                                                                        <!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->
-                                                                                                                                                        <!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->
-                                                                                                                                                        <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
-                                                                                                                                                        <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
-                                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                                        <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
-                                                                                                                                                        <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
-                                                                                                                                                        <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
-                                                                                                                                                        <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/'` " />
-                                                                                                                                                    </save>
-                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-                                                                                                                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+                                                                                                                                            <block atomic='true'>
+                                                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                                                    <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>
+                                                                                                                                                </execute>
+                                                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>
+                                                                                                                                                    <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />
+                                                                                                                                                    <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->
+                                                                                                                                                    <parameter name='operational-status' value='Created' />
+                                                                                                                                                    <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
+                                                                                                                                                    <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
+                                                                                                                                                    <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
+                                                                                                                                                    <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                                                                                                                    <!--<parameter name='access-ltp-id' value='``' />-->
+                                                                                                                                                    <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->
+                                                                                                                                                    <!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                                                                                                                    <parameter name='bandwidth-profile-name' value='`$gfp`' />
+                                                                                                                                                    <parameter name='vpn-type' value='dummy' />
+                                                                                                                                                    <parameter name='cir' value='`$gfp *1000000`' />
+                                                                                                                                                    <parameter name='eir' value='`$gfp *1000000`' />
+                                                                                                                                                    <!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->
+                                                                                                                                                    <!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->
+                                                                                                                                                    <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
+                                                                                                                                                    <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
+                                                                                                                                                    <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                                                                                                                    <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                                    <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                                    <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
+                                                                                                                                                    <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/'` " />
+                                                                                                                                                </save>
+                                                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                                      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
          AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
          AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
-                                                                                                                                                          force="true" pfx="tmp.AnAI-data">
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
-                                                                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                                                                    </save>
-                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
-                                                                                                                                                          force="true" pfx="tmp.AnAI-data">
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
-                                                                                                                                                    </save>
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                        </switch>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                            </switch>
-                                                                                                                        </block>
-                                                                                                                    </for>
-                                                                                                                </block>
-                                                                                                            </call>
+                                                                                                                                                      force="true" pfx="tmp.AnAI-data">
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
+                                                                                                                                                    <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                                    <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                                    <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                                    <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                                    <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                                    <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                                    <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                                    <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                                    <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                                                </save>
+                                                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
+                                                                                                                                                      force="true" pfx="tmp.AnAI-data">
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
+                                                                                                                                                </save>
+                                                                                                                                                <set>
+                                                                                                                                                    <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                                                </set>
+                                                                                                                                            </block>
+                                                                                                                                        </outcome>
+                                                                                                                                    </switch>
+                                                                                                                                </block>
+                                                                                                                            </outcome>
+                                                                                                                        </switch>
+                                                                                                                    </block>
+                                                                                                                </for>
+                                                                                                            </block>
                                                                                                         </outcome>
                                                                                                         <outcome value='true'>
-                                                                                                            <block>
+                                                                                                            <block atomic='true'>
                                                                                                                 <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
                                                                                                                     <parameter name="ctx-destination" value="prop.vpn-binding-samedomain-uuid"/>
                                                                                                                 </execute>
                                                                                                                 <set>
                                                                                                                     <parameter name='tmp.sameDomain-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
                                                                                                                     <parameter name='tmp.sameDomain-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                    <parameter name='tmp.sameDomain-src-access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                    <parameter name='tmp.sameDomain-dst-access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
                                                                                                                 </set>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-samedomain-uuid' >
@@ -1039,10 +1071,10 @@
                                                                                                                     <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
                                                                                                                     <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
                                                                                                                     <parameter name='src-access-node-id' value='`$tmp.sameDomain-src-access-node-id`' />
-                                                                                                                    <!--<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->
+                                                                                                                    <parameter name='src-access-ltp-id' value='`$tmp.sameDomain-src-access-ltp-id`' />
                                                                                                                     <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
                                                                                                                     <parameter name='dst-access-node-id' value='`$tmp.sameDomain-dst-access-node-id`' />
-                                                                                                                    <!--<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->
+                                                                                                                    <parameter name='dst-access-ltp-id' value='`$tmp.sameDomain-dst-access-ltp-id`' />
                                                                                                                     <parameter name='route-distinguisher' value='`$gfp`' />
                                                                                                                     <parameter name='operational-status' value='Created' />
                                                                                                                     <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
diff --git a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml
index 78ec3179..599cd075 100644
--- a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-delete.xml
@@ -132,27 +132,43 @@
                                                                     <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
                                                                         <outcome value='Other'>
                                                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />-->
-                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
                                                                                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
                                                                                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
                                                                                 <parameter name="format" value="json"/>
                                                                                 <parameter name="httpMethod" value="delete"/>
-                                                                                <parameter name="responsePrefix" value="otn-oof"/>
-                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                                <outcome value='failure'>
-                                                                                    <return status='failure'>
-                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                        <parameter name="error-code" value="500" />
-                                                                                        <parameter name="error-message" value="Error executing decoloring UNI rest api" />
-                                                                                    </return>
-                                                                                </outcome>
+                                                                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                <outcome value='failure'></outcome>
                                                                                 <outcome value='success'>
-                                                                                    <block></block>
+                                                                                    <block>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.PeriodicDiscoveryNode' method='deleteSubscription' >
+                                                                                            <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url`" />
+                                                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`" />
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`" />
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                            <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                            <parameter name="format" value="json" />
+                                                                                            <parameter name="httpMethod" value="post" />
+                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                            <!--<parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />-->
+                                                                                            <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                            <parameter name="rpc" value="p2p-vnf-topology-operation-p2p-callbackdg-notification" />
+                                                                                            <parameter name="version" value="`$project.version`" />
+                                                                                            <parameter name="mode" value="sync" />
+                                                                                            <parameter name="responsePrefix" value="restapi-result"/>
+                                                                                        </execute>
+                                                                                    </block>
                                                                                 </outcome>
                                                                             </execute>
                                                                         </outcome>
diff --git a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof.xml
new file mode 100644
index 00000000..a3249b33
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof.xml
@@ -0,0 +1,762 @@
+<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}'>
+    <method rpc='p2p-vnf-topology-operation-p2p-get-otn-tunnel-path-from-oof' mode='sync'>
+        <block atomic="true">
+            <block atomic='true'>
+                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                              resource="network-resources"
+                              key="selflink = 'https://aai.onap:8443/aai/v21/network/network-resources?depth=0'"
+                              local-only="false"
+                              pfx="allNetworksList" >
+                    <outcome value='success'></outcome>
+                    <outcome value='Other'></outcome>
+                    <outcome value='not-found'></outcome>
+                </get-resource>
+                <for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >
+                    <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>
+                        <outcome value='true'>
+                            <switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>
+                                <outcome value='true'>
+                                    <set>
+                                        <parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                        <outcome value='false'>
+                            <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainB-pnfName[2]`'>
+                                <outcome value='true'>
+                                    <switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainB-pnfName[6]`'>
+                                        <outcome value='true'>
+                                            <block>
+                                                <switch test='`$hasSecondary`'>
+                                                    <outcome value='true'>
+                                                        <block>
+                                                            <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
+                                                            <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
+                                                                <outcome value='true'>
+                                                                    <block>
+                                                                        <set>
+                                                                            <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                                        </set>
+                                                                        <set>
+                                                                            <parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='false'>
+                                                                    <block>
+                                                                        <set>
+                                                                            <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <set>
+                                                            <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                        </set>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                </outcome>
+                                <outcome value='false'>
+                                    <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainC-pnfName[2]`'>
+                                        <outcome value='true'>
+                                            <block>
+                                                <switch test='`$hasSecondary`'>
+                                                    <outcome value='true'>
+                                                        <block>
+                                                            <set>
+                                                                <parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                            </set>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                </for>
+                <set>
+                    <parameter name='tmp.pce-src-node.' value='' />
+                </set>
+                <set>
+                    <parameter name='tmp.pce-dst-node.' value='' />
+                </set>
+                <set>
+                    <parameter name='tmp.pce-dst-node-backup.' value='' />
+                </set>
+                <set>
+                    <!--<parameter name='`otn-oof`' value='' />-->
+                    <parameter name='otn-oof.' value='' />
+                    <!--<parameter name='`otn-oof.solutions`' value='' />-->
+                    <!--<parameter name='`otn-oof.solutions.`' value='' />-->
+                    <!--<parameter name='`otn-oof.solutions_length`' value='0' />-->
+                </set>
+                <set>
+                    <!--<parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->
+                    <!--                                                   1 + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[8]`" />-->
+                    <parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $otnTopoIdSrc + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                </set>
+                <set>
+                    <!--<parameter name='$tmp.pce-dst-node' value="`$param-prefix-domainB-pnfName[0] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[1] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[2] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[3] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[4] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[5] + '-' +-->
+                    <!--                                                   1 + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[8]`" />-->
+                    <parameter name='tmp.pce-dst-node' value="`$param-prefix-domainB-pnfName[0] + '-' +
+                                                   $param-prefix-domainB-pnfName[1] + '-' +
+                                                   $param-prefix-domainB-pnfName[2] + '-' +
+                                                   $param-prefix-domainB-pnfName[3] + '-' +
+                                                   $param-prefix-domainB-pnfName[4] + '-' +
+                                                   $param-prefix-domainB-pnfName[5] + '-' +
+                                                   $otnTopoIdDst + '-' +
+                                                   $param-prefix-domainB-pnfName[7] + '-' +
+                                                   $param-prefix-domainB-pnfName[8]`" />
+                </set>
+                <set>
+                    <!--<parameter name='$tmp.pce-dst-node' value="`$param-prefix-domainB-pnfName[0] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[1] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[2] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[3] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[4] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[5] + '-' +-->
+                    <!--                                                   1 + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[8]`" />-->
+                    <parameter name='tmp.pce-dst-node-backup' value="`$param-prefix-domainC-pnfName[0] + '-' +
+                                                   $param-prefix-domainC-pnfName[1] + '-' +
+                                                   $param-prefix-domainC-pnfName[2] + '-' +
+                                                   $param-prefix-domainC-pnfName[3] + '-' +
+                                                   $param-prefix-domainC-pnfName[4] + '-' +
+                                                   $param-prefix-domainC-pnfName[5] + '-' +
+                                                   $otnTopoIdDstBackup + '-' +
+                                                   $param-prefix-domainC-pnfName[7] + '-' +
+                                                   $param-prefix-domainC-pnfName[8]`" />
+                </set>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                    <parameter name="logger" value="message-log" />
+                    <parameter name="level" value="info" />
+                    <!--<parameter name="field1" value="Path computation succeed!"/>-->
+                    <!--<parameter name="field2" value="`$ccsdkTopo.resp.solutions_length`"/>-->
+                    <!--<parameter name="field1" value="`$tmp.src.domainA.pnf-name`"/>-->
+                    <!--<parameter name="field2" value="`$tmp.dst.domainB.pnf-name`"/>-->
+                    <parameter name="field1" value="`$tmp.pce-src-node`"/>
+                    <parameter name="field2" value="`$tmp.pce-dst-node`"/>
+                    <parameter name="field3" value="`$tmp.pce-dst-node-backup`"/>
+                </record>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                    <parameter name="logger" value="message-log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="`$otn-oof.`"/>
+                </record>
+                <set>
+                    <!--<parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->
+                    <!--                                                   1 + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->
+                    <!--                                                   $param-prefix-domainA-pnfName[8]`" />-->
+                    <parameter name='filenamemm' value="`$tmp.pce-src-node + $tmp.pce-dst-node + $tmp.pce-dst-node-backup`" />
+                </set>
+                <switch test='`$hasSecondary`'>
+                    <outcome value='true'>
+                        <block>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePaths' >
+                                <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>
+                                <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>
+                                <parameter name="response-pfx" value="otn-oof"/>
+                                <parameter name="output-end-to-end-path" value="false"/>
+                                <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->
+                                <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->
+                                <parameter name="src-node" value="`$tmp.pce-src-node`"/>
+                                <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>
+                                <parameter name="dst-node-backup" value="`$tmp.pce-dst-node-backup`"/>
+                                <parameter name="require-backuppath" value="`$hasSecondary`"/>
+                                <outcome value='success'></outcome>
+                                <outcome value='Other'></outcome>
+                                <outcome value='not-found'></outcome>
+                            </execute>
+                        </block>
+                    </outcome>
+                    <outcome value='Other'>
+                        <block>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >
+                                <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>
+                                <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>
+                                <parameter name="response-pfx" value="otn-oof"/>
+                                <parameter name="output-end-to-end-path" value="false"/>
+                                <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->
+                                <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->
+                                <parameter name="src-node" value="`$tmp.pce-src-node`"/>
+                                <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>
+                                <outcome value='success'></outcome>
+                                <outcome value='Other'></outcome>
+                                <outcome value='not-found'></outcome>
+                            </execute>
+                        </block>
+                    </outcome>
+                </switch>
+            </block>
+            <set>
+                <parameter name='`tmp.otninfo.`' value='' />
+                <!--<parameter name='`tmp.otninfo_length`' value='0' />-->
+                <parameter name='`tmp.otninfoProtect.`' value='' />
+            </set>
+            <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
+                <block atomic="true">
+                    <set>
+                        <parameter name='otn-oof.link-name' value='' />
+                        <!--<parameter name='tmp.aai.cross-link' value='' />-->
+                        <parameter name='tmp.aai.cross-link.' value='' />
+                        <!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->
+                    </set>
+                    <set>
+                        <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].original_link`' />
+                        <parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].src_node`' />
+                        <parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].dst_node`' />
+                    </set>
+                    <set>
+                        <parameter name='tmp.cross-link.src-ltpId' value="`$otn-oof.solutions[$vidx].src_pinterface`" />
+                        <parameter name='tmp.src-pnf-name' value="`$otn-oof.solutions[$vidx].src_node`" />
+                    </set>
+                    <set>
+                        <parameter name='tmp.cross-link.dst-ltpId' value="`$otn-oof.solutions[$vidx].dst_pinterface`" />
+                        <parameter name='tmp.dst-pnf-name' value="`$otn-oof.solutions[$vidx].dst_node`" />
+                    </set>
+                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                        <parameter name="logger" value="message-log" />
+                        <parameter name="level" value="info" />
+                        <!--<parameter name="field1" value="Path computation succeed!"/>-->
+                        <!--<parameter name="field2" value="`$ccsdkTopo.resp.solutions_length`"/>-->
+                        <!--<parameter name="field1" value="`$tmp.src.domainA.pnf-name`"/>-->
+                        <!--<parameter name="field2" value="`$tmp.dst.domainB.pnf-name`"/>-->
+                        <parameter name="field1" value="`$tmp.cross-link.src-ltpId`"/>
+                        <parameter name="field2" value="`$tmp.src-pnf-name`"/>
+                        <parameter name="field3" value="`$tmp.cross-link.dst-ltpId`"/>
+                        <parameter name="field4" value="`$tmp.dst-pnf-name`"/>
+                    </record>
+                    <block atomic="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                      resource="p-interface"
+                                      key="pnf.pnf-name = $tmp.src-pnf-name
+		    AND p-interface.interface-name = $tmp.cross-link.src-ltpId"
+                                      pfx='tmp.aai.src-tp' local-only='false' >
+                            <!--AND depth = '0'"-->
+                            <outcome value='success'>
+                                <block atomic="true">
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                        <!--<parameter name="original_string" value='`$tmp.aai.src-tp`'/>-->
+                                        <parameter name="original_string" value='`$tmp.aai.src-tp.interface-name`'/>
+                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                        <parameter name="regex" value="[-]+"/>
+                                        <parameter name="ctx_memory_result_key" value="param-prefix-src-tp"/>
+                                        <outcome value='success'>
+                                            <block atomic="true">
+                                                <set>
+                                                    <parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />
+                                                    <parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value="`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`" />
+                                                    <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
+                                                </set>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='' />
+                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                            </return>
+                                        </outcome>
+                                    </execute>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="pnf"
+                                                  key="pnf.pnf-name = $tmp.src-pnf-name"
+                                                  pfx='tmp.aai.src-pnf' local-only='false' >
+                                        <!--AND depth = '0'"-->
+                                        <outcome value='success'>
+                                            <block>
+                                                <set>
+                                                    <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                    <parameter name='domain-A.tpn' value='1' />
+                                                    <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                    <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
+                                                </set>
+                                                <for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
+                                                    <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>
+                                                        <outcome value='network-resource'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`" />
+                                                                </set>
+                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                              resource="network-resource"
+                                                                              key="network-resource.network-id = $tmp.domain-A.network-id
+		AND depth = '0'"
+                                                                              pfx='tmp.aai.src-network-resource' local-only='false' >
+                                                                    <outcome value='success'>
+                                                                        <set>
+                                                                            <parameter name='domain-A.network-id' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                            <parameter name='domain-A.provider-id' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                            <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                            <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                            <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                            <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                            <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                            <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                            <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                            <parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                            <parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />
+                                                                        </set>
+                                                                    </outcome>
+                                                                </get-resource>
+                                                                <break/>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                </block>
+                            </outcome>
+                            <outcome value='not-found'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                </return>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                </return>
+                            </outcome>
+                        </get-resource>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                      resource="p-interface"
+                                      key="pnf.pnf-name = $tmp.dst-pnf-name
+		    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId"
+                                      pfx='tmp.aai.dst-tp' local-only='false' >
+                            <!--AND depth = '0'"-->
+                            <outcome value='success'>
+                                <block atomic="true">
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                        <parameter name="original_string" value='`$tmp.aai.dst-tp.interface-name`'/>
+                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                        <parameter name="regex" value="[-]+"/>
+                                        <parameter name="ctx_memory_result_key" value="param-prefix-dst-tp"/>
+                                        <outcome value='success'>
+                                            <block atomic="true">
+                                                <set>
+                                                    <parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />
+                                                    <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value="`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`" />
+                                                    <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
+                                                </set>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='error-code' value='' />
+                                                <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                            </return>
+                                        </outcome>
+                                    </execute>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="pnf"
+                                                  key="pnf.pnf-name = $tmp.dst-pnf-name"
+                                                  pfx='tmp.aai.dst-pnf' local-only='false' >
+                                        <!--AND depth = '0'"-->
+                                        <outcome value='success'>
+                                            <block>
+                                                <set>
+                                                    <parameter name='domain-B.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                    <parameter name='domain-B.tpn' value='1' />
+                                                    <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                    <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
+                                                </set>
+                                                <for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
+                                                    <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>
+                                                        <outcome value='network-resource'>
+                                                            <block atomic="true">
+                                                                <set>
+                                                                    <parameter name='tmp.domain-B.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`" />
+                                                                </set>
+                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                              resource="network-resource"
+                                                                              key="network-resource.network-id = $tmp.domain-B.network-id
+		AND depth = '0'"
+                                                                              pfx='tmp.aai.dst-network-resource' local-only='false' >
+                                                                    <outcome value='success'>
+                                                                        <set>
+                                                                            <parameter name='domain-B.network-id' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                            <parameter name='domain-B.provider-id' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                            <parameter name='domain-B.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                            <parameter name='domain-B.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                            <parameter name='domain-B.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                            <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                            <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                            <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                            <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                            <parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                            <parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />
+                                                                        </set>
+                                                                    </outcome>
+                                                                </get-resource>
+                                                                <break/>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                </block>
+                            </outcome>
+                            <outcome value='not-found'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                </return>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                </return>
+                            </outcome>
+                        </get-resource>
+                    </block>
+                </block>
+            </for>
+            <switch test='`$hasSecondary`'>
+                <outcome value='true'>
+                    <block>
+                        <for index='vidx' start='0' end='`$otn-oof.secondarySolutions_length`' >
+                            <block atomic="true">
+                                <set>
+                                    <parameter name='otn-oof.link-name' value='' />
+                                    <!--<parameter name='tmp.aai.cross-link' value='' />-->
+                                    <parameter name='tmp.aai.cross-link.' value='' />
+                                    <!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->
+                                    <parameter name='tmp.src-pnf-name' value='' />
+                                    <parameter name='tmp.cross-link.' value='' />
+                                    <parameter name='tmp.dst-pnf-name' value='' />
+                                    <parameter name='tmp.aai.src-tp.' value='' />
+                                    <parameter name='param-prefix-src-tp.' value='' />
+                                    <parameter name='tmp.aai.src-pnf.' value='' />
+                                    <parameter name='tmp.domain-A.network-id' value='' />
+                                    <parameter name='tmp.aai.src-network-resource.' value='' />
+                                    <parameter name='tmp.domain-A.ttp-id' value='' />
+                                    <parameter name='tmp.aai.src-ttp.' value='' />
+                                    <parameter name='tmp.aai.dst-tp.' value='' />
+                                    <parameter name='param-prefix-dst-tp.' value='' />
+                                    <parameter name='tmp.aai.dst-pnf.' value='' />
+                                    <parameter name='tmp.domain-C.network-id' value='' />
+                                    <parameter name='tmp.aai.dst-network-resource.' value='' />
+                                    <parameter name='tmp.domain-C.ttp-id' value='' />
+                                    <parameter name='tmp.aai.dst-ttp.' value='' />
+                                </set>
+                                <set>
+                                    <parameter name='otn-oof.link-name' value='`$otn-oof.secondarySolutions[$vidx].original_link`' />
+                                    <parameter name='otn-oof.start-node' value='`$otn-oof.secondarySolutions[$vidx].src_node`' />
+                                    <parameter name='otn-oof.end-node' value='`$otn-oof.secondarySolutions[$vidx].dst_node`' />
+                                </set>
+                                <set>
+                                    <parameter name='tmp.cross-link.src-ltpId' value="`$otn-oof.secondarySolutions[$vidx].src_pinterface`" />
+                                    <parameter name='tmp.src-pnf-name' value="`$otn-oof.secondarySolutions[$vidx].src_node`" />
+                                </set>
+                                <set>
+                                    <parameter name='tmp.cross-link.dst-ltpId' value="`$otn-oof.secondarySolutions[$vidx].dst_pinterface`" />
+                                    <parameter name='tmp.dst-pnf-name' value="`$otn-oof.secondarySolutions[$vidx].dst_node`" />
+                                </set>
+                                <block atomic="true">
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="p-interface"
+                                                  key="pnf.pnf-name = $tmp.src-pnf-name
+		    AND p-interface.interface-name = $tmp.cross-link.src-ltpId"
+                                                  pfx='tmp.aai.src-tp' local-only='false' >
+                                        <!--AND depth = '0'"-->
+                                        <outcome value='success'>
+                                            <block atomic="true">
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                    <!--<parameter name="original_string" value='`$tmp.aai.src-tp`'/>-->
+                                                    <parameter name="original_string" value='`$tmp.aai.src-tp.interface-name`'/>
+                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                    <parameter name="regex" value="[-]+"/>
+                                                    <parameter name="ctx_memory_result_key" value="param-prefix-src-tp"/>
+                                                    <outcome value='success'>
+                                                        <block atomic="true">
+                                                            <set>
+                                                                <parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />
+                                                                <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-ltp-id`' value="`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`" />
+                                                                <parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />
+                                                            </set>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='error-code' value='' />
+                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                        </return>
+                                                    </outcome>
+                                                </execute>
+                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                              resource="pnf"
+                                                              key="pnf.pnf-name = $tmp.src-pnf-name"
+                                                              pfx='tmp.aai.src-pnf' local-only='false' >
+                                                    <!--AND depth = '0'"-->
+                                                    <outcome value='success'>
+                                                        <block>
+                                                            <set>
+                                                                <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                <parameter name='domain-A.tpn' value='1' />
+                                                                <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                <parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />
+                                                            </set>
+                                                            <for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
+                                                                <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>
+                                                                    <outcome value='network-resource'>
+                                                                        <block atomic="true">
+                                                                            <set>
+                                                                                <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`" />
+                                                                            </set>
+                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                          resource="network-resource"
+                                                                                          key="network-resource.network-id = $tmp.domain-A.network-id
+		AND depth = '0'"
+                                                                                          pfx='tmp.aai.src-network-resource' local-only='false' >
+                                                                                <outcome value='success'>
+                                                                                    <set>
+                                                                                        <parameter name='domain-A.network-id' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                                        <parameter name='domain-A.provider-id' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                                        <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                                        <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                                        <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                        <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-id`' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                                        <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-provider-id`' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                                        <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-client-id`' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                                        <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-topology-id`' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                                        <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-type`' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                        <parameter name='`tmp.otninfoProtect`' value='`$vidx + 1`' />
+                                                                                    </set>
+                                                                                </outcome>
+                                                                            </get-resource>
+                                                                            <break/>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </for>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='not-found'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                        </return>
+                                                    </outcome>
+                                                </get-resource>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="p-interface"
+                                                  key="pnf.pnf-name = $tmp.dst-pnf-name
+		    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId"
+                                                  pfx='tmp.aai.dst-tp' local-only='false' >
+                                        <!--AND depth = '0'"-->
+                                        <outcome value='success'>
+                                            <block atomic="true">
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                    <parameter name="original_string" value='`$tmp.aai.dst-tp.interface-name`'/>
+                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                    <parameter name="regex" value="[-]+"/>
+                                                    <parameter name="ctx_memory_result_key" value="param-prefix-dst-tp"/>
+                                                    <outcome value='success'>
+                                                        <block atomic="true">
+                                                            <set>
+                                                                <parameter name='domain-C.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />
+                                                                <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-ltp-id`' value="`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`" />
+                                                                <parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />
+                                                            </set>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='failure'>
+                                                        <return status='failure'>
+                                                            <parameter name='error-code' value='' />
+                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                        </return>
+                                                    </outcome>
+                                                </execute>
+                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                              resource="pnf"
+                                                              key="pnf.pnf-name = $tmp.dst-pnf-name"
+                                                              pfx='tmp.aai.dst-pnf' local-only='false' >
+                                                    <!--AND depth = '0'"-->
+                                                    <outcome value='success'>
+                                                        <block>
+                                                            <set>
+                                                                <parameter name='domain-C.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                <parameter name='domain-C.tpn' value='1' />
+                                                                <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-node-id`' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                <parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />
+                                                            </set>
+                                                            <for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
+                                                                <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>
+                                                                    <outcome value='network-resource'>
+                                                                        <block atomic="true">
+                                                                            <set>
+                                                                                <parameter name='tmp.domain-C.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`" />
+                                                                            </set>
+                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                          resource="network-resource"
+                                                                                          key="network-resource.network-id = $tmp.domain-C.network-id
+		AND depth = '0'"
+                                                                                          pfx='tmp.aai.dst-network-resource' local-only='false' >
+                                                                                <outcome value='success'>
+                                                                                    <set>
+                                                                                        <parameter name='domain-C.network-id' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                                        <parameter name='domain-C.provider-id' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                                        <parameter name='domain-C.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                                        <parameter name='domain-C.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                                        <parameter name='domain-C.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                        <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-id`' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                                        <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-provider-id`' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                                        <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-client-id`' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                                        <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-topology-id`' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                                        <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-type`' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                        <parameter name='`tmp.otninfoProtect`' value='`$vidx + 2`' />
+                                                                                    </set>
+                                                                                </outcome>
+                                                                            </get-resource>
+                                                                            <break/>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </for>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='not-found'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                        </return>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <return status='failure'>
+                                                            <parameter name='ack-final' value='Y'/>
+                                                            <parameter name="error-code" value="500" />
+                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                        </return>
+                                                    </outcome>
+                                                </get-resource>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                </block>
+                            </block>
+                        </for>
+                    </block>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.xml b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.xml
index f1c90eca..08dae57a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/p2p_eline/GENERIC-RESOURCE-API_p2p-vnf-topology-operation-p2p-modify.xml
@@ -246,6 +246,172 @@
                                                                                                                                                                             <parameter name='cir' value='`$gfp *1000000`' />
                                                                                                                                                                             <parameter name='eir' value='`$gfp *1000000`' />
                                                                                                                                                                         </update>
+                                                                                                                                                                        <block atomic="true">
+                                                                                                                                                                            <set>
+                                                                                                                                                                                <parameter name='tmp.aai.vpn-bindingA.' value="" />
+                                                                                                                                                                                <parameter name='tmp.aai.connectivityA.' value="" />
+                                                                                                                                                                            </set>
+                                                                                                                                                                            <set>
+                                                                                                                                                                                <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
+                                                                                                                                                                                <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
+                                                                                                                                                                            </set>
+                                                                                                                                                                            <set>
+                                                                                                                                                                                <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />
+                                                                                                                                                                                <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
+                                                                                                                                                                                <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                                                                                                                                <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />
+                                                                                                                                                                                <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
+                                                                                                                                                                                <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                                                                                <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                                                                                                <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
+                                                                                                                                                                                <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
+                                                                                                                                                                                <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
+                                                                                                                                                                            </set>
+                                                                                                                                                                            <set>
+                                                                                                                                                                                <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-bindingA.src-access-node-id`" />
+                                                                                                                                                                            </set>
+                                                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                                          resource="pnf"
+                                                                                                                                                                                          key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
+                                                                                                                                                                                          pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                                                                                                                <!--AND depth = '0'"-->
+                                                                                                                                                                                <outcome value='success'>
+                                                                                                                                                                                    <block>
+                                                                                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                                                                                                                            <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                                                                                    <block atomic="true">
+                                                                                                                                                                                                        <set>
+                                                                                                                                                                                                            <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                                                                                        </set>
+                                                                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                                                                      resource="esr-thirdparty-sdnc"
+                                                                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                                                                                      pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                                                                            <outcome value='success'>
+                                                                                                                                                                                                                <block>
+                                                                                                                                                                                                                    <set>
+                                                                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                                                                    </set>
+                                                                                                                                                                                                                </block>
+                                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                                            <outcome value='not-found'>
+                                                                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                                                                </return>
+                                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                                            <outcome value='Other'>
+                                                                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                                                                </return>
+                                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                                        </get-resource>
+                                                                                                                                                                                                    </block>
+                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                            </switch>
+                                                                                                                                                                                        </for>
+                                                                                                                                                                                    </block>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                                <outcome value='not-found'>
+                                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                                    </return>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                                <outcome value='Other'>
+                                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                                                    </return>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                            </get-resource>
+                                                                                                                                                                            <set>
+                                                                                                                                                                                <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                                                                                                                                <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
+                                                                                                                                                                                <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                                                                                                                                <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
+                                                                                                                                                                                <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
+                                                                                                                                                                                <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
+                                                                                                                                                                                <parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                                                                                                <parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                                                                                                                <parameter name='index-number' value='0' />
+                                                                                                                                                                                <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
+                                                                                                                                                                                <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
+                                                                                                                                                                                <parameter name='CIR' value='`$gfp *1000000`' />
+                                                                                                                                                                                <!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
+                                                                                                                                                                                <parameter name='EIR' value='0' />
+                                                                                                                                                                                <parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />
+                                                                                                                                                                            </set>
+                                                                                                                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                                                                                                                <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service.templatefile`" />-->
+                                                                                                                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.p2p-ethernet-service-modify.templatefile`" />
+                                                                                                                                                                                <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`" />
+                                                                                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                                                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                                                                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                                                                                                                                <parameter name="format" value="json"/>
+                                                                                                                                                                                <parameter name="httpMethod" value="patch"/>
+                                                                                                                                                                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                                                                                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                                                <outcome value='failure'>
+                                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                                                        <parameter name="error-message" value="Error executing Create ethernet service rest api" />
+                                                                                                                                                                                    </return>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                                <outcome value='success'>
+                                                                                                                                                                                    <block atomic="true">
+                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
+                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
+                                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                                                                                                                                            <parameter name='operational-status' value='Activated' />
+                                                                                                                                                                                        </update>
+                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>
+                                                                                                                                                                                            <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                                                                                                                            <parameter name='operational-status' value='Activated' />
+                                                                                                                                                                                        </update>
+                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+                                                                                                                                                                                                key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>
+                                                                                                                                                                                            <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                                                                                            <parameter name='orchestration-status' value='Activated' />
+                                                                                                                                                                                        </update>
+                                                                                                                                                                                    </block>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                            </execute>
+                                                                                                                                                                        </block>
                                                                                                                                                                     </block>
                                                                                                                                                                 </outcome>
                                                                                                                                                                 <outcome value='not-found'>
@@ -292,927 +458,6 @@
                                                                                                 </block>
                                                                                             </outcome>
                                                                                         </get-resource>
-                                                                                        <switch test='`$currLinkIsFound`'>
-                                                                                            <outcome value='true'>
-                                                                                                <block atomic="true"></block>
-                                                                                            </outcome>
-                                                                                            <outcome value='false'>
-                                                                                                <block>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                        <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
-                                                                                                    </execute>
-                                                                                                    <set>
-                                                                                                        <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->
-                                                                                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />
-                                                                                                    </set>
-                                                                                                    <set>
-                                                                                                        <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />
-                                                                                                        <!--<parameter name='network-route-A' value="`$tmp.aai.logical-link.link-id`" />-->
-                                                                                                    </set>
-                                                                                                    <set>
-                                                                                                        <parameter name='network-route-B' value="`$tmp.aai.logical-link.link-name2`" />
-                                                                                                    </set>
-                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                  resource="network-route"
-                                                                                                                  key='network-route.route-id = $network-route-A'
-                                                                                                                  local-only="false"
-                                                                                                                  force="true" pfx="tmp.aai.network-route-A">
-                                                                                                        <outcome value='not-found'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='failure'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='error-code' value='' />
-                                                                                                                <parameter name='error-message' value='' />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block atomic="true">
-                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-A.next-hop`'/>
-                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                    <parameter name="regex" value="[-]+"/>
-                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainA-pnfName"/>
-                                                                                                                    <outcome value='success'>
-                                                                                                                        <block atomic="true">
-                                                                                                                            <set>
-                                                                                                                                <parameter name='tmp.src.domainA.pnf-name' value="`$param-prefix-domainA-pnfName[0] + '-' +
-                                                   $param-prefix-domainA-pnfName[1] + '-' +
-                                                   $param-prefix-domainA-pnfName[2] + '-' +
-                                                   $param-prefix-domainA-pnfName[3] + '-' +
-                                                   $param-prefix-domainA-pnfName[4] + '-' +
-                                                   $param-prefix-domainA-pnfName[5] + '-' +
-                                                   $param-prefix-domainA-pnfName[6] + '-' +
-                                                   $param-prefix-domainA-pnfName[7] + '-' +
-                                                   $param-prefix-domainA-pnfName[8]`" />
-                                                                                                                            </set>
-                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                          resource="pnf"
-                                                                                                                                          key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
-                                                                                                                                          pfx='tmp.aai.source-pnf' local-only='false' >
-                                                                                                                                <!--AND depth = '0'"-->
-                                                                                                                                <outcome value='success'>
-                                                                                                                                    <block>
-                                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
-                                                                                                                                            <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                                                    <block atomic="true">
-                                                                                                                                                        <set>
-                                                                                                                                                            <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                        </set>
-                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                                      resource="esr-thirdparty-sdnc"
-                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
-		     depth = '1'"
-                                                                                                                                                                      pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                                            <outcome value='success'>
-                                                                                                                                                                <block>
-                                                                                                                                                                    <set>
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                    </set>
-                                                                                                                                                                </block>
-                                                                                                                                                            </outcome>
-                                                                                                                                                            <outcome value='not-found'>
-                                                                                                                                                                <return status='failure'>
-                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                                </return>
-                                                                                                                                                            </outcome>
-                                                                                                                                                            <outcome value='Other'>
-                                                                                                                                                                <return status='failure'>
-                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                                </return>
-                                                                                                                                                            </outcome>
-                                                                                                                                                        </get-resource>
-                                                                                                                                                    </block>
-                                                                                                                                                </outcome>
-                                                                                                                                                <outcome value='network-resource'>
-                                                                                                                                                    <block atomic="true">
-                                                                                                                                                        <set>
-                                                                                                                                                            <parameter name='tmp.domainA.eth-network-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                        </set>
-                                                                                                                                                    </block>
-                                                                                                                                                </outcome>
-                                                                                                                                            </switch>
-                                                                                                                                        </for>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='not-found'>
-                                                                                                                                    <return status='failure'>
-                                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                    </return>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='Other'>
-                                                                                                                                    <return status='failure'>
-                                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                    </return>
-                                                                                                                                </outcome>
-                                                                                                                            </get-resource>
-                                                                                                                        </block>
-                                                                                                                    </outcome>
-                                                                                                                    <outcome value='failure'>
-                                                                                                                        <return status='failure'>
-                                                                                                                            <parameter name='error-code' value='' />
-                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                        </return>
-                                                                                                                    </outcome>
-                                                                                                                </execute>
-                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                              resource="p-interface"
-                                                                                                                              key="pnf.pnf-name = $tmp.src.domainA.pnf-name
-	        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop"
-                                                                                                                              local-only="false"
-                                                                                                                              pfx="tmp.aai.network-route-A.p-interface-src" >
-                                                                                                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                                                                                                    <!--	resource="p-interface"-->
-                                                                                                                    <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
-                                                                                                                    <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
-                                                                                                                    <!--		local-only="false" -->
-                                                                                                                    <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
-                                                                                                                    <outcome value='success'>
-                                                                                                                        <block atomic="true">
-                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>
-                                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                                <parameter name="regex" value="[-]+"/>
-                                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainA"/>
-                                                                                                                                <outcome value='success'>
-                                                                                                                                    <block atomic="true">
-                                                                                                                                        <set>
-                                                                                                                                            <parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                                                        </set>
-                                                                                                                                        <set>
-                                                                                                                                            <parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                                                        </set>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='failure'>
-                                                                                                                                    <return status='failure'>
-                                                                                                                                        <parameter name='error-code' value='' />
-                                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                                    </return>
-                                                                                                                                </outcome>
-                                                                                                                            </execute>
-                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                                <parameter name="ctx-destination" value="uuid.connectivity-domainA-uuid"/>
-                                                                                                                            </execute>
-                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                  key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
-                                                                                                                                <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
-                                                                                                                                <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
-                                                                                                                                <parameter name='operational-status' value='Created' />
-                                                                                                                                <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
-                                                                                                                                <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
-                                                                                                                                <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
-                                                                                                                                <parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                                                <parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                                                <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
-                                                                                                                                <parameter name='bandwidth-profile-name' value='`$gfp`' />
-                                                                                                                                <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
-                                                                                                                                <parameter name='cir' value='`$gfp *1000000`' />
-                                                                                                                                <parameter name='eir' value='`$gfp *1000000`' />
-                                                                                                                                <parameter name='cbs' value='`$prop.sotn.cbs`' />
-                                                                                                                                <parameter name='ebs' value='`$prop.sotn.ebs`' />
-                                                                                                                                <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
-                                                                                                                                <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
-                                                                                                                                <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
-                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
-                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
-                                                                                                                                <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/'` " />
-                                                                                                                            </save>
-                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-                                                                                                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
-                                                                                                                                  force="true" pfx="tmp.AnAI-data">
-                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
-                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
-                                                                                                                                <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                                                <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                                                <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                                                <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                                                <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                                            </save>
-                                                                                                                            <for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >
-                                                                                                                                <switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>
-                                                                                                                                    <outcome value='tunnel-termination-point'>
-                                                                                                                                        <block atomic="true">
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='tmp.source.ttp-id' value="`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`" />
-                                                                                                                                            </set>
-                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                          resource="tunnel-termination-point"
-                                                                                                                                                          key="tunnel-termination-point.ttp-id = $tmp.source.ttp-id
-		AND depth = '0'"
-                                                                                                                                                          pfx='tmp.aai.source-ttp' local-only='false' >
-                                                                                                                                                <outcome value='success'>
-                                                                                                                                                    <block atomic="true">
-                                                                                                                                                        <set>
-                                                                                                                                                            <parameter name='source.tunnel-tp-id' value="`$tmp.aai.source-ttp.tunnel-tp-id`" />
-                                                                                                                                                        </set>
-                                                                                                                                                    </block>
-                                                                                                                                                </outcome>
-                                                                                                                                            </get-resource>
-                                                                                                                                            <break/>
-                                                                                                                                        </block>
-                                                                                                                                    </outcome>
-                                                                                                                                </switch>
-                                                                                                                            </for>
-                                                                                                                        </block>
-                                                                                                                    </outcome>
-                                                                                                                    <outcome value='not-found'>
-                                                                                                                        <return status='failure'>
-                                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                                        </return>
-                                                                                                                    </outcome>
-                                                                                                                    <outcome value='failure'>
-                                                                                                                        <return status='failure'>
-                                                                                                                            <parameter name='error-code' value='' />
-                                                                                                                            <parameter name='error-message' value='' />
-                                                                                                                        </return>
-                                                                                                                    </outcome>
-                                                                                                                </get-resource>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                    </get-resource>
-                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                  resource="network-route"
-                                                                                                                  key='network-route.route-id = $network-route-B'
-                                                                                                                  local-only="false"
-                                                                                                                  force="true" pfx="tmp.aai.network-route-B">
-                                                                                                        <outcome value='not-found'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='failure'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='error-code' value='' />
-                                                                                                                <parameter name='error-message' value='' />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='success'>
-                                                                                                            <block atomic="true">
-                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-B.next-hop`'/>
-                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                    <parameter name="regex" value="[-]+"/>
-                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainB-pnfName"/>
-                                                                                                                    <outcome value='success'>
-                                                                                                                        <block atomic="true">
-                                                                                                                            <set>
-                                                                                                                                <parameter name='tmp.dst.domainB.pnf-name' value="`$param-prefix-domainB-pnfName[0] + '-' +
-                                                   $param-prefix-domainB-pnfName[1] + '-' +
-                                                   $param-prefix-domainB-pnfName[2] + '-' +
-                                                   $param-prefix-domainB-pnfName[3] + '-' +
-                                                   $param-prefix-domainB-pnfName[4] + '-' +
-                                                   $param-prefix-domainB-pnfName[5] + '-' +
-                                                   $param-prefix-domainB-pnfName[6] + '-' +
-                                                   $param-prefix-domainB-pnfName[7] + '-' +
-                                                   $param-prefix-domainB-pnfName[8]`" />
-                                                                                                                            </set>
-                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                          resource="pnf"
-                                                                                                                                          key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
-                                                                                                                                          pfx='tmp.aai.destination-pnf' local-only='false' >
-                                                                                                                                <!--AND depth = '0'"-->
-                                                                                                                                <outcome value='success'>
-                                                                                                                                    <block>
-                                                                                                                                        <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
-                                                                                                                                            <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
-                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                                                    <block atomic="true">
-                                                                                                                                                        <set>
-                                                                                                                                                            <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                        </set>
-                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                                      resource="esr-thirdparty-sdnc"
-                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
-		     depth = '1'"
-                                                                                                                                                                      pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                                            <outcome value='success'>
-                                                                                                                                                                <block>
-                                                                                                                                                                    <set>
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                    </set>
-                                                                                                                                                                </block>
-                                                                                                                                                            </outcome>
-                                                                                                                                                            <outcome value='not-found'>
-                                                                                                                                                                <return status='failure'>
-                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                                </return>
-                                                                                                                                                            </outcome>
-                                                                                                                                                            <outcome value='Other'>
-                                                                                                                                                                <return status='failure'>
-                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                                </return>
-                                                                                                                                                            </outcome>
-                                                                                                                                                        </get-resource>
-                                                                                                                                                    </block>
-                                                                                                                                                </outcome>
-                                                                                                                                                <outcome value='network-resource'>
-                                                                                                                                                    <block atomic="true">
-                                                                                                                                                        <set>
-                                                                                                                                                            <parameter name='tmp.domainB.eth-network-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                        </set>
-                                                                                                                                                    </block>
-                                                                                                                                                </outcome>
-                                                                                                                                            </switch>
-                                                                                                                                        </for>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='not-found'>
-                                                                                                                                    <return status='failure'>
-                                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                    </return>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='Other'>
-                                                                                                                                    <return status='failure'>
-                                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                    </return>
-                                                                                                                                </outcome>
-                                                                                                                            </get-resource>
-                                                                                                                        </block>
-                                                                                                                    </outcome>
-                                                                                                                    <outcome value='failure'>
-                                                                                                                        <return status='failure'>
-                                                                                                                            <parameter name='error-code' value='' />
-                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                        </return>
-                                                                                                                    </outcome>
-                                                                                                                </execute>
-                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                              resource="p-interface"
-                                                                                                                              key="pnf.pnf-name = $tmp.dst.domainB.pnf-name
-	        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop"
-                                                                                                                              local-only="false"
-                                                                                                                              pfx="tmp.aai.network-route-B.p-interface-dst" >
-                                                                                                                    <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
-                                                                                                                    <!--	resource="p-interface"-->
-                                                                                                                    <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
-                                                                                                                    <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
-                                                                                                                    <!--		local-only="false" -->
-                                                                                                                    <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
-                                                                                                                    <outcome value='success'>
-                                                                                                                        <block atomic="true">
-                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                                                                <parameter name="original_string" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>
-                                                                                                                                <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                                                                <parameter name="regex" value="[-]+"/>
-                                                                                                                                <parameter name="ctx_memory_result_key" value="param-prefix-domainB"/>
-                                                                                                                                <outcome value='success'>
-                                                                                                                                    <block atomic="true">
-                                                                                                                                        <set>
-                                                                                                                                            <parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                                                        </set>
-                                                                                                                                        <set>
-                                                                                                                                            <parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                                        </set>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='failure'>
-                                                                                                                                    <return status='failure'>
-                                                                                                                                        <parameter name='error-code' value='' />
-                                                                                                                                        <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                                                                    </return>
-                                                                                                                                </outcome>
-                                                                                                                            </execute>
-                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                                <parameter name="ctx-destination" value="prop.connectivity-domainB-uuid"/>
-                                                                                                                            </execute>
-                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                  key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
-                                                                                                                                <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
-                                                                                                                                <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
-                                                                                                                                <parameter name='operational-status' value='Created' />
-                                                                                                                                <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
-                                                                                                                                <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
-                                                                                                                                <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
-                                                                                                                                <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                                <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                                                <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
-                                                                                                                                <parameter name='bandwidth-profile-name' value='`$gfp`' />
-                                                                                                                                <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
-                                                                                                                                <parameter name='cir' value='`$gfp *1000000`' />
-                                                                                                                                <parameter name='eir' value='`$gfp *1000000`' />
-                                                                                                                                <parameter name='cbs' value='`$prop.sotn.cbs`' />
-                                                                                                                                <parameter name='ebs' value='`$prop.sotn.ebs`' />
-                                                                                                                                <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
-                                                                                                                                <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
-                                                                                                                                <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
-                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
-                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
-                                                                                                                                <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/'` " />
-                                                                                                                            </save>
-                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-                                                                                                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
-                                                                                                                                  force="true" pfx="tmp.AnAI-data">
-                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
-                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
-                                                                                                                                <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                                                <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                                                <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                                                <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                                                <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                                            </save>
-                                                                                                                            <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >
-                                                                                                                                <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
-                                                                                                                                    <outcome value='tunnel-termination-point'>
-                                                                                                                                        <block atomic="true">
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`" />
-                                                                                                                                            </set>
-                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                          resource="tunnel-termination-point"
-                                                                                                                                                          key="tunnel-termination-point.ttp-id = $tmp.destination.ttp-id
-		AND depth = '0'"
-                                                                                                                                                          pfx='tmp.aai.destination-ttp' local-only='false' >
-                                                                                                                                                <outcome value='success'>
-                                                                                                                                                    <block atomic="true">
-                                                                                                                                                        <set>
-                                                                                                                                                            <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
-                                                                                                                                                        </set>
-                                                                                                                                                    </block>
-                                                                                                                                                </outcome>
-                                                                                                                                            </get-resource>
-                                                                                                                                            <break/>
-                                                                                                                                        </block>
-                                                                                                                                    </outcome>
-                                                                                                                                </switch>
-                                                                                                                            </for>
-                                                                                                                        </block>
-                                                                                                                    </outcome>
-                                                                                                                    <outcome value='not-found'>
-                                                                                                                        <return status='failure'>
-                                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                                        </return>
-                                                                                                                    </outcome>
-                                                                                                                    <outcome value='failure'>
-                                                                                                                        <return status='failure'>
-                                                                                                                            <parameter name='error-code' value='' />
-                                                                                                                            <parameter name='error-message' value='' />
-                                                                                                                        </return>
-                                                                                                                    </outcome>
-                                                                                                                </get-resource>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                    </get-resource>
-                                                                                                    <set>
-                                                                                                        <parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
-                                                                                                        <parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
-                                                                                                        <parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
-                                                                                                        <parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                        <parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
-                                                                                                        <parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
-                                                                                                        <parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
-                                                                                                        <parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
-                                                                                                        <parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                        <parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
-                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->
-                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->
-                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->
-                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->
-                                                                                                        <!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->
-                                                                                                    </set>
-                                                                                                    <set>
-                                                                                                        <parameter name='prop.ethsrvType' value='`$network-route-A`' />
-                                                                                                    </set>
-                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>
-                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                                                                                        <parameter name="filename" value="`$filenamemm`" />
-                                                                                                    </execute>
-                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>
-                                                                                                    <switch test="`$param-prefix-domainA[$param-prefix-domainA_length -9] == $param-prefix-domainB[$param-prefix-domainB_length -9]`">
-
-                                                                                                        `
-
-
-                                                                                                        <outcome value='false'>
-                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >
-                                                                                                                <block atomic='true'>
-                                                                                                                    <for index='otnidx' start='0' end='`$tmp.otninfo_length`' >
-                                                                                                                        <block atomic='true'>
-                                                                                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                                <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>
-                                                                                                                            </execute>
-                                                                                                                            <switch test="`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`">
-                                                                                                                                <outcome value='true'>
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />
-                                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />
-                                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />
-                                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
-                                                                                                                                    </set>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='false'>
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />
-                                                                                                                                        <parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />
-                                                                                                                                        <parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />
-                                                                                                                                        <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
-                                                                                                                                    </set>
-                                                                                                                                </outcome>
-                                                                                                                            </switch>
-                                                                                                                            <set>
-                                                                                                                                <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +
-                                             $tmp.access-provider-id + '-clientId-' +
-                                             $tmp.access-client-id + '-topologyId-' +
-                                             $tmp.access-topology-id + '-nodeId-' +
-                                             $tmp.srcdstpnf-id`" />
-                                                                                                                            </set>
-                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                          resource="pnf"
-                                                                                                                                          key="pnf.pnf-name = $tmp.srcdstpnf-name"
-                                                                                                                                          pfx='tmp.aai.srcdst-pnf' local-only='false' >
-                                                                                                                                <!--AND depth = '0'"-->
-                                                                                                                                <outcome value='success'>
-                                                                                                                                    <block>
-                                                                                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >
-                                                                                                                                            <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                                                                                <outcome value='esr-thirdparty-sdnc'>
-                                                                                                                                                    <block atomic="true">
-                                                                                                                                                        <set>
-                                                                                                                                                            <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                                                                        </set>
-                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                                                                      resource="esr-thirdparty-sdnc"
-                                                                                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
-		     depth = '1'"
-                                                                                                                                                                      pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                                                                            <outcome value='success'>
-                                                                                                                                                                <block>
-                                                                                                                                                                    <set>
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                                                                        <!--<parameter name="format" value="json"/>-->
-                                                                                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                                                                    </set>
-                                                                                                                                                                </block>
-                                                                                                                                                            </outcome>
-                                                                                                                                                            <outcome value='not-found'>
-                                                                                                                                                                <return status='failure'>
-                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                                </return>
-                                                                                                                                                            </outcome>
-                                                                                                                                                            <outcome value='Other'>
-                                                                                                                                                                <return status='failure'>
-                                                                                                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                                                                                                    <parameter name="error-code" value="500" />
-                                                                                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                                                </return>
-                                                                                                                                                            </outcome>
-                                                                                                                                                        </get-resource>
-                                                                                                                                                    </block>
-                                                                                                                                                </outcome>
-                                                                                                                                            </switch>
-                                                                                                                                        </for>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='not-found'>
-                                                                                                                                    <return status='failure'>
-                                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                    </return>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='Other'>
-                                                                                                                                    <return status='failure'>
-                                                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                                                    </return>
-                                                                                                                                </outcome>
-                                                                                                                            </get-resource>
-                                                                                                                            <switch test='`$otnidx == 0`'>
-                                                                                                                                <outcome value='true'>
-                                                                                                                                    <set>
-                                                                                                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
-                                                                                                                                    </set>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='false'>
-                                                                                                                                    <switch test='`$otnidx == $tmp.otninfo_length - 1`'>
-                                                                                                                                        <outcome value='true'>
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
-                                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                                            </set>
-                                                                                                                                        </outcome>
-                                                                                                                                        <outcome value='false'>
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />
-                                                                                                                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />
-                                                                                                                                            </set>
-                                                                                                                                        </outcome>
-                                                                                                                                    </switch>
-                                                                                                                                </outcome>
-                                                                                                                            </switch>
-                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >
-                                                                                                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />
-                                                                                                                                <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
-                                                                                                                                <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->
-                                                                                                                                <parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />
-                                                                                                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
-                                                                                                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />
-                                                                                                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
-                                                                                                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />
-                                                                                                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
-                                                                                                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />
-                                                                                                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
-                                                                                                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />
-                                                                                                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />
-                                                                                                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
-                                                                                                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />
-                                                                                                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
-                                                                                                                                <parameter name='route-distinguisher' value='`$gfp`' />
-                                                                                                                                <parameter name='operational-status' value='Created' />
-                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
-                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
-                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
-                                                                                                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
-                                                                                                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
-                                                                                                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
-                                                                                                                                <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->
-                                                                                                                                <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                                <outcome value='success'>
-                                                                                                                                    <block></block>
-                                                                                                                                </outcome>
-                                                                                                                            </save>
-                                                                                                                            <switch test='`$otnidx == 0`'>
-                                                                                                                                <outcome value='true'>
-                                                                                                                                    <block>
-                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                                                              key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
-                                                                                                                                              force="true" pfx="tmp.AnAI-data">
-                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
-                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
-                                                                                                                                        </save>
-                                                                                                                                        <set>
-                                                                                                                                            <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                                        </set>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                                <outcome value='false'>
-                                                                                                                                    <block>
-                                                                                                                                        <set>
-                                                                                                                                            <parameter name='testingvalue' value='$tmp.otninfo_length -1' />
-                                                                                                                                        </set>
-                                                                                                                                        <switch test='`$otnidx == $tmp.otninfo_length - 1`'>
-                                                                                                                                            <outcome value='true'>
-                                                                                                                                                <block>
-                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
-                                                                                                                                                          force="true" pfx="tmp.AnAI-data">
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
-                                                                                                                                                    </save>
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                            <outcome value='false'>
-                                                                                                                                                <block atomic='true'>
-                                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                                                        <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>
-                                                                                                                                                    </execute>
-                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                          key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>
-                                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />
-                                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->
-                                                                                                                                                        <parameter name='operational-status' value='Created' />
-                                                                                                                                                        <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
-                                                                                                                                                        <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
-                                                                                                                                                        <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
-                                                                                                                                                        <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
-                                                                                                                                                        <!--<parameter name='access-ltp-id' value='``' />-->
-                                                                                                                                                        <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->
-                                                                                                                                                        <parameter name='bandwidth-profile-name' value='`$gfp`' />
-                                                                                                                                                        <parameter name='vpn-type' value='dummy' />
-                                                                                                                                                        <parameter name='cir' value='`$gfp *1000000`' />
-                                                                                                                                                        <parameter name='eir' value='`$gfp *1000000`' />
-                                                                                                                                                        <!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->
-                                                                                                                                                        <!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->
-                                                                                                                                                        <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
-                                                                                                                                                        <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
-                                                                                                                                                        <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                                        <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
-                                                                                                                                                        <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
-                                                                                                                                                        <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
-                                                                                                                                                        <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/'` " />
-                                                                                                                                                    </save>
-                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-                                                                                                                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
-                                                                                                                                                          force="true" pfx="tmp.AnAI-data">
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
-                                                                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
-                                                                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
-                                                                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
-                                                                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
-                                                                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->
-                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
-                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
-                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
-                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
-                                                                                                                                                    </save>
-                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                                                                          key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
-                                                                                                                                                          force="true" pfx="tmp.AnAI-data">
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
-                                                                                                                                                    </save>
-                                                                                                                                                    <set>
-                                                                                                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                                                    </set>
-                                                                                                                                                </block>
-                                                                                                                                            </outcome>
-                                                                                                                                        </switch>
-                                                                                                                                    </block>
-                                                                                                                                </outcome>
-                                                                                                                            </switch>
-                                                                                                                        </block>
-                                                                                                                    </for>
-                                                                                                                </block>
-                                                                                                            </call>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='true'>
-                                                                                                            <block>
-                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                                                                                                                    <parameter name="ctx-destination" value="prop.vpn-binding-samedomain-uuid"/>
-                                                                                                                </execute>
-                                                                                                                <set>
-                                                                                                                    <parameter name='tmp.sameDomain-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
-                                                                                                                    <parameter name='tmp.sameDomain-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
-                                                                                                                </set>
-                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-samedomain-uuid' >
-                                                                                                                    <parameter name='vpn-id' value='`$prop.vpn-binding-samedomain-uuid`' />
-                                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
-                                                                                                                    <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->
-                                                                                                                    <parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />
-                                                                                                                    <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
-                                                                                                                    <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
-                                                                                                                    <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
-                                                                                                                    <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
-                                                                                                                    <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
-                                                                                                                    <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
-                                                                                                                    <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
-                                                                                                                    <parameter name='src-access-node-id' value='`$tmp.sameDomain-src-access-node-id`' />
-                                                                                                                    <!--<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />-->
-                                                                                                                    <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
-                                                                                                                    <parameter name='dst-access-node-id' value='`$tmp.sameDomain-dst-access-node-id`' />
-                                                                                                                    <!--<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />-->
-                                                                                                                    <parameter name='route-distinguisher' value='`$gfp`' />
-                                                                                                                    <parameter name='operational-status' value='Created' />
-                                                                                                                    <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
-                                                                                                                    <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
-                                                                                                                    <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
-                                                                                                                    <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
-                                                                                                                    <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
-                                                                                                                    <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
-                                                                                                                    <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->
-                                                                                                                    <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />
-                                                                                                                    <outcome value='success'>
-                                                                                                                        <block></block>
-                                                                                                                    </outcome>
-                                                                                                                </save>
-                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
-                                                                                                                      key='vpn-binding.vpn-id = $prop.vpn-binding-samedomain-uuid'
-                                                                                                                      force="true" pfx="tmp.AnAI-data">
-                                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`" />
-                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-domainA-uuid`" />
-                                                                                                                </save>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                    </switch>
-                                                                                                    <set>
-                                                                                                        <parameter name='domain-A.tunnel-tp-id' value='' />
-                                                                                                        <parameter name='domain-A.node-id' value='' />
-                                                                                                        <parameter name='domain-A.network-id' value="" />
-                                                                                                        <parameter name='domain-A.provider-id' value="" />
-                                                                                                        <parameter name='domain-A.client-id' value="" />
-                                                                                                        <parameter name='domain-A.te-topo-id' value="" />
-                                                                                                        <parameter name='domain-A.network-type' value="" />
-                                                                                                        <parameter name='domain-A.ltpId' value="" />
-                                                                                                        <parameter name='tmp.domain-A.network-id' value="" />
-                                                                                                        <parameter name='tmp.domain-A.ttp-id' value="" />
-                                                                                                        <parameter name='network-route-A' value="" />
-                                                                                                        <!--<parameter name='domain-A.' value="" />-->
-                                                                                                        <parameter name='request-id' value='' />
-                                                                                                        <parameter name='otn-source-node' value='' />
-                                                                                                        <parameter name='otn-dest-node' value='' />
-                                                                                                        <parameter name='bw-odu' value="" />
-                                                                                                        <parameter name='src-ttp-id' value='' />
-                                                                                                        <parameter name='dst-ttp-id' value='' />
-                                                                                                        <parameter name='domain-B.tunnel-tp-id' value='' />
-                                                                                                        <parameter name='domain-B.node-id' value='' />
-                                                                                                        <parameter name='domain-B.network-id' value="" />
-                                                                                                        <parameter name='domain-B.provider-id' value="" />
-                                                                                                        <parameter name='domain-B.client-id' value="" />
-                                                                                                        <parameter name='domain-B.te-topo-id' value="" />
-                                                                                                        <parameter name='domain-B.network-type' value="" />
-                                                                                                        <parameter name='domain-B.ltpId' value="" />
-                                                                                                        <parameter name='tmp.domain-B.network-id' value="" />
-                                                                                                        <parameter name='tmp.domain-B.ttp-id' value="" />
-                                                                                                        <parameter name='network-route-B' value="" />
-                                                                                                        <!--<parameter name='domain-B.' value="" />-->
-                                                                                                    </set>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                        </switch>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </switch>
-- 
cgit 1.2.3-korg