X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json;h=035df45f9fefef4c4d853f6949596380aed66cb3;hb=c14f920415db0de169e0826e0d746cf80757b1f4;hp=d58ad7bff7243a4f5b51008f924f20f8cb0aa9ee;hpb=b1548aa206521de7feaeacab179a2f0860dafcb1;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 d58ad7bf..035df45f 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,199 +1,199 @@
 [
     {
-        "id": "d35e2da9.70a7e",
+        "id": "b052f7e.a3d5288",
         "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": 372,
-        "y": 306,
-        "z": "5a4cb919.dfff38",
+        "x": 356.75,
+        "y": 462,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "88d19ab1.10b18",
-                "8fd12759.af6e18",
-                "50405d21.7eae84"
+                "e207ef26.f8a29",
+                "15b30bbc.e66fc4",
+                "c73b1c6f.dfba4"
             ]
         ]
     },
     {
-        "id": "88d19ab1.10b18",
+        "id": "e207ef26.f8a29",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 560,
-        "y": 319,
-        "z": "5a4cb919.dfff38",
+        "x": 544.75,
+        "y": 475,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d472199a.beff9"
+                "53374de6.fbbc9c"
             ]
         ]
     },
     {
-        "id": "8fd12759.af6e18",
+        "id": "15b30bbc.e66fc4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 567.4909362792969,
-        "y": 361.57403564453125,
-        "z": "5a4cb919.dfff38",
+        "x": 552.2409362792969,
+        "y": 517.5740356445312,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "50405d21.7eae84",
+        "id": "c73b1c6f.dfba4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 558,
-        "y": 408,
-        "z": "5a4cb919.dfff38",
+        "x": 542.75,
+        "y": 564,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "6b1a691d.f6617"
+                "1d9a3789.c423c"
             ]
         ]
     },
     {
-        "id": "d472199a.beff9",
+        "id": "53374de6.fbbc9c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 733,
-        "y": 317,
-        "z": "5a4cb919.dfff38",
+        "x": 717.75,
+        "y": 473,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "f306805a.38d6f8"
+                "74134804.4c5ab"
             ]
         ]
     },
     {
-        "id": "f306805a.38d6f8",
+        "id": "74134804.4c5ab",
         "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": 962,
-        "y": 318,
-        "z": "5a4cb919.dfff38",
+        "x": 946.75,
+        "y": 474,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "4a920666.d84d68"
+                "88398d04.70bb08"
             ]
         ]
     },
     {
-        "id": "4a920666.d84d68",
+        "id": "88398d04.70bb08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1177,
-        "y": 319,
-        "z": "5a4cb919.dfff38",
+        "x": 1161.75,
+        "y": 475,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fc848cba.fc33d8"
+                "60755719.5aec98"
             ]
         ]
     },
     {
-        "id": "841ae1dd.49d178",
+        "id": "23c1dec0.4bd442",
         "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": 1431,
-        "y": 241,
-        "z": "5a4cb919.dfff38",
+        "x": 1415.75,
+        "y": 397,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "98ef6cc.4725e9",
-                "ab42fe03.c49e3"
+                "14654146.223b47",
+                "d151f4bf.d5f298"
             ]
         ]
     },
     {
-        "id": "98ef6cc.4725e9",
+        "id": "14654146.223b47",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648,
-        "y": 220,
-        "z": "5a4cb919.dfff38",
+        "x": 1632.75,
+        "y": 376,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fc848cba.fc33d8"
+                "60755719.5aec98"
             ]
         ]
     },
     {
-        "id": "ab42fe03.c49e3",
+        "id": "d151f4bf.d5f298",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648,
-        "y": 269,
-        "z": "5a4cb919.dfff38",
+        "x": 1632.75,
+        "y": 425,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc848cba.fc33d8",
+        "id": "60755719.5aec98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1832,
-        "y": 306,
-        "z": "5a4cb919.dfff38",
+        "x": 1816.75,
+        "y": 462,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "53692e4a.48cde",
-                "957d0d12.f7d338",
-                "1f9b767f.d670b2"
+                "e58078ca.32c2b8",
+                "db55a5db.cc9e2",
+                "d1721022.90ae5"
             ]
         ]
     },
     {
-        "id": "524dbe59.8ef8f",
+        "id": "ebc2ede2.3e82f8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 191,
-        "y": 47,
-        "z": "5a4cb919.dfff38",
+        "x": 175.75,
+        "y": 203,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "320667fa.12a2c"
+                "19d2750a.7ada53"
             ]
         ]
     },
     {
-        "id": "320667fa.12a2c",
+        "id": "19d2750a.7ada53",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3556 +201,3649 @@
         "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": 475.2856903076172,
-        "y": 108.23810863494873,
-        "z": "5a4cb919.dfff38",
+        "x": 460.0356903076172,
+        "y": 264.23810863494873,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "aa006c98.f12b58"
+                "32b35910.0922e6"
             ]
         ]
     },
     {
-        "id": "aa006c98.f12b58",
+        "id": "32b35910.0922e6",
         "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": 481.42860412597656,
-        "y": 193.00003051757812,
-        "z": "5a4cb919.dfff38",
+        "x": 466.17860412597656,
+        "y": 349.0000305175781,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "72fe4a66.39584c"
+                "9f4c6f10.a708b"
             ]
         ]
     },
     {
-        "id": "72fe4a66.39584c",
+        "id": "9f4c6f10.a708b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 791.238037109375,
-        "y": 184.66668701171875,
-        "z": "5a4cb919.dfff38",
+        "x": 775.988037109375,
+        "y": 340.66668701171875,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d35e2da9.70a7e",
-                "cce8745e.b515b8",
-                "706cb78c.da92b",
-                "88772a4.9b58658",
-                "4ace150.4554dec"
+                "b052f7e.a3d5288",
+                "14b40144.c74357",
+                "8371652a.c1422",
+                "ab74b4be.cbc48",
+                "77984a30.f32474"
             ]
         ]
     },
     {
-        "id": "53692e4a.48cde",
+        "id": "e58078ca.32c2b8",
         "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": 2049,
-        "y": 244,
-        "z": "5a4cb919.dfff38",
+        "x": 2033.75,
+        "y": 400,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "123fcc82.b79ae3",
+        "id": "bd448e7d.80d888",
         "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": 4218,
-        "y": 130,
-        "z": "5a4cb919.dfff38",
+        "x": 4202.75,
+        "y": 286,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "e308a3a2.af826",
+        "id": "13f5ead.1dca895",
         "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": 4299,
-        "y": 445,
-        "z": "5a4cb919.dfff38",
+        "x": 4283.75,
+        "y": 601,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fedd6b9.d7f3318",
-                "39581c20.edb614"
+                "322b352.ceea84a",
+                "b686bcae.ff7c7"
             ]
         ]
     },
     {
-        "id": "fedd6b9.d7f3318",
+        "id": "322b352.ceea84a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4608.5,
-        "y": 414,
-        "z": "5a4cb919.dfff38",
+        "x": 4593.25,
+        "y": 570,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "c49081cf.377c78"
+                "1e1970be.0764a7"
             ]
         ]
     },
     {
-        "id": "39581c20.edb614",
+        "id": "b686bcae.ff7c7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4613.5,
-        "y": 479,
-        "z": "5a4cb919.dfff38",
+        "x": 4598.25,
+        "y": 635,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9c0572a4.3a997"
+                "bd24692b.5a8508"
             ]
         ]
     },
     {
-        "id": "c49081cf.377c78",
+        "id": "1e1970be.0764a7",
         "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": 4784.5,
-        "y": 414,
-        "z": "5a4cb919.dfff38",
+        "x": 4769.25,
+        "y": 570,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "9c0572a4.3a997",
+        "id": "bd24692b.5a8508",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4780,
-        "y": 479,
-        "z": "5a4cb919.dfff38",
+        "x": 4764.75,
+        "y": 635,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d297001.689a7",
+        "id": "bdfec131.c9a298",
         "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": 4163.5,
-        "y": 699,
-        "z": "5a4cb919.dfff38",
+        "x": 4148.25,
+        "y": 855,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "54d9bbcc.0d0bac",
+        "id": "68cdfef7.64c51",
         "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": 4317.5,
-        "y": 747,
-        "z": "5a4cb919.dfff38",
+        "x": 4302.25,
+        "y": 903,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "2ade786d.c09b28",
-                "f17ad5b3.0ef818"
+                "534fa647.cdf3",
+                "626cbb12.a73134"
             ]
         ]
     },
     {
-        "id": "2ade786d.c09b28",
+        "id": "534fa647.cdf3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4663,
-        "y": 728,
-        "z": "5a4cb919.dfff38",
+        "x": 4647.75,
+        "y": 884,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "72718fb4.e15e78"
+                "2db65967.f1a87e"
             ]
         ]
     },
     {
-        "id": "f17ad5b3.0ef818",
+        "id": "626cbb12.a73134",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4667,
-        "y": 768,
-        "z": "5a4cb919.dfff38",
+        "x": 4651.75,
+        "y": 924,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "98b1fdb0.a42648"
+                "54fc5ed8.18991"
             ]
         ]
     },
     {
-        "id": "72718fb4.e15e78",
+        "id": "2db65967.f1a87e",
         "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": 4821,
-        "y": 728,
-        "z": "5a4cb919.dfff38",
+        "x": 4805.75,
+        "y": 884,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "98b1fdb0.a42648",
+        "id": "54fc5ed8.18991",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4824.5,
-        "y": 768,
-        "z": "5a4cb919.dfff38",
+        "x": 4809.25,
+        "y": 924,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fe12ce9.6a53ab",
-                "4eba4c2.fda54b4"
+                "5bbebd3d.56e454",
+                "7821e9b0.59a868"
             ]
         ]
     },
     {
-        "id": "fe12ce9.6a53ab",
+        "id": "5bbebd3d.56e454",
         "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": 5155,
-        "y": 733,
-        "z": "5a4cb919.dfff38",
+        "x": 5139.75,
+        "y": 889,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "9e233ee4.5c90e",
+        "id": "72ed7974.8997",
         "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": 5019,
-        "y": 692,
-        "z": "5a4cb919.dfff38",
+        "x": 5003.75,
+        "y": 848,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "4eba4c2.fda54b4",
+        "id": "7821e9b0.59a868",
         "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": 5082,
-        "y": 779,
-        "z": "5a4cb919.dfff38",
+        "x": 5066.75,
+        "y": 935,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "fbd17573.b91cd8",
+        "id": "47a40348.350864",
         "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": 4156,
-        "y": 178,
-        "z": "5a4cb919.dfff38",
+        "x": 4140.75,
+        "y": 334,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "985dbb20.1c3b78",
+        "id": "e86c4698.44de68",
         "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": 4182,
-        "y": 295,
-        "z": "5a4cb919.dfff38",
+        "x": 4166.75,
+        "y": 451,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "544c4f89.eba52",
-                "eb873b5e.d10b8",
-                "d8377d86.76164"
+                "3bef2a94.7a3c56",
+                "8e5e548f.b7d088",
+                "9e92c765.4c36e"
             ]
         ]
     },
     {
-        "id": "544c4f89.eba52",
+        "id": "3bef2a94.7a3c56",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4377.5001220703125,
-        "y": 247,
-        "z": "5a4cb919.dfff38",
+        "x": 4362.2501220703125,
+        "y": 403,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cd232c91.ed7d5"
+                "8ae11b21.8072d"
             ]
         ]
     },
     {
-        "id": "eb873b5e.d10b8",
+        "id": "8e5e548f.b7d088",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4369.5001220703125,
-        "y": 302,
-        "z": "5a4cb919.dfff38",
+        "x": 4354.2501220703125,
+        "y": 458,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "7e7e18a4.ea2a98"
+                "85930301.e40178"
             ]
         ]
     },
     {
-        "id": "cd232c91.ed7d5",
+        "id": "8ae11b21.8072d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4521.8824462890625,
-        "y": 246.65567016601562,
-        "z": "5a4cb919.dfff38",
+        "x": 4506.6324462890625,
+        "y": 402.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d5d46c3b.524dc8"
+                "2b001bb5.f3beac"
             ]
         ]
     },
     {
-        "id": "4c85ec99.26bac4",
+        "id": "44cbb5eb.fe11fc",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5104,
-        "y": 249,
-        "z": "5a4cb919.dfff38",
+        "x": 5088.75,
+        "y": 405,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "490c8cc0.c71134"
+                "8828c3a6.4773b"
             ]
         ]
     },
     {
-        "id": "d5d46c3b.524dc8",
+        "id": "2b001bb5.f3beac",
         "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": 4706,
-        "y": 245,
-        "z": "5a4cb919.dfff38",
+        "x": 4690.75,
+        "y": 401,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cc43f2ea.19847"
+                "e234651a.d8201"
             ]
         ]
     },
     {
-        "id": "cc43f2ea.19847",
+        "id": "e234651a.d8201",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4901,
-        "y": 245,
-        "z": "5a4cb919.dfff38",
+        "x": 4885.75,
+        "y": 401,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "4c85ec99.26bac4"
+                "44cbb5eb.fe11fc"
             ]
         ]
     },
     {
-        "id": "d8377d86.76164",
+        "id": "9e92c765.4c36e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4374.5001220703125,
-        "y": 359,
-        "z": "5a4cb919.dfff38",
+        "x": 4359.2501220703125,
+        "y": 515,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9cf617d3.aee3a8"
+                "2e1c6b8c.8fd4dc"
             ]
         ]
     },
     {
-        "id": "9cf617d3.aee3a8",
+        "id": "2e1c6b8c.8fd4dc",
         "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": 4526.5001220703125,
-        "y": 360,
-        "z": "5a4cb919.dfff38",
+        "x": 4511.2501220703125,
+        "y": 516,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "7e7e18a4.ea2a98",
+        "id": "85930301.e40178",
         "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": 4537.5001220703125,
-        "y": 303,
-        "z": "5a4cb919.dfff38",
+        "x": 4522.2501220703125,
+        "y": 459,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "f42e9c90.ae58f",
+        "id": "90e4153e.8023d8",
         "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": 5489,
-        "y": 262,
-        "z": "5a4cb919.dfff38",
+        "x": 5473.75,
+        "y": 418,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "f404a9ca.fbce2",
-                "3fd1ebaf.c62a54",
-                "66a3972e.71bfa8"
+                "bac51d99.85cdd8",
+                "432bf875.253be8",
+                "32be30ae.8624b"
             ]
         ]
     },
     {
-        "id": "490c8cc0.c71134",
+        "id": "8828c3a6.4773b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5283,
-        "y": 249,
-        "z": "5a4cb919.dfff38",
+        "x": 5267.75,
+        "y": 405,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9ce5b4b0.4bb188",
-                "f42e9c90.ae58f"
+                "580b4f3c.2239f",
+                "90e4153e.8023d8"
             ]
         ]
     },
     {
-        "id": "9ce5b4b0.4bb188",
+        "id": "580b4f3c.2239f",
         "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": 5519,
-        "y": 210,
-        "z": "5a4cb919.dfff38",
+        "x": 5503.75,
+        "y": 366,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "f404a9ca.fbce2",
+        "id": "bac51d99.85cdd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5699,
-        "y": 253,
-        "z": "5a4cb919.dfff38",
+        "x": 5683.75,
+        "y": 409,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "3597c274.50637e"
+                "7a8928ea.c03e88"
             ]
         ]
     },
     {
-        "id": "3fd1ebaf.c62a54",
+        "id": "432bf875.253be8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5691,
-        "y": 308,
-        "z": "5a4cb919.dfff38",
+        "x": 5675.75,
+        "y": 464,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ff90e84e.43d4b8"
+                "609d607b.1ff68"
             ]
         ]
     },
     {
-        "id": "66a3972e.71bfa8",
+        "id": "32be30ae.8624b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5696,
-        "y": 365,
-        "z": "5a4cb919.dfff38",
+        "x": 5680.75,
+        "y": 521,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ff823793.36814"
+                "e7f093f9.7ecc4"
             ]
         ]
     },
     {
-        "id": "ff823793.36814",
+        "id": "e7f093f9.7ecc4",
         "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": 5848,
-        "y": 366,
-        "z": "5a4cb919.dfff38",
+        "x": 5832.75,
+        "y": 522,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "ff90e84e.43d4b8",
+        "id": "609d607b.1ff68",
         "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": 5859,
-        "y": 311,
-        "z": "5a4cb919.dfff38",
+        "x": 5843.75,
+        "y": 467,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "3597c274.50637e",
+        "id": "7a8928ea.c03e88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5843.38232421875,
-        "y": 250.65567016601562,
-        "z": "5a4cb919.dfff38",
+        "x": 5828.13232421875,
+        "y": 406.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d39e28b5.1aec5"
+                "d93996e8.177a9"
             ]
         ]
     },
     {
-        "id": "d39e28b5.1aec5",
+        "id": "d93996e8.177a9",
         "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": 6058,
-        "y": 247,
-        "z": "5a4cb919.dfff38",
+        "x": 6042.75,
+        "y": 403,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "139f2f1e.8fa159",
+        "id": "a51ca3ec.fcbd9",
         "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": 3625,
-        "y": 1587,
-        "z": "5a4cb919.dfff38",
+        "x": 3609.75,
+        "y": 1743,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "18d2c2bc.05fd85",
+        "id": "75a3839f.237ba4",
         "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": 3688,
-        "y": 1916,
-        "z": "5a4cb919.dfff38",
+        "x": 3672.75,
+        "y": 2072,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "8895fa29.bf8e3",
-                "23c7c635.fd4722"
+                "dce36923.840728",
+                "157f1852.8f7de8"
             ]
         ]
     },
     {
-        "id": "8895fa29.bf8e3",
+        "id": "dce36923.840728",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3983.5,
-        "y": 1883,
-        "z": "5a4cb919.dfff38",
+        "x": 3968.25,
+        "y": 2039,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "500b5538.e88684"
+                "c9eb5c3d.58ade8"
             ]
         ]
     },
     {
-        "id": "23c7c635.fd4722",
+        "id": "157f1852.8f7de8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3988.5,
-        "y": 1948,
-        "z": "5a4cb919.dfff38",
+        "x": 3973.25,
+        "y": 2104,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "909dfd67.2300d8"
+                "ee455d7a.4369c"
             ]
         ]
     },
     {
-        "id": "500b5538.e88684",
+        "id": "c9eb5c3d.58ade8",
         "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": 4151.5,
-        "y": 1883,
-        "z": "5a4cb919.dfff38",
+        "x": 4136.25,
+        "y": 2039,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "909dfd67.2300d8",
+        "id": "ee455d7a.4369c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4162,
-        "y": 1948,
-        "z": "5a4cb919.dfff38",
+        "x": 4146.75,
+        "y": 2104,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "a49aeabe.b5ff8",
+        "id": "93204f2.1b4a73",
         "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": 3564,
-        "y": 1644,
-        "z": "5a4cb919.dfff38",
+        "x": 3548.75,
+        "y": 1800,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "642d00da.b53c68",
+        "id": "4ba3f303.c0a41c",
         "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": 3584,
-        "y": 1741,
-        "z": "5a4cb919.dfff38",
+        "x": 3568.75,
+        "y": 1897,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "1e5d6803.78b7d8",
-                "84307ec5.09a8d",
-                "b468d4fc.bc9c8"
+                "cb100a9c.e2d048",
+                "ffd6b507.6159d",
+                "7158557b.4eb374"
             ]
         ]
     },
     {
-        "id": "1e5d6803.78b7d8",
+        "id": "cb100a9c.e2d048",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3786.5001220703125,
-        "y": 1694,
-        "z": "5a4cb919.dfff38",
+        "x": 3771.2501220703125,
+        "y": 1850,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "683b34d0.c1df64"
+                "e6720bf0.83c908"
             ]
         ]
     },
     {
-        "id": "84307ec5.09a8d",
+        "id": "ffd6b507.6159d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3778.5001220703125,
-        "y": 1749,
-        "z": "5a4cb919.dfff38",
+        "x": 3763.2501220703125,
+        "y": 1905,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "72cad52e.cb1d74"
+                "80e1f285.9bd438"
             ]
         ]
     },
     {
-        "id": "683b34d0.c1df64",
+        "id": "e6720bf0.83c908",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3930.8824462890625,
-        "y": 1691.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 3915.6324462890625,
+        "y": 1847.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "8511cae6.cbf588"
+                "62828788.5424"
             ]
         ]
     },
     {
-        "id": "8511cae6.cbf588",
+        "id": "62828788.5424",
         "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": 4115,
-        "y": 1706,
-        "z": "5a4cb919.dfff38",
+        "x": 4099.75,
+        "y": 1862,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "82496ff9.234ee"
+                "151698eb.d8b1bf"
             ]
         ]
     },
     {
-        "id": "b468d4fc.bc9c8",
+        "id": "7158557b.4eb374",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3783.5001220703125,
-        "y": 1806,
-        "z": "5a4cb919.dfff38",
+        "x": 3768.2501220703125,
+        "y": 1962,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "a6137ce1.b3b5c"
+                "4f499dcc.5ccf54"
             ]
         ]
     },
     {
-        "id": "a6137ce1.b3b5c",
+        "id": "4f499dcc.5ccf54",
         "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": 3935.5001220703125,
-        "y": 1807,
-        "z": "5a4cb919.dfff38",
+        "x": 3920.2501220703125,
+        "y": 1963,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "72cad52e.cb1d74",
+        "id": "80e1f285.9bd438",
         "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": 3946.5001220703125,
-        "y": 1752,
-        "z": "5a4cb919.dfff38",
+        "x": 3931.2501220703125,
+        "y": 1908,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "7b4a137a.364fcc",
+        "id": "48500cb6.0a5974",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4513,
-        "y": 1710,
-        "z": "5a4cb919.dfff38",
+        "x": 4497.75,
+        "y": 1866,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "37fe69a9.07064e"
+                "9253635.59581a"
             ]
         ]
     },
     {
-        "id": "82496ff9.234ee",
+        "id": "151698eb.d8b1bf",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4310,
-        "y": 1706,
-        "z": "5a4cb919.dfff38",
+        "x": 4294.75,
+        "y": 1862,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "7b4a137a.364fcc"
+                "48500cb6.0a5974"
             ]
         ]
     },
     {
-        "id": "4bdd9e57.a5e13",
+        "id": "a71424bd.8e0678",
         "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": 4898,
-        "y": 1709,
-        "z": "5a4cb919.dfff38",
+        "x": 4882.75,
+        "y": 1865,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "8afff046.26af98",
-                "5118b1e.53f805",
-                "5a800db8.063d6c"
+                "a7626fee.35776",
+                "f55d0ed2.02e038",
+                "47407f5a.98f7f8"
             ]
         ]
     },
     {
-        "id": "37fe69a9.07064e",
+        "id": "9253635.59581a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4690,
-        "y": 1702,
-        "z": "5a4cb919.dfff38",
+        "x": 4674.75,
+        "y": 1858,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d299743b.8f6b68",
-                "4bdd9e57.a5e13"
+                "3d578b8.a79bc74",
+                "a71424bd.8e0678"
             ]
         ]
     },
     {
-        "id": "d299743b.8f6b68",
+        "id": "3d578b8.a79bc74",
         "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": 4928,
-        "y": 1657,
-        "z": "5a4cb919.dfff38",
+        "x": 4912.75,
+        "y": 1813,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "2523ddf0.8e1c8a",
+        "id": "d6ea76ec.6a17f8",
         "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": 5257,
-        "y": 1813,
-        "z": "5a4cb919.dfff38",
+        "x": 5241.75,
+        "y": 1969,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "6f850c0f.e212ac",
+        "id": "2c34e3d1.56f314",
         "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": 5268,
-        "y": 1758,
-        "z": "5a4cb919.dfff38",
+        "x": 5252.75,
+        "y": 1914,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "546ca846.269108",
+        "id": "fae51f86.36cbd8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5252.38232421875,
-        "y": 1697.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 5237.13232421875,
+        "y": 1853.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fac7ab27.77dda8"
+                "e7fe4b79.28daf8"
             ]
         ]
     },
     {
-        "id": "fac7ab27.77dda8",
+        "id": "e7fe4b79.28daf8",
         "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": 5467,
-        "y": 1694,
-        "z": "5a4cb919.dfff38",
+        "x": 5451.75,
+        "y": 1850,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "8afff046.26af98",
+        "id": "a7626fee.35776",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5108,
-        "y": 1700,
-        "z": "5a4cb919.dfff38",
+        "x": 5092.75,
+        "y": 1856,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "546ca846.269108"
+                "fae51f86.36cbd8"
             ]
         ]
     },
     {
-        "id": "5118b1e.53f805",
+        "id": "f55d0ed2.02e038",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5100,
-        "y": 1755,
-        "z": "5a4cb919.dfff38",
+        "x": 5084.75,
+        "y": 1911,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "6f850c0f.e212ac"
+                "2c34e3d1.56f314"
             ]
         ]
     },
     {
-        "id": "5a800db8.063d6c",
+        "id": "47407f5a.98f7f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5105,
-        "y": 1812,
-        "z": "5a4cb919.dfff38",
+        "x": 5089.75,
+        "y": 1968,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "2523ddf0.8e1c8a"
+                "d6ea76ec.6a17f8"
             ]
         ]
     },
     {
-        "id": "a1edca3.1a62bb8",
+        "id": "3dd6564a.788bea",
         "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": 3139,
-        "y": 658,
-        "z": "5a4cb919.dfff38",
+        "x": 3123.75,
+        "y": 814,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d4bdeded.3ef248",
-                "eead64c.0115918"
+                "4498685c.f8a9c8",
+                "ce59ca85.515708"
             ]
         ]
     },
     {
-        "id": "d4bdeded.3ef248",
+        "id": "4498685c.f8a9c8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3353,
-        "y": 695,
-        "z": "5a4cb919.dfff38",
+        "x": 3337.75,
+        "y": 851,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "614a0644.b0e3e"
+                "b9aa4ba2.44d89"
             ]
         ]
     },
     {
-        "id": "eead64c.0115918",
+        "id": "ce59ca85.515708",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3355,
-        "y": 633,
-        "z": "5a4cb919.dfff38",
+        "x": 3339.75,
+        "y": 789,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "295e16ce.878c6a"
+                "50bc7adf.71a1d4"
             ]
         ]
     },
     {
-        "id": "614a0644.b0e3e",
+        "id": "b9aa4ba2.44d89",
         "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": 2933,
-        "y": 1938,
-        "z": "5a4cb919.dfff38",
+        "x": 2917.75,
+        "y": 2094,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "75bfd38b.356f64",
-                "f4c4b096.a3ce2"
+                "28dcb01c.f45e6",
+                "415698c1.9dad18"
             ]
         ]
     },
     {
-        "id": "75bfd38b.356f64",
+        "id": "28dcb01c.f45e6",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3186,
-        "y": 1972,
-        "z": "5a4cb919.dfff38",
+        "x": 3170.75,
+        "y": 2128,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "b0597a28.514d3"
+                "8cf945af.2f52c8"
             ]
         ]
     },
     {
-        "id": "f4c4b096.a3ce2",
+        "id": "415698c1.9dad18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3186,
-        "y": 1916,
-        "z": "5a4cb919.dfff38",
+        "x": 3170.75,
+        "y": 2072,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "64045150.224658"
+                "c8aba811.103238"
             ]
         ]
     },
     {
-        "id": "b0597a28.514d3",
+        "id": "8cf945af.2f52c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3337,
-        "y": 1972,
-        "z": "5a4cb919.dfff38",
+        "x": 3321.75,
+        "y": 2128,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "cf5b963d.2b5a08",
+        "id": "eb2e2de2.a53528",
         "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": 4213,
-        "y": 70,
-        "z": "5a4cb919.dfff38",
+        "x": 4197.75,
+        "y": 226,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "4badfb31.b82c1c",
+        "id": "15f47b8b.7e00dc",
         "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": 3621,
-        "y": 1529,
-        "z": "5a4cb919.dfff38",
+        "x": 3605.75,
+        "y": 1685,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "552020c2.f01db",
+        "id": "9c2c3c17.6c4b68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3904,
-        "y": 327,
-        "z": "5a4cb919.dfff38",
+        "x": 3888.75,
+        "y": 483,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cf5b963d.2b5a08",
-                "123fcc82.b79ae3",
-                "fbd17573.b91cd8",
-                "985dbb20.1c3b78",
-                "e308a3a2.af826",
-                "ec3b4a19.7f5ee",
-                "881b2d7a.c4e888",
-                "1a392cd7.238923"
+                "eb2e2de2.a53528",
+                "bd448e7d.80d888",
+                "47a40348.350864",
+                "e86c4698.44de68",
+                "13f5ead.1dca895",
+                "94ce35b5.84e9d",
+                "9dbb6108.db3f08",
+                "7f10b67d.13cbf"
             ]
         ]
     },
     {
-        "id": "64045150.224658",
+        "id": "c8aba811.103238",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3337,
-        "y": 1915,
-        "z": "5a4cb919.dfff38",
+        "x": 3321.75,
+        "y": 2071,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "4badfb31.b82c1c",
-                "139f2f1e.8fa159",
-                "a49aeabe.b5ff8",
-                "642d00da.b53c68",
-                "18d2c2bc.05fd85",
-                "724930a5.f44628",
-                "98331ea2.d141f",
-                "f84de17e.e8ea08"
+                "15f47b8b.7e00dc",
+                "a51ca3ec.fcbd9",
+                "93204f2.1b4a73",
+                "4ba3f303.c0a41c",
+                "75a3839f.237ba4",
+                "b13189f3.5c00c",
+                "72e7ea14.321c0c",
+                "a1c10f72.410b08"
             ]
         ]
     },
     {
-        "id": "ed40d4d6.135678",
+        "id": "30be8f1c.c2c68",
         "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": 3575,
-        "y": 2214,
-        "z": "5a4cb919.dfff38",
+        "x": 3559.75,
+        "y": 2370,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "b71c97.3dad8368",
+        "id": "60d95124.1573e8",
         "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": 3729,
-        "y": 2262,
-        "z": "5a4cb919.dfff38",
+        "x": 3713.75,
+        "y": 2418,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "aa1d9a65.d56ee",
-                "ce785491.f82258"
+                "626c41a5.4a556",
+                "319f7c4c.700584"
             ]
         ]
     },
     {
-        "id": "aa1d9a65.d56ee",
+        "id": "626c41a5.4a556",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4074.5,
-        "y": 2243,
-        "z": "5a4cb919.dfff38",
+        "x": 4059.25,
+        "y": 2399,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d8df230a.b47018"
+                "a16c0d6b.aa021"
             ]
         ]
     },
     {
-        "id": "ce785491.f82258",
+        "id": "319f7c4c.700584",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4078.5,
-        "y": 2283,
-        "z": "5a4cb919.dfff38",
+        "x": 4063.25,
+        "y": 2439,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d2d57048.de12f"
+                "c46066f7.6ad638"
             ]
         ]
     },
     {
-        "id": "d8df230a.b47018",
+        "id": "a16c0d6b.aa021",
         "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": 4232.5,
-        "y": 2243,
-        "z": "5a4cb919.dfff38",
+        "x": 4217.25,
+        "y": 2399,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "d2d57048.de12f",
+        "id": "c46066f7.6ad638",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4236,
-        "y": 2283,
-        "z": "5a4cb919.dfff38",
+        "x": 4220.75,
+        "y": 2439,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "703675c3.1d187c",
-                "6a8e2764.0748e8"
+                "dbf72bce.fe4fd",
+                "da41ce10.71c4a8"
             ]
         ]
     },
     {
-        "id": "703675c3.1d187c",
+        "id": "dbf72bce.fe4fd",
         "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": 4576,
-        "y": 2282,
-        "z": "5a4cb919.dfff38",
+        "x": 4560.75,
+        "y": 2438,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "b9adfc7b.f1d908",
+        "id": "a0a6a7a2.80538",
         "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": 4434,
-        "y": 2240,
-        "z": "5a4cb919.dfff38",
+        "x": 4418.75,
+        "y": 2396,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "6a8e2764.0748e8",
+        "id": "da41ce10.71c4a8",
         "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": 4505,
-        "y": 2331,
-        "z": "5a4cb919.dfff38",
+        "x": 4489.75,
+        "y": 2487,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "641093d5.a73774",
+        "id": "509b9ad8.503f2c",
         "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": 3130,
-        "y": 598,
-        "z": "5a4cb919.dfff38",
+        "x": 3114.75,
+        "y": 754,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "29b91b19.d2edf4",
+        "id": "8edfc4cd.8a0528",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3725,
-        "y": 284,
-        "z": "5a4cb919.dfff38",
+        "x": 3709.75,
+        "y": 440,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "df88a98e.3b797",
+        "id": "f79b26c9.540128",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3282,
-        "y": 1862,
-        "z": "5a4cb919.dfff38",
+        "x": 3266.75,
+        "y": 2018,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "295e16ce.878c6a",
+        "id": "50bc7adf.71a1d4",
         "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": 3461,
-        "y": 446,
-        "z": "5a4cb919.dfff38",
+        "x": 3445.75,
+        "y": 602,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fdfbdf68.ace01",
-                "8f7ef737.3d4208"
+                "ebf4cc93.93ec7",
+                "8e7f6f60.66ae28"
             ]
         ]
     },
     {
-        "id": "8f7ef737.3d4208",
+        "id": "8e7f6f60.66ae28",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3703,
-        "y": 1035,
-        "z": "5a4cb919.dfff38",
+        "x": 3687.75,
+        "y": 1191,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d545d977.39f008"
+                "d55e670.1fa9f18"
             ]
         ]
     },
     {
-        "id": "fdfbdf68.ace01",
+        "id": "ebf4cc93.93ec7",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3697,
-        "y": 326,
-        "z": "5a4cb919.dfff38",
+        "x": 3681.75,
+        "y": 482,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "552020c2.f01db"
+                "9c2c3c17.6c4b68"
             ]
         ]
     },
     {
-        "id": "d545d977.39f008",
+        "id": "d55e670.1fa9f18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3861,
-        "y": 1034,
-        "z": "5a4cb919.dfff38",
+        "x": 3845.75,
+        "y": 1190,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "127c7c35.f5600c",
-                "aa22b9fb.8c00d",
-                "7a8bb8ff.a3807",
-                "b6e4b7cd.3aab58",
-                "9befe6d.bfbfb18",
-                "61ff745d.2cf8b4"
+                "f4e2a19a.1a35e",
+                "f86044a9.f193d",
+                "4b4e2775.d6044",
+                "86690982.b14b6",
+                "21d875df.4e5d92",
+                "971d8a82.30a53"
             ]
         ]
     },
     {
-        "id": "aa22b9fb.8c00d",
+        "id": "f86044a9.f193d",
         "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": 4125,
-        "y": 917,
-        "z": "5a4cb919.dfff38",
+        "x": 4109.75,
+        "y": 1073,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "9befe6d.bfbfb18",
+        "id": "21d875df.4e5d92",
         "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": 4206,
-        "y": 1232,
-        "z": "5a4cb919.dfff38",
+        "x": 4190.75,
+        "y": 1388,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "602f32f4.cac7b4",
-                "1d093526.32224b"
+                "cd1830a.9a25b5",
+                "5f7c3883.6456e"
             ]
         ]
     },
     {
-        "id": "602f32f4.cac7b4",
+        "id": "cd1830a.9a25b5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4515.5,
-        "y": 1201,
-        "z": "5a4cb919.dfff38",
+        "x": 4500.25,
+        "y": 1357,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "4513cd6b.369634"
+                "cf35e2b3.2c8468"
             ]
         ]
     },
     {
-        "id": "1d093526.32224b",
+        "id": "5f7c3883.6456e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4520.5,
-        "y": 1266,
-        "z": "5a4cb919.dfff38",
+        "x": 4505.25,
+        "y": 1422,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "7640c8ac.188fc8"
+                "b3a80e08.d037b"
             ]
         ]
     },
     {
-        "id": "4513cd6b.369634",
+        "id": "cf35e2b3.2c8468",
         "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": 4691.5,
-        "y": 1201,
-        "z": "5a4cb919.dfff38",
+        "x": 4676.25,
+        "y": 1357,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "7640c8ac.188fc8",
+        "id": "b3a80e08.d037b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4687,
-        "y": 1266,
-        "z": "5a4cb919.dfff38",
+        "x": 4671.75,
+        "y": 1422,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a8bb8ff.a3807",
+        "id": "4b4e2775.d6044",
         "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": 4063,
-        "y": 965,
-        "z": "5a4cb919.dfff38",
+        "x": 4047.75,
+        "y": 1121,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "b6e4b7cd.3aab58",
+        "id": "86690982.b14b6",
         "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": 4089,
-        "y": 1082,
-        "z": "5a4cb919.dfff38",
+        "x": 4073.75,
+        "y": 1238,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "bc604696.f19bf",
-                "6b2ab2eb.e94cac",
-                "158e3d74.81687b"
+                "85fe6961.6a7908",
+                "3fb6fcbe.a3fa0c",
+                "89e44c19.cf1b38"
             ]
         ]
     },
     {
-        "id": "bc604696.f19bf",
+        "id": "85fe6961.6a7908",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4284.5001220703125,
-        "y": 1034,
-        "z": "5a4cb919.dfff38",
+        "x": 4269.2501220703125,
+        "y": 1190,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fbbae41a.6bb8"
+                "8a104557.0ad8d8"
             ]
         ]
     },
     {
-        "id": "6b2ab2eb.e94cac",
+        "id": "3fb6fcbe.a3fa0c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4276.5001220703125,
-        "y": 1089,
-        "z": "5a4cb919.dfff38",
+        "x": 4261.2501220703125,
+        "y": 1245,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "5e10560f.7f2a6"
+                "42db739a.3307d4"
             ]
         ]
     },
     {
-        "id": "fbbae41a.6bb8",
+        "id": "8a104557.0ad8d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4428.8824462890625,
-        "y": 1033.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 4413.6324462890625,
+        "y": 1189.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "4ab90ec7.0f8a1"
+                "f760615b.c41c38"
             ]
         ]
     },
     {
-        "id": "4ab90ec7.0f8a1",
+        "id": "f760615b.c41c38",
         "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": 4613,
-        "y": 1032,
-        "z": "5a4cb919.dfff38",
+        "x": 4597.75,
+        "y": 1188,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "3bb025b6.92298a"
+                "142416ba.388749"
             ]
         ]
     },
     {
-        "id": "3bb025b6.92298a",
+        "id": "142416ba.388749",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4808,
-        "y": 1032,
-        "z": "5a4cb919.dfff38",
+        "x": 4792.75,
+        "y": 1188,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ce204654.d589e8"
+                "ee80fb82.914478"
             ]
         ]
     },
     {
-        "id": "158e3d74.81687b",
+        "id": "89e44c19.cf1b38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4281.5001220703125,
-        "y": 1146,
-        "z": "5a4cb919.dfff38",
+        "x": 4266.2501220703125,
+        "y": 1302,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cfe04507.17faa"
+                "190fd174.e420e7"
             ]
         ]
     },
     {
-        "id": "cfe04507.17faa",
+        "id": "190fd174.e420e7",
         "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": 4433.5001220703125,
-        "y": 1147,
-        "z": "5a4cb919.dfff38",
+        "x": 4418.2501220703125,
+        "y": 1303,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "5e10560f.7f2a6",
+        "id": "42db739a.3307d4",
         "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": 4444.5001220703125,
-        "y": 1090,
-        "z": "5a4cb919.dfff38",
+        "x": 4429.2501220703125,
+        "y": 1246,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "127c7c35.f5600c",
+        "id": "f4e2a19a.1a35e",
         "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": 4120,
-        "y": 857,
-        "z": "5a4cb919.dfff38",
+        "x": 4104.75,
+        "y": 1013,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "ce204654.d589e8",
+        "id": "ee80fb82.914478",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5011,
-        "y": 1036,
-        "z": "5a4cb919.dfff38",
+        "x": 4995.75,
+        "y": 1192,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fea8f5c8.b664d8"
+                "16f58788.f805f"
             ]
         ]
     },
     {
-        "id": "17936311.45c0f5",
+        "id": "4337aa6a.e7854c",
         "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": 5396,
-        "y": 1049,
-        "z": "5a4cb919.dfff38",
+        "x": 5380.75,
+        "y": 1205,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "bda3b861.07af08",
-                "8ce8739f.28fc08",
-                "8098fa71.4cbf3"
+                "d59e46ba.4f5ed8",
+                "51e7728a.8676fc",
+                "dbdd6c65.aefc38"
             ]
         ]
     },
     {
-        "id": "fea8f5c8.b664d8",
+        "id": "16f58788.f805f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5190,
-        "y": 1036,
-        "z": "5a4cb919.dfff38",
+        "x": 5174.75,
+        "y": 1192,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "619520a0.18d9e",
-                "17936311.45c0f5"
+                "925f4411.b3c5c",
+                "4337aa6a.e7854c"
             ]
         ]
     },
     {
-        "id": "619520a0.18d9e",
+        "id": "925f4411.b3c5c",
         "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": 5426,
-        "y": 997,
-        "z": "5a4cb919.dfff38",
+        "x": 5410.75,
+        "y": 1153,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "bda3b861.07af08",
+        "id": "d59e46ba.4f5ed8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5606,
-        "y": 1040,
-        "z": "5a4cb919.dfff38",
+        "x": 5590.75,
+        "y": 1196,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "3c9ad3f5.e5e4a4"
+                "9fb3d6ee.612538"
             ]
         ]
     },
     {
-        "id": "8ce8739f.28fc08",
+        "id": "51e7728a.8676fc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5598,
-        "y": 1095,
-        "z": "5a4cb919.dfff38",
+        "x": 5582.75,
+        "y": 1251,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ec86cd9f.a15968"
+                "1c483cb2.44cb23"
             ]
         ]
     },
     {
-        "id": "8098fa71.4cbf3",
+        "id": "dbdd6c65.aefc38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5603,
-        "y": 1152,
-        "z": "5a4cb919.dfff38",
+        "x": 5587.75,
+        "y": 1308,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "244270ad.8dfe1"
+                "c131e872.bad5c8"
             ]
         ]
     },
     {
-        "id": "244270ad.8dfe1",
+        "id": "c131e872.bad5c8",
         "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": 5755,
-        "y": 1153,
-        "z": "5a4cb919.dfff38",
+        "x": 5739.75,
+        "y": 1309,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "ec86cd9f.a15968",
+        "id": "1c483cb2.44cb23",
         "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": 5766,
-        "y": 1098,
-        "z": "5a4cb919.dfff38",
+        "x": 5750.75,
+        "y": 1254,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "3c9ad3f5.e5e4a4",
+        "id": "9fb3d6ee.612538",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5750.38232421875,
-        "y": 1037.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 5735.13232421875,
+        "y": 1193.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "2068f2a1.5ec866"
+                "e9716a08.a0ba08"
             ]
         ]
     },
     {
-        "id": "2068f2a1.5ec866",
+        "id": "e9716a08.a0ba08",
         "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": 5965,
-        "y": 1034,
-        "z": "5a4cb919.dfff38",
+        "x": 5949.75,
+        "y": 1190,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "e69cbe2a.82be58",
+        "id": "c1f0320d.223f",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3739,
-        "y": 975,
-        "z": "5a4cb919.dfff38",
+        "x": 3723.75,
+        "y": 1131,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "957d0d12.f7d338",
+        "id": "db55a5db.cc9e2",
         "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": 2301,
-        "y": 702,
-        "z": "5a4cb919.dfff38",
+        "x": 2285.75,
+        "y": 858,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "7969493f.6a54d",
-                "9a6050c4.300548"
+                "8cfca669.4c31d",
+                "1cedd7fb.e18cd"
             ]
         ]
     },
     {
-        "id": "9a6050c4.300548",
+        "id": "1cedd7fb.e18cd",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2708,
-        "y": 720,
-        "z": "5a4cb919.dfff38",
+        "x": 2692.75,
+        "y": 876,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "66cd0943.de62f"
+                "91bf0188.93b52"
             ]
         ]
     },
     {
-        "id": "7969493f.6a54d",
+        "id": "8cfca669.4c31d",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2708,
-        "y": 665,
-        "z": "5a4cb919.dfff38",
+        "x": 2692.75,
+        "y": 821,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "7c5fc999.6b62c"
+                "6ae8a7fa.83375"
             ]
         ]
     },
     {
-        "id": "7c5fc999.6b62c",
+        "id": "6ae8a7fa.83375",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2864,
-        "y": 663,
-        "z": "5a4cb919.dfff38",
+        "x": 2848.75,
+        "y": 819,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "641093d5.a73774",
-                "a1edca3.1a62bb8"
+                "509b9ad8.503f2c",
+                "3dd6564a.788bea"
             ]
         ]
     },
     {
-        "id": "66cd0943.de62f",
+        "id": "91bf0188.93b52",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2841,
-        "y": 721,
-        "z": "5a4cb919.dfff38",
+        "x": 2825.75,
+        "y": 877,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "cce8745e.b515b8",
+        "id": "14b40144.c74357",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 1018,
-        "y": 137,
-        "z": "5a4cb919.dfff38",
+        "x": 1002.75,
+        "y": 293,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "48ad099a.c16688",
+        "id": "470acf69.6a7218",
         "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": 4135,
-        "y": 555,
-        "z": "5a4cb919.dfff38",
+        "x": 4119.75,
+        "y": 711,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "ec3b4a19.7f5ee",
+        "id": "94ce35b5.84e9d",
         "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": 4195,
-        "y": 594,
-        "z": "5a4cb919.dfff38",
+        "x": 4179.75,
+        "y": 750,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "706cb78c.da92b",
+        "id": "8371652a.c1422",
         "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": 1011,
-        "y": 45,
-        "z": "5a4cb919.dfff38",
+        "x": 995.75,
+        "y": 201,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "9a38eb9e.71f4d8",
+        "id": "180e951c.adb823",
         "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": 3547,
-        "y": 2071,
-        "z": "5a4cb919.dfff38",
+        "x": 3531.75,
+        "y": 2227,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "724930a5.f44628",
+        "id": "b13189f3.5c00c",
         "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": 3603,
-        "y": 2120,
-        "z": "5a4cb919.dfff38",
+        "x": 3587.75,
+        "y": 2276,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "2a414bdc.2311dc",
+        "id": "68b96268.5bf0d4",
         "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": 1011,
-        "y": 84,
-        "z": "5a4cb919.dfff38",
+        "x": 995.75,
+        "y": 240,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "88772a4.9b58658",
+        "id": "ab74b4be.cbc48",
         "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": 1042,
-        "y": 185,
-        "z": "5a4cb919.dfff38",
+        "x": 1026.75,
+        "y": 341,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "4ace150.4554dec",
+        "id": "77984a30.f32474",
         "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": 252,
-        "y": 660,
-        "z": "5a4cb919.dfff38",
+        "x": 236.75,
+        "y": 816,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ce4ab0d3.b836a",
-                "9dbee6c6.1a60a",
-                "290803ec.65c94c"
+                "6b466955.39f7e8",
+                "ea72fa7a.37647",
+                "256cca7a.4ba78e"
             ]
         ]
     },
     {
-        "id": "ce4ab0d3.b836a",
+        "id": "6b466955.39f7e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 471,
-        "y": 598,
-        "z": "5a4cb919.dfff38",
+        "x": 455.75,
+        "y": 754,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "280015e3.c315e2"
+                "ff154227.b5783"
             ]
         ]
     },
     {
-        "id": "9dbee6c6.1a60a",
+        "id": "ea72fa7a.37647",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 480.490966796875,
-        "y": 640.5740356445312,
-        "z": "5a4cb919.dfff38",
+        "x": 465.240966796875,
+        "y": 796.5740356445312,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "290803ec.65c94c",
+        "id": "256cca7a.4ba78e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 469,
-        "y": 687,
-        "z": "5a4cb919.dfff38",
+        "x": 453.75,
+        "y": 843,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "f842cdf9.29a79"
+                "9c1b438c.70f6e8"
             ]
         ]
     },
     {
-        "id": "280015e3.c315e2",
+        "id": "ff154227.b5783",
         "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": 668,
-        "y": 594,
-        "z": "5a4cb919.dfff38",
+        "x": 652.75,
+        "y": 750,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cd508bdd.302a88"
+                "d19cd8ca.093408"
             ]
         ]
     },
     {
-        "id": "f842cdf9.29a79",
+        "id": "9c1b438c.70f6e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 638,
-        "y": 688,
-        "z": "5a4cb919.dfff38",
+        "x": 622.75,
+        "y": 844,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "cd508bdd.302a88",
+        "id": "d19cd8ca.093408",
         "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": 891.33349609375,
-        "y": 593.9999389648438,
-        "z": "5a4cb919.dfff38",
+        "x": 876.08349609375,
+        "y": 749.9999389648438,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d4df8e14.56fc08"
+                "ec3530b4.60943"
             ]
         ]
     },
     {
-        "id": "d4df8e14.56fc08",
+        "id": "ec3530b4.60943",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1092.0001335144043,
-        "y": 595.000020980835,
-        "z": "5a4cb919.dfff38",
+        "x": 1076.7501335144043,
+        "y": 751.000020980835,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "b67eb6e5.58b31"
+                "732a5938.51aee8"
             ]
         ]
     },
     {
-        "id": "b67eb6e5.58b31",
+        "id": "732a5938.51aee8",
         "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": 222,
-        "y": 857,
-        "z": "5a4cb919.dfff38",
+        "x": 206.75,
+        "y": 1013,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "eb910f68.8a5408",
-                "a6536ba8.c4e148",
-                "6d1288a7.3722b8"
+                "23a8b591.9364c2",
+                "8c7cc41e.285ad",
+                "a093cec4.b44ed"
             ]
         ]
     },
     {
-        "id": "eb910f68.8a5408",
+        "id": "23a8b591.9364c2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 430,
-        "y": 821,
-        "z": "5a4cb919.dfff38",
+        "x": 414.75,
+        "y": 977,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "6687da8.fb06ca4"
+                "9b9627ac.373dc8"
             ]
         ]
     },
     {
-        "id": "a6536ba8.c4e148",
+        "id": "8c7cc41e.285ad",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 430.490966796875,
-        "y": 866.5740356445312,
-        "z": "5a4cb919.dfff38",
+        "x": 415.240966796875,
+        "y": 1022.5740356445312,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "6d1288a7.3722b8",
+        "id": "a093cec4.b44ed",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 428,
-        "y": 910,
-        "z": "5a4cb919.dfff38",
+        "x": 412.75,
+        "y": 1066,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "a3e6b31.4b2495"
+                "26fe918.5a2edee"
             ]
         ]
     },
     {
-        "id": "a3e6b31.4b2495",
+        "id": "26fe918.5a2edee",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 597,
-        "y": 911,
-        "z": "5a4cb919.dfff38",
+        "x": 581.75,
+        "y": 1067,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "64de189c.ea0ca",
+        "id": "f6f3f7dd.ddd42",
         "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": 569,
-        "y": 1405,
-        "z": "5a4cb919.dfff38",
+        "x": 553.75,
+        "y": 1561,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "f09d5f3a.90b09"
+                "8744e477.6cb05"
             ]
         ]
     },
     {
-        "id": "f09d5f3a.90b09",
+        "id": "8744e477.6cb05",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 772,
-        "y": 1417,
-        "z": "5a4cb919.dfff38",
+        "x": 756.75,
+        "y": 1573,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "be069a3d.2f258"
+                "9fc39c57.082728"
             ]
         ]
     },
     {
-        "id": "be069a3d.2f258",
+        "id": "9fc39c57.082728",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 938,
-        "y": 1414,
-        "z": "5a4cb919.dfff38",
+        "x": 922.75,
+        "y": 1570,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "b33327bf.cf44b8"
+                "5d341323.92886c"
             ]
         ]
     },
     {
-        "id": "b33327bf.cf44b8",
+        "id": "5d341323.92886c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1099,
-        "y": 1411,
-        "z": "5a4cb919.dfff38",
+        "x": 1083.75,
+        "y": 1567,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9b6250ff.75cf18",
-                "6e8e9c3e.00f634",
-                "db16830a.f6a5",
-                "611e4d54.277574",
-                "c0f4e533.035be8",
-                "ee82569c.a25768"
+                "878fc20b.33088",
+                "9a421f91.9b1b28",
+                "7916417b.dd4858",
+                "277d0a08.b51776",
+                "5d833ac3.a3e554",
+                "6bd95e1e.6c91d8"
             ]
         ]
     },
     {
-        "id": "6e8e9c3e.00f634",
+        "id": "9a421f91.9b1b28",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1305,
-        "y": 1010.9999389648438,
-        "z": "5a4cb919.dfff38",
+        "x": 1289.75,
+        "y": 1166.9999389648438,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "9b6250ff.75cf18",
+        "id": "878fc20b.33088",
         "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": 1302,
-        "y": 1055.9999389648438,
-        "z": "5a4cb919.dfff38",
+        "x": 1286.75,
+        "y": 1211.9999389648438,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "1b290eb5.e974c9",
-                "b84573d.a8be19",
-                "ef2334eb.3c1b68"
+                "1277502d.c8e7a",
+                "3575cdbd.1f32e2",
+                "bad103b9.14ac5"
             ]
         ]
     },
     {
-        "id": "b84573d.a8be19",
+        "id": "3575cdbd.1f32e2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1497.490966796875,
-        "y": 1029.5739135742188,
-        "z": "5a4cb919.dfff38",
+        "x": 1482.240966796875,
+        "y": 1185.5739135742188,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "45bb14a8.1a7924"
+                "245198ca.86efd8"
             ]
         ]
     },
     {
-        "id": "ef2334eb.3c1b68",
+        "id": "bad103b9.14ac5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1493,
-        "y": 1073.9998779296875,
-        "z": "5a4cb919.dfff38",
+        "x": 1477.75,
+        "y": 1229.9998779296875,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cd1f6950.fef1f"
+                "564cd01d.c60fe8"
             ]
         ]
     },
     {
-        "id": "45bb14a8.1a7924",
+        "id": "245198ca.86efd8",
         "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": 1660.0625,
-        "y": 1028.859619140625,
-        "z": "5a4cb919.dfff38",
+        "x": 1644.8125,
+        "y": 1184.859619140625,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "cd1f6950.fef1f",
+        "id": "564cd01d.c60fe8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1661,
-        "y": 1073.9998779296875,
-        "z": "5a4cb919.dfff38",
+        "x": 1645.75,
+        "y": 1229.9998779296875,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "cd4af41f.be1a78",
+        "id": "57d2d0ba.ac96f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1663,
-        "y": 1120.9998779296875,
-        "z": "5a4cb919.dfff38",
+        "x": 1647.75,
+        "y": 1276.9998779296875,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "1b290eb5.e974c9",
+        "id": "1277502d.c8e7a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1494,
-        "y": 1120.9998779296875,
-        "z": "5a4cb919.dfff38",
+        "x": 1478.75,
+        "y": 1276.9998779296875,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cd4af41f.be1a78"
+                "57d2d0ba.ac96f"
             ]
         ]
     },
     {
-        "id": "60f7024f.a382fc",
+        "id": "5f14d939.b7d6d",
         "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": 1276,
-        "y": 1642,
-        "z": "5a4cb919.dfff38",
+        "x": 1260.75,
+        "y": 1798,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "db16830a.f6a5",
+        "id": "7916417b.dd4858",
         "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": 1367,
-        "y": 1696,
-        "z": "5a4cb919.dfff38",
+        "x": 1351.75,
+        "y": 1852,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "1989ebd9.8b76bc",
+        "id": "780a0f58.bba71",
         "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": 2043.5,
-        "y": 1109,
-        "z": "5a4cb919.dfff38",
+        "x": 2028.25,
+        "y": 1265,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "9da50ff.0241af",
+        "id": "423abc5f.68ffa4",
         "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": 2048.5,
-        "y": 1211,
-        "z": "5a4cb919.dfff38",
+        "x": 2033.25,
+        "y": 1367,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "eda2f0f7.d8fb38",
+        "id": "9ae45b75.53fe1",
         "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": 532,
-        "y": 1661,
-        "z": "5a4cb919.dfff38",
+        "x": 516.75,
+        "y": 1817,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "62852429.1f30ac"
+                "a1c491a.b9e1cf"
             ]
         ]
     },
     {
-        "id": "62852429.1f30ac",
+        "id": "a1c491a.b9e1cf",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 764,
-        "y": 1660,
-        "z": "5a4cb919.dfff38",
+        "x": 748.75,
+        "y": 1816,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ede4a749.9f1af8"
+                "c7d001fc.995ef"
             ]
         ]
     },
     {
-        "id": "ede4a749.9f1af8",
+        "id": "c7d001fc.995ef",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 976,
-        "y": 1661,
-        "z": "5a4cb919.dfff38",
+        "x": 960.75,
+        "y": 1817,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "b699a292.eb6f88"
+                "af8caf57.c80ff"
             ]
         ]
     },
     {
-        "id": "b699a292.eb6f88",
+        "id": "af8caf57.c80ff",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 232,
-        "y": 1817,
-        "z": "5a4cb919.dfff38",
+        "x": 216.75,
+        "y": 1973,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "13d7e483.3188fb",
-                "74bc3a8f.9628d4"
+                "dbb11610.758b08",
+                "e6442fee.44c628"
             ]
         ]
     },
     {
-        "id": "74bc3a8f.9628d4",
+        "id": "e6442fee.44c628",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 467,
-        "y": 1804,
-        "z": "5a4cb919.dfff38",
+        "x": 451.75,
+        "y": 1960,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "13d7e483.3188fb",
+        "id": "dbb11610.758b08",
         "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": 457,
-        "y": 1865,
-        "z": "5a4cb919.dfff38",
+        "x": 441.75,
+        "y": 2021,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "bcef8cd9.e20998",
-                "764e27eb.b5496",
-                "21958602.3fa0ea"
+                "afa88564.16a37",
+                "83950a7.2f6c078",
+                "12b1aba5.e7a0f4"
             ]
         ]
     },
     {
-        "id": "764e27eb.b5496",
+        "id": "83950a7.2f6c078",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 670.490966796875,
-        "y": 1849.5740356445312,
-        "z": "5a4cb919.dfff38",
+        "x": 655.240966796875,
+        "y": 2005.5740356445312,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9c812de2.87639"
+                "ea85ca6d.e8d7e"
             ]
         ]
     },
     {
-        "id": "21958602.3fa0ea",
+        "id": "12b1aba5.e7a0f4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 666,
-        "y": 1894,
-        "z": "5a4cb919.dfff38",
+        "x": 650.75,
+        "y": 2050,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "2915d3a6.63730c"
+                "eb678b0e.5293e8"
             ]
         ]
     },
     {
-        "id": "bcef8cd9.e20998",
+        "id": "afa88564.16a37",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 668,
-        "y": 1954,
-        "z": "5a4cb919.dfff38",
+        "x": 652.75,
+        "y": 2110,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "bb26f0d0.bc6288"
+                "46f07676.1e063"
             ]
         ]
     },
     {
-        "id": "9c812de2.87639",
+        "id": "ea85ca6d.e8d7e",
         "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": 833.0625,
-        "y": 1848.8597412109375,
-        "z": "5a4cb919.dfff38",
+        "x": 817.8125,
+        "y": 2004.8597412109375,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "2915d3a6.63730c",
+        "id": "eb678b0e.5293e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 834,
-        "y": 1894,
-        "z": "5a4cb919.dfff38",
+        "x": 818.75,
+        "y": 2050,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "bb26f0d0.bc6288",
+        "id": "46f07676.1e063",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 837,
-        "y": 1953,
-        "z": "5a4cb919.dfff38",
+        "x": 821.75,
+        "y": 2109,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "e8fb0469.22a408",
-                "b503b0ba.b1ff6"
+                "d6f04402.414508",
+                "ac4ce335.0555f"
             ]
         ]
     },
     {
-        "id": "445d8bb1.6c470c",
+        "id": "42a4fda9.57619c",
         "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",
+        "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='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\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": 236,
-        "y": 2452,
-        "z": "5a4cb919.dfff38",
+        "x": 241.75,
+        "y": 2611,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "925823e9.1c4a4",
+        "id": "3738a9bc.2f26e6",
         "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": 379,
-        "y": 2512,
-        "z": "5a4cb919.dfff38",
+        "x": 363.75,
+        "y": 2668,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "345842a4.88ef2e",
-                "a4dc32a8.6620d8"
+                "ac81680a.65fae",
+                "96fc6628.148e78"
             ]
         ]
     },
     {
-        "id": "345842a4.88ef2e",
+        "id": "ac81680a.65fae",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 691.5,
-        "y": 2489,
-        "z": "5a4cb919.dfff38",
+        "x": 676.25,
+        "y": 2645,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4dc32a8.6620d8",
+        "id": "96fc6628.148e78",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 695.5,
-        "y": 2529,
-        "z": "5a4cb919.dfff38",
+        "x": 680.25,
+        "y": 2685,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d1fda3bb.92b0e"
+                "bf7ee9c0.419518"
             ]
         ]
     },
     {
-        "id": "cde1b667.7c4d6",
+        "id": "6f03e95e.3ec198",
         "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": 871.5,
-        "y": 2493,
-        "z": "5a4cb919.dfff38",
+        "x": 856.25,
+        "y": 2649,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "d1fda3bb.92b0e",
+        "id": "bf7ee9c0.419518",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 887,
-        "y": 2547,
-        "z": "5a4cb919.dfff38",
+        "x": 871.75,
+        "y": 2703,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "a9ee92c3.93f6e8"
+                "846842ab.33ca8",
+                "5e1c0ed5.c69c48",
+                "9a742833.7a10a8",
+                "feb8a80.2e93d58"
             ]
         ]
     },
     {
-        "id": "459839ba.ae33c",
+        "id": "214d3a40.5474be",
         "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": 1182.5,
-        "y": 2516,
-        "z": "5a4cb919.dfff38",
+        "x": 1167.25,
+        "y": 2672,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "120147ed.79206",
+        "id": "4243a8af.47f99",
         "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": 2649.5,
-        "y": 1867,
-        "z": "5a4cb919.dfff38",
+        "x": 2634.25,
+        "y": 2023,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "a9ee92c3.93f6e8",
+        "id": "846842ab.33ca8",
         "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": 1144.5,
-        "y": 2558,
-        "z": "5a4cb919.dfff38",
+        "x": 1129.25,
+        "y": 2714,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "9d25e547.75567",
+        "id": "eb2c1071.d160d8",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 2009.5,
-        "y": 1147,
-        "z": "5a4cb919.dfff38",
+        "x": 1994.25,
+        "y": 1303,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "52a255e0.e77dec",
+        "id": "3c1d8397.66cfbc",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 2010.5,
-        "y": 1251,
-        "z": "5a4cb919.dfff38",
+        "x": 1995.25,
+        "y": 1407,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "881b2d7a.c4e888",
+        "id": "9dbb6108.db3f08",
         "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": 4304,
-        "y": 508,
-        "z": "5a4cb919.dfff38",
+        "x": 4288.75,
+        "y": 664,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "61ff745d.2cf8b4",
+        "id": "971d8a82.30a53",
         "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": 4207,
-        "y": 1327,
-        "z": "5a4cb919.dfff38",
+        "x": 4191.75,
+        "y": 1483,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "98331ea2.d141f",
+        "id": "72e7ea14.321c0c",
         "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": 3701,
-        "y": 1999,
-        "z": "5a4cb919.dfff38",
+        "x": 3685.75,
+        "y": 2155,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "6687da8.fb06ca4",
+        "id": "9b9627ac.373dc8",
         "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": 802,
-        "y": 807,
-        "z": "5a4cb919.dfff38",
+        "x": 786.75,
+        "y": 963,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "11a4a5f5.385f32",
-                "192499d2.667f1e"
+                "20416bfa.abd944",
+                "3157f22c.bca4c6"
             ]
         ]
     },
     {
-        "id": "11a4a5f5.385f32",
+        "id": "20416bfa.abd944",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1165,
-        "y": 830,
-        "z": "5a4cb919.dfff38",
+        "x": 1149.75,
+        "y": 986,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "1fc9c5be.8fac2a"
+                "16371b2a.82f3f5"
             ]
         ]
     },
     {
-        "id": "192499d2.667f1e",
+        "id": "3157f22c.bca4c6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1165,
-        "y": 779,
-        "z": "5a4cb919.dfff38",
+        "x": 1149.75,
+        "y": 935,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "5fe8520c.50e664"
+                "7c942827.229d68"
             ]
         ]
     },
     {
-        "id": "1fc9c5be.8fac2a",
+        "id": "16371b2a.82f3f5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1321,
-        "y": 828,
-        "z": "5a4cb919.dfff38",
+        "x": 1305.75,
+        "y": 984,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "a46faf22.6dbda8"
+                "6516a515.9e0ed4"
             ]
         ]
     },
     {
-        "id": "5fe8520c.50e664",
+        "id": "7c942827.229d68",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1298,
-        "y": 780,
-        "z": "5a4cb919.dfff38",
+        "x": 1282.75,
+        "y": 936,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "1f9b767f.d670b2",
+        "id": "d1721022.90ae5",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2058,
-        "y": 178,
-        "z": "5a4cb919.dfff38",
+        "x": 2042.75,
+        "y": 334,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "f84de17e.e8ea08",
+        "id": "a1c10f72.410b08",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3600,
-        "y": 2159,
-        "z": "5a4cb919.dfff38",
+        "x": 3584.75,
+        "y": 2315,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "1a392cd7.238923",
+        "id": "7f10b67d.13cbf",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4190,
-        "y": 632,
-        "z": "5a4cb919.dfff38",
+        "x": 4174.75,
+        "y": 788,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "611e4d54.277574",
+        "id": "277d0a08.b51776",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1364,
-        "y": 1738,
-        "z": "5a4cb919.dfff38",
+        "x": 1348.75,
+        "y": 1894,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "dc7d7df9.afb81",
+        "id": "dbed9630.5fe208",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 543,
-        "y": 1472,
-        "z": "5a4cb919.dfff38",
+        "x": 527.75,
+        "y": 1628,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "c70f6326.e297a",
+        "id": "b8630526.556578",
         "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": 574,
-        "y": 1512,
-        "z": "5a4cb919.dfff38",
+        "x": 558.75,
+        "y": 1668,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "e8fb0469.22a408",
+        "id": "d6f04402.414508",
         "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": 1122,
-        "y": 1920,
-        "z": "5a4cb919.dfff38",
+        "x": 1106.75,
+        "y": 2076,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "b503b0ba.b1ff6",
+        "id": "ac4ce335.0555f",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1125,
-        "y": 1962,
-        "z": "5a4cb919.dfff38",
+        "x": 1109.75,
+        "y": 2118,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "f7d70d92.8a17d",
+        "id": "d6151d45.cfb988",
         "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": 568,
-        "y": 1602,
-        "z": "5a4cb919.dfff38",
+        "x": 552.75,
+        "y": 1758,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "93ecab9f.5bb27",
+        "id": "f1b784f.6be4af8",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 323,
-        "y": 1981,
-        "z": "5a4cb919.dfff38",
+        "x": 307.75,
+        "y": 2137,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "e1bf516d.80132",
+        "id": "b54d5a69.762db",
         "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": 331,
-        "y": 2038,
-        "z": "5a4cb919.dfff38",
+        "x": 315.75,
+        "y": 2194,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "c0f4e533.035be8",
+        "id": "5d833ac3.a3e554",
         "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": 1342,
-        "y": 1587,
-        "z": "5a4cb919.dfff38",
+        "x": 1326.75,
+        "y": 1743,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ff9a5641.69fda",
-                "a44c9ce4.5d2008"
+                "5ddf355f.54101c",
+                "1bdf6619.a36342"
             ]
         ]
     },
     {
-        "id": "a44c9ce4.5d2008",
+        "id": "1bdf6619.a36342",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1565,
-        "y": 1542,
-        "z": "5a4cb919.dfff38",
+        "x": 1549.75,
+        "y": 1698,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "eaca171f.944a48"
+                "754506fa.d51aa8"
             ]
         ]
     },
     {
-        "id": "ff9a5641.69fda",
+        "id": "5ddf355f.54101c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1567,
-        "y": 1606,
-        "z": "5a4cb919.dfff38",
+        "x": 1551.75,
+        "y": 1762,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "93d69fa.52d496"
+                "68209615.eef37"
             ]
         ]
     },
     {
-        "id": "eaca171f.944a48",
+        "id": "754506fa.d51aa8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1730,
-        "y": 1539,
-        "z": "5a4cb919.dfff38",
+        "x": 1714.75,
+        "y": 1695,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "b0447236.92d3b"
+                "714f4595.b88ec4"
             ]
         ]
     },
     {
-        "id": "93d69fa.52d496",
+        "id": "68209615.eef37",
         "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": 1729,
-        "y": 1602,
-        "z": "5a4cb919.dfff38",
+        "x": 1713.75,
+        "y": 1758,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "b0447236.92d3b",
+        "id": "714f4595.b88ec4",
         "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 -4]`' />\n",
         "comments": "",
-        "x": 1950,
-        "y": 1553,
-        "z": "5a4cb919.dfff38",
+        "x": 1934.75,
+        "y": 1709,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "ab15b7a9.bc6bc8",
+        "id": "1db1829e.06c1d5",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1495,
-        "y": 2278,
-        "z": "5a4cb919.dfff38",
+        "x": 1479.75,
+        "y": 2434,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "be2440af.c20c98"
+                "2cbd7342.8e2ecc"
             ]
         ]
     },
     {
-        "id": "1405448e.40f263",
+        "id": "fa138a5b.3e0008",
         "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": 1880,
-        "y": 2291,
-        "z": "5a4cb919.dfff38",
+        "x": 1864.75,
+        "y": 2447,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "facba133.b01618",
-                "36457cd.f85a104",
-                "a0c24437.cf174"
+                "e14f1acf.1bcd",
+                "c2e19be7.fca29",
+                "775dbfec.d9501"
             ]
         ]
     },
     {
-        "id": "be2440af.c20c98",
+        "id": "2cbd7342.8e2ecc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1674,
-        "y": 2278,
-        "z": "5a4cb919.dfff38",
+        "x": 1658.75,
+        "y": 2434,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "eec40e11.9fdab",
-                "1405448e.40f263"
+                "6f327062.742838",
+                "fa138a5b.3e0008"
             ]
         ]
     },
     {
-        "id": "eec40e11.9fdab",
+        "id": "6f327062.742838",
         "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": 1910,
-        "y": 2239,
-        "z": "5a4cb919.dfff38",
+        "x": 1894.75,
+        "y": 2395,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "facba133.b01618",
+        "id": "e14f1acf.1bcd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2090,
-        "y": 2282,
-        "z": "5a4cb919.dfff38",
+        "x": 2074.75,
+        "y": 2438,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "926a046d.eed228"
+                "d0fc139e.1761"
             ]
         ]
     },
     {
-        "id": "36457cd.f85a104",
+        "id": "c2e19be7.fca29",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2082,
-        "y": 2337,
-        "z": "5a4cb919.dfff38",
+        "x": 2066.75,
+        "y": 2493,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "6ca22053.c9fba8"
+                "43b937df.ececd8"
             ]
         ]
     },
     {
-        "id": "a0c24437.cf174",
+        "id": "775dbfec.d9501",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2087,
-        "y": 2394,
-        "z": "5a4cb919.dfff38",
+        "x": 2071.75,
+        "y": 2550,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "f91dd017.676d7"
+                "ac944679.99243"
             ]
         ]
     },
     {
-        "id": "f91dd017.676d7",
+        "id": "ac944679.99243",
         "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": 2239,
-        "y": 2395,
-        "z": "5a4cb919.dfff38",
+        "x": 2223.75,
+        "y": 2551,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "6ca22053.c9fba8",
+        "id": "43b937df.ececd8",
         "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": 2250,
-        "y": 2340,
-        "z": "5a4cb919.dfff38",
+        "x": 2234.75,
+        "y": 2496,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "926a046d.eed228",
+        "id": "d0fc139e.1761",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2234.38232421875,
-        "y": 2279.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 2219.13232421875,
+        "y": 2435.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "1e25e04f.ee7df"
+                "79bc2aa4.303284"
             ]
         ]
     },
     {
-        "id": "1e25e04f.ee7df",
+        "id": "79bc2aa4.303284",
         "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": 2449,
-        "y": 2276,
-        "z": "5a4cb919.dfff38",
+        "x": 2433.75,
+        "y": 2432,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "46842cb8.91c5bc",
+        "id": "d91a9773.8b97d8",
         "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": 573,
-        "y": 2324,
-        "z": "5a4cb919.dfff38",
+        "x": 557.75,
+        "y": 2480,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "80e94eed.70f82",
-                "e1101309.b00428",
-                "6cefa506.12a2dc"
+                "fd5d97.57110a68",
+                "e3891e3f.2fa52",
+                "6282c457.966ab4"
             ]
         ]
     },
     {
-        "id": "80e94eed.70f82",
+        "id": "fd5d97.57110a68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 768.5001220703125,
-        "y": 2276,
-        "z": "5a4cb919.dfff38",
+        "x": 753.2501220703125,
+        "y": 2432,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "a961cabf.5d77d8"
+                "ee247bd7.5fac58"
             ]
         ]
     },
     {
-        "id": "e1101309.b00428",
+        "id": "e3891e3f.2fa52",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 760.5001220703125,
-        "y": 2331,
-        "z": "5a4cb919.dfff38",
+        "x": 745.2501220703125,
+        "y": 2487,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cfce6a08.8d1818"
+                "91fa570e.651ca8"
             ]
         ]
     },
     {
-        "id": "a961cabf.5d77d8",
+        "id": "ee247bd7.5fac58",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 912.8824462890625,
-        "y": 2275.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 897.6324462890625,
+        "y": 2431.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "41f5578e.096c08"
+                "ea7d04e7.1afcb8"
             ]
         ]
     },
     {
-        "id": "41f5578e.096c08",
+        "id": "ea7d04e7.1afcb8",
         "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": 1097,
-        "y": 2274,
-        "z": "5a4cb919.dfff38",
+        "x": 1081.75,
+        "y": 2430,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "78702bad.3695f4"
+                "40c13bcd.4d6ac4"
             ]
         ]
     },
     {
-        "id": "78702bad.3695f4",
+        "id": "40c13bcd.4d6ac4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1292,
-        "y": 2274,
-        "z": "5a4cb919.dfff38",
+        "x": 1276.75,
+        "y": 2430,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ab15b7a9.bc6bc8"
+                "1db1829e.06c1d5"
             ]
         ]
     },
     {
-        "id": "6cefa506.12a2dc",
+        "id": "6282c457.966ab4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 765.5001220703125,
-        "y": 2388,
-        "z": "5a4cb919.dfff38",
+        "x": 750.2501220703125,
+        "y": 2544,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "bbb236e9.1d475"
+                "4979dd8d.1f5f3c"
             ]
         ]
     },
     {
-        "id": "bbb236e9.1d475",
+        "id": "4979dd8d.1f5f3c",
         "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": 917.5001220703125,
-        "y": 2389,
-        "z": "5a4cb919.dfff38",
+        "x": 902.2501220703125,
+        "y": 2545,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "cfce6a08.8d1818",
+        "id": "91fa570e.651ca8",
         "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": 928.5001220703125,
-        "y": 2332,
-        "z": "5a4cb919.dfff38",
+        "x": 913.2501220703125,
+        "y": 2488,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "fd11a034.71ffe8",
+        "id": "bd1da98.2130f58",
         "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": 563,
-        "y": 2236,
-        "z": "5a4cb919.dfff38",
+        "x": 547.75,
+        "y": 2392,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "2ab715a0.ab46a2",
+        "id": "aa3bbb2.a6f0e48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 308,
-        "y": 2367,
-        "z": "5a4cb919.dfff38",
+        "x": 292.75,
+        "y": 2523,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fd11a034.71ffe8",
-                "46842cb8.91c5bc"
+                "bd1da98.2130f58",
+                "d91a9773.8b97d8"
             ]
         ]
     },
     {
-        "id": "c68339b5.636678",
+        "id": "4b46d34a.40e874",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1522.9666748046875,
-        "y": 184.88333129882812,
-        "z": "5a4cb919.dfff38",
+        "x": 1507.7166748046875,
+        "y": 340.8833312988281,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "6b1a691d.f6617",
+        "id": "1d9a3789.c423c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 725,
-        "y": 407,
-        "z": "5a4cb919.dfff38",
+        "x": 709.75,
+        "y": 563,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "a46faf22.6dbda8",
+        "id": "6516a515.9e0ed4",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 284.5,
-        "y": 1376,
-        "z": "5a4cb919.dfff38",
+        "x": 269.25,
+        "y": 1532,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "64de189c.ea0ca",
-                "eda2f0f7.d8fb38",
-                "dc7d7df9.afb81",
-                "c70f6326.e297a",
-                "445d8bb1.6c470c",
-                "925823e9.1c4a4",
-                "f7d70d92.8a17d",
-                "93ecab9f.5bb27",
-                "e1bf516d.80132",
-                "2ab715a0.ab46a2"
+                "f6f3f7dd.ddd42",
+                "9ae45b75.53fe1",
+                "dbed9630.5fe208",
+                "b8630526.556578",
+                "42a4fda9.57619c",
+                "3738a9bc.2f26e6",
+                "d6151d45.cfb988",
+                "f1b784f.6be4af8",
+                "b54d5a69.762db",
+                "aa3bbb2.a6f0e48"
             ]
         ]
     },
     {
-        "id": "ee82569c.a25768",
+        "id": "6bd95e1e.6c91d8",
         "type": "switchNode",
         "name": "switch uni type",
         "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1315,
-        "y": 1214,
-        "z": "5a4cb919.dfff38",
+        "x": 1299.75,
+        "y": 1370,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ef11d348.e67b18",
-                "db4eac49.9ee78",
-                "ccd7386e.438c4",
-                "8a1e26c1.925918"
+                "92533584.a5f61",
+                "18980475.16f3b4",
+                "ec63f877.0fd998",
+                "c1c9dc9a.d31ec"
             ]
         ]
     },
     {
-        "id": "ef11d348.e67b18",
+        "id": "92533584.a5f61",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1480,
-        "y": 1196,
-        "z": "5a4cb919.dfff38",
+        "x": 1464.75,
+        "y": 1352,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "1989ebd9.8b76bc",
-                "9d25e547.75567"
+                "b00f22e0.6a5e"
             ]
         ]
     },
     {
-        "id": "db4eac49.9ee78",
+        "id": "18980475.16f3b4",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1483,
-        "y": 1235,
-        "z": "5a4cb919.dfff38",
+        "x": 1467.75,
+        "y": 1391,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9da50ff.0241af",
-                "52a255e0.e77dec"
+                "52cb104.aabcaf"
             ]
         ]
     },
     {
-        "id": "8a1e26c1.925918",
+        "id": "c1c9dc9a.d31ec",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1477,
-        "y": 1313,
-        "z": "5a4cb919.dfff38",
+        "x": 1461.75,
+        "y": 1469,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "af3eb285.34bda8"
+                "4eaa272a.ec5048"
             ]
         ]
     },
     {
-        "id": "ccd7386e.438c4",
+        "id": "ec63f877.0fd998",
         "type": "outcome",
         "name": "root-secondary",
         "xml": "<outcome value='root-secondary'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1500,
-        "y": 1276,
-        "z": "5a4cb919.dfff38",
+        "x": 1484.75,
+        "y": 1432,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "8dd3ee03.704618",
-                "3acf3b0f.3b0184"
+                "e77dda82.efac78"
             ]
         ]
     },
     {
-        "id": "8dd3ee03.704618",
+        "id": "fb2c8aff.5902e",
         "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": 2046,
-        "y": 1309,
-        "z": "5a4cb919.dfff38",
+        "x": 2030.75,
+        "y": 1465,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "3acf3b0f.3b0184",
+        "id": "c8ca91d0.91a568",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
         "comments": "",
-        "x": 2008,
-        "y": 1349,
-        "z": "5a4cb919.dfff38",
+        "x": 1992.75,
+        "y": 1505,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "af3eb285.34bda8",
+        "id": "4eaa272a.ec5048",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1629,
-        "y": 1334,
-        "z": "5a4cb919.dfff38",
+        "x": 1613.75,
+        "y": 1490,
+        "z": "111f91bb.269a56",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5e1c0ed5.c69c48",
+        "type": "execute",
+        "name": "execute RestApiCallNode Create Performance Monitoring Data",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`\" />\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=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1203.3333740234375,
+        "y": 2789.3336181640625,
+        "z": "111f91bb.269a56",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b00f22e0.6a5e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1599.6666259765625,
+        "y": 1348.333251953125,
+        "z": "111f91bb.269a56",
+        "wires": [
+            [
+                "eb2c1071.d160d8"
+            ]
+        ]
+    },
+    {
+        "id": "52cb104.aabcaf",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1601.6666259765625,
+        "y": 1386.333251953125,
+        "z": "111f91bb.269a56",
+        "wires": [
+            [
+                "3c1d8397.66cfbc"
+            ]
+        ]
+    },
+    {
+        "id": "e77dda82.efac78",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1644.6666259765625,
+        "y": 1433.333251953125,
+        "z": "111f91bb.269a56",
+        "wires": [
+            [
+                "c8ca91d0.91a568"
+            ]
+        ]
+    },
+    {
+        "id": "9a742833.7a10a8",
+        "type": "execute",
+        "name": "execute RestconfDiscoveryNode establishSubscription",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1171.3333740234375,
+        "y": 2861.33349609375,
+        "z": "111f91bb.269a56",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "feb8a80.2e93d58",
+        "type": "execute",
+        "name": "execute RestconfDiscoveryNode establishPersistentConnection",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1201.3333740234375,
+        "y": 2923.33349609375,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]