X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json;h=4ba32b4674ad72501952d918c8682b537b12cdfb;hb=2c4d878572be86786419130d35da41e58593be8c;hp=795a74160d84f89bbdcea89890cab46e08252c8a;hpb=8e3280a9c2c7cd372cfb268e9df2f7332d405d9e;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
index 795a7416..4ba32b46 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,223 +1,199 @@
 [
     {
-        "id": "2395bbe0.4b8ec4",
+        "id": "6467c9b6.3ea7b",
         "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/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 361,
-        "y": 348,
-        "z": "ed7c1675.7a56b",
+        "x": 415.8833312988281,
+        "y": 377,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7a4b4c32.339f0c",
-                "476b558f.0cf4e4",
-                "c5f863d4.faa76"
+                "1c0c6fa0.017178",
+                "ec984d7b.605098",
+                "25450eba.0fd99a"
             ]
         ]
     },
     {
-        "id": "7a4b4c32.339f0c",
+        "id": "1c0c6fa0.017178",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 549,
-        "y": 361,
-        "z": "ed7c1675.7a56b",
+        "x": 603.8833312988281,
+        "y": 390,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "477b4d49.40f0ec"
+                "fcdf737f.3ba08"
             ]
         ]
     },
     {
-        "id": "476b558f.0cf4e4",
+        "id": "ec984d7b.605098",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 549.490966796875,
-        "y": 406.57403564453125,
-        "z": "ed7c1675.7a56b",
+        "x": 611.374267578125,
+        "y": 432.57403564453125,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
-            [
-                "9391f816.87a258"
-            ]
+            []
         ]
     },
     {
-        "id": "c5f863d4.faa76",
+        "id": "25450eba.0fd99a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 547,
-        "y": 450,
-        "z": "ed7c1675.7a56b",
+        "x": 601.8833312988281,
+        "y": 479,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7e716c79.c4ee54"
+                "f645589d.ed3d98"
             ]
         ]
     },
     {
-        "id": "477b4d49.40f0ec",
+        "id": "fcdf737f.3ba08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 722,
-        "y": 359,
-        "z": "ed7c1675.7a56b",
+        "x": 776.8833312988281,
+        "y": 388,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "de48ad25.e4a568"
+                "6641b1bb.011df8"
             ]
         ]
     },
     {
-        "id": "9391f816.87a258",
-        "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": 712.0623779296875,
-        "y": 406.8597717285156,
-        "z": "ed7c1675.7a56b",
-        "wires": []
-    },
-    {
-        "id": "7e716c79.c4ee54",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 714,
-        "y": 449,
-        "z": "ed7c1675.7a56b",
-        "wires": []
-    },
-    {
-        "id": "de48ad25.e4a568",
+        "id": "6641b1bb.011df8",
         "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": 951,
-        "y": 360,
-        "z": "ed7c1675.7a56b",
+        "x": 1005.8833312988281,
+        "y": 389,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1fd8993c.e83297"
+                "42fd94e4.9f459c"
             ]
         ]
     },
     {
-        "id": "1fd8993c.e83297",
+        "id": "42fd94e4.9f459c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1166,
-        "y": 361,
-        "z": "ed7c1675.7a56b",
+        "x": 1220.8833312988281,
+        "y": 390,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "33755ee2.127952"
+                "341f3db4.7e268a"
             ]
         ]
     },
     {
-        "id": "edb565df.2fd588",
+        "id": "802e937a.3ac",
         "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].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1420,
-        "y": 283,
-        "z": "ed7c1675.7a56b",
+        "x": 1474.8833312988281,
+        "y": 312,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "d9f77b89.2576a8",
-                "d1a41641.7e8658"
+                "ccfe4ade.41ae98",
+                "912c0faa.e5e1c8"
             ]
         ]
     },
     {
-        "id": "d9f77b89.2576a8",
+        "id": "ccfe4ade.41ae98",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1637,
-        "y": 262,
-        "z": "ed7c1675.7a56b",
+        "x": 1691.8833312988281,
+        "y": 291,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "33755ee2.127952"
+                "341f3db4.7e268a"
             ]
         ]
     },
     {
-        "id": "d1a41641.7e8658",
+        "id": "912c0faa.e5e1c8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1637,
-        "y": 311,
-        "z": "ed7c1675.7a56b",
+        "x": 1691.8833312988281,
+        "y": 340,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "33755ee2.127952",
+        "id": "341f3db4.7e268a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1821,
-        "y": 348,
-        "z": "ed7c1675.7a56b",
+        "x": 1875.8833312988281,
+        "y": 377,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "9647ef19.c8c25",
-                "b3842f71.731b38",
-                "ca01ca51.23bb98"
+                "b1ca96f9.f78f38",
+                "2c3b3231.83c2be",
+                "4660bf61.473a18"
             ]
         ]
     },
     {
-        "id": "48081245.456c3c",
+        "id": "377c3031.0fc7c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 180,
-        "y": 89,
-        "z": "ed7c1675.7a56b",
+        "x": 234.88333129882812,
+        "y": 118,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "226f6982.562f5e"
+                "8b8ba227.5e7638"
             ]
         ]
     },
     {
-        "id": "226f6982.562f5e",
+        "id": "8b8ba227.5e7638",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -225,3560 +201,3545 @@
         "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": 464.2856903076172,
-        "y": 150.23810863494873,
-        "z": "ed7c1675.7a56b",
+        "x": 519.1690216064453,
+        "y": 179.23810863494873,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f533e2ec.f849f"
+                "6c55ded0.30c498"
             ]
         ]
     },
     {
-        "id": "f533e2ec.f849f",
+        "id": "6c55ded0.30c498",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-F1-Activate",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 470.42860412597656,
-        "y": 235.00003051757812,
-        "z": "ed7c1675.7a56b",
+        "x": 525.3119354248047,
+        "y": 264.0000305175781,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "15848be5.af4ba4"
+                "b63c19cf.5911b8"
             ]
         ]
     },
     {
-        "id": "15848be5.af4ba4",
+        "id": "b63c19cf.5911b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 780.238037109375,
-        "y": 226.66668701171875,
-        "z": "ed7c1675.7a56b",
+        "x": 835.1213684082031,
+        "y": 255.66668701171875,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "2395bbe0.4b8ec4",
-                "5c62cbf5.952894",
-                "4957906b.cb3908",
-                "25a3d5e5.55ea62",
-                "624a734b.81957c"
+                "6467c9b6.3ea7b",
+                "7714415.bcb45c",
+                "2cf2ff05.5ecb98",
+                "ff64d6f0.1d24e",
+                "c19ef147.be92d8"
             ]
         ]
     },
     {
-        "id": "9647ef19.c8c25",
+        "id": "b1ca96f9.f78f38",
         "type": "set",
         "name": "set tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
         "comments": "",
-        "x": 2038,
-        "y": 286,
-        "z": "ed7c1675.7a56b",
+        "x": 2092.883331298828,
+        "y": 315,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "927e2807.47e1",
+        "id": "f11c1dac.45c748",
         "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": 4207,
-        "y": 172,
-        "z": "ed7c1675.7a56b",
+        "x": 4261.883331298828,
+        "y": 201,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "71f8cbde.7b70ec",
+        "id": "c95c33ef.381fa8",
         "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.cll-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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4288,
-        "y": 487,
-        "z": "ed7c1675.7a56b",
+        "x": 4342.883331298828,
+        "y": 516,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "dca0592f.f2f0f8",
-                "7abf945b.d3630c"
+                "89c7efd5.cb6558",
+                "d5cfec9d.5347f8"
             ]
         ]
     },
     {
-        "id": "dca0592f.f2f0f8",
+        "id": "89c7efd5.cb6558",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4597.5,
-        "y": 456,
-        "z": "ed7c1675.7a56b",
+        "x": 4652.383331298828,
+        "y": 485,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "4d6d008.1dd328"
+                "beffe966.8b1b08"
             ]
         ]
     },
     {
-        "id": "7abf945b.d3630c",
+        "id": "d5cfec9d.5347f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4602.5,
-        "y": 521,
-        "z": "ed7c1675.7a56b",
+        "x": 4657.383331298828,
+        "y": 550,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6ddc3bc2.826894"
+                "18fce568.1c292b"
             ]
         ]
     },
     {
-        "id": "4d6d008.1dd328",
+        "id": "beffe966.8b1b08",
         "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": 4773.5,
-        "y": 456,
-        "z": "ed7c1675.7a56b",
+        "x": 4828.383331298828,
+        "y": 485,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "6ddc3bc2.826894",
+        "id": "18fce568.1c292b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4769,
-        "y": 521,
-        "z": "ed7c1675.7a56b",
+        "x": 4823.883331298828,
+        "y": 550,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "639d74a6.1d8f04",
+        "id": "64fdffc9.427678",
         "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": 4152.5,
-        "y": 741,
-        "z": "ed7c1675.7a56b",
+        "x": 4207.383331298828,
+        "y": 770,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "d9456183.6b2d68",
+        "id": "c0e95206.343c2",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 4306.5,
-        "y": 789,
-        "z": "ed7c1675.7a56b",
+        "x": 4361.383331298828,
+        "y": 818,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3efbdf9b.54682",
-                "243cc169.72316e"
+                "7a1edf39.b6a0f8",
+                "b605ddae.9f2b2"
             ]
         ]
     },
     {
-        "id": "3efbdf9b.54682",
+        "id": "7a1edf39.b6a0f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4652,
-        "y": 770,
-        "z": "ed7c1675.7a56b",
+        "x": 4706.883331298828,
+        "y": 799,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ba970949.4ab53"
+                "db29824f.2b664"
             ]
         ]
     },
     {
-        "id": "243cc169.72316e",
+        "id": "b605ddae.9f2b2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4656,
-        "y": 810,
-        "z": "ed7c1675.7a56b",
+        "x": 4710.883331298828,
+        "y": 839,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "4891a43f.02e58c"
+                "10ebb808.22b9d8"
             ]
         ]
     },
     {
-        "id": "ba970949.4ab53",
+        "id": "db29824f.2b664",
         "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": 4810,
-        "y": 770,
-        "z": "ed7c1675.7a56b",
+        "x": 4864.883331298828,
+        "y": 799,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "4891a43f.02e58c",
+        "id": "10ebb808.22b9d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4813.5,
-        "y": 810,
-        "z": "ed7c1675.7a56b",
+        "x": 4868.383331298828,
+        "y": 839,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "388beb56.7c7234",
-                "eb334e0f.b54c3"
+                "6d35eb39.2fe42c",
+                "b62c3c22.2cb09"
             ]
         ]
     },
     {
-        "id": "388beb56.7c7234",
+        "id": "6d35eb39.2fe42c",
         "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": 5144,
-        "y": 775,
-        "z": "ed7c1675.7a56b",
+        "x": 5198.883331298828,
+        "y": 804,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d196af8c.f36ae8",
+        "id": "3f34bcf0.b30eb4",
         "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": 5008,
-        "y": 734,
-        "z": "ed7c1675.7a56b",
+        "x": 5062.883331298828,
+        "y": 763,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "eb334e0f.b54c3",
+        "id": "b62c3c22.2cb09",
         "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": 5071,
-        "y": 821,
-        "z": "ed7c1675.7a56b",
+        "x": 5125.883331298828,
+        "y": 850,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "51361643.15e97",
+        "id": "dc51dde.504a12",
         "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": 4145,
-        "y": 220,
-        "z": "ed7c1675.7a56b",
+        "x": 4199.883331298828,
+        "y": 249,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "7074e291.428a74",
+        "id": "25f0cbb9.ff400c",
         "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": 4171,
-        "y": 337,
-        "z": "ed7c1675.7a56b",
+        "x": 4225.883331298828,
+        "y": 366,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "fd9f25cd.b6ab9",
-                "13f82e43.b47822",
-                "a1ba843c.92fa78"
+                "26af6a64.84f75e",
+                "dfaad5e6.3e7388",
+                "d4f19086.9e394"
             ]
         ]
     },
     {
-        "id": "fd9f25cd.b6ab9",
+        "id": "26af6a64.84f75e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4366.5001220703125,
-        "y": 289,
-        "z": "ed7c1675.7a56b",
+        "x": 4421.383453369141,
+        "y": 318,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "10d11922.59185f"
+                "825f4729.b63ee8"
             ]
         ]
     },
     {
-        "id": "13f82e43.b47822",
+        "id": "dfaad5e6.3e7388",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4358.5001220703125,
-        "y": 344,
-        "z": "ed7c1675.7a56b",
+        "x": 4413.383453369141,
+        "y": 373,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "19650434.8dad4c"
+                "92b1984a.bc8b"
             ]
         ]
     },
     {
-        "id": "10d11922.59185f",
+        "id": "825f4729.b63ee8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4510.8824462890625,
-        "y": 288.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 4565.765777587891,
+        "y": 317.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "777ae9c7.6a278"
+                "415768e6.6651f8"
             ]
         ]
     },
     {
-        "id": "391ce87d.ba3df8",
+        "id": "a6a2d3e2.2e526",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5093,
-        "y": 291,
-        "z": "ed7c1675.7a56b",
+        "x": 5147.883331298828,
+        "y": 320,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "65b820ac.17e0d"
+                "e243a570.71b51"
             ]
         ]
     },
     {
-        "id": "777ae9c7.6a278",
+        "id": "415768e6.6651f8",
         "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": 4695,
-        "y": 287,
-        "z": "ed7c1675.7a56b",
+        "x": 4749.883331298828,
+        "y": 316,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f4f1a808.b22bc"
+                "ab4dd1f4.04e1f"
             ]
         ]
     },
     {
-        "id": "f4f1a808.b22bc",
+        "id": "ab4dd1f4.04e1f",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4890,
-        "y": 287,
-        "z": "ed7c1675.7a56b",
+        "x": 4944.883331298828,
+        "y": 316,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "391ce87d.ba3df8"
+                "a6a2d3e2.2e526"
             ]
         ]
     },
     {
-        "id": "a1ba843c.92fa78",
+        "id": "d4f19086.9e394",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4363.5001220703125,
-        "y": 401,
-        "z": "ed7c1675.7a56b",
+        "x": 4418.383453369141,
+        "y": 430,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a6d9e4b5.ea0fd8"
+                "28f88c03.cb5e5c"
             ]
         ]
     },
     {
-        "id": "a6d9e4b5.ea0fd8",
+        "id": "28f88c03.cb5e5c",
         "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": 4515.5001220703125,
-        "y": 402,
-        "z": "ed7c1675.7a56b",
+        "x": 4570.383453369141,
+        "y": 431,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "19650434.8dad4c",
+        "id": "92b1984a.bc8b",
         "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": 4526.5001220703125,
-        "y": 345,
-        "z": "ed7c1675.7a56b",
+        "x": 4581.383453369141,
+        "y": 374,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "5d042a1f.c8fb44",
+        "id": "677439f1.5f7ed",
         "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": 5478,
-        "y": 304,
-        "z": "ed7c1675.7a56b",
+        "x": 5532.883331298828,
+        "y": 333,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8c0f87c1.0cfa88",
-                "96b96977.b4fed8",
-                "6ce026da.737ea"
+                "e7fd97d3.bbcd08",
+                "38bba5b7.de41b2",
+                "6bf961e8.c56a58"
             ]
         ]
     },
     {
-        "id": "65b820ac.17e0d",
+        "id": "e243a570.71b51",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5272,
-        "y": 291,
-        "z": "ed7c1675.7a56b",
+        "x": 5326.883331298828,
+        "y": 320,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1918c44c.117ae4",
-                "5d042a1f.c8fb44"
+                "857cacb0.81444",
+                "677439f1.5f7ed"
             ]
         ]
     },
     {
-        "id": "1918c44c.117ae4",
+        "id": "857cacb0.81444",
         "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": 5508,
-        "y": 252,
-        "z": "ed7c1675.7a56b",
+        "x": 5562.883331298828,
+        "y": 281,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "8c0f87c1.0cfa88",
+        "id": "e7fd97d3.bbcd08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5688,
-        "y": 295,
-        "z": "ed7c1675.7a56b",
+        "x": 5742.883331298828,
+        "y": 324,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e1aae278.d9aab"
+                "60a50433.d26434"
             ]
         ]
     },
     {
-        "id": "96b96977.b4fed8",
+        "id": "38bba5b7.de41b2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5680,
-        "y": 350,
-        "z": "ed7c1675.7a56b",
+        "x": 5734.883331298828,
+        "y": 379,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a74826f7.daef6"
+                "d9350787.861f1"
             ]
         ]
     },
     {
-        "id": "6ce026da.737ea",
+        "id": "6bf961e8.c56a58",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5685,
-        "y": 407,
-        "z": "ed7c1675.7a56b",
+        "x": 5739.883331298828,
+        "y": 436,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "80c7718d.f0881"
+                "1afc54ba.8ed313"
             ]
         ]
     },
     {
-        "id": "80c7718d.f0881",
+        "id": "1afc54ba.8ed313",
         "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": 5837,
-        "y": 408,
-        "z": "ed7c1675.7a56b",
+        "x": 5891.883331298828,
+        "y": 437,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a74826f7.daef6",
+        "id": "d9350787.861f1",
         "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": 5848,
-        "y": 353,
-        "z": "ed7c1675.7a56b",
+        "x": 5902.883331298828,
+        "y": 382,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "e1aae278.d9aab",
+        "id": "60a50433.d26434",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5832.38232421875,
-        "y": 292.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 5887.265655517578,
+        "y": 321.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "b6fb5857.56d2c"
+                "8367dac2.ac8b98"
             ]
         ]
     },
     {
-        "id": "b6fb5857.56d2c",
+        "id": "8367dac2.ac8b98",
         "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": 6047,
-        "y": 289,
-        "z": "ed7c1675.7a56b",
+        "x": 6101.883331298828,
+        "y": 318,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "881ac3d.2b73cc",
+        "id": "aa2473a.12d4d9",
         "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": 3614,
-        "y": 1629,
-        "z": "ed7c1675.7a56b",
+        "x": 3668.883331298828,
+        "y": 1658,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "f942fe34.857118",
+        "id": "28a663c6.7433b4",
         "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.cll-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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3677,
-        "y": 1958,
-        "z": "ed7c1675.7a56b",
+        "x": 3731.883331298828,
+        "y": 1987,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "d6aba815.0c0b98",
-                "fb15fc4f.27732"
+                "422a3196.0fb7d",
+                "371e9e8f.f6f942"
             ]
         ]
     },
     {
-        "id": "d6aba815.0c0b98",
+        "id": "422a3196.0fb7d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3972.5,
-        "y": 1925,
-        "z": "ed7c1675.7a56b",
+        "x": 4027.383331298828,
+        "y": 1954,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f7e9b7f6.cb6cf8"
+                "c3084137.121c7"
             ]
         ]
     },
     {
-        "id": "fb15fc4f.27732",
+        "id": "371e9e8f.f6f942",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3977.5,
-        "y": 1990,
-        "z": "ed7c1675.7a56b",
+        "x": 4032.383331298828,
+        "y": 2019,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e7e93f9f.05e6f8"
+                "c6676165.ac5c"
             ]
         ]
     },
     {
-        "id": "f7e9b7f6.cb6cf8",
+        "id": "c3084137.121c7",
         "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": 4140.5,
-        "y": 1925,
-        "z": "ed7c1675.7a56b",
+        "x": 4195.383331298828,
+        "y": 1954,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "e7e93f9f.05e6f8",
+        "id": "c6676165.ac5c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4151,
-        "y": 1990,
-        "z": "ed7c1675.7a56b",
+        "x": 4205.883331298828,
+        "y": 2019,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c6f7c9bc.a78ea8",
+        "id": "dfee532c.a1419",
         "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": 3553,
-        "y": 1686,
-        "z": "ed7c1675.7a56b",
+        "x": 3607.883331298828,
+        "y": 1715,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "8f243ad6.97dd38",
+        "id": "e52702af.314718",
         "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": 3573,
-        "y": 1783,
-        "z": "ed7c1675.7a56b",
+        "x": 3627.883331298828,
+        "y": 1812,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a8e6c84d.0f237",
-                "3ee8ddc2.b7378a",
-                "311698c.6883b68"
+                "9ca1c561.5c796",
+                "9cf5cab4.99d6e",
+                "5d5762eb.724c64"
             ]
         ]
     },
     {
-        "id": "a8e6c84d.0f237",
+        "id": "9ca1c561.5c796",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3775.5001220703125,
-        "y": 1736,
-        "z": "ed7c1675.7a56b",
+        "x": 3830.3834533691406,
+        "y": 1765,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6ef9124f.c91bc4"
+                "502f683e.00cf7"
             ]
         ]
     },
     {
-        "id": "3ee8ddc2.b7378a",
+        "id": "9cf5cab4.99d6e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3767.5001220703125,
-        "y": 1791,
-        "z": "ed7c1675.7a56b",
+        "x": 3822.3834533691406,
+        "y": 1820,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "9b01e4a.2bf7598"
+                "9587c00d.994eb"
             ]
         ]
     },
     {
-        "id": "6ef9124f.c91bc4",
+        "id": "502f683e.00cf7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3919.8824462890625,
-        "y": 1733.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 3974.7657775878906,
+        "y": 1762.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8bd570a1.9b5908"
+                "39b96666.82062a"
             ]
         ]
     },
     {
-        "id": "8bd570a1.9b5908",
+        "id": "39b96666.82062a",
         "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": 4104,
-        "y": 1748,
-        "z": "ed7c1675.7a56b",
+        "x": 4158.883331298828,
+        "y": 1777,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "5951fb7a.778dbc"
+                "94ae9a5d.e5d56"
             ]
         ]
     },
     {
-        "id": "311698c.6883b68",
+        "id": "5d5762eb.724c64",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3772.5001220703125,
-        "y": 1848,
-        "z": "ed7c1675.7a56b",
+        "x": 3827.3834533691406,
+        "y": 1877,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "25fe1469.5e13bc"
+                "7a00ac4a.8d918c"
             ]
         ]
     },
     {
-        "id": "25fe1469.5e13bc",
+        "id": "7a00ac4a.8d918c",
         "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": 3924.5001220703125,
-        "y": 1849,
-        "z": "ed7c1675.7a56b",
+        "x": 3979.3834533691406,
+        "y": 1878,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "9b01e4a.2bf7598",
+        "id": "9587c00d.994eb",
         "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": 3935.5001220703125,
-        "y": 1794,
-        "z": "ed7c1675.7a56b",
+        "x": 3990.3834533691406,
+        "y": 1823,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a9a3100d.7e9a38",
+        "id": "f1540d0.014217",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4502,
-        "y": 1752,
-        "z": "ed7c1675.7a56b",
+        "x": 4556.883331298828,
+        "y": 1781,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "15a6f6cf.b80121"
+                "c932c6af.938f38"
             ]
         ]
     },
     {
-        "id": "5951fb7a.778dbc",
+        "id": "94ae9a5d.e5d56",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4299,
-        "y": 1748,
-        "z": "ed7c1675.7a56b",
+        "x": 4353.883331298828,
+        "y": 1777,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a9a3100d.7e9a38"
+                "f1540d0.014217"
             ]
         ]
     },
     {
-        "id": "b462757e.f97cf",
+        "id": "2ff151e7.182fee",
         "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": 4887,
-        "y": 1751,
-        "z": "ed7c1675.7a56b",
+        "x": 4941.883331298828,
+        "y": 1780,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f548cd5f.cf97e8",
-                "7bf2c309.936484",
-                "37200156.6e45ae"
+                "40d3a7a.4400bd8",
+                "353377f9.20c718",
+                "f8f22501.0020d8"
             ]
         ]
     },
     {
-        "id": "15a6f6cf.b80121",
+        "id": "c932c6af.938f38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4679,
-        "y": 1744,
-        "z": "ed7c1675.7a56b",
+        "x": 4733.883331298828,
+        "y": 1773,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "24625031.3ccbb",
-                "b462757e.f97cf"
+                "53fc3a7e.05d404",
+                "2ff151e7.182fee"
             ]
         ]
     },
     {
-        "id": "24625031.3ccbb",
+        "id": "53fc3a7e.05d404",
         "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": 4917,
-        "y": 1699,
-        "z": "ed7c1675.7a56b",
+        "x": 4971.883331298828,
+        "y": 1728,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "3717e4c0.7e91fc",
+        "id": "d551b07b.11f68",
         "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": 5246,
-        "y": 1855,
-        "z": "ed7c1675.7a56b",
+        "x": 5300.883331298828,
+        "y": 1884,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ebaf4cad.7f7ac",
+        "id": "c19bb319.e0e2b8",
         "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": 5257,
-        "y": 1800,
-        "z": "ed7c1675.7a56b",
+        "x": 5311.883331298828,
+        "y": 1829,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "95133e26.a5c4",
+        "id": "2dbaf595.6cfed2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5241.38232421875,
-        "y": 1739.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 5296.265655517578,
+        "y": 1768.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "74fa69d9.12322"
+                "eaeaf1b8.196fc"
             ]
         ]
     },
     {
-        "id": "74fa69d9.12322",
+        "id": "eaeaf1b8.196fc",
         "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": 5456,
-        "y": 1736,
-        "z": "ed7c1675.7a56b",
+        "x": 5510.883331298828,
+        "y": 1765,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "f548cd5f.cf97e8",
+        "id": "40d3a7a.4400bd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5097,
-        "y": 1742,
-        "z": "ed7c1675.7a56b",
+        "x": 5151.883331298828,
+        "y": 1771,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "95133e26.a5c4"
+                "2dbaf595.6cfed2"
             ]
         ]
     },
     {
-        "id": "7bf2c309.936484",
+        "id": "353377f9.20c718",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5089,
-        "y": 1797,
-        "z": "ed7c1675.7a56b",
+        "x": 5143.883331298828,
+        "y": 1826,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ebaf4cad.7f7ac"
+                "c19bb319.e0e2b8"
             ]
         ]
     },
     {
-        "id": "37200156.6e45ae",
+        "id": "f8f22501.0020d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5094,
-        "y": 1854,
-        "z": "ed7c1675.7a56b",
+        "x": 5148.883331298828,
+        "y": 1883,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3717e4c0.7e91fc"
+                "d551b07b.11f68"
             ]
         ]
     },
     {
-        "id": "4573661e.19551",
+        "id": "c7d66e95.fb47e",
         "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": 3128,
-        "y": 700,
-        "z": "ed7c1675.7a56b",
+        "x": 3182.883331298828,
+        "y": 729,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e3a931ba.d41978",
-                "cce98769.66d2f"
+                "4d8bbec2.c0db6",
+                "507d82bd.8807cc"
             ]
         ]
     },
     {
-        "id": "e3a931ba.d41978",
+        "id": "4d8bbec2.c0db6",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3342,
-        "y": 737,
-        "z": "ed7c1675.7a56b",
+        "x": 3396.883331298828,
+        "y": 766,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "83f7a2a0.47e4a"
+                "6524452d.4a2f94"
             ]
         ]
     },
     {
-        "id": "cce98769.66d2f",
+        "id": "507d82bd.8807cc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3344,
-        "y": 675,
-        "z": "ed7c1675.7a56b",
+        "x": 3398.883331298828,
+        "y": 704,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a3a1c771.fa4dc8"
+                "4b590d33.c81684"
             ]
         ]
     },
     {
-        "id": "83f7a2a0.47e4a",
+        "id": "6524452d.4a2f94",
         "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": 2922,
-        "y": 1980,
-        "z": "ed7c1675.7a56b",
+        "x": 2976.883331298828,
+        "y": 2009,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "b17cf12.c5b4e9",
-                "375f750c.523c3a"
+                "75800cfe.e64b04",
+                "28895848.af5c18"
             ]
         ]
     },
     {
-        "id": "b17cf12.c5b4e9",
+        "id": "75800cfe.e64b04",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3175,
-        "y": 2014,
-        "z": "ed7c1675.7a56b",
+        "x": 3229.883331298828,
+        "y": 2043,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "b574ded7.ea26d"
+                "34389e65.7f3f0a"
             ]
         ]
     },
     {
-        "id": "375f750c.523c3a",
+        "id": "28895848.af5c18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3175,
-        "y": 1958,
-        "z": "ed7c1675.7a56b",
+        "x": 3229.883331298828,
+        "y": 1987,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3eeb971b.8e101"
+                "4c94a377.c6d4e4"
             ]
         ]
     },
     {
-        "id": "b574ded7.ea26d",
+        "id": "34389e65.7f3f0a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3326,
-        "y": 2014,
-        "z": "ed7c1675.7a56b",
+        "x": 3380.883331298828,
+        "y": 2043,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "27c7cf1.51adcb",
+        "id": "ff717106.1f6f7",
         "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": 4202,
-        "y": 112,
-        "z": "ed7c1675.7a56b",
+        "x": 4256.883331298828,
+        "y": 141,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "e24e0a9e.a7db8",
+        "id": "98bc8f5e.55646",
         "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": 3610,
-        "y": 1571,
-        "z": "ed7c1675.7a56b",
+        "x": 3664.883331298828,
+        "y": 1600,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "6b14e6ca.05c05",
+        "id": "1901ad68.6869bb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3893,
-        "y": 369,
-        "z": "ed7c1675.7a56b",
+        "x": 3947.883331298828,
+        "y": 398,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "27c7cf1.51adcb",
-                "927e2807.47e1",
-                "51361643.15e97",
-                "7074e291.428a74",
-                "71f8cbde.7b70ec",
-                "41c50446.37f104",
-                "e5881b35.2a2bf8",
-                "ceaa1f2c.697ad"
+                "ff717106.1f6f7",
+                "f11c1dac.45c748",
+                "dc51dde.504a12",
+                "25f0cbb9.ff400c",
+                "c95c33ef.381fa8",
+                "7a0ef184.deb28",
+                "dd4c3392.e1b02",
+                "2a6ffb7c.8797f4"
             ]
         ]
     },
     {
-        "id": "3eeb971b.8e101",
+        "id": "4c94a377.c6d4e4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3326,
-        "y": 1957,
-        "z": "ed7c1675.7a56b",
+        "x": 3380.883331298828,
+        "y": 1986,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e24e0a9e.a7db8",
-                "881ac3d.2b73cc",
-                "c6f7c9bc.a78ea8",
-                "8f243ad6.97dd38",
-                "f942fe34.857118",
-                "51d22e16.357968",
-                "8caebf31.dc028",
-                "6ccc1a6d.d89cd4"
+                "98bc8f5e.55646",
+                "aa2473a.12d4d9",
+                "dfee532c.a1419",
+                "e52702af.314718",
+                "28a663c6.7433b4",
+                "c984548c.2e537",
+                "88e8f378.a2b808",
+                "1fda4b4a.2131e5"
             ]
         ]
     },
     {
-        "id": "f87bcfd0.50c8c",
+        "id": "d79079df.baf578",
         "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": 3564,
-        "y": 2256,
-        "z": "ed7c1675.7a56b",
+        "x": 3618.883331298828,
+        "y": 2285,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ab6e58b.3c55528",
+        "id": "45ccc628.f5551",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 3718,
-        "y": 2304,
-        "z": "ed7c1675.7a56b",
+        "x": 3772.883331298828,
+        "y": 2333,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "eff9a19.776a7e",
-                "ddb717fb.d9a6d8"
+                "6173b4db.203ce4",
+                "7f21396.e7ee248"
             ]
         ]
     },
     {
-        "id": "eff9a19.776a7e",
+        "id": "6173b4db.203ce4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4063.5,
-        "y": 2285,
-        "z": "ed7c1675.7a56b",
+        "x": 4118.383331298828,
+        "y": 2314,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "59a2ea1f.0d3f14"
+                "2b5ddf83.e8a168"
             ]
         ]
     },
     {
-        "id": "ddb717fb.d9a6d8",
+        "id": "7f21396.e7ee248",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4067.5,
-        "y": 2325,
-        "z": "ed7c1675.7a56b",
+        "x": 4122.383331298828,
+        "y": 2354,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "81b55fda.fb8e98"
+                "9fc151.f9cc46b"
             ]
         ]
     },
     {
-        "id": "59a2ea1f.0d3f14",
+        "id": "2b5ddf83.e8a168",
         "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": 4221.5,
-        "y": 2285,
-        "z": "ed7c1675.7a56b",
+        "x": 4276.383331298828,
+        "y": 2314,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "81b55fda.fb8e98",
+        "id": "9fc151.f9cc46b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4225,
-        "y": 2325,
-        "z": "ed7c1675.7a56b",
+        "x": 4279.883331298828,
+        "y": 2354,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1bcc30a0.546397",
-                "1eaaa262.028326"
+                "ec406c4.a093b1",
+                "ba32c60f.0ec53"
             ]
         ]
     },
     {
-        "id": "1bcc30a0.546397",
+        "id": "ec406c4.a093b1",
         "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": 4565,
-        "y": 2324,
-        "z": "ed7c1675.7a56b",
+        "x": 4619.883331298828,
+        "y": 2353,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "68a7db89.5a89fc",
+        "id": "650aeaf3.da502c",
         "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": 4423,
-        "y": 2282,
-        "z": "ed7c1675.7a56b",
+        "x": 4477.883331298828,
+        "y": 2311,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "1eaaa262.028326",
+        "id": "ba32c60f.0ec53",
         "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": 4494,
-        "y": 2373,
-        "z": "ed7c1675.7a56b",
+        "x": 4548.883331298828,
+        "y": 2402,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "71f36947.989c9",
+        "id": "c8295377.ff6158",
         "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": 3119,
-        "y": 640,
-        "z": "ed7c1675.7a56b",
+        "x": 3173.883331298828,
+        "y": 669,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "24508e5.8723172",
+        "id": "17d3b71c.0a74f9",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3714,
-        "y": 326,
-        "z": "ed7c1675.7a56b",
+        "x": 3768.883331298828,
+        "y": 355,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "f3eaab4d.9a827",
+        "id": "12dd212a.e5931f",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3271,
-        "y": 1904,
-        "z": "ed7c1675.7a56b",
+        "x": 3325.883331298828,
+        "y": 1933,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a3a1c771.fa4dc8",
+        "id": "4b590d33.c81684",
         "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": 3450,
-        "y": 488,
-        "z": "ed7c1675.7a56b",
+        "x": 3504.883331298828,
+        "y": 517,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6921df6d.0bad7",
-                "5859006e.3869c8"
+                "e68f7957.57ea98",
+                "90c8120e.55a8c8"
             ]
         ]
     },
     {
-        "id": "5859006e.3869c8",
+        "id": "90c8120e.55a8c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3692,
-        "y": 1077,
-        "z": "ed7c1675.7a56b",
+        "x": 3746.883331298828,
+        "y": 1106,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6a1db5bd.d7e224"
+                "5f92c041.e2a22"
             ]
         ]
     },
     {
-        "id": "6921df6d.0bad7",
+        "id": "e68f7957.57ea98",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3686,
-        "y": 368,
-        "z": "ed7c1675.7a56b",
+        "x": 3740.883331298828,
+        "y": 397,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6b14e6ca.05c05"
+                "1901ad68.6869bb"
             ]
         ]
     },
     {
-        "id": "6a1db5bd.d7e224",
+        "id": "5f92c041.e2a22",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3850,
-        "y": 1076,
-        "z": "ed7c1675.7a56b",
+        "x": 3904.883331298828,
+        "y": 1105,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e8ac2c73.115cc",
-                "de077050.d3ab3",
-                "d36a1b80.8692c8",
-                "73f78d36.ab931c",
-                "8ec0e69e.0bdfb8",
-                "4004366.ff0b5c8"
+                "eb5cd95b.b46698",
+                "bcb9498.a9205b8",
+                "24e13fd8.afe2d8",
+                "57e5431f.63be4c",
+                "8b688219.8ed198",
+                "9c0b0957.1e6c48"
             ]
         ]
     },
     {
-        "id": "de077050.d3ab3",
+        "id": "bcb9498.a9205b8",
         "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": 4114,
-        "y": 959,
-        "z": "ed7c1675.7a56b",
+        "x": 4168.883331298828,
+        "y": 988,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "8ec0e69e.0bdfb8",
+        "id": "8b688219.8ed198",
         "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.cll-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`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4195,
-        "y": 1274,
-        "z": "ed7c1675.7a56b",
+        "x": 4249.883331298828,
+        "y": 1303,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a8d20b89.8deb88",
-                "ebe8f709.819288"
+                "4ea88210.ceec44",
+                "cd5b1128.4dbb9"
             ]
         ]
     },
     {
-        "id": "a8d20b89.8deb88",
+        "id": "4ea88210.ceec44",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4504.5,
-        "y": 1243,
-        "z": "ed7c1675.7a56b",
+        "x": 4559.383331298828,
+        "y": 1272,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f56a0e73.901ac"
+                "9646de5b.fe3c7"
             ]
         ]
     },
     {
-        "id": "ebe8f709.819288",
+        "id": "cd5b1128.4dbb9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4509.5,
-        "y": 1308,
-        "z": "ed7c1675.7a56b",
+        "x": 4564.383331298828,
+        "y": 1337,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8bcbb353.d66038"
+                "55735b11.27f424"
             ]
         ]
     },
     {
-        "id": "f56a0e73.901ac",
+        "id": "9646de5b.fe3c7",
         "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": 4680.5,
-        "y": 1243,
-        "z": "ed7c1675.7a56b",
+        "x": 4735.383331298828,
+        "y": 1272,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "8bcbb353.d66038",
+        "id": "55735b11.27f424",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4676,
-        "y": 1308,
-        "z": "ed7c1675.7a56b",
+        "x": 4730.883331298828,
+        "y": 1337,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d36a1b80.8692c8",
+        "id": "24e13fd8.afe2d8",
         "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": 4052,
-        "y": 1007,
-        "z": "ed7c1675.7a56b",
+        "x": 4106.883331298828,
+        "y": 1036,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "73f78d36.ab931c",
+        "id": "57e5431f.63be4c",
         "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": 4078,
-        "y": 1124,
-        "z": "ed7c1675.7a56b",
+        "x": 4132.883331298828,
+        "y": 1153,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e0243648.484bc",
-                "e14aa09.d5d416",
-                "5447b1d0.03a8b"
+                "1d187a80.e65b15",
+                "370c15e3.9b5fca",
+                "703dc49a.960884"
             ]
         ]
     },
     {
-        "id": "e0243648.484bc",
+        "id": "1d187a80.e65b15",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4273.5001220703125,
-        "y": 1076,
-        "z": "ed7c1675.7a56b",
+        "x": 4328.383453369141,
+        "y": 1105,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "94135ed.07ea02"
+                "5c6509dd.e3a81"
             ]
         ]
     },
     {
-        "id": "e14aa09.d5d416",
+        "id": "370c15e3.9b5fca",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4265.5001220703125,
-        "y": 1131,
-        "z": "ed7c1675.7a56b",
+        "x": 4320.383453369141,
+        "y": 1160,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1628394b.83cd8f"
+                "ccfe239.f2e7de"
             ]
         ]
     },
     {
-        "id": "94135ed.07ea02",
+        "id": "5c6509dd.e3a81",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4417.8824462890625,
-        "y": 1075.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 4472.765777587891,
+        "y": 1104.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "fdedf72e.2dd36"
+                "35d4ca24.cf236e"
             ]
         ]
     },
     {
-        "id": "fdedf72e.2dd36",
+        "id": "35d4ca24.cf236e",
         "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": 4602,
-        "y": 1074,
-        "z": "ed7c1675.7a56b",
+        "x": 4656.883331298828,
+        "y": 1103,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f99d2e19.85b668"
+                "c8705d75.001f7"
             ]
         ]
     },
     {
-        "id": "f99d2e19.85b668",
+        "id": "c8705d75.001f7",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4797,
-        "y": 1074,
-        "z": "ed7c1675.7a56b",
+        "x": 4851.883331298828,
+        "y": 1103,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ff4cc7a8.15eb18"
+                "b9376422.2a71"
             ]
         ]
     },
     {
-        "id": "5447b1d0.03a8b",
+        "id": "703dc49a.960884",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4270.5001220703125,
-        "y": 1188,
-        "z": "ed7c1675.7a56b",
+        "x": 4325.383453369141,
+        "y": 1217,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "74603a77.be9d34"
+                "ece92d94.dd0ac"
             ]
         ]
     },
     {
-        "id": "74603a77.be9d34",
+        "id": "ece92d94.dd0ac",
         "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": 4422.5001220703125,
-        "y": 1189,
-        "z": "ed7c1675.7a56b",
+        "x": 4477.383453369141,
+        "y": 1218,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "1628394b.83cd8f",
+        "id": "ccfe239.f2e7de",
         "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": 4433.5001220703125,
-        "y": 1132,
-        "z": "ed7c1675.7a56b",
+        "x": 4488.383453369141,
+        "y": 1161,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "e8ac2c73.115cc",
+        "id": "eb5cd95b.b46698",
         "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": 4109,
-        "y": 899,
-        "z": "ed7c1675.7a56b",
+        "x": 4163.883331298828,
+        "y": 928,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ff4cc7a8.15eb18",
+        "id": "b9376422.2a71",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5000,
-        "y": 1078,
-        "z": "ed7c1675.7a56b",
+        "x": 5054.883331298828,
+        "y": 1107,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8469558b.e4d748"
+                "d2480516.2fc378"
             ]
         ]
     },
     {
-        "id": "cf8a4c78.37fe58",
+        "id": "9cb817ae.cef538",
         "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": 5385,
-        "y": 1091,
-        "z": "ed7c1675.7a56b",
+        "x": 5439.883331298828,
+        "y": 1120,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "44cef850.3e64a",
-                "9337c3a8.6f7408",
-                "6a44b1b.7cb45d"
+                "a79825bb.dff1f8",
+                "1395d5f.298062a",
+                "7903ca2c.aa5cc4"
             ]
         ]
     },
     {
-        "id": "8469558b.e4d748",
+        "id": "d2480516.2fc378",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5179,
-        "y": 1078,
-        "z": "ed7c1675.7a56b",
+        "x": 5233.883331298828,
+        "y": 1107,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "82428162.54c128",
-                "cf8a4c78.37fe58"
+                "fbf9e6b6.15b5c",
+                "9cb817ae.cef538"
             ]
         ]
     },
     {
-        "id": "82428162.54c128",
+        "id": "fbf9e6b6.15b5c",
         "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": 5415,
-        "y": 1039,
-        "z": "ed7c1675.7a56b",
+        "x": 5469.883331298828,
+        "y": 1068,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "44cef850.3e64a",
+        "id": "a79825bb.dff1f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5595,
-        "y": 1082,
-        "z": "ed7c1675.7a56b",
+        "x": 5649.883331298828,
+        "y": 1111,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ffb7eeb1.dda348"
+                "c7dce557.6dded"
             ]
         ]
     },
     {
-        "id": "9337c3a8.6f7408",
+        "id": "1395d5f.298062a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5587,
-        "y": 1137,
-        "z": "ed7c1675.7a56b",
+        "x": 5641.883331298828,
+        "y": 1166,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "28235dd8.9620aa"
+                "598e647b.5837b4"
             ]
         ]
     },
     {
-        "id": "6a44b1b.7cb45d",
+        "id": "7903ca2c.aa5cc4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5592,
-        "y": 1194,
-        "z": "ed7c1675.7a56b",
+        "x": 5646.883331298828,
+        "y": 1223,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a95b4d04.8ebfb"
+                "e6c7a6e7.b2f038"
             ]
         ]
     },
     {
-        "id": "a95b4d04.8ebfb",
+        "id": "e6c7a6e7.b2f038",
         "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": 5744,
-        "y": 1195,
-        "z": "ed7c1675.7a56b",
+        "x": 5798.883331298828,
+        "y": 1224,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "28235dd8.9620aa",
+        "id": "598e647b.5837b4",
         "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": 5755,
-        "y": 1140,
-        "z": "ed7c1675.7a56b",
+        "x": 5809.883331298828,
+        "y": 1169,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ffb7eeb1.dda348",
+        "id": "c7dce557.6dded",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5739.38232421875,
-        "y": 1079.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 5794.265655517578,
+        "y": 1108.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "eb1ea22e.dc12c"
+                "2cfbc0b6.6ae748"
             ]
         ]
     },
     {
-        "id": "eb1ea22e.dc12c",
+        "id": "2cfbc0b6.6ae748",
         "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": 5954,
-        "y": 1076,
-        "z": "ed7c1675.7a56b",
+        "x": 6008.883331298828,
+        "y": 1105,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "47e1e7c7.6cadf",
+        "id": "fca9cd7.3028eb",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3728,
-        "y": 1017,
-        "z": "ed7c1675.7a56b",
+        "x": 3782.883331298828,
+        "y": 1046,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "b3842f71.731b38",
+        "id": "2c3b3231.83c2be",
         "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": 2290,
-        "y": 744,
-        "z": "ed7c1675.7a56b",
+        "x": 2344.883331298828,
+        "y": 773,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "fe4cd4cf.21da1",
-                "8d3265c3.ddab38"
+                "81a947d8.a13a68",
+                "b480f4ae.d59fb8"
             ]
         ]
     },
     {
-        "id": "8d3265c3.ddab38",
+        "id": "b480f4ae.d59fb8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2697,
-        "y": 762,
-        "z": "ed7c1675.7a56b",
+        "x": 2751.883331298828,
+        "y": 791,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "418df61.fe2be08"
+                "23d2aee5.d5b2fa"
             ]
         ]
     },
     {
-        "id": "fe4cd4cf.21da1",
+        "id": "81a947d8.a13a68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2697,
-        "y": 707,
-        "z": "ed7c1675.7a56b",
+        "x": 2751.883331298828,
+        "y": 736,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8b0dea0b.e78e98"
+                "773948cf.a686e8"
             ]
         ]
     },
     {
-        "id": "8b0dea0b.e78e98",
+        "id": "773948cf.a686e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2853,
-        "y": 705,
-        "z": "ed7c1675.7a56b",
+        "x": 2907.883331298828,
+        "y": 734,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "71f36947.989c9",
-                "4573661e.19551"
+                "c8295377.ff6158",
+                "c7d66e95.fb47e"
             ]
         ]
     },
     {
-        "id": "418df61.fe2be08",
+        "id": "23d2aee5.d5b2fa",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2830,
-        "y": 763,
-        "z": "ed7c1675.7a56b",
+        "x": 2884.883331298828,
+        "y": 792,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5c62cbf5.952894",
+        "id": "7714415.bcb45c",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 1007,
-        "y": 179,
-        "z": "ed7c1675.7a56b",
+        "x": 1061.8833312988281,
+        "y": 208,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a7fd19a0.011a5",
+        "id": "79981366.647454",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 4124,
-        "y": 597,
-        "z": "ed7c1675.7a56b",
+        "x": 4178.883331298828,
+        "y": 626,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "41c50446.37f104",
+        "id": "7a0ef184.deb28",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4184,
-        "y": 636,
-        "z": "ed7c1675.7a56b",
+        "x": 4238.883331298828,
+        "y": 665,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "4957906b.cb3908",
+        "id": "2cf2ff05.5ecb98",
         "type": "set",
         "name": "unset leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",
         "comments": "",
-        "x": 1000,
-        "y": 87,
-        "z": "ed7c1675.7a56b",
+        "x": 1054.8833312988281,
+        "y": 116,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "5277b309.13aef4",
+        "id": "7871357e.92d2f4",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 3536,
-        "y": 2113,
-        "z": "ed7c1675.7a56b",
+        "x": 3590.883331298828,
+        "y": 2142,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "51d22e16.357968",
+        "id": "c984548c.2e537",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3592,
-        "y": 2162,
-        "z": "ed7c1675.7a56b",
+        "x": 3646.883331298828,
+        "y": 2191,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "8191f581.e3e888",
+        "id": "efee660.b5b7f18",
         "type": "set",
         "name": "unset root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",
         "comments": "",
-        "x": 1000,
-        "y": 126,
-        "z": "ed7c1675.7a56b",
+        "x": 1054.8833312988281,
+        "y": 155,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "25a3d5e5.55ea62",
+        "id": "ff64d6f0.1d24e",
         "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": 1031,
-        "y": 227,
-        "z": "ed7c1675.7a56b",
+        "x": 1085.8833312988281,
+        "y": 256,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "624a734b.81957c",
+        "id": "c19ef147.be92d8",
         "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": 241,
-        "y": 702,
-        "z": "ed7c1675.7a56b",
+        "x": 295.8833312988281,
+        "y": 731,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "2ff4bd45.763852",
-                "237ce68a.9b5a2a",
-                "86bae4d8.c51f3"
+                "4acbe821.0c1ff8",
+                "63a107d4.a006c8",
+                "4bb92513.9b1ebc"
             ]
         ]
     },
     {
-        "id": "2ff4bd45.763852",
+        "id": "4acbe821.0c1ff8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 460,
-        "y": 640,
-        "z": "ed7c1675.7a56b",
+        "x": 514.8833312988281,
+        "y": 669,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "2f347c57.a92144"
+                "d6a121aa.ecf888"
             ]
         ]
     },
     {
-        "id": "237ce68a.9b5a2a",
+        "id": "63a107d4.a006c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 469.490966796875,
-        "y": 682.5740356445312,
-        "z": "ed7c1675.7a56b",
+        "x": 524.3742980957031,
+        "y": 711.5740356445312,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
-            [
-                "196b18f9.87f4a7"
-            ]
+            []
         ]
     },
     {
-        "id": "86bae4d8.c51f3",
+        "id": "4bb92513.9b1ebc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 458,
-        "y": 729,
-        "z": "ed7c1675.7a56b",
+        "x": 512.8833312988281,
+        "y": 758,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "d6f02bd7.9f988"
+                "f58f94a6.d7fb9"
             ]
         ]
     },
     {
-        "id": "2f347c57.a92144",
+        "id": "d6a121aa.ecf888",
         "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": 657,
-        "y": 636,
-        "z": "ed7c1675.7a56b",
+        "x": 711.8833312988281,
+        "y": 665,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "408bfafb.b2f244"
+                "46606d75.f5af5c"
             ]
         ]
     },
     {
-        "id": "196b18f9.87f4a7",
-        "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": 623.0623779296875,
-        "y": 685.8597717285156,
-        "z": "ed7c1675.7a56b",
-        "wires": []
-    },
-    {
-        "id": "d6f02bd7.9f988",
+        "id": "f58f94a6.d7fb9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 627,
-        "y": 730,
-        "z": "ed7c1675.7a56b",
+        "x": 681.8833312988281,
+        "y": 759,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "408bfafb.b2f244",
+        "id": "46606d75.f5af5c",
         "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": 880.33349609375,
-        "y": 635.9999389648438,
-        "z": "ed7c1675.7a56b",
+        "x": 935.2168273925781,
+        "y": 664.9999389648438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7d8f8b2e.4aa30c"
+                "1dffeedd.2e39d1"
             ]
         ]
     },
     {
-        "id": "7d8f8b2e.4aa30c",
+        "id": "1dffeedd.2e39d1",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1081.0001335144043,
-        "y": 637.000020980835,
-        "z": "ed7c1675.7a56b",
+        "x": 1135.8834648132324,
+        "y": 666.000020980835,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "bd2be559.7e491"
+                "5eeac4ab.784bec"
             ]
         ]
     },
     {
-        "id": "bd2be559.7e491",
+        "id": "5eeac4ab.784bec",
         "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": 211,
-        "y": 899,
-        "z": "ed7c1675.7a56b",
+        "x": 265.8833312988281,
+        "y": 928,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "97323d62.80248",
-                "afdba634.5389a8",
-                "c784d901.2500c8"
+                "93ffca07.c36c6",
+                "a6155e5c.4a2e4",
+                "edf3ae2.0898ad"
             ]
         ]
     },
     {
-        "id": "97323d62.80248",
+        "id": "93ffca07.c36c6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 419,
-        "y": 863,
-        "z": "ed7c1675.7a56b",
+        "x": 473.8833312988281,
+        "y": 892,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "dc950dad.bba8c8"
+                "41f16b19.4ea28c"
             ]
         ]
     },
     {
-        "id": "afdba634.5389a8",
+        "id": "a6155e5c.4a2e4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 419.490966796875,
-        "y": 908.5740356445312,
-        "z": "ed7c1675.7a56b",
+        "x": 474.3742980957031,
+        "y": 937.5740356445312,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
-            [
-                "f09199a5.a037f"
-            ]
+            []
         ]
     },
     {
-        "id": "c784d901.2500c8",
+        "id": "edf3ae2.0898ad",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 417,
-        "y": 952,
-        "z": "ed7c1675.7a56b",
+        "x": 471.8833312988281,
+        "y": 981,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a903bba8.c7f45"
+                "77488207.b4a2f4"
             ]
         ]
     },
     {
-        "id": "f09199a5.a037f",
-        "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": 582.0623779296875,
-        "y": 908.8597717285156,
-        "z": "ed7c1675.7a56b",
-        "wires": []
-    },
-    {
-        "id": "a903bba8.c7f45",
+        "id": "77488207.b4a2f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 586,
-        "y": 953,
-        "z": "ed7c1675.7a56b",
+        "x": 640.8833312988281,
+        "y": 982,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "c4e5acdc.5eea4",
+        "id": "1853bc71.11bc54",
         "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": 558,
-        "y": 1447,
-        "z": "ed7c1675.7a56b",
+        "x": 612.8833312988281,
+        "y": 1476,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f2e2cc22.a529f"
+                "aa99b60e.a0ae8"
             ]
         ]
     },
     {
-        "id": "f2e2cc22.a529f",
+        "id": "aa99b60e.a0ae8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 761,
-        "y": 1459,
-        "z": "ed7c1675.7a56b",
+        "x": 815.8833312988281,
+        "y": 1488,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "c09b72f6.aeae98"
+                "6b5b67d6.d9cff8"
             ]
         ]
     },
     {
-        "id": "c09b72f6.aeae98",
+        "id": "6b5b67d6.d9cff8",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 927,
-        "y": 1456,
-        "z": "ed7c1675.7a56b",
+        "x": 981.8833312988281,
+        "y": 1485,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "bfe2cfaf.5416a"
+                "c9be5883.2f43"
             ]
         ]
     },
     {
-        "id": "bfe2cfaf.5416a",
+        "id": "c9be5883.2f43",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1088,
-        "y": 1453,
-        "z": "ed7c1675.7a56b",
+        "x": 1142.8833312988281,
+        "y": 1482,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ed44bd0b.bb6278",
-                "85af841c.633c5",
-                "785dd3f1.f249ac",
-                "b8d52cff.f0dcb",
-                "4915b2e4.5fd2dc"
+                "8328946b.83ccf",
+                "70436354.fbd2a4",
+                "71db6bb7.f92dd4",
+                "a3af61e2.8efbd8",
+                "1dbcecbe.b5c9a3"
             ]
         ]
     },
     {
-        "id": "85af841c.633c5",
+        "id": "70436354.fbd2a4",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1292,
-        "y": 1411,
-        "z": "ed7c1675.7a56b",
+        "x": 1346.8833312988281,
+        "y": 1440,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ed44bd0b.bb6278",
+        "id": "8328946b.83ccf",
         "type": "save",
         "name": "get uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1289,
-        "y": 1456,
-        "z": "ed7c1675.7a56b",
+        "x": 1343.8833312988281,
+        "y": 1485,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6b32d7eb.72211",
-                "7343128c.f923b4",
-                "b9b05d3.e5ae12"
+                "95cc35e2.dbd57",
+                "6243e8b2.6e7d68",
+                "ea238384.cd0de8"
             ]
         ]
     },
     {
-        "id": "7343128c.f923b4",
+        "id": "6243e8b2.6e7d68",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1484.490966796875,
-        "y": 1429.573974609375,
-        "z": "ed7c1675.7a56b",
+        "x": 1539.3742980957031,
+        "y": 1458.573974609375,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "5dcee0f6.9162a8"
+                "60cc7ad4.175214"
             ]
         ]
     },
     {
-        "id": "b9b05d3.e5ae12",
+        "id": "ea238384.cd0de8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1480,
-        "y": 1473.9999389648438,
-        "z": "ed7c1675.7a56b",
+        "x": 1534.8833312988281,
+        "y": 1502.9999389648438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "b7ed6a74.25237"
+                "33a586e8.574ea2"
             ]
         ]
     },
     {
-        "id": "5dcee0f6.9162a8",
+        "id": "60cc7ad4.175214",
         "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": 1647.0625,
-        "y": 1428.8596801757812,
-        "z": "ed7c1675.7a56b",
+        "x": 1701.9458312988281,
+        "y": 1457.8596801757812,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "b7ed6a74.25237",
+        "id": "33a586e8.574ea2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1648,
-        "y": 1473.9999389648438,
-        "z": "ed7c1675.7a56b",
+        "x": 1702.8833312988281,
+        "y": 1502.9999389648438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "dfdfa822.c47e1",
+        "id": "3ed2826e.143bbe",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1650,
-        "y": 1520.9999389648438,
-        "z": "ed7c1675.7a56b",
+        "x": 1704.8833312988281,
+        "y": 1549.9999389648438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6b32d7eb.72211",
+        "id": "95cc35e2.dbd57",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1481,
-        "y": 1520.9999389648438,
-        "z": "ed7c1675.7a56b",
+        "x": 1535.8833312988281,
+        "y": 1549.9999389648438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "dfdfa822.c47e1"
+                "3ed2826e.143bbe"
             ]
         ]
     },
     {
-        "id": "9ed7a6be.5472c",
+        "id": "a3b35ff6.7d4a88",
         "type": "switchNode",
         "name": "switch conn type",
         "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 170.5,
-        "y": 1118,
-        "z": "ed7c1675.7a56b",
+        "x": 225.38333129882812,
+        "y": 1147,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3e9a846b.aac024",
-                "fd2eac9f.aa3be8",
-                "81d85b97.ec18c"
+                "53e42336.cf6874",
+                "64e5ac9.b8c59d4",
+                "29d673d9.3ef8bc"
             ]
         ]
     },
     {
-        "id": "3d4d11fc.e19976",
+        "id": "fdb5b362.28d2e8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 281.5,
-        "y": 1474,
-        "z": "ed7c1675.7a56b",
+        "x": 336.3833312988281,
+        "y": 1503,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "3e9a846b.aac024",
+        "id": "53e42336.cf6874",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 156.5,
-        "y": 1364,
-        "z": "ed7c1675.7a56b",
+        "x": 211.38333129882812,
+        "y": 1393,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "186f4361.0093b5"
+                "2d911faf.b625f"
             ]
         ]
     },
     {
-        "id": "fd2eac9f.aa3be8",
+        "id": "64e5ac9.b8c59d4",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 157.5,
-        "y": 1422,
-        "z": "ed7c1675.7a56b",
+        "x": 212.38333129882812,
+        "y": 1451,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a8f57470.dafb1"
+                "c8a49fba.48732"
             ]
         ]
     },
     {
-        "id": "81d85b97.ec18c",
+        "id": "29d673d9.3ef8bc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 159.5,
-        "y": 1476,
-        "z": "ed7c1675.7a56b",
+        "x": 214.38333129882812,
+        "y": 1505,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3d4d11fc.e19976"
+                "fdb5b362.28d2e8"
             ]
         ]
     },
     {
-        "id": "17f45567.72d3f3",
+        "id": "893647bf.8d35f8",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 1265,
-        "y": 1684,
-        "z": "ed7c1675.7a56b",
+        "x": 1319.8833312988281,
+        "y": 1713,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "785dd3f1.f249ac",
+        "id": "71db6bb7.f92dd4",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1356,
-        "y": 1738,
-        "z": "ed7c1675.7a56b",
+        "x": 1410.8833312988281,
+        "y": 1767,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a8f57470.dafb1",
+        "id": "c8a49fba.48732",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 273.5,
-        "y": 1418,
-        "z": "ed7c1675.7a56b",
+        "x": 328.3833312988281,
+        "y": 1447,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6d0b5941.55c8f8",
-                "c4e5acdc.5eea4",
-                "3e47dbd3.f7afc4",
-                "c378a6a3.2e4c8",
-                "901c32b.8d67fd",
-                "d142c0f2.700e98",
-                "b2e88ff.3380b7",
-                "3026fc23.0fd5f4",
-                "f24a5646.1c02c8",
-                "db09832f.86c758",
-                "3c14b8ea.b96268",
-                "c7cb304b.f39168"
+                "c9ed31d4.2a59a",
+                "1853bc71.11bc54",
+                "e2c4a442.f42cf",
+                "7b94a56a.0cc0c4",
+                "14d69ea3.c37079",
+                "e39ba7bd.aed5d8",
+                "9e9fd2d9.fce4a8",
+                "3e44ba6b.3875e6",
+                "de368aef.16cb",
+                "61a182f0.95ec2c",
+                "fae7aeca.a940b8",
+                "f92bafd0.7c69c8"
             ]
         ]
     },
     {
-        "id": "186f4361.0093b5",
+        "id": "2d911faf.b625f",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 286.5,
-        "y": 1360,
-        "z": "ed7c1675.7a56b",
+        "x": 341.3833312988281,
+        "y": 1389,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "c4e5acdc.5eea4",
-                "b5d90017.45ce98",
-                "913d2a70.ccfd3",
-                "c378a6a3.2e4c8",
-                "901c32b.8d67fd",
-                "d142c0f2.700e98",
-                "b2e88ff.3380b7",
-                "3026fc23.0fd5f4",
-                "f24a5646.1c02c8",
-                "db09832f.86c758",
-                "3c14b8ea.b96268",
-                "c7cb304b.f39168"
+                "1853bc71.11bc54",
+                "30a75a3e.13e116",
+                "878444f9.a47b7",
+                "7b94a56a.0cc0c4",
+                "14d69ea3.c37079",
+                "e39ba7bd.aed5d8",
+                "9e9fd2d9.fce4a8",
+                "3e44ba6b.3875e6",
+                "de368aef.16cb",
+                "61a182f0.95ec2c",
+                "fae7aeca.a940b8",
+                "f92bafd0.7c69c8"
             ]
         ]
     },
     {
-        "id": "b5d90017.45ce98",
+        "id": "30a75a3e.13e116",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 577.5,
-        "y": 1240,
-        "z": "ed7c1675.7a56b",
+        "x": 632.3833312988281,
+        "y": 1269,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "6d0b5941.55c8f8",
+        "id": "c9ed31d4.2a59a",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 594.5,
-        "y": 1334,
-        "z": "ed7c1675.7a56b",
+        "x": 649.3833312988281,
+        "y": 1363,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "c378a6a3.2e4c8",
+        "id": "7b94a56a.0cc0c4",
         "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": 521,
-        "y": 1703,
-        "z": "ed7c1675.7a56b",
+        "x": 575.8833312988281,
+        "y": 1732,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3613e1a4.3cd206"
+                "bd67d795.2e839"
             ]
         ]
     },
     {
-        "id": "3613e1a4.3cd206",
+        "id": "bd67d795.2e839",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 753,
-        "y": 1702,
-        "z": "ed7c1675.7a56b",
+        "x": 807.8833312988281,
+        "y": 1731,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "c46d21fc.7c5088"
+                "148b77ab.48b7a"
             ]
         ]
     },
     {
-        "id": "c46d21fc.7c5088",
+        "id": "148b77ab.48b7a",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 965,
-        "y": 1703,
-        "z": "ed7c1675.7a56b",
+        "x": 1019.8833312988281,
+        "y": 1732,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "41d3d62e.c810a8"
+                "90ccd6ae.a26198"
             ]
         ]
     },
     {
-        "id": "41d3d62e.c810a8",
+        "id": "90ccd6ae.a26198",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 221,
-        "y": 1859,
-        "z": "ed7c1675.7a56b",
+        "x": 275.8833312988281,
+        "y": 1888,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "24bb38a6.cf0a88",
-                "80203aa0.6c8a6"
+                "8f4c1c14.35a72",
+                "c6a7aee9.6724"
             ]
         ]
     },
     {
-        "id": "80203aa0.6c8a6",
+        "id": "c6a7aee9.6724",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 456,
-        "y": 1846,
-        "z": "ed7c1675.7a56b",
+        "x": 510.8833312988281,
+        "y": 1875,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "24bb38a6.cf0a88",
+        "id": "8f4c1c14.35a72",
         "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": 446,
-        "y": 1907,
-        "z": "ed7c1675.7a56b",
+        "x": 500.8833312988281,
+        "y": 1936,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "e7df9a86.a02dd8",
-                "d754cb82.42f37",
-                "80509f91.59bce8"
+                "2e648939.1db066",
+                "6fc34533.3f02e4",
+                "f4ca0a98.2172d"
             ]
         ]
     },
     {
-        "id": "d754cb82.42f37",
+        "id": "6fc34533.3f02e4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 659.490966796875,
-        "y": 1891.5740356445312,
-        "z": "ed7c1675.7a56b",
+        "x": 714.3742980957031,
+        "y": 1920.5740356445312,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "31b91fbf.39fff8"
+                "24a8c225.12e4ae"
             ]
         ]
     },
     {
-        "id": "80509f91.59bce8",
+        "id": "f4ca0a98.2172d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 655,
-        "y": 1936,
-        "z": "ed7c1675.7a56b",
+        "x": 709.8833312988281,
+        "y": 1965,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "312541a.87b29be"
+                "a2a9b29c.7bdb18"
             ]
         ]
     },
     {
-        "id": "e7df9a86.a02dd8",
+        "id": "2e648939.1db066",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 657,
-        "y": 1996,
-        "z": "ed7c1675.7a56b",
+        "x": 711.8833312988281,
+        "y": 2025,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f19203b2.563a88"
+                "6e035263.0ab9c4"
             ]
         ]
     },
     {
-        "id": "31b91fbf.39fff8",
+        "id": "24a8c225.12e4ae",
         "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": 822.0625,
-        "y": 1890.8597412109375,
-        "z": "ed7c1675.7a56b",
+        "x": 876.9458312988281,
+        "y": 1919.8597412109375,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "312541a.87b29be",
+        "id": "a2a9b29c.7bdb18",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 823,
-        "y": 1936,
-        "z": "ed7c1675.7a56b",
+        "x": 877.8833312988281,
+        "y": 1965,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "f19203b2.563a88",
+        "id": "6e035263.0ab9c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 826,
-        "y": 1995,
-        "z": "ed7c1675.7a56b",
+        "x": 880.8833312988281,
+        "y": 2024,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "70164d90.2f08c4",
-                "27824a25.86f05e"
+                "fc704734.f5a92",
+                "534cefd0.094168"
             ]
         ]
     },
     {
-        "id": "b2e88ff.3380b7",
+        "id": "9e9fd2d9.fce4a8",
         "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.connectivity.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.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.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": 225,
-        "y": 2494,
-        "z": "ed7c1675.7a56b",
+        "x": 279.8833312988281,
+        "y": 2523,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "3026fc23.0fd5f4",
+        "id": "3e44ba6b.3875e6",
         "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.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.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.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": 368,
-        "y": 2554,
-        "z": "ed7c1675.7a56b",
+        "x": 422.8833312988281,
+        "y": 2583,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a9d1707f.7a88c8",
-                "8ab460b7.633638"
+                "b4c4bd8d.d5bdc",
+                "c813638c.89d0f"
             ]
         ]
     },
     {
-        "id": "a9d1707f.7a88c8",
+        "id": "b4c4bd8d.d5bdc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 680.5,
-        "y": 2531,
-        "z": "ed7c1675.7a56b",
+        "x": 735.3833312988281,
+        "y": 2560,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "8ab460b7.633638",
+        "id": "c813638c.89d0f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 684.5,
-        "y": 2571,
-        "z": "ed7c1675.7a56b",
+        "x": 739.3833312988281,
+        "y": 2600,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7ddc0654.bb96f8"
+                "3e668730.81c5e8"
             ]
         ]
     },
     {
-        "id": "a1d8045c.1b61e8",
+        "id": "1c6aee6c.a3a53a",
         "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": 860.5,
-        "y": 2535,
-        "z": "ed7c1675.7a56b",
+        "x": 915.3833312988281,
+        "y": 2564,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "7ddc0654.bb96f8",
+        "id": "3e668730.81c5e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 876,
-        "y": 2589,
-        "z": "ed7c1675.7a56b",
+        "x": 930.8833312988281,
+        "y": 2618,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1eddd66c.da478a"
+                "e6168d7c.f871d"
             ]
         ]
     },
     {
-        "id": "cee3e55d.189dc",
+        "id": "59cef6d7.b8a21",
         "type": "save",
         "name": "update vpn-binding resource (aka. OTN ) 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\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1171.5,
-        "y": 2558,
-        "z": "ed7c1675.7a56b",
+        "x": 1226.3833312988281,
+        "y": 2587,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "bb915427.f0582",
+        "id": "b5303ab1.d78928",
         "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": 2638.5,
-        "y": 1909,
-        "z": "ed7c1675.7a56b",
+        "x": 2693.383331298828,
+        "y": 1938,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "1eddd66c.da478a",
+        "id": "e6168d7c.f871d",
         "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='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1133.5,
-        "y": 2600,
-        "z": "ed7c1675.7a56b",
+        "x": 1188.3833312988281,
+        "y": 2629,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "913d2a70.ccfd3",
+        "id": "878444f9.a47b7",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 543.5,
-        "y": 1278,
-        "z": "ed7c1675.7a56b",
+        "x": 598.3833312988281,
+        "y": 1307,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "3e47dbd3.f7afc4",
+        "id": "e2c4a442.f42cf",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 556.5,
-        "y": 1374,
-        "z": "ed7c1675.7a56b",
+        "x": 611.3833312988281,
+        "y": 1403,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "e5881b35.2a2bf8",
+        "id": "dd4c3392.e1b02",
         "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": 4293,
-        "y": 550,
-        "z": "ed7c1675.7a56b",
+        "x": 4347.883331298828,
+        "y": 579,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4004366.ff0b5c8",
+        "id": "9c0b0957.1e6c48",
         "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": 4196,
-        "y": 1369,
-        "z": "ed7c1675.7a56b",
+        "x": 4250.883331298828,
+        "y": 1398,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "8caebf31.dc028",
+        "id": "88e8f378.a2b808",
         "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": 3690,
-        "y": 2041,
-        "z": "ed7c1675.7a56b",
+        "x": 3744.883331298828,
+        "y": 2070,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc950dad.bba8c8",
+        "id": "41f16b19.4ea28c",
         "type": "switchNode",
         "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 791,
-        "y": 849,
-        "z": "ed7c1675.7a56b",
+        "x": 845.8833312988281,
+        "y": 878,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "28d7875f.122df",
-                "47ffeb93.7b808c"
+                "7bf4aa70.c75d74",
+                "a798281b.2c68d8"
             ]
         ]
     },
     {
-        "id": "28d7875f.122df",
+        "id": "7bf4aa70.c75d74",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1154,
-        "y": 872,
-        "z": "ed7c1675.7a56b",
+        "x": 1208.8833312988281,
+        "y": 901,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f3fb6a94.133bb"
+                "e5a55559.f1ecf"
             ]
         ]
     },
     {
-        "id": "47ffeb93.7b808c",
+        "id": "a798281b.2c68d8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1154,
-        "y": 821,
-        "z": "ed7c1675.7a56b",
+        "x": 1208.8833312988281,
+        "y": 850,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "3da0dc2.736e6a4"
+                "486913c4.08fb54"
             ]
         ]
     },
     {
-        "id": "f3fb6a94.133bb",
+        "id": "e5a55559.f1ecf",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1310,
-        "y": 870,
-        "z": "ed7c1675.7a56b",
+        "x": 1364.8833312988281,
+        "y": 899,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "9ed7a6be.5472c"
+                "a3b35ff6.7d4a88"
             ]
         ]
     },
     {
-        "id": "3da0dc2.736e6a4",
+        "id": "486913c4.08fb54",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1287,
-        "y": 822,
-        "z": "ed7c1675.7a56b",
+        "x": 1341.8833312988281,
+        "y": 851,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "ca01ca51.23bb98",
+        "id": "4660bf61.473a18",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2047,
-        "y": 220,
-        "z": "ed7c1675.7a56b",
+        "x": 2101.883331298828,
+        "y": 249,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "6ccc1a6d.d89cd4",
+        "id": "1fda4b4a.2131e5",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3589,
-        "y": 2201,
-        "z": "ed7c1675.7a56b",
+        "x": 3643.883331298828,
+        "y": 2230,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ceaa1f2c.697ad",
+        "id": "2a6ffb7c.8797f4",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4179,
-        "y": 674,
-        "z": "ed7c1675.7a56b",
+        "x": 4233.883331298828,
+        "y": 703,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "b8d52cff.f0dcb",
+        "id": "a3af61e2.8efbd8",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1353,
-        "y": 1780,
-        "z": "ed7c1675.7a56b",
+        "x": 1407.8833312988281,
+        "y": 1809,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "901c32b.8d67fd",
+        "id": "14d69ea3.c37079",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 532,
-        "y": 1514,
-        "z": "ed7c1675.7a56b",
+        "x": 586.8833312988281,
+        "y": 1543,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "d142c0f2.700e98",
+        "id": "e39ba7bd.aed5d8",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 563,
-        "y": 1554,
-        "z": "ed7c1675.7a56b",
+        "x": 617.8833312988281,
+        "y": 1583,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "70164d90.2f08c4",
+        "id": "fc704734.f5a92",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1111,
-        "y": 1962,
-        "z": "ed7c1675.7a56b",
+        "x": 1165.8833312988281,
+        "y": 1991,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "27824a25.86f05e",
+        "id": "534cefd0.094168",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1114,
-        "y": 2004,
-        "z": "ed7c1675.7a56b",
+        "x": 1168.8833312988281,
+        "y": 2033,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "f24a5646.1c02c8",
+        "id": "de368aef.16cb",
         "type": "set",
         "name": "unset otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",
         "comments": "",
-        "x": 557,
-        "y": 1644,
-        "z": "ed7c1675.7a56b",
+        "x": 611.8833312988281,
+        "y": 1673,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "db09832f.86c758",
+        "id": "61a182f0.95ec2c",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 312,
-        "y": 2023,
-        "z": "ed7c1675.7a56b",
+        "x": 366.8833312988281,
+        "y": 2052,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "3c14b8ea.b96268",
+        "id": "fae7aeca.a940b8",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 320,
-        "y": 2080,
-        "z": "ed7c1675.7a56b",
+        "x": 374.8833312988281,
+        "y": 2109,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4915b2e4.5fd2dc",
+        "id": "1dbcecbe.b5c9a3",
         "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.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1331,
-        "y": 1629,
-        "z": "ed7c1675.7a56b",
+        "x": 1385.8833312988281,
+        "y": 1658,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "bfcf3bba.b5daa",
-                "9b18409e.c203c8"
+                "2facd73.aebb428",
+                "7c34f1f3.22e088"
             ]
         ]
     },
     {
-        "id": "9b18409e.c203c8",
+        "id": "7c34f1f3.22e088",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1554,
-        "y": 1584,
-        "z": "ed7c1675.7a56b",
+        "x": 1608.8833312988281,
+        "y": 1613,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "5afaf397.e20c3c"
+                "7e28ac3f.b53f7c"
             ]
         ]
     },
     {
-        "id": "bfcf3bba.b5daa",
+        "id": "2facd73.aebb428",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1556,
-        "y": 1648,
-        "z": "ed7c1675.7a56b",
+        "x": 1610.8833312988281,
+        "y": 1677,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "f7de9867.a0fd38"
+                "c1661a7d.0e642"
             ]
         ]
     },
     {
-        "id": "5afaf397.e20c3c",
+        "id": "7e28ac3f.b53f7c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1719,
-        "y": 1581,
-        "z": "ed7c1675.7a56b",
+        "x": 1773.8833312988281,
+        "y": 1610,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "cdcfe3c8.962368"
+                "a55c6cbe.f3cef"
             ]
         ]
     },
     {
-        "id": "f7de9867.a0fd38",
+        "id": "c1661a7d.0e642",
         "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": 1718,
-        "y": 1644,
-        "z": "ed7c1675.7a56b",
+        "x": 1772.8833312988281,
+        "y": 1673,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "cdcfe3c8.962368",
+        "id": "a55c6cbe.f3cef",
         "type": "set",
         "name": "set tmp.uni-node-id-short",
         "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -3]`' />\n",
         "comments": "",
-        "x": 1939,
-        "y": 1595,
-        "z": "ed7c1675.7a56b",
+        "x": 1993.8833312988281,
+        "y": 1624,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "6d07bcb7.ffff34",
+        "id": "a3eb9377.85c18",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1484,
-        "y": 2320,
-        "z": "ed7c1675.7a56b",
+        "x": 1538.8833312988281,
+        "y": 2349,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "9547fb43.8165f"
+                "fcb0361d.62eb48"
             ]
         ]
     },
     {
-        "id": "261f721d.19cda6",
+        "id": "dcd8db20.d12b7",
         "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.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 1869,
-        "y": 2333,
-        "z": "ed7c1675.7a56b",
+        "x": 1923.8833312988281,
+        "y": 2362,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "a4fad359.d63e7",
-                "d7202a06.97a2a8",
-                "d2a1d22e.b2ed6"
+                "62f93408.d79154",
+                "c38cc9d8.7f1bc",
+                "576ffe09.c4abd8"
             ]
         ]
     },
     {
-        "id": "9547fb43.8165f",
+        "id": "fcb0361d.62eb48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1663,
-        "y": 2320,
-        "z": "ed7c1675.7a56b",
+        "x": 1717.8833312988281,
+        "y": 2349,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "9b0cdae9.5834e8",
-                "261f721d.19cda6"
+                "90857791.e16908",
+                "dcd8db20.d12b7"
             ]
         ]
     },
     {
-        "id": "9b0cdae9.5834e8",
+        "id": "90857791.e16908",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainConn id",
         "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 1899,
-        "y": 2281,
-        "z": "ed7c1675.7a56b",
+        "x": 1953.8833312988281,
+        "y": 2310,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "a4fad359.d63e7",
+        "id": "62f93408.d79154",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2079,
-        "y": 2324,
-        "z": "ed7c1675.7a56b",
+        "x": 2133.883331298828,
+        "y": 2353,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "ce2ed097.248ac"
+                "2c548a06.655d4e"
             ]
         ]
     },
     {
-        "id": "d7202a06.97a2a8",
+        "id": "c38cc9d8.7f1bc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2071,
-        "y": 2379,
-        "z": "ed7c1675.7a56b",
+        "x": 2125.883331298828,
+        "y": 2408,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "15f2754c.6e5b2b"
+                "99196e80.99674"
             ]
         ]
     },
     {
-        "id": "d2a1d22e.b2ed6",
+        "id": "576ffe09.c4abd8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2076,
-        "y": 2436,
-        "z": "ed7c1675.7a56b",
+        "x": 2130.883331298828,
+        "y": 2465,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "fe7bb44f.f58b7"
+                "ea704904.f61c3"
             ]
         ]
     },
     {
-        "id": "fe7bb44f.f58b7",
+        "id": "ea704904.f61c3",
         "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": 2228,
-        "y": 2437,
-        "z": "ed7c1675.7a56b",
+        "x": 2282.883331298828,
+        "y": 2466,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "15f2754c.6e5b2b",
+        "id": "99196e80.99674",
         "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": 2239,
-        "y": 2382,
-        "z": "ed7c1675.7a56b",
+        "x": 2293.883331298828,
+        "y": 2411,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "ce2ed097.248ac",
+        "id": "2c548a06.655d4e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2223.38232421875,
-        "y": 2321.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 2278.265655517578,
+        "y": 2350.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "1c2a2a5a.6d8256"
+                "55de506e.ab2138"
             ]
         ]
     },
     {
-        "id": "1c2a2a5a.6d8256",
+        "id": "55de506e.ab2138",
         "type": "set",
         "name": "set controller domainConn data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.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": 2438,
-        "y": 2318,
-        "z": "ed7c1675.7a56b",
+        "x": 2492.883331298828,
+        "y": 2347,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "9710382e.112c58",
+        "id": "2eeb0084.f61b88",
         "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.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 562,
-        "y": 2366,
-        "z": "ed7c1675.7a56b",
+        "x": 616.8833312988281,
+        "y": 2395,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "afc311a9.64a498",
-                "1b364ee.7270531",
-                "aa64b78b.7ab17"
+                "21d8f2c9.3cd2be",
+                "32ff82a0.3bb24e",
+                "21eb3441.66cbb4"
             ]
         ]
     },
     {
-        "id": "afc311a9.64a498",
+        "id": "21d8f2c9.3cd2be",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 757.5001220703125,
-        "y": 2318,
-        "z": "ed7c1675.7a56b",
+        "x": 812.3834533691406,
+        "y": 2347,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7cd619d5.a4e8c"
+                "2571d7b1.c4fb5"
             ]
         ]
     },
     {
-        "id": "1b364ee.7270531",
+        "id": "32ff82a0.3bb24e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 749.5001220703125,
-        "y": 2373,
-        "z": "ed7c1675.7a56b",
+        "x": 804.3834533691406,
+        "y": 2402,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "7127ee10.2a0b4"
+                "b0a2917a.ecde4"
             ]
         ]
     },
     {
-        "id": "7cd619d5.a4e8c",
+        "id": "2571d7b1.c4fb5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 901.8824462890625,
-        "y": 2317.6556701660156,
-        "z": "ed7c1675.7a56b",
+        "x": 956.7657775878906,
+        "y": 2346.6556701660156,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "fd5a5a0.ad9b128"
+                "a50320.52c78ce"
             ]
         ]
     },
     {
-        "id": "fd5a5a0.ad9b128",
+        "id": "a50320.52c78ce",
         "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": 1086,
-        "y": 2316,
-        "z": "ed7c1675.7a56b",
+        "x": 1140.8833312988281,
+        "y": 2345,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "8c513405.b809e8"
+                "b3deb273.cebb88"
             ]
         ]
     },
     {
-        "id": "8c513405.b809e8",
+        "id": "b3deb273.cebb88",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1281,
-        "y": 2316,
-        "z": "ed7c1675.7a56b",
+        "x": 1335.8833312988281,
+        "y": 2345,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "6d07bcb7.ffff34"
+                "a3eb9377.85c18"
             ]
         ]
     },
     {
-        "id": "aa64b78b.7ab17",
+        "id": "21eb3441.66cbb4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 754.5001220703125,
-        "y": 2430,
-        "z": "ed7c1675.7a56b",
+        "x": 809.3834533691406,
+        "y": 2459,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "22a641d1.a7babe"
+                "f2a9e7b0.6a4ff8"
             ]
         ]
     },
     {
-        "id": "22a641d1.a7babe",
+        "id": "f2a9e7b0.6a4ff8",
         "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": 906.5001220703125,
-        "y": 2431,
-        "z": "ed7c1675.7a56b",
+        "x": 961.3834533691406,
+        "y": 2460,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "7127ee10.2a0b4",
+        "id": "b0a2917a.ecde4",
         "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": 917.5001220703125,
-        "y": 2374,
-        "z": "ed7c1675.7a56b",
+        "x": 972.3834533691406,
+        "y": 2403,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "41c682cf.a83f2c",
+        "id": "e821cf32.5b22f",
         "type": "set",
         "name": "set tmp.pnf-name-forUrl",
         "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
         "comments": "",
-        "x": 552,
-        "y": 2278,
-        "z": "ed7c1675.7a56b",
+        "x": 606.8833312988281,
+        "y": 2307,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     },
     {
-        "id": "c7cb304b.f39168",
+        "id": "f92bafd0.7c69c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 297,
-        "y": 2409,
-        "z": "ed7c1675.7a56b",
+        "x": 351.8833312988281,
+        "y": 2438,
+        "z": "3f6a2e0f.b66c8a",
         "wires": [
             [
-                "41c682cf.a83f2c",
-                "9710382e.112c58"
+                "e821cf32.5b22f",
+                "2eeb0084.f61b88"
             ]
         ]
     },
     {
-        "id": "d390d070.3dc4c",
+        "id": "a832f3b6.8874e",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1511.9666748046875,
-        "y": 226.88333129882812,
-        "z": "ed7c1675.7a56b",
+        "x": 1566.8500061035156,
+        "y": 255.88333129882812,
+        "z": "3f6a2e0f.b66c8a",
+        "wires": []
+    },
+    {
+        "id": "f645589d.ed3d98",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 768.8833312988281,
+        "y": 478,
+        "z": "3f6a2e0f.b66c8a",
         "wires": []
     }
 ]
\ No newline at end of file