X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json;h=a522c41639532e96b34cf87913c28001033c7168;hb=645b21298c9a4aff5f3f625eabb586fff40db732;hp=9697f1489c203e4cf3acbef969d61ccf1e54a783;hpb=a3fc5687fdd9b8d89fa36019d6e61eb2d22f8c27;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 9697f148..a522c416 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": "a7aee3f0.b04268",
+        "id": "9ee6a3c1.bedb",
         "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": 400.566650390625,
-        "y": 374,
-        "z": "b25656d7.85a8a8",
+        "x": 450.33331298828125,
+        "y": 350.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "96c8722a.b993c",
-                "e5061783.573db8",
-                "6a27552b.ad1ba4"
+                "3d418b0.8302bf6",
+                "48d7e3bc.f2883c",
+                "8ec621b1.80ebc8"
             ]
         ]
     },
     {
-        "id": "96c8722a.b993c",
+        "id": "3d418b0.8302bf6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 588.566650390625,
-        "y": 387,
-        "z": "b25656d7.85a8a8",
+        "x": 638.3333129882812,
+        "y": 363.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "41e4d89f.ed1468"
+                "9c98306.e2cffd"
             ]
         ]
     },
     {
-        "id": "e5061783.573db8",
+        "id": "48d7e3bc.f2883c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 596.0575866699219,
-        "y": 429.57403564453125,
-        "z": "b25656d7.85a8a8",
+        "x": 645.8242492675781,
+        "y": 405.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a27552b.ad1ba4",
+        "id": "8ec621b1.80ebc8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 586.566650390625,
-        "y": 476,
-        "z": "b25656d7.85a8a8",
+        "x": 636.3333129882812,
+        "y": 452.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a92b97b8.4129e8"
+                "57052eb0.583298"
             ]
         ]
     },
     {
-        "id": "41e4d89f.ed1468",
+        "id": "9c98306.e2cffd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 761.566650390625,
-        "y": 385,
-        "z": "b25656d7.85a8a8",
+        "x": 811.3333129882812,
+        "y": 361.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "cbc7d636.2def18"
+                "53767e53.94959"
             ]
         ]
     },
     {
-        "id": "cbc7d636.2def18",
+        "id": "53767e53.94959",
         "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": 990.566650390625,
-        "y": 386,
-        "z": "b25656d7.85a8a8",
+        "x": 1040.3333129882812,
+        "y": 362.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "39ab6bfa.74801c"
+                "c415e278.f5611"
             ]
         ]
     },
     {
-        "id": "39ab6bfa.74801c",
+        "id": "c415e278.f5611",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1205.566650390625,
-        "y": 387,
-        "z": "b25656d7.85a8a8",
+        "x": 1255.3333129882812,
+        "y": 363.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e124b2ef.0bfdc8"
+                "c71ad5b.64b44a8"
             ]
         ]
     },
     {
-        "id": "f6144c8.446efb",
+        "id": "3d675d8e.b88daa",
         "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": 1459.566650390625,
-        "y": 309,
-        "z": "b25656d7.85a8a8",
+        "x": 1509.3333129882812,
+        "y": 285.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "dc53b823.c6e998",
-                "b2e345a3.6b81"
+                "bbedabe9.bd4b",
+                "34793819.776c6"
             ]
         ]
     },
     {
-        "id": "dc53b823.c6e998",
+        "id": "bbedabe9.bd4b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1676.566650390625,
-        "y": 288,
-        "z": "b25656d7.85a8a8",
+        "x": 1726.3333129882812,
+        "y": 264.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e124b2ef.0bfdc8"
+                "c71ad5b.64b44a8"
             ]
         ]
     },
     {
-        "id": "b2e345a3.6b81",
+        "id": "34793819.776c6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1676.566650390625,
-        "y": 337,
-        "z": "b25656d7.85a8a8",
+        "x": 1726.3333129882812,
+        "y": 313.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e124b2ef.0bfdc8",
+        "id": "c71ad5b.64b44a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1860.566650390625,
-        "y": 374,
-        "z": "b25656d7.85a8a8",
+        "x": 1910.3333129882812,
+        "y": 350.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2ac81333.5163cc",
-                "ce04a89c.bde61",
-                "b01d3963.8ea8b8"
+                "3dd08dae.27e4a2",
+                "52a060f7.3567c8",
+                "a8591f2d.71e23"
             ]
         ]
     },
     {
-        "id": "daba1b59.df55a",
+        "id": "e6629469.2dd4b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 219.566650390625,
-        "y": 115,
-        "z": "b25656d7.85a8a8",
+        "x": 269.33331298828125,
+        "y": 91.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "53bce33c.ae731c"
+                "e4a2a292.f645d8"
             ]
         ]
     },
     {
-        "id": "53bce33c.ae731c",
+        "id": "e4a2a292.f645d8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3711 +201,3711 @@
         "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": 503.8523406982422,
-        "y": 176.23810863494873,
-        "z": "b25656d7.85a8a8",
+        "x": 553.6190032958984,
+        "y": 152.23811626434326,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "13dd53c4.ce4fbc"
+                "94591033.455c8"
             ]
         ]
     },
     {
-        "id": "13dd53c4.ce4fbc",
+        "id": "94591033.455c8",
         "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": 509.99525451660156,
-        "y": 261.0000305175781,
-        "z": "b25656d7.85a8a8",
+        "x": 559.7619171142578,
+        "y": 237.00003814697266,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "60b5835f.a436c4"
+                "fa712947.37c038"
             ]
         ]
     },
     {
-        "id": "60b5835f.a436c4",
+        "id": "fa712947.37c038",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 819.8046875,
-        "y": 252.66668701171875,
-        "z": "b25656d7.85a8a8",
+        "x": 869.5713500976562,
+        "y": 228.66669464111328,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a7aee3f0.b04268",
-                "6d17c7fb.4906d8",
-                "7de7f253.4369ac",
-                "731e9165.7bfe5",
-                "c3d34fd5.00b8e8"
+                "9ee6a3c1.bedb",
+                "b5b4ab5e.850cd8",
+                "8297c516.b14308",
+                "e7860d61.a71378",
+                "a8115aec.3c3d6"
             ]
         ]
     },
     {
-        "id": "2ac81333.5163cc",
+        "id": "3dd08dae.27e4a2",
         "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": 2077.566650390625,
-        "y": 312,
-        "z": "b25656d7.85a8a8",
+        "x": 2127.3333129882812,
+        "y": 288.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "581b9833.ca5308",
+        "id": "a8b9f4f8.1eb4e8",
         "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": 4246.566650390625,
-        "y": 198,
-        "z": "b25656d7.85a8a8",
+        "x": 4296.333312988281,
+        "y": 174.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c57ed1b4.089b78",
+        "id": "24ae2ddb.2d91ca",
         "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": 4327.566650390625,
-        "y": 513,
-        "z": "b25656d7.85a8a8",
+        "x": 4377.333312988281,
+        "y": 489.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6866347a.b34054",
-                "d9ef66bb.b2e3a"
+                "d90569fe.c301e",
+                "9a0fd68f.7364"
             ]
         ]
     },
     {
-        "id": "6866347a.b34054",
+        "id": "d90569fe.c301e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4637.066650390625,
-        "y": 482,
-        "z": "b25656d7.85a8a8",
+        "x": 4686.833312988281,
+        "y": 458.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "351f2ca1.efff8c"
+                "bfcc154c.9d015"
             ]
         ]
     },
     {
-        "id": "d9ef66bb.b2e3a",
+        "id": "9a0fd68f.7364",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4642.066650390625,
-        "y": 547,
-        "z": "b25656d7.85a8a8",
+        "x": 4691.833312988281,
+        "y": 523.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7ec1daf0.49ebbc"
+                "5fe18426.281bd4"
             ]
         ]
     },
     {
-        "id": "351f2ca1.efff8c",
+        "id": "bfcc154c.9d015",
         "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": 4813.066650390625,
-        "y": 482,
-        "z": "b25656d7.85a8a8",
+        "x": 4862.833312988281,
+        "y": 458.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7ec1daf0.49ebbc",
+        "id": "5fe18426.281bd4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4808.566650390625,
-        "y": 547,
-        "z": "b25656d7.85a8a8",
+        "x": 4858.333312988281,
+        "y": 523.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "fe354f09.d7eaa",
+        "id": "3e254ec8.8f602a",
         "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": 4192.066650390625,
-        "y": 767,
-        "z": "b25656d7.85a8a8",
+        "x": 4241.833312988281,
+        "y": 743.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f82c7890.c5a3a",
+        "id": "4a6469cd.4f0b98",
         "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": 4346.066650390625,
-        "y": 815,
-        "z": "b25656d7.85a8a8",
+        "x": 4395.833312988281,
+        "y": 791.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "66ca2f72.5d0ea",
-                "384ae824.cd397"
+                "826c2f73.5d5e88",
+                "403359b0.843728"
             ]
         ]
     },
     {
-        "id": "66ca2f72.5d0ea",
+        "id": "826c2f73.5d5e88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4691.566650390625,
-        "y": 796,
-        "z": "b25656d7.85a8a8",
+        "x": 4741.333312988281,
+        "y": 772.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8897aa30.2d04c"
+                "80c327f3.9b168"
             ]
         ]
     },
     {
-        "id": "384ae824.cd397",
+        "id": "403359b0.843728",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4695.566650390625,
-        "y": 836,
-        "z": "b25656d7.85a8a8",
+        "x": 4745.333312988281,
+        "y": 812.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e98f7531.5d07d8"
+                "6ab9c98a.fce4d8"
             ]
         ]
     },
     {
-        "id": "8897aa30.2d04c",
+        "id": "80c327f3.9b168",
         "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": 4849.566650390625,
-        "y": 796,
-        "z": "b25656d7.85a8a8",
+        "x": 4899.333312988281,
+        "y": 772.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "e98f7531.5d07d8",
+        "id": "6ab9c98a.fce4d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4853.066650390625,
-        "y": 836,
-        "z": "b25656d7.85a8a8",
+        "x": 4902.833312988281,
+        "y": 812.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3b168b09.265424",
-                "f9e9fb1f.d5d228"
+                "e1c867b8.192bd",
+                "913acec9.956098"
             ]
         ]
     },
     {
-        "id": "3b168b09.265424",
+        "id": "e1c867b8.192bd",
         "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": 5183.566650390625,
-        "y": 801,
-        "z": "b25656d7.85a8a8",
+        "x": 5233.333312988281,
+        "y": 777.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "293d08cf.5ba9b",
+        "id": "b428e7f5.22dd58",
         "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": 5047.566650390625,
-        "y": 760,
-        "z": "b25656d7.85a8a8",
+        "x": 5097.333312988281,
+        "y": 736.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f9e9fb1f.d5d228",
+        "id": "913acec9.956098",
         "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": 5110.566650390625,
-        "y": 847,
-        "z": "b25656d7.85a8a8",
+        "x": 5160.333312988281,
+        "y": 823.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b448e3f.d6f97",
+        "id": "c0a903ed.d424f",
         "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": 4184.566650390625,
-        "y": 246,
-        "z": "b25656d7.85a8a8",
+        "x": 4234.333312988281,
+        "y": 222.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "11357d7a.7ec893",
+        "id": "c9a2a428.5985e8",
         "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": 4210.566650390625,
-        "y": 363,
-        "z": "b25656d7.85a8a8",
+        "x": 4260.333312988281,
+        "y": 339.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9cee4545.4afd2",
-                "c87207dc.1fc4c8",
-                "a541f904.08a73"
+                "fe7b0b4f.4f25b8",
+                "1f23a1db.9239d6",
+                "80067a1b.7e8398"
             ]
         ]
     },
     {
-        "id": "9cee4545.4afd2",
+        "id": "fe7b0b4f.4f25b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4406.0667724609375,
-        "y": 315,
-        "z": "b25656d7.85a8a8",
+        "x": 4455.833435058594,
+        "y": 291.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "174041c6.ef00ae"
+                "b7ec9659.601c4"
             ]
         ]
     },
     {
-        "id": "c87207dc.1fc4c8",
+        "id": "1f23a1db.9239d6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4398.0667724609375,
-        "y": 370,
-        "z": "b25656d7.85a8a8",
+        "x": 4447.833435058594,
+        "y": 346.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2578a714.32fd88"
+                "fe1da93b.8b0db8"
             ]
         ]
     },
     {
-        "id": "174041c6.ef00ae",
+        "id": "b7ec9659.601c4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4550.4490966796875,
-        "y": 314.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 4600.215759277344,
+        "y": 290.65567779541016,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "44c47bf6.544e84"
+                "5d87f5d0.3bfe2c"
             ]
         ]
     },
     {
-        "id": "416e074e.1652a8",
+        "id": "4b9cdc3a.96a434",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5132.566650390625,
-        "y": 317,
-        "z": "b25656d7.85a8a8",
+        "x": 5182.333312988281,
+        "y": 293.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "77699d71.cb9cbc"
+                "c5c0e693.b5a978"
             ]
         ]
     },
     {
-        "id": "44c47bf6.544e84",
+        "id": "5d87f5d0.3bfe2c",
         "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": 4734.566650390625,
-        "y": 313,
-        "z": "b25656d7.85a8a8",
+        "x": 4784.333312988281,
+        "y": 289.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ec3ad4d7.e6b51"
+                "3668fdab.2d6312"
             ]
         ]
     },
     {
-        "id": "ec3ad4d7.e6b51",
+        "id": "3668fdab.2d6312",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4929.566650390625,
-        "y": 313,
-        "z": "b25656d7.85a8a8",
+        "x": 4979.333312988281,
+        "y": 289.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "416e074e.1652a8"
+                "4b9cdc3a.96a434"
             ]
         ]
     },
     {
-        "id": "a541f904.08a73",
+        "id": "80067a1b.7e8398",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4403.0667724609375,
-        "y": 427,
-        "z": "b25656d7.85a8a8",
+        "x": 4452.833435058594,
+        "y": 403.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "44c8faa6.17201c"
+                "72f714cc.b21364"
             ]
         ]
     },
     {
-        "id": "44c8faa6.17201c",
+        "id": "72f714cc.b21364",
         "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": 4555.0667724609375,
-        "y": 428,
-        "z": "b25656d7.85a8a8",
+        "x": 4604.833435058594,
+        "y": 404.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2578a714.32fd88",
+        "id": "fe1da93b.8b0db8",
         "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": 4566.0667724609375,
-        "y": 371,
-        "z": "b25656d7.85a8a8",
+        "x": 4615.833435058594,
+        "y": 347.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "157b4f1e.ec4409",
+        "id": "247e40ac.03f008",
         "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": 5517.566650390625,
-        "y": 330,
-        "z": "b25656d7.85a8a8",
+        "x": 5567.333312988281,
+        "y": 306.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5eb578c.a510488",
-                "646e1345.d32534",
-                "d2cac0b5.69fe18"
+                "2769fc5a.203d24",
+                "510b4bec.e64154",
+                "dc91b912.6316b8"
             ]
         ]
     },
     {
-        "id": "77699d71.cb9cbc",
+        "id": "c5c0e693.b5a978",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5311.566650390625,
-        "y": 317,
-        "z": "b25656d7.85a8a8",
+        "x": 5361.333312988281,
+        "y": 293.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e5b6fb7a.6fa868",
-                "157b4f1e.ec4409"
+                "d3a253e8.52c87",
+                "247e40ac.03f008"
             ]
         ]
     },
     {
-        "id": "e5b6fb7a.6fa868",
+        "id": "d3a253e8.52c87",
         "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": 5547.566650390625,
-        "y": 278,
-        "z": "b25656d7.85a8a8",
+        "x": 5597.333312988281,
+        "y": 254.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5eb578c.a510488",
+        "id": "2769fc5a.203d24",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5727.566650390625,
-        "y": 321,
-        "z": "b25656d7.85a8a8",
+        "x": 5777.333312988281,
+        "y": 297.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e92c3ae0.67c78"
+                "373ad72a.24ed2"
             ]
         ]
     },
     {
-        "id": "646e1345.d32534",
+        "id": "510b4bec.e64154",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5719.566650390625,
-        "y": 376,
-        "z": "b25656d7.85a8a8",
+        "x": 5769.333312988281,
+        "y": 352.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bbc83f99.73f6"
+                "fed052ea.46fa"
             ]
         ]
     },
     {
-        "id": "d2cac0b5.69fe18",
+        "id": "dc91b912.6316b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5724.566650390625,
-        "y": 433,
-        "z": "b25656d7.85a8a8",
+        "x": 5774.333312988281,
+        "y": 409.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2b4662b0.39c236"
+                "62129ad3.e59fd4"
             ]
         ]
     },
     {
-        "id": "2b4662b0.39c236",
+        "id": "62129ad3.e59fd4",
         "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": 5876.566650390625,
-        "y": 434,
-        "z": "b25656d7.85a8a8",
+        "x": 5926.333312988281,
+        "y": 410.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "bbc83f99.73f6",
+        "id": "fed052ea.46fa",
         "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": 5887.566650390625,
-        "y": 379,
-        "z": "b25656d7.85a8a8",
+        "x": 5937.333312988281,
+        "y": 355.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "e92c3ae0.67c78",
+        "id": "373ad72a.24ed2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5871.948974609375,
-        "y": 318.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 5921.715637207031,
+        "y": 294.65567779541016,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "79f8358f.b45374"
+                "53739ad0.387d34"
             ]
         ]
     },
     {
-        "id": "79f8358f.b45374",
+        "id": "53739ad0.387d34",
         "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": 6086.566650390625,
-        "y": 315,
-        "z": "b25656d7.85a8a8",
+        "x": 6136.333312988281,
+        "y": 291.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ffd19574.4197a8",
+        "id": "a04b7e22.2aeb18",
         "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": 3653.566650390625,
-        "y": 1655,
-        "z": "b25656d7.85a8a8",
+        "x": 3703.3333129882812,
+        "y": 1631.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "bd3c5166.6aead",
+        "id": "a747fd61.4d43f8",
         "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": 3716.566650390625,
-        "y": 1984,
-        "z": "b25656d7.85a8a8",
+        "x": 3766.3333129882812,
+        "y": 1960.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "85a267fb.c74d5",
-                "1abf40e9.7b1f1f"
+                "1746de51.5350e2",
+                "3d545b09.cac1fc"
             ]
         ]
     },
     {
-        "id": "85a267fb.c74d5",
+        "id": "1746de51.5350e2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4012.066650390625,
-        "y": 1951,
-        "z": "b25656d7.85a8a8",
+        "x": 4061.8333129882812,
+        "y": 1927.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8944bada.8beb4"
+                "fee57d61.96dd7"
             ]
         ]
     },
     {
-        "id": "1abf40e9.7b1f1f",
+        "id": "3d545b09.cac1fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4017.066650390625,
-        "y": 2016,
-        "z": "b25656d7.85a8a8",
+        "x": 4066.8333129882812,
+        "y": 1992.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "fa8bf7ac.5ecf28"
+                "3e571aef.d1d9c6"
             ]
         ]
     },
     {
-        "id": "8944bada.8beb4",
+        "id": "fee57d61.96dd7",
         "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": 4180.066650390625,
-        "y": 1951,
-        "z": "b25656d7.85a8a8",
+        "x": 4229.833312988281,
+        "y": 1927.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "fa8bf7ac.5ecf28",
+        "id": "3e571aef.d1d9c6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4190.566650390625,
-        "y": 2016,
-        "z": "b25656d7.85a8a8",
+        "x": 4240.333312988281,
+        "y": 1992.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e3d71f0.616b0e",
+        "id": "c298ee7.360a71",
         "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": 3592.566650390625,
-        "y": 1712,
-        "z": "b25656d7.85a8a8",
+        "x": 3642.3333129882812,
+        "y": 1688.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5f81a64c.5bf2a",
+        "id": "374df09c.221b4",
         "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": 3612.566650390625,
-        "y": 1809,
-        "z": "b25656d7.85a8a8",
+        "x": 3662.3333129882812,
+        "y": 1785.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1781a1bd.0348ce",
-                "e03bcd54.697738",
-                "94b9ef51.5409d"
+                "b8613e52.06e248",
+                "b100c849.f8697",
+                "9726d82.0cb02a8"
             ]
         ]
     },
     {
-        "id": "1781a1bd.0348ce",
+        "id": "b8613e52.06e248",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3815.0667724609375,
-        "y": 1762,
-        "z": "b25656d7.85a8a8",
+        "x": 3864.8334350585938,
+        "y": 1738.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a95165c1.f614f8"
+                "fe5dc3f.664f44"
             ]
         ]
     },
     {
-        "id": "e03bcd54.697738",
+        "id": "b100c849.f8697",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3807.0667724609375,
-        "y": 1817,
-        "z": "b25656d7.85a8a8",
+        "x": 3856.8334350585938,
+        "y": 1793.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b5b6c797.75de6"
+                "45b746dd.1fc3c8"
             ]
         ]
     },
     {
-        "id": "a95165c1.f614f8",
+        "id": "fe5dc3f.664f44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3959.4490966796875,
-        "y": 1759.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 4009.2157592773438,
+        "y": 1735.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5bb225c8.c4c70c"
+                "38c123a7.87ff54"
             ]
         ]
     },
     {
-        "id": "5bb225c8.c4c70c",
+        "id": "38c123a7.87ff54",
         "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": 4143.566650390625,
-        "y": 1774,
-        "z": "b25656d7.85a8a8",
+        "x": 4193.333312988281,
+        "y": 1750.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7747e85a.705d5"
+                "8269be24.8785c8"
             ]
         ]
     },
     {
-        "id": "94b9ef51.5409d",
+        "id": "9726d82.0cb02a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3812.0667724609375,
-        "y": 1874,
-        "z": "b25656d7.85a8a8",
+        "x": 3861.8334350585938,
+        "y": 1850.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9d4f33d7.c972d"
+                "920b3194.25369"
             ]
         ]
     },
     {
-        "id": "9d4f33d7.c972d",
+        "id": "920b3194.25369",
         "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": 3964.0667724609375,
-        "y": 1875,
-        "z": "b25656d7.85a8a8",
+        "x": 4013.8334350585938,
+        "y": 1851.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b5b6c797.75de6",
+        "id": "45b746dd.1fc3c8",
         "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": 3975.0667724609375,
-        "y": 1820,
-        "z": "b25656d7.85a8a8",
+        "x": 4024.8334350585938,
+        "y": 1796.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7641eade.641374",
+        "id": "3be7fe46.7bed5a",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4541.566650390625,
-        "y": 1778,
-        "z": "b25656d7.85a8a8",
+        "x": 4591.333312988281,
+        "y": 1754.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "745d7190.9cf208"
+                "9242c93c.f02488"
             ]
         ]
     },
     {
-        "id": "7747e85a.705d5",
+        "id": "8269be24.8785c8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4338.566650390625,
-        "y": 1774,
-        "z": "b25656d7.85a8a8",
+        "x": 4388.333312988281,
+        "y": 1750.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7641eade.641374"
+                "3be7fe46.7bed5a"
             ]
         ]
     },
     {
-        "id": "95464c66.d9ff8",
+        "id": "24d5bcbc.e5fd54",
         "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": 4926.566650390625,
-        "y": 1777,
-        "z": "b25656d7.85a8a8",
+        "x": 4976.333312988281,
+        "y": 1753.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bb6dbaba.ff1548",
-                "a59e3175.15a9b",
-                "4bc34556.41323c"
+                "7fafe45b.58f05c",
+                "c7d3d0e7.e6edb8",
+                "2bbce26d.997346"
             ]
         ]
     },
     {
-        "id": "745d7190.9cf208",
+        "id": "9242c93c.f02488",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4718.566650390625,
-        "y": 1770,
-        "z": "b25656d7.85a8a8",
+        "x": 4768.333312988281,
+        "y": 1746.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "80afd84e.d6bdd8",
-                "95464c66.d9ff8"
+                "4aece362.c97204",
+                "24d5bcbc.e5fd54"
             ]
         ]
     },
     {
-        "id": "80afd84e.d6bdd8",
+        "id": "4aece362.c97204",
         "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": 4956.566650390625,
-        "y": 1725,
-        "z": "b25656d7.85a8a8",
+        "x": 5006.333312988281,
+        "y": 1701.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "42edd12e.5451d",
+        "id": "5653f279.fa187c",
         "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": 5285.566650390625,
-        "y": 1881,
-        "z": "b25656d7.85a8a8",
+        "x": 5335.333312988281,
+        "y": 1857.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ea697aed.d1f358",
+        "id": "991ab386.c1ab2",
         "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": 5296.566650390625,
-        "y": 1826,
-        "z": "b25656d7.85a8a8",
+        "x": 5346.333312988281,
+        "y": 1802.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "edcb3571.8c6728",
+        "id": "f903abd6.bcb5e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5280.948974609375,
-        "y": 1765.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 5330.715637207031,
+        "y": 1741.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6d55462a.8f8fa8"
+                "9d78b23c.6c7458"
             ]
         ]
     },
     {
-        "id": "6d55462a.8f8fa8",
+        "id": "9d78b23c.6c7458",
         "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": 5495.566650390625,
-        "y": 1762,
-        "z": "b25656d7.85a8a8",
+        "x": 5545.333312988281,
+        "y": 1738.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "bb6dbaba.ff1548",
+        "id": "7fafe45b.58f05c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5136.566650390625,
-        "y": 1768,
-        "z": "b25656d7.85a8a8",
+        "x": 5186.333312988281,
+        "y": 1744.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "edcb3571.8c6728"
+                "f903abd6.bcb5e"
             ]
         ]
     },
     {
-        "id": "a59e3175.15a9b",
+        "id": "c7d3d0e7.e6edb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5128.566650390625,
-        "y": 1823,
-        "z": "b25656d7.85a8a8",
+        "x": 5178.333312988281,
+        "y": 1799.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ea697aed.d1f358"
+                "991ab386.c1ab2"
             ]
         ]
     },
     {
-        "id": "4bc34556.41323c",
+        "id": "2bbce26d.997346",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5133.566650390625,
-        "y": 1880,
-        "z": "b25656d7.85a8a8",
+        "x": 5183.333312988281,
+        "y": 1856.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "42edd12e.5451d"
+                "5653f279.fa187c"
             ]
         ]
     },
     {
-        "id": "64ebcb8e.6a273c",
+        "id": "d6212bc2.789e7",
         "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": 3167.566650390625,
-        "y": 726,
-        "z": "b25656d7.85a8a8",
+        "x": 3217.3333129882812,
+        "y": 702.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "635bfedd.0eff1",
-                "4466b072.e153e8"
+                "e3d89802.393a78",
+                "22a27baf.15e97c"
             ]
         ]
     },
     {
-        "id": "635bfedd.0eff1",
+        "id": "e3d89802.393a78",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3381.566650390625,
-        "y": 763,
-        "z": "b25656d7.85a8a8",
+        "x": 3431.3333129882812,
+        "y": 739.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f20f4b09.4270d8"
+                "793df4ee.f1df74"
             ]
         ]
     },
     {
-        "id": "4466b072.e153e8",
+        "id": "22a27baf.15e97c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3383.566650390625,
-        "y": 701,
-        "z": "b25656d7.85a8a8",
+        "x": 3433.3333129882812,
+        "y": 677.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "388a019b.9b73c6"
+                "7ecfd25a.90cdcc"
             ]
         ]
     },
     {
-        "id": "f20f4b09.4270d8",
+        "id": "793df4ee.f1df74",
         "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": 2961.566650390625,
-        "y": 2006,
-        "z": "b25656d7.85a8a8",
+        "x": 3011.3333129882812,
+        "y": 1982.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "69af1ba1.41260c",
-                "13b2b9f.1f67dc6"
+                "3123087e.cfd848",
+                "426b4898.f559d8"
             ]
         ]
     },
     {
-        "id": "69af1ba1.41260c",
+        "id": "3123087e.cfd848",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3214.566650390625,
-        "y": 2040,
-        "z": "b25656d7.85a8a8",
+        "x": 3264.3333129882812,
+        "y": 2016.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c8858f37.c3f05"
+                "534033f3.f59e9c"
             ]
         ]
     },
     {
-        "id": "13b2b9f.1f67dc6",
+        "id": "426b4898.f559d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3214.566650390625,
-        "y": 1984,
-        "z": "b25656d7.85a8a8",
+        "x": 3264.3333129882812,
+        "y": 1960.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "be4790f9.3bf898"
+                "d5f2676f.c2a88"
             ]
         ]
     },
     {
-        "id": "c8858f37.c3f05",
+        "id": "534033f3.f59e9c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3365.566650390625,
-        "y": 2040,
-        "z": "b25656d7.85a8a8",
+        "x": 3415.3333129882812,
+        "y": 2016.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7a5e210e.9e5d48",
+        "id": "c77b264c.fe2528",
         "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": 4241.566650390625,
-        "y": 138,
-        "z": "b25656d7.85a8a8",
+        "x": 4291.333312988281,
+        "y": 114.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "163461bd.87a87e",
+        "id": "6ed23267.9185fc",
         "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": 3649.566650390625,
-        "y": 1597,
-        "z": "b25656d7.85a8a8",
+        "x": 3699.3333129882812,
+        "y": 1573.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "354c57ea.e71ee8",
+        "id": "7d0cb107.7824a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3932.566650390625,
-        "y": 395,
-        "z": "b25656d7.85a8a8",
+        "x": 3982.3333129882812,
+        "y": 371.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7a5e210e.9e5d48",
-                "581b9833.ca5308",
-                "5b448e3f.d6f97",
-                "11357d7a.7ec893",
-                "c57ed1b4.089b78",
-                "5d6e99f5.a1e2d",
-                "1771c9d3.36c546",
-                "d9cf64bd.4ed12"
+                "c77b264c.fe2528",
+                "a8b9f4f8.1eb4e8",
+                "c0a903ed.d424f",
+                "c9a2a428.5985e8",
+                "24ae2ddb.2d91ca",
+                "1656bf6f.d0ade1",
+                "d2ff3c56.4372d",
+                "9499a947.255148"
             ]
         ]
     },
     {
-        "id": "be4790f9.3bf898",
+        "id": "d5f2676f.c2a88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3365.566650390625,
-        "y": 1983,
-        "z": "b25656d7.85a8a8",
+        "x": 3415.3333129882812,
+        "y": 1959.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "163461bd.87a87e",
-                "ffd19574.4197a8",
-                "e3d71f0.616b0e",
-                "5f81a64c.5bf2a",
-                "bd3c5166.6aead",
-                "b596d9f.c7daaa8",
-                "2308c235.08d20e",
-                "5a0cb184.9cdf98"
+                "6ed23267.9185fc",
+                "a04b7e22.2aeb18",
+                "c298ee7.360a71",
+                "374df09c.221b4",
+                "a747fd61.4d43f8",
+                "ad599918.3fac7",
+                "cedd744c.d4173",
+                "c2c48b41.449c5"
             ]
         ]
     },
     {
-        "id": "12d5b667.53ec1a",
+        "id": "dd92322c.d6fdb",
         "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": 3603.566650390625,
-        "y": 2282,
-        "z": "b25656d7.85a8a8",
+        "x": 3653.3333129882812,
+        "y": 2258.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b0af817e.3df5c",
+        "id": "4e1fc9cd.44e65",
         "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": 3757.566650390625,
-        "y": 2330,
-        "z": "b25656d7.85a8a8",
+        "x": 3807.3333129882812,
+        "y": 2306.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8bd672ae.f97518",
-                "171382a6.de96c5"
+                "3bc05be0.577364",
+                "9453988b.761fc"
             ]
         ]
     },
     {
-        "id": "8bd672ae.f97518",
+        "id": "3bc05be0.577364",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4103.066650390625,
-        "y": 2311,
-        "z": "b25656d7.85a8a8",
+        "x": 4152.833312988281,
+        "y": 2287.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "26f501a4.aaf356"
+                "48b1874d.6dc6a"
             ]
         ]
     },
     {
-        "id": "171382a6.de96c5",
+        "id": "9453988b.761fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4107.066650390625,
-        "y": 2351,
-        "z": "b25656d7.85a8a8",
+        "x": 4156.833312988281,
+        "y": 2327.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "81506f95.53e78"
+                "e2a44822.8eb888"
             ]
         ]
     },
     {
-        "id": "26f501a4.aaf356",
+        "id": "48b1874d.6dc6a",
         "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": 4261.066650390625,
-        "y": 2311,
-        "z": "b25656d7.85a8a8",
+        "x": 4310.833312988281,
+        "y": 2287.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "81506f95.53e78",
+        "id": "e2a44822.8eb888",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4264.566650390625,
-        "y": 2351,
-        "z": "b25656d7.85a8a8",
+        "x": 4314.333312988281,
+        "y": 2327.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8a72bd7f.2b673",
-                "2efc6876.725c8"
+                "3369ff99.af45f",
+                "6ce9279e.5956d"
             ]
         ]
     },
     {
-        "id": "8a72bd7f.2b673",
+        "id": "3369ff99.af45f",
         "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": 4604.566650390625,
-        "y": 2350,
-        "z": "b25656d7.85a8a8",
+        "x": 4654.333312988281,
+        "y": 2326.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "52aaed09.836384",
+        "id": "64323d0d.a53eec",
         "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": 4462.566650390625,
-        "y": 2308,
-        "z": "b25656d7.85a8a8",
+        "x": 4512.333312988281,
+        "y": 2284.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2efc6876.725c8",
+        "id": "6ce9279e.5956d",
         "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": 4533.566650390625,
-        "y": 2399,
-        "z": "b25656d7.85a8a8",
+        "x": 4583.333312988281,
+        "y": 2375.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "601ee7c2.7cf4c8",
+        "id": "8b193137.7290b",
         "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": 3158.566650390625,
-        "y": 666,
-        "z": "b25656d7.85a8a8",
+        "x": 3208.3333129882812,
+        "y": 642.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f8b99cf2.a93e78",
+        "id": "6b6c5120.d697b",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3753.566650390625,
-        "y": 352,
-        "z": "b25656d7.85a8a8",
+        "x": 3803.3333129882812,
+        "y": 328.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ba2b5c4f.29126",
+        "id": "7a49b0ec.1116e8",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3310.566650390625,
-        "y": 1930,
-        "z": "b25656d7.85a8a8",
+        "x": 3360.3333129882812,
+        "y": 1906.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "388a019b.9b73c6",
+        "id": "7ecfd25a.90cdcc",
         "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": 3489.566650390625,
-        "y": 514,
-        "z": "b25656d7.85a8a8",
+        "x": 3539.3333129882812,
+        "y": 490.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "60287d21.a15fac",
-                "e673bc57.d2c08"
+                "c5975b58.7cfb78",
+                "8fa5c52a.f6d0f"
             ]
         ]
     },
     {
-        "id": "e673bc57.d2c08",
+        "id": "8fa5c52a.f6d0f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3731.566650390625,
-        "y": 1103,
-        "z": "b25656d7.85a8a8",
+        "x": 3781.3333129882812,
+        "y": 1079.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8e141356.94256"
+                "1a8ceecd.14cfa1"
             ]
         ]
     },
     {
-        "id": "60287d21.a15fac",
+        "id": "c5975b58.7cfb78",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3725.566650390625,
-        "y": 394,
-        "z": "b25656d7.85a8a8",
+        "x": 3775.3333129882812,
+        "y": 370.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "354c57ea.e71ee8"
+                "7d0cb107.7824a8"
             ]
         ]
     },
     {
-        "id": "8e141356.94256",
+        "id": "1a8ceecd.14cfa1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3889.566650390625,
-        "y": 1102,
-        "z": "b25656d7.85a8a8",
+        "x": 3939.3333129882812,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "660dd4a0.d8f1f4",
-                "bd6ec24f.7d2838",
-                "2d50a497.118c24",
-                "60d7ef05.f89ff8",
-                "feec0e79.04d7e8",
-                "6270f9ff.6a6b4"
+                "cfc45fbc.625408",
+                "87ccca6a.f8f9b8",
+                "e86d624f.d5f408",
+                "3e480e6a.3eb6c2",
+                "178f13fb.65189c",
+                "8c5d7664.9247c8"
             ]
         ]
     },
     {
-        "id": "bd6ec24f.7d2838",
+        "id": "87ccca6a.f8f9b8",
         "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": 4153.566650390625,
-        "y": 985,
-        "z": "b25656d7.85a8a8",
+        "x": 4203.333312988281,
+        "y": 961.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "feec0e79.04d7e8",
+        "id": "178f13fb.65189c",
         "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": 4234.566650390625,
-        "y": 1300,
-        "z": "b25656d7.85a8a8",
+        "x": 4284.333312988281,
+        "y": 1276.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1829c13e.6c182f",
-                "cdc3e429.be6fa"
+                "47471e7d.1bf5e",
+                "2f64742a.d54c2c"
             ]
         ]
     },
     {
-        "id": "1829c13e.6c182f",
+        "id": "47471e7d.1bf5e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4544.066650390625,
-        "y": 1269,
-        "z": "b25656d7.85a8a8",
+        "x": 4593.833312988281,
+        "y": 1245.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5b91a7ec.2e4658"
+                "27252576.feabca"
             ]
         ]
     },
     {
-        "id": "cdc3e429.be6fa",
+        "id": "2f64742a.d54c2c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4549.066650390625,
-        "y": 1334,
-        "z": "b25656d7.85a8a8",
+        "x": 4598.833312988281,
+        "y": 1310.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8046aee4.83e438"
+                "d2def383.359ac8"
             ]
         ]
     },
     {
-        "id": "5b91a7ec.2e4658",
+        "id": "27252576.feabca",
         "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": 4720.066650390625,
-        "y": 1269,
-        "z": "b25656d7.85a8a8",
+        "x": 4769.833312988281,
+        "y": 1245.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "8046aee4.83e438",
+        "id": "d2def383.359ac8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4715.566650390625,
-        "y": 1334,
-        "z": "b25656d7.85a8a8",
+        "x": 4765.333312988281,
+        "y": 1310.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d50a497.118c24",
+        "id": "e86d624f.d5f408",
         "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": 4091.566650390625,
-        "y": 1033,
-        "z": "b25656d7.85a8a8",
+        "x": 4141.333312988281,
+        "y": 1009.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "60d7ef05.f89ff8",
+        "id": "3e480e6a.3eb6c2",
         "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": 4117.566650390625,
-        "y": 1150,
-        "z": "b25656d7.85a8a8",
+        "x": 4167.333312988281,
+        "y": 1126.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "684da58c.28fc44",
-                "7420bdce.6aab1c",
-                "21d55314.ed559c"
+                "2fe7a70f.325738",
+                "de56dd13.56cbc",
+                "da128a7e.2de4c8"
             ]
         ]
     },
     {
-        "id": "684da58c.28fc44",
+        "id": "2fe7a70f.325738",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4313.0667724609375,
-        "y": 1102,
-        "z": "b25656d7.85a8a8",
+        "x": 4362.833435058594,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "64489fc6.c8241"
+                "236585d1.bff802"
             ]
         ]
     },
     {
-        "id": "7420bdce.6aab1c",
+        "id": "de56dd13.56cbc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4305.0667724609375,
-        "y": 1157,
-        "z": "b25656d7.85a8a8",
+        "x": 4354.833435058594,
+        "y": 1133.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "92f1b89c.1ab69"
+                "7ab4252e.e507d4"
             ]
         ]
     },
     {
-        "id": "64489fc6.c8241",
+        "id": "236585d1.bff802",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4457.4490966796875,
-        "y": 1101.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 4507.215759277344,
+        "y": 1077.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "48d2ac4e.25f6b4"
+                "d1f5d3f1.d937a8"
             ]
         ]
     },
     {
-        "id": "48d2ac4e.25f6b4",
+        "id": "d1f5d3f1.d937a8",
         "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": 4641.566650390625,
-        "y": 1100,
-        "z": "b25656d7.85a8a8",
+        "x": 4691.333312988281,
+        "y": 1076.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "714ce556.4f2fcc"
+                "b6dba6f2.6f5a68"
             ]
         ]
     },
     {
-        "id": "714ce556.4f2fcc",
+        "id": "b6dba6f2.6f5a68",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4836.566650390625,
-        "y": 1100,
-        "z": "b25656d7.85a8a8",
+        "x": 4886.333312988281,
+        "y": 1076.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2076535.8c263ac"
+                "decb3043.cd12c"
             ]
         ]
     },
     {
-        "id": "21d55314.ed559c",
+        "id": "da128a7e.2de4c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4310.0667724609375,
-        "y": 1214,
-        "z": "b25656d7.85a8a8",
+        "x": 4359.833435058594,
+        "y": 1190.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "45f37411.31ce94"
+                "98ee3a25.1ab9e"
             ]
         ]
     },
     {
-        "id": "45f37411.31ce94",
+        "id": "98ee3a25.1ab9e",
         "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": 4462.0667724609375,
-        "y": 1215,
-        "z": "b25656d7.85a8a8",
+        "x": 4511.833435058594,
+        "y": 1191.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "92f1b89c.1ab69",
+        "id": "7ab4252e.e507d4",
         "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": 4473.0667724609375,
-        "y": 1158,
-        "z": "b25656d7.85a8a8",
+        "x": 4522.833435058594,
+        "y": 1134.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "660dd4a0.d8f1f4",
+        "id": "cfc45fbc.625408",
         "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": 4148.566650390625,
-        "y": 925,
-        "z": "b25656d7.85a8a8",
+        "x": 4198.333312988281,
+        "y": 901.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2076535.8c263ac",
+        "id": "decb3043.cd12c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5039.566650390625,
-        "y": 1104,
-        "z": "b25656d7.85a8a8",
+        "x": 5089.333312988281,
+        "y": 1080.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f782ae02.7309d8"
+                "b6ba573a.60741"
             ]
         ]
     },
     {
-        "id": "4c7d2512.5b4fb4",
+        "id": "f4847f5f.1d887",
         "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": 5424.566650390625,
-        "y": 1117,
-        "z": "b25656d7.85a8a8",
+        "x": 5474.333312988281,
+        "y": 1093.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f27cc561.589478",
-                "533a9a4e.562074",
-                "f04fcd62.bdef1"
+                "e228c69c.360f98",
+                "9bce816d.2db348",
+                "41d83525.ce00b4"
             ]
         ]
     },
     {
-        "id": "f782ae02.7309d8",
+        "id": "b6ba573a.60741",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5218.566650390625,
-        "y": 1104,
-        "z": "b25656d7.85a8a8",
+        "x": 5268.333312988281,
+        "y": 1080.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "eec3155e.2bcec8",
-                "4c7d2512.5b4fb4"
+                "5b50b3ea.1f8ef4",
+                "f4847f5f.1d887"
             ]
         ]
     },
     {
-        "id": "eec3155e.2bcec8",
+        "id": "5b50b3ea.1f8ef4",
         "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": 5454.566650390625,
-        "y": 1065,
-        "z": "b25656d7.85a8a8",
+        "x": 5504.333312988281,
+        "y": 1041.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f27cc561.589478",
+        "id": "e228c69c.360f98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5634.566650390625,
-        "y": 1108,
-        "z": "b25656d7.85a8a8",
+        "x": 5684.333312988281,
+        "y": 1084.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "20cc7528.d35caa"
+                "189e198c.62579e"
             ]
         ]
     },
     {
-        "id": "533a9a4e.562074",
+        "id": "9bce816d.2db348",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5626.566650390625,
-        "y": 1163,
-        "z": "b25656d7.85a8a8",
+        "x": 5676.333312988281,
+        "y": 1139.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a99b13d6.7a5b4"
+                "a893456b.716548"
             ]
         ]
     },
     {
-        "id": "f04fcd62.bdef1",
+        "id": "41d83525.ce00b4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5631.566650390625,
-        "y": 1220,
-        "z": "b25656d7.85a8a8",
+        "x": 5681.333312988281,
+        "y": 1196.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "76e3f44a.1be574"
+                "7bd5c1c9.c0b778"
             ]
         ]
     },
     {
-        "id": "76e3f44a.1be574",
+        "id": "7bd5c1c9.c0b778",
         "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": 5783.566650390625,
-        "y": 1221,
-        "z": "b25656d7.85a8a8",
+        "x": 5833.333312988281,
+        "y": 1197.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a99b13d6.7a5b4",
+        "id": "a893456b.716548",
         "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": 5794.566650390625,
-        "y": 1166,
-        "z": "b25656d7.85a8a8",
+        "x": 5844.333312988281,
+        "y": 1142.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "20cc7528.d35caa",
+        "id": "189e198c.62579e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5778.948974609375,
-        "y": 1105.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 5828.715637207031,
+        "y": 1081.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "52e6acc9.c6278c"
+                "ae6db88e.b087a"
             ]
         ]
     },
     {
-        "id": "52e6acc9.c6278c",
+        "id": "ae6db88e.b087a",
         "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": 5993.566650390625,
-        "y": 1102,
-        "z": "b25656d7.85a8a8",
+        "x": 6043.333312988281,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7dd287b6.719d08",
+        "id": "56d817b5.d38a48",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3767.566650390625,
-        "y": 1043,
-        "z": "b25656d7.85a8a8",
+        "x": 3817.3333129882812,
+        "y": 1019.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ce04a89c.bde61",
+        "id": "52a060f7.3567c8",
         "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": 2329.566650390625,
-        "y": 770,
-        "z": "b25656d7.85a8a8",
+        "x": 2379.3333129882812,
+        "y": 746.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f4c77699.53d898",
-                "9865c4e0.3bcc6"
+                "f7d2b361.6e54e",
+                "d75a20a3.76dfd"
             ]
         ]
     },
     {
-        "id": "9865c4e0.3bcc6",
+        "id": "d75a20a3.76dfd",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2736.566650390625,
-        "y": 788,
-        "z": "b25656d7.85a8a8",
+        "x": 2786.3333129882812,
+        "y": 764.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ad8883f5.8e3298"
+                "87632a9d.0edf7"
             ]
         ]
     },
     {
-        "id": "f4c77699.53d898",
+        "id": "f7d2b361.6e54e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2736.566650390625,
-        "y": 733,
-        "z": "b25656d7.85a8a8",
+        "x": 2786.3333129882812,
+        "y": 709.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e8f3ed6f.2eafd"
+                "d139f1fa.1d1b08"
             ]
         ]
     },
     {
-        "id": "e8f3ed6f.2eafd",
+        "id": "d139f1fa.1d1b08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2892.566650390625,
-        "y": 731,
-        "z": "b25656d7.85a8a8",
+        "x": 2942.3333129882812,
+        "y": 707.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "601ee7c2.7cf4c8",
-                "64ebcb8e.6a273c"
+                "8b193137.7290b",
+                "d6212bc2.789e7"
             ]
         ]
     },
     {
-        "id": "ad8883f5.8e3298",
+        "id": "87632a9d.0edf7",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2869.566650390625,
-        "y": 789,
-        "z": "b25656d7.85a8a8",
+        "x": 2919.3333129882812,
+        "y": 765.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6d17c7fb.4906d8",
+        "id": "b5b4ab5e.850cd8",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 1046.566650390625,
-        "y": 205,
-        "z": "b25656d7.85a8a8",
+        "x": 1096.3333129882812,
+        "y": 181.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c6c6f64f.fccbe8",
+        "id": "7e254bc9.6368cc",
         "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": 4163.566650390625,
-        "y": 623,
-        "z": "b25656d7.85a8a8",
+        "x": 4213.333312988281,
+        "y": 599.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5d6e99f5.a1e2d",
+        "id": "1656bf6f.d0ade1",
         "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": 4223.566650390625,
-        "y": 662,
-        "z": "b25656d7.85a8a8",
+        "x": 4273.333312988281,
+        "y": 638.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7de7f253.4369ac",
+        "id": "8297c516.b14308",
         "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": 1039.566650390625,
-        "y": 113,
-        "z": "b25656d7.85a8a8",
+        "x": 1089.3333129882812,
+        "y": 89.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9d19ef7b.02af28",
+        "id": "b5552ed0.c09148",
         "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": 3575.566650390625,
-        "y": 2139,
-        "z": "b25656d7.85a8a8",
+        "x": 3625.3333129882812,
+        "y": 2115.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b596d9f.c7daaa8",
+        "id": "ad599918.3fac7",
         "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": 3631.566650390625,
-        "y": 2188,
-        "z": "b25656d7.85a8a8",
+        "x": 3681.3333129882812,
+        "y": 2164.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "aeebae01.261168",
+        "id": "1fbc8dc6.5c716a",
         "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": 1039.566650390625,
-        "y": 152,
-        "z": "b25656d7.85a8a8",
+        "x": 1089.3333129882812,
+        "y": 128.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "731e9165.7bfe5",
+        "id": "e7860d61.a71378",
         "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": 1070.566650390625,
-        "y": 253,
-        "z": "b25656d7.85a8a8",
+        "x": 1120.3333129882812,
+        "y": 229.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c3d34fd5.00b8e8",
+        "id": "a8115aec.3c3d6",
         "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": 280.566650390625,
-        "y": 728,
-        "z": "b25656d7.85a8a8",
+        "x": 330.33331298828125,
+        "y": 704.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "39350f2.499cf7",
-                "6ce2e49e.7b3484",
-                "5333638f.7ecf8c"
+                "9234c3d4.71d2d8",
+                "71dab0f1.557458",
+                "d5b7dbc9.87e818"
             ]
         ]
     },
     {
-        "id": "39350f2.499cf7",
+        "id": "9234c3d4.71d2d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 499.566650390625,
-        "y": 666,
-        "z": "b25656d7.85a8a8",
+        "x": 549.3333129882812,
+        "y": 642.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "36841c29.6decdc"
+                "deed2b95.51b008"
             ]
         ]
     },
     {
-        "id": "6ce2e49e.7b3484",
+        "id": "71dab0f1.557458",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 509.0576171875,
-        "y": 708.5740356445312,
-        "z": "b25656d7.85a8a8",
+        "x": 558.8242797851562,
+        "y": 684.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5333638f.7ecf8c",
+        "id": "d5b7dbc9.87e818",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 497.566650390625,
-        "y": 755,
-        "z": "b25656d7.85a8a8",
+        "x": 547.3333129882812,
+        "y": 731.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3e93247c.aebb34"
+                "1f43e158.ba10c7"
             ]
         ]
     },
     {
-        "id": "36841c29.6decdc",
+        "id": "deed2b95.51b008",
         "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": 696.566650390625,
-        "y": 662,
-        "z": "b25656d7.85a8a8",
+        "x": 746.3333129882812,
+        "y": 638.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1f2c86c7.cadda9"
+                "2dc9974e.fd8eb"
             ]
         ]
     },
     {
-        "id": "3e93247c.aebb34",
+        "id": "1f43e158.ba10c7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 666.566650390625,
-        "y": 756,
-        "z": "b25656d7.85a8a8",
+        "x": 716.3333129882812,
+        "y": 732.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "1f2c86c7.cadda9",
+        "id": "2dc9974e.fd8eb",
         "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": 919.900146484375,
-        "y": 661.9999389648438,
-        "z": "b25656d7.85a8a8",
+        "x": 969.6668090820312,
+        "y": 637.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a1cbb7bd.24594"
+                "ba6829c9.a61c58"
             ]
         ]
     },
     {
-        "id": "a1cbb7bd.24594",
+        "id": "ba6829c9.a61c58",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1120.5667839050293,
-        "y": 663.000020980835,
-        "z": "b25656d7.85a8a8",
+        "x": 1170.3334465026855,
+        "y": 639.0000286102295,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1f60fbe4.6df234"
+                "64a3ee9a.60466"
             ]
         ]
     },
     {
-        "id": "1f60fbe4.6df234",
+        "id": "64a3ee9a.60466",
         "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": 250.566650390625,
-        "y": 925,
-        "z": "b25656d7.85a8a8",
+        "x": 300.33331298828125,
+        "y": 901.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "63c00e4f.b84e58",
-                "13815c78.95eb5c",
-                "e5780368.e11db"
+                "b06f4672.19b5b",
+                "1bbc50b7.a546f7",
+                "46ec206d.bba02"
             ]
         ]
     },
     {
-        "id": "63c00e4f.b84e58",
+        "id": "b06f4672.19b5b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 458.566650390625,
-        "y": 889,
-        "z": "b25656d7.85a8a8",
+        "x": 508.33331298828125,
+        "y": 865.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c1076b8e.81d988"
+                "71154b9b.41ff14"
             ]
         ]
     },
     {
-        "id": "13815c78.95eb5c",
+        "id": "1bbc50b7.a546f7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 459.0576171875,
-        "y": 934.5740356445312,
-        "z": "b25656d7.85a8a8",
+        "x": 508.82427978515625,
+        "y": 910.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e5780368.e11db",
+        "id": "46ec206d.bba02",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 456.566650390625,
-        "y": 978,
-        "z": "b25656d7.85a8a8",
+        "x": 506.33331298828125,
+        "y": 954.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "96cea788.4bc5b"
+                "d5a43e3e.bfb46"
             ]
         ]
     },
     {
-        "id": "96cea788.4bc5b",
+        "id": "d5a43e3e.bfb46",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 625.566650390625,
-        "y": 979,
-        "z": "b25656d7.85a8a8",
+        "x": 675.3333129882812,
+        "y": 955.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ec5bb05c.091188",
+        "id": "c36699ae.d9b4d8",
         "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": 597.566650390625,
-        "y": 1473,
-        "z": "b25656d7.85a8a8",
+        "x": 647.3333129882812,
+        "y": 1449.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "19a0d254.b680d6"
+                "cf4994da.4e15f8"
             ]
         ]
     },
     {
-        "id": "19a0d254.b680d6",
+        "id": "cf4994da.4e15f8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 800.566650390625,
-        "y": 1485,
-        "z": "b25656d7.85a8a8",
+        "x": 850.3333129882812,
+        "y": 1461.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5cf33a37.92a98c"
+                "5493f71f.74de8"
             ]
         ]
     },
     {
-        "id": "5cf33a37.92a98c",
+        "id": "5493f71f.74de8",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 966.566650390625,
-        "y": 1482,
-        "z": "b25656d7.85a8a8",
+        "x": 1016.3333129882812,
+        "y": 1458.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "60d055a9.95f0c4"
+                "ee9f0ecc.141c08"
             ]
         ]
     },
     {
-        "id": "60d055a9.95f0c4",
+        "id": "ee9f0ecc.141c08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1127.566650390625,
-        "y": 1479,
-        "z": "b25656d7.85a8a8",
+        "x": 1177.3333129882812,
+        "y": 1455.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "325c2337.f5bbac",
-                "282c70ac.7ebb8",
-                "790547b3.03e69",
-                "be332a4a.d8db58",
-                "88b6396e.dee88",
-                "3f4654a9.b7d9fc"
+                "4557d328.03c724",
+                "aa5d4b55.ae996",
+                "977d1c3.25b4f6",
+                "f4df7601.a8481",
+                "e57dfa3b.7a1478",
+                "7a26c91d.a51bf"
             ]
         ]
     },
     {
-        "id": "282c70ac.7ebb8",
+        "id": "aa5d4b55.ae996",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1333.566650390625,
-        "y": 1078.9999389648438,
-        "z": "b25656d7.85a8a8",
+        "x": 1383.3333129882812,
+        "y": 1054.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "325c2337.f5bbac",
+        "id": "4557d328.03c724",
         "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": 1330.566650390625,
-        "y": 1123.9999389648438,
-        "z": "b25656d7.85a8a8",
+        "x": 1380.3333129882812,
+        "y": 1099.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5ebf3dd3.403df4",
-                "df8620f2.fcde78",
-                "4f82abb0.8dd704"
+                "93fcd434.d90c9",
+                "74ecef95.a69828",
+                "c24f7a8a.a1ade"
             ]
         ]
     },
     {
-        "id": "df8620f2.fcde78",
+        "id": "74ecef95.a69828",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1526.0576171875,
-        "y": 1097.5739135742188,
-        "z": "b25656d7.85a8a8",
+        "x": 1575.8242797851562,
+        "y": 1073.5739212036133,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f317bbdf.6454e"
+                "ae28b8c.fba5c48"
             ]
         ]
     },
     {
-        "id": "4f82abb0.8dd704",
+        "id": "c24f7a8a.a1ade",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521.566650390625,
-        "y": 1141.9998779296875,
-        "z": "b25656d7.85a8a8",
+        "x": 1571.3333129882812,
+        "y": 1117.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ba985891.b5d178"
+                "90024c2d.8db9e"
             ]
         ]
     },
     {
-        "id": "f317bbdf.6454e",
+        "id": "ae28b8c.fba5c48",
         "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": 1688.629150390625,
-        "y": 1096.859619140625,
-        "z": "b25656d7.85a8a8",
+        "x": 1738.3958129882812,
+        "y": 1072.8596267700195,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ba985891.b5d178",
+        "id": "90024c2d.8db9e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1689.566650390625,
-        "y": 1141.9998779296875,
-        "z": "b25656d7.85a8a8",
+        "x": 1739.3333129882812,
+        "y": 1117.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d594aca6.9a4aa",
+        "id": "3a69019e.e0465e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1691.566650390625,
-        "y": 1188.9998779296875,
-        "z": "b25656d7.85a8a8",
+        "x": 1741.3333129882812,
+        "y": 1164.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5ebf3dd3.403df4",
+        "id": "93fcd434.d90c9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1522.566650390625,
-        "y": 1188.9998779296875,
-        "z": "b25656d7.85a8a8",
+        "x": 1572.3333129882812,
+        "y": 1164.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d594aca6.9a4aa"
+                "3a69019e.e0465e"
             ]
         ]
     },
     {
-        "id": "f22d69be.3697f8",
+        "id": "87587932.9e7dd",
         "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": 1304.566650390625,
-        "y": 1710,
-        "z": "b25656d7.85a8a8",
+        "x": 1354.3333129882812,
+        "y": 1686.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "790547b3.03e69",
+        "id": "977d1c3.25b4f6",
         "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",
+        "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<!--<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.uni.data-owner`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1395.566650390625,
-        "y": 1764,
-        "z": "b25656d7.85a8a8",
+        "x": 1445.3333129882812,
+        "y": 1740.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a6f0acc2.4c1e8",
+        "id": "1a612904.ca3407",
         "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": 2072.066650390625,
-        "y": 1177,
-        "z": "b25656d7.85a8a8",
+        "x": 2121.8333129882812,
+        "y": 1153.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ff492e23.69ead8",
+        "id": "70124697.bdc348",
         "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": 2077.066650390625,
-        "y": 1279,
-        "z": "b25656d7.85a8a8",
+        "x": 2126.8333129882812,
+        "y": 1255.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f2cd3854.ada88",
+        "id": "d56221fe.c2bbf",
         "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": 560.566650390625,
-        "y": 1729,
-        "z": "b25656d7.85a8a8",
+        "x": 610.3333129882812,
+        "y": 1705.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6040df7.067df2"
+                "aeacc57e.1c70e"
             ]
         ]
     },
     {
-        "id": "6040df7.067df2",
+        "id": "aeacc57e.1c70e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 792.566650390625,
-        "y": 1728,
-        "z": "b25656d7.85a8a8",
+        "x": 842.3333129882812,
+        "y": 1704.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f4813036.0e422"
+                "dab1af90.85d2c"
             ]
         ]
     },
     {
-        "id": "f4813036.0e422",
+        "id": "dab1af90.85d2c",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1004.566650390625,
-        "y": 1729,
-        "z": "b25656d7.85a8a8",
+        "x": 1054.3333129882812,
+        "y": 1705.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "21d7816d.cb9a2e"
+                "6cc09a7e.3eecf4"
             ]
         ]
     },
     {
-        "id": "21d7816d.cb9a2e",
+        "id": "6cc09a7e.3eecf4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 260.566650390625,
-        "y": 1885,
-        "z": "b25656d7.85a8a8",
+        "x": 310.33331298828125,
+        "y": 1861.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "99bd9d6a.34096",
-                "25dea7fd.0f37b"
+                "acf145f8.65836",
+                "d6c02212.5df71"
             ]
         ]
     },
     {
-        "id": "25dea7fd.0f37b",
+        "id": "d6c02212.5df71",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 495.566650390625,
-        "y": 1872,
-        "z": "b25656d7.85a8a8",
+        "x": 545.3333129882812,
+        "y": 1848.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "99bd9d6a.34096",
+        "id": "acf145f8.65836",
         "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": 485.566650390625,
-        "y": 1933,
-        "z": "b25656d7.85a8a8",
+        "x": 535.3333129882812,
+        "y": 1909.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "74a706a.d47d878",
-                "7274c8e3.f8fec8",
-                "b6208f6.4c1eb7"
+                "87fb6e74.97fee8",
+                "cc7c3629.07cd7",
+                "419399de.ad60b8"
             ]
         ]
     },
     {
-        "id": "7274c8e3.f8fec8",
+        "id": "cc7c3629.07cd7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 699.0576171875,
-        "y": 1917.5740356445312,
-        "z": "b25656d7.85a8a8",
+        "x": 748.8242797851562,
+        "y": 1893.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7f886391.998a1c"
+                "739447c7.2df608"
             ]
         ]
     },
     {
-        "id": "b6208f6.4c1eb7",
+        "id": "419399de.ad60b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 694.566650390625,
-        "y": 1962,
-        "z": "b25656d7.85a8a8",
+        "x": 744.3333129882812,
+        "y": 1938.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3f233556.698682"
+                "a817deb7.6d09d"
             ]
         ]
     },
     {
-        "id": "74a706a.d47d878",
+        "id": "87fb6e74.97fee8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 696.566650390625,
-        "y": 2022,
-        "z": "b25656d7.85a8a8",
+        "x": 746.3333129882812,
+        "y": 1998.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "721ed34e.4f1714"
+                "40dff6fa.ed3558"
             ]
         ]
     },
     {
-        "id": "7f886391.998a1c",
+        "id": "739447c7.2df608",
         "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": 861.629150390625,
-        "y": 1916.8597412109375,
-        "z": "b25656d7.85a8a8",
+        "x": 911.3958129882812,
+        "y": 1892.859748840332,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "3f233556.698682",
+        "id": "a817deb7.6d09d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 862.566650390625,
-        "y": 1962,
-        "z": "b25656d7.85a8a8",
+        "x": 912.3333129882812,
+        "y": 1938.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "721ed34e.4f1714",
+        "id": "40dff6fa.ed3558",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 865.566650390625,
-        "y": 2021,
-        "z": "b25656d7.85a8a8",
+        "x": 915.3333129882812,
+        "y": 1997.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "fb6c612a.831f28",
-                "af0310e2.931fe8"
+                "e2deabd9.c69c8",
+                "574db0eb.1dd5f"
             ]
         ]
     },
     {
-        "id": "a05b5003.46c7e8",
+        "id": "bcc45625.ebbc48",
         "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='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",
+        "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": 285.566650390625,
-        "y": 2523,
-        "z": "b25656d7.85a8a8",
+        "x": 335.33331298828125,
+        "y": 2499.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c5885881.921d18",
+        "id": "fa8a8b3f.f0a5f8",
         "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": 407.566650390625,
-        "y": 2580,
-        "z": "b25656d7.85a8a8",
+        "x": 457.33331298828125,
+        "y": 2556.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1736d2be.a7f385",
-                "11bf3fb5.747c4"
+                "2e9bd62d.c02afa",
+                "55c19c27.0b4a64"
             ]
         ]
     },
     {
-        "id": "1736d2be.a7f385",
+        "id": "2e9bd62d.c02afa",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 720.066650390625,
-        "y": 2557,
-        "z": "b25656d7.85a8a8",
+        "x": 769.8333129882812,
+        "y": 2533.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "11bf3fb5.747c4",
+        "id": "55c19c27.0b4a64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 724.066650390625,
-        "y": 2597,
-        "z": "b25656d7.85a8a8",
+        "x": 773.8333129882812,
+        "y": 2573.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9fa6731e.bfdda"
+                "19a8d296.6252e5"
             ]
         ]
     },
     {
-        "id": "d975bee8.cbb1b8",
+        "id": "81214b8b.cb073",
         "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": 900.066650390625,
-        "y": 2561,
-        "z": "b25656d7.85a8a8",
+        "x": 949.8333129882812,
+        "y": 2537.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9fa6731e.bfdda",
+        "id": "19a8d296.6252e5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 915.566650390625,
-        "y": 2615,
-        "z": "b25656d7.85a8a8",
+        "x": 965.3333129882812,
+        "y": 2591.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "26102eb4.5bf9d2",
-                "a5cf86e7.fd2ae8",
-                "94107493.94d3e8",
-                "c85f3994.bd81f"
+                "89591cea.6097a8",
+                "e0a0a9f7.c3b968",
+                "39281a09.347b8e",
+                "8394d0d1.93103"
             ]
         ]
     },
     {
-        "id": "3a7c38a3.d1311",
+        "id": "d3d37efd.5c6f1",
         "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": 1211.066650390625,
-        "y": 2584,
-        "z": "b25656d7.85a8a8",
+        "x": 1260.8333129882812,
+        "y": 2560.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d5ebfe0.284f7",
+        "id": "e1720f9a.264c28",
         "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": 2678.066650390625,
-        "y": 1935,
-        "z": "b25656d7.85a8a8",
+        "x": 2727.8333129882812,
+        "y": 1911.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "26102eb4.5bf9d2",
+        "id": "89591cea.6097a8",
         "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": 1173.066650390625,
-        "y": 2626,
-        "z": "b25656d7.85a8a8",
+        "x": 1222.8333129882812,
+        "y": 2602.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "eaf51112.30b59",
+        "id": "7128141a.22afcc",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 2038.066650390625,
-        "y": 1215,
-        "z": "b25656d7.85a8a8",
+        "x": 2087.8333129882812,
+        "y": 1191.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "77e27285.394bfc",
+        "id": "59bf9e6a.8c5448",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 2039.066650390625,
-        "y": 1319,
-        "z": "b25656d7.85a8a8",
+        "x": 2088.8333129882812,
+        "y": 1295.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "1771c9d3.36c546",
+        "id": "d2ff3c56.4372d",
         "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": 4332.566650390625,
-        "y": 576,
-        "z": "b25656d7.85a8a8",
+        "x": 4382.333312988281,
+        "y": 552.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6270f9ff.6a6b4",
+        "id": "8c5d7664.9247c8",
         "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": 4235.566650390625,
-        "y": 1395,
-        "z": "b25656d7.85a8a8",
+        "x": 4285.333312988281,
+        "y": 1371.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2308c235.08d20e",
+        "id": "cedd744c.d4173",
         "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": 3729.566650390625,
-        "y": 2067,
-        "z": "b25656d7.85a8a8",
+        "x": 3779.3333129882812,
+        "y": 2043.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c1076b8e.81d988",
+        "id": "71154b9b.41ff14",
         "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": 830.566650390625,
-        "y": 875,
-        "z": "b25656d7.85a8a8",
+        "x": 880.3333129882812,
+        "y": 851.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "451a757.6fc508c",
-                "8b0542af.2f9d78"
+                "549c1dfb.8f3224",
+                "34cb7bd3.43733c"
             ]
         ]
     },
     {
-        "id": "451a757.6fc508c",
+        "id": "549c1dfb.8f3224",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1193.566650390625,
-        "y": 898,
-        "z": "b25656d7.85a8a8",
+        "x": 1243.3333129882812,
+        "y": 874.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f1ea0737.b79178"
+                "e217a5f3.43edf8"
             ]
         ]
     },
     {
-        "id": "8b0542af.2f9d78",
+        "id": "34cb7bd3.43733c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1193.566650390625,
-        "y": 847,
-        "z": "b25656d7.85a8a8",
+        "x": 1243.3333129882812,
+        "y": 823.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3e6bbe33.acc602"
+                "845a9945.5ecef8"
             ]
         ]
     },
     {
-        "id": "f1ea0737.b79178",
+        "id": "e217a5f3.43edf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1349.566650390625,
-        "y": 896,
-        "z": "b25656d7.85a8a8",
+        "x": 1399.3333129882812,
+        "y": 872.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "cb3a4052.881008"
+                "462f3353.3aa76c"
             ]
         ]
     },
     {
-        "id": "3e6bbe33.acc602",
+        "id": "845a9945.5ecef8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1326.566650390625,
-        "y": 848,
-        "z": "b25656d7.85a8a8",
+        "x": 1376.3333129882812,
+        "y": 824.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b01d3963.8ea8b8",
+        "id": "a8591f2d.71e23",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2086.566650390625,
-        "y": 246,
-        "z": "b25656d7.85a8a8",
+        "x": 2136.3333129882812,
+        "y": 222.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5a0cb184.9cdf98",
+        "id": "c2c48b41.449c5",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3628.566650390625,
-        "y": 2227,
-        "z": "b25656d7.85a8a8",
+        "x": 3678.3333129882812,
+        "y": 2203.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d9cf64bd.4ed12",
+        "id": "9499a947.255148",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4218.566650390625,
-        "y": 700,
-        "z": "b25656d7.85a8a8",
+        "x": 4268.333312988281,
+        "y": 676.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "be332a4a.d8db58",
+        "id": "f4df7601.a8481",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1392.566650390625,
-        "y": 1806,
-        "z": "b25656d7.85a8a8",
+        "x": 1442.3333129882812,
+        "y": 1782.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "3501da3.a014526",
+        "id": "c236e813.0b75c",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 571.566650390625,
-        "y": 1540,
-        "z": "b25656d7.85a8a8",
+        "x": 621.3333129882812,
+        "y": 1516.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2c2649c2.53ac7e",
+        "id": "ccf5136c.426918",
         "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": 602.566650390625,
-        "y": 1580,
-        "z": "b25656d7.85a8a8",
+        "x": 652.3333129882812,
+        "y": 1556.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "fb6c612a.831f28",
+        "id": "e2deabd9.c69c8",
         "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": 1150.566650390625,
-        "y": 1988,
-        "z": "b25656d7.85a8a8",
+        "x": 1200.3333129882812,
+        "y": 1964.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "af0310e2.931fe8",
+        "id": "574db0eb.1dd5f",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1153.566650390625,
-        "y": 2030,
-        "z": "b25656d7.85a8a8",
+        "x": 1203.3333129882812,
+        "y": 2006.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "694d6c2f.8edccc",
+        "id": "67d19d91.7e0464",
         "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": 596.566650390625,
-        "y": 1670,
-        "z": "b25656d7.85a8a8",
+        "x": 646.3333129882812,
+        "y": 1646.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "4b32fbef.652bc4",
+        "id": "6dec5e05.6defc8",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 351.566650390625,
-        "y": 2049,
-        "z": "b25656d7.85a8a8",
+        "x": 401.33331298828125,
+        "y": 2025.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "caa8a64f.1936",
+        "id": "4d2f3635.de76f",
         "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": 359.566650390625,
-        "y": 2106,
-        "z": "b25656d7.85a8a8",
+        "x": 409.33331298828125,
+        "y": 2082.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "88b6396e.dee88",
+        "id": "e57dfa3b.7a1478",
         "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": 1370.566650390625,
-        "y": 1655,
-        "z": "b25656d7.85a8a8",
+        "x": 1420.3333129882812,
+        "y": 1631.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "45e3fdbe.201574",
-                "86940004.bfdd7"
+                "42d55673.4b259",
+                "c68b8996.7afed8"
             ]
         ]
     },
     {
-        "id": "86940004.bfdd7",
+        "id": "c68b8996.7afed8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1593.566650390625,
-        "y": 1610,
-        "z": "b25656d7.85a8a8",
+        "x": 1643.3333129882812,
+        "y": 1586.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c31b8cce.808f08"
+                "30a6d609.f0af22"
             ]
         ]
     },
     {
-        "id": "45e3fdbe.201574",
+        "id": "42d55673.4b259",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1595.566650390625,
-        "y": 1674,
-        "z": "b25656d7.85a8a8",
+        "x": 1645.3333129882812,
+        "y": 1650.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1cc861e4.834c36"
+                "36f16c60.30df3c"
             ]
         ]
     },
     {
-        "id": "c31b8cce.808f08",
+        "id": "30a6d609.f0af22",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1758.566650390625,
-        "y": 1607,
-        "z": "b25656d7.85a8a8",
+        "x": 1808.3333129882812,
+        "y": 1583.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b2423aca.7a4fa8"
+                "33a6db5.6665724"
             ]
         ]
     },
     {
-        "id": "1cc861e4.834c36",
+        "id": "36f16c60.30df3c",
         "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": 1757.566650390625,
-        "y": 1670,
-        "z": "b25656d7.85a8a8",
+        "x": 1807.3333129882812,
+        "y": 1646.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b2423aca.7a4fa8",
+        "id": "33a6db5.6665724",
         "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": 1978.566650390625,
-        "y": 1621,
-        "z": "b25656d7.85a8a8",
+        "x": 2028.3333129882812,
+        "y": 1597.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "45f30159.842648",
+        "id": "9a45a6ac.6bb008",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1523.566650390625,
-        "y": 2346,
-        "z": "b25656d7.85a8a8",
+        "x": 1573.3333129882812,
+        "y": 2322.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "195465ca.996e92"
+                "90552bad.c118e"
             ]
         ]
     },
     {
-        "id": "ac9df433.f2c8",
+        "id": "746f3218.6a2f4c",
         "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": 1908.566650390625,
-        "y": 2359,
-        "z": "b25656d7.85a8a8",
+        "x": 1958.3333129882812,
+        "y": 2335.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "565cac1f.04fa64",
-                "e43b7ac1.fcb9e",
-                "7ad49b0d.e0614c"
+                "cc717bee.327628",
+                "4215d2eb.6b41b4",
+                "6de2353d.61ff6c"
             ]
         ]
     },
     {
-        "id": "195465ca.996e92",
+        "id": "90552bad.c118e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1702.566650390625,
-        "y": 2346,
-        "z": "b25656d7.85a8a8",
+        "x": 1752.3333129882812,
+        "y": 2322.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "94dbb559.adb488",
-                "ac9df433.f2c8"
+                "f2b28f1.371b57",
+                "746f3218.6a2f4c"
             ]
         ]
     },
     {
-        "id": "94dbb559.adb488",
+        "id": "f2b28f1.371b57",
         "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": 1938.566650390625,
-        "y": 2307,
-        "z": "b25656d7.85a8a8",
+        "x": 1988.3333129882812,
+        "y": 2283.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "565cac1f.04fa64",
+        "id": "cc717bee.327628",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2118.566650390625,
-        "y": 2350,
-        "z": "b25656d7.85a8a8",
+        "x": 2168.3333129882812,
+        "y": 2326.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b1dc084c.7cde9"
+                "864e3f3b.37515"
             ]
         ]
     },
     {
-        "id": "e43b7ac1.fcb9e",
+        "id": "4215d2eb.6b41b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2110.566650390625,
-        "y": 2405,
-        "z": "b25656d7.85a8a8",
+        "x": 2160.3333129882812,
+        "y": 2381.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "385c483c.3ef568"
+                "dbafb74f.d2c48"
             ]
         ]
     },
     {
-        "id": "7ad49b0d.e0614c",
+        "id": "6de2353d.61ff6c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2115.566650390625,
-        "y": 2462,
-        "z": "b25656d7.85a8a8",
+        "x": 2165.3333129882812,
+        "y": 2438.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "35f4b5a3.f8aa4a"
+                "d9191b0b.ddee58"
             ]
         ]
     },
     {
-        "id": "35f4b5a3.f8aa4a",
+        "id": "d9191b0b.ddee58",
         "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": 2267.566650390625,
-        "y": 2463,
-        "z": "b25656d7.85a8a8",
+        "x": 2317.3333129882812,
+        "y": 2439.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "385c483c.3ef568",
+        "id": "dbafb74f.d2c48",
         "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": 2278.566650390625,
-        "y": 2408,
-        "z": "b25656d7.85a8a8",
+        "x": 2328.3333129882812,
+        "y": 2384.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b1dc084c.7cde9",
+        "id": "864e3f3b.37515",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2262.948974609375,
-        "y": 2347.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 2312.7156372070312,
+        "y": 2323.65567779541,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5d32a434.f7be54"
+                "f35ba5bd.48a6c8"
             ]
         ]
     },
     {
-        "id": "5d32a434.f7be54",
+        "id": "f35ba5bd.48a6c8",
         "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": 2477.566650390625,
-        "y": 2344,
-        "z": "b25656d7.85a8a8",
+        "x": 2527.3333129882812,
+        "y": 2320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "51bc490a.0719c",
+        "id": "8481025.43fb9",
         "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": 601.566650390625,
-        "y": 2392,
-        "z": "b25656d7.85a8a8",
+        "x": 651.3333129882812,
+        "y": 2368.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9a98fb41.58116",
-                "d11dcfed.810438",
-                "f803d5ab.85238"
+                "372d54fa.9f96f4",
+                "9dc1c4cc.c7a94",
+                "2d38b1b0.a69f26"
             ]
         ]
     },
     {
-        "id": "9a98fb41.58116",
+        "id": "372d54fa.9f96f4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 797.0667724609375,
-        "y": 2344,
-        "z": "b25656d7.85a8a8",
+        "x": 846.8334350585938,
+        "y": 2320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "98bce7a3.da5e"
+                "eb66892d.1f2808"
             ]
         ]
     },
     {
-        "id": "d11dcfed.810438",
+        "id": "9dc1c4cc.c7a94",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 789.0667724609375,
-        "y": 2399,
-        "z": "b25656d7.85a8a8",
+        "x": 838.8334350585938,
+        "y": 2375.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "71f2762f.659628"
+                "79e4473c.6cea88"
             ]
         ]
     },
     {
-        "id": "98bce7a3.da5e",
+        "id": "eb66892d.1f2808",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 941.4490966796875,
-        "y": 2343.6556701660156,
-        "z": "b25656d7.85a8a8",
+        "x": 991.2157592773438,
+        "y": 2319.65567779541,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c67046c0.c64788"
+                "a488eeff.b05b28"
             ]
         ]
     },
     {
-        "id": "c67046c0.c64788",
+        "id": "a488eeff.b05b28",
         "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": 1125.566650390625,
-        "y": 2342,
-        "z": "b25656d7.85a8a8",
+        "x": 1175.3333129882812,
+        "y": 2318.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5f0a1eb2.b2273"
+                "52486109.89e3d"
             ]
         ]
     },
     {
-        "id": "5f0a1eb2.b2273",
+        "id": "52486109.89e3d",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1320.566650390625,
-        "y": 2342,
-        "z": "b25656d7.85a8a8",
+        "x": 1370.3333129882812,
+        "y": 2318.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "45f30159.842648"
+                "9a45a6ac.6bb008"
             ]
         ]
     },
     {
-        "id": "f803d5ab.85238",
+        "id": "2d38b1b0.a69f26",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 794.0667724609375,
-        "y": 2456,
-        "z": "b25656d7.85a8a8",
+        "x": 843.8334350585938,
+        "y": 2432.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "33262ba5.8d682c"
+                "7ec62576.a9581c"
             ]
         ]
     },
     {
-        "id": "33262ba5.8d682c",
+        "id": "7ec62576.a9581c",
         "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": 946.0667724609375,
-        "y": 2457,
-        "z": "b25656d7.85a8a8",
+        "x": 995.8334350585938,
+        "y": 2433.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "71f2762f.659628",
+        "id": "79e4473c.6cea88",
         "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": 957.0667724609375,
-        "y": 2400,
-        "z": "b25656d7.85a8a8",
+        "x": 1006.8334350585938,
+        "y": 2376.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "808535b.d0bfd48",
+        "id": "46b10267.ea0e94",
         "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": 591.566650390625,
-        "y": 2304,
-        "z": "b25656d7.85a8a8",
+        "x": 641.3333129882812,
+        "y": 2280.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "6e3ab27b.a7f37c",
+        "id": "9e415421.d3d5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 336.566650390625,
-        "y": 2435,
-        "z": "b25656d7.85a8a8",
+        "x": 386.33331298828125,
+        "y": 2411.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "808535b.d0bfd48",
-                "51bc490a.0719c"
+                "46b10267.ea0e94",
+                "8481025.43fb9"
             ]
         ]
     },
     {
-        "id": "dc357fe5.d2f6d8",
+        "id": "e5923dd1.06f5c",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1551.5333251953125,
-        "y": 252.88333129882812,
-        "z": "b25656d7.85a8a8",
+        "x": 1601.2999877929688,
+        "y": 228.88333892822266,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a92b97b8.4129e8",
+        "id": "57052eb0.583298",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 753.566650390625,
-        "y": 475,
-        "z": "b25656d7.85a8a8",
+        "x": 803.3333129882812,
+        "y": 451.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "baa368e2.d0057",
+        "id": "b87c2610.4dcfe8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 313.066650390625,
-        "y": 1444,
-        "z": "b25656d7.85a8a8",
+        "x": 362.83331298828125,
+        "y": 1420.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ec5bb05c.091188",
-                "f2cd3854.ada88",
-                "3501da3.a014526",
-                "2c2649c2.53ac7e",
-                "a05b5003.46c7e8",
-                "c5885881.921d18",
-                "694d6c2f.8edccc",
-                "4b32fbef.652bc4",
-                "caa8a64f.1936",
-                "6e3ab27b.a7f37c",
-                "5a72a2f9.fe54bc"
+                "c36699ae.d9b4d8",
+                "d56221fe.c2bbf",
+                "c236e813.0b75c",
+                "ccf5136c.426918",
+                "bcc45625.ebbc48",
+                "fa8a8b3f.f0a5f8",
+                "67d19d91.7e0464",
+                "6dec5e05.6defc8",
+                "4d2f3635.de76f",
+                "9e415421.d3d5",
+                "4fcc44c7.7479d4"
             ]
         ]
     },
     {
-        "id": "3f4654a9.b7d9fc",
+        "id": "7a26c91d.a51bf",
         "type": "switchNode",
         "name": "switch uni type",
         "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1343.566650390625,
-        "y": 1282,
-        "z": "b25656d7.85a8a8",
+        "x": 1393.3333129882812,
+        "y": 1258.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "118223c9.ee1e8c",
-                "5e72886e.16b82",
-                "9ad14e96.a683a8",
-                "b20e668c.49e0a"
+                "a9279133.62197",
+                "c4ef1cec.86081",
+                "5303ba0b.725dcc",
+                "84ee69ca.e736d8"
             ]
         ]
     },
     {
-        "id": "118223c9.ee1e8c",
+        "id": "a9279133.62197",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1508.566650390625,
-        "y": 1264,
-        "z": "b25656d7.85a8a8",
+        "x": 1558.3333129882812,
+        "y": 1240.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4829f132.924c9"
+                "df04fed1.2e9e3"
             ]
         ]
     },
     {
-        "id": "5e72886e.16b82",
+        "id": "c4ef1cec.86081",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1511.566650390625,
-        "y": 1303,
-        "z": "b25656d7.85a8a8",
+        "x": 1561.3333129882812,
+        "y": 1279.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1b6bbf84.2b9b8"
+                "1437703.dec509"
             ]
         ]
     },
     {
-        "id": "b20e668c.49e0a",
+        "id": "84ee69ca.e736d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1505.566650390625,
-        "y": 1381,
-        "z": "b25656d7.85a8a8",
+        "x": 1555.3333129882812,
+        "y": 1357.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "23f70279.3c530e"
+                "c52f2275.ca0538"
             ]
         ]
     },
     {
-        "id": "9ad14e96.a683a8",
+        "id": "5303ba0b.725dcc",
         "type": "outcome",
         "name": "root-secondary",
         "xml": "<outcome value='root-secondary'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1528.566650390625,
-        "y": 1344,
-        "z": "b25656d7.85a8a8",
+        "x": 1578.3333129882812,
+        "y": 1320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "690a7c3c.e28bc4"
+                "bb188e14.1d1858"
             ]
         ]
     },
     {
-        "id": "34596fcc.944e58",
+        "id": "f4fe23e8.e2bba",
         "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": 2074.566650390625,
-        "y": 1377,
-        "z": "b25656d7.85a8a8",
+        "x": 2124.3333129882812,
+        "y": 1353.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "36c4b896.3cd558",
+        "id": "a68d577a.75b008",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
         "comments": "",
-        "x": 2036.566650390625,
-        "y": 1417,
-        "z": "b25656d7.85a8a8",
+        "x": 2086.3333129882812,
+        "y": 1393.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "23f70279.3c530e",
+        "id": "c52f2275.ca0538",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1657.566650390625,
-        "y": 1402,
-        "z": "b25656d7.85a8a8",
+        "x": 1707.3333129882812,
+        "y": 1378.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5cf86e7.fd2ae8",
+        "id": "e0a0a9f7.c3b968",
         "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/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1247.1500244140625,
-        "y": 2701.3336181640625,
-        "z": "b25656d7.85a8a8",
+        "x": 1296.9166870117188,
+        "y": 2677.333625793457,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4829f132.924c9",
+        "id": "df04fed1.2e9e3",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1643.4832763671875,
-        "y": 1260.333251953125,
-        "z": "b25656d7.85a8a8",
+        "x": 1693.2499389648438,
+        "y": 1236.3332595825195,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "eaf51112.30b59"
+                "7128141a.22afcc"
             ]
         ]
     },
     {
-        "id": "1b6bbf84.2b9b8",
+        "id": "1437703.dec509",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1645.4832763671875,
-        "y": 1298.333251953125,
-        "z": "b25656d7.85a8a8",
+        "x": 1695.2499389648438,
+        "y": 1274.3332595825195,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "77e27285.394bfc"
+                "59bf9e6a.8c5448"
             ]
         ]
     },
     {
-        "id": "690a7c3c.e28bc4",
+        "id": "bb188e14.1d1858",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1688.4832763671875,
-        "y": 1345.333251953125,
-        "z": "b25656d7.85a8a8",
+        "x": 1738.2499389648438,
+        "y": 1321.3332595825195,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "36c4b896.3cd558"
+                "a68d577a.75b008"
             ]
         ]
     },
     {
-        "id": "94107493.94d3e8",
+        "id": "39281a09.347b8e",
         "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=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1215.1500244140625,
-        "y": 2773.33349609375,
-        "z": "b25656d7.85a8a8",
+        "x": 1264.9166870117188,
+        "y": 2749.3335037231445,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c85f3994.bd81f",
+        "id": "8394d0d1.93103",
         "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=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1245.1500244140625,
-        "y": 2835.33349609375,
-        "z": "b25656d7.85a8a8",
+        "x": 1294.9166870117188,
+        "y": 2811.3335037231445,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "5a72a2f9.fe54bc",
+        "id": "4fcc44c7.7479d4",
         "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": 638.566650390625,
-        "y": 1382.166748046875,
-        "z": "b25656d7.85a8a8",
+        "x": 688.3333129882812,
+        "y": 1358.1667556762695,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "cb3a4052.881008",
+        "id": "462f3353.3aa76c",
         "type": "switchNode",
         "name": "switch conn type",
         "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 179.56666564941406,
-        "y": 1093.1666259765625,
-        "z": "b25656d7.85a8a8",
+        "x": 229.3333282470703,
+        "y": 1069.166633605957,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f5718cb9.775688",
-                "eaa991b9.45489"
+                "66788e31.cd8e5",
+                "15c226b1.2f2f21"
             ]
         ]
     },
     {
-        "id": "eaa991b9.45489",
+        "id": "15c226b1.2f2f21",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 364.566650390625,
-        "y": 1267.1666259765625,
-        "z": "b25656d7.85a8a8",
+        "x": 414.33331298828125,
+        "y": 1243.166633605957,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "baa368e2.d0057"
+                "b87c2610.4dcfe8"
             ]
         ]
     },
     {
-        "id": "f5718cb9.775688",
+        "id": "66788e31.cd8e5",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 367.566650390625,
-        "y": 1222.1666259765625,
-        "z": "b25656d7.85a8a8",
+        "x": 417.33331298828125,
+        "y": 1198.166633605957,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "baa368e2.d0057"
+                "b87c2610.4dcfe8"
             ]
         ]
     }