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=b318a7311e37871362051ecb0e2e1fa53973a44d;hpb=a6c6776d93ee0ec6bd8aefa23ac107262cf93154;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 b318a731..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": "190659b8.bcae0e",
+        "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": 353.566650390625,
-        "y": 335,
-        "z": "8603b63b.c1c358",
+        "x": 450.33331298828125,
+        "y": 350.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b2e66c4e.a3d2f8",
-                "35dfe125.6c620e",
-                "69d67799.ffee68"
+                "3d418b0.8302bf6",
+                "48d7e3bc.f2883c",
+                "8ec621b1.80ebc8"
             ]
         ]
     },
     {
-        "id": "b2e66c4e.a3d2f8",
+        "id": "3d418b0.8302bf6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 541.566650390625,
-        "y": 348,
-        "z": "8603b63b.c1c358",
+        "x": 638.3333129882812,
+        "y": 363.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a7669132.5699f8"
+                "9c98306.e2cffd"
             ]
         ]
     },
     {
-        "id": "35dfe125.6c620e",
+        "id": "48d7e3bc.f2883c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 549.0575866699219,
-        "y": 390.57403564453125,
-        "z": "8603b63b.c1c358",
+        "x": 645.8242492675781,
+        "y": 405.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "69d67799.ffee68",
+        "id": "8ec621b1.80ebc8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 539.566650390625,
-        "y": 437,
-        "z": "8603b63b.c1c358",
+        "x": 636.3333129882812,
+        "y": 452.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7627d017.e729d8"
+                "57052eb0.583298"
             ]
         ]
     },
     {
-        "id": "a7669132.5699f8",
+        "id": "9c98306.e2cffd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 714.566650390625,
-        "y": 346,
-        "z": "8603b63b.c1c358",
+        "x": 811.3333129882812,
+        "y": 361.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "efea1cd6.23d6f8"
+                "53767e53.94959"
             ]
         ]
     },
     {
-        "id": "efea1cd6.23d6f8",
+        "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": 943.566650390625,
-        "y": 347,
-        "z": "8603b63b.c1c358",
+        "x": 1040.3333129882812,
+        "y": 362.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "afe63db8.26dbd8"
+                "c415e278.f5611"
             ]
         ]
     },
     {
-        "id": "afe63db8.26dbd8",
+        "id": "c415e278.f5611",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1158.566650390625,
-        "y": 348,
-        "z": "8603b63b.c1c358",
+        "x": 1255.3333129882812,
+        "y": 363.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "46ace79f.7f246"
+                "c71ad5b.64b44a8"
             ]
         ]
     },
     {
-        "id": "356939c7.7d339e",
+        "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": 1412.566650390625,
-        "y": 270,
-        "z": "8603b63b.c1c358",
+        "x": 1509.3333129882812,
+        "y": 285.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a076eac6.b4101",
-                "488c763c.46cdf"
+                "bbedabe9.bd4b",
+                "34793819.776c6"
             ]
         ]
     },
     {
-        "id": "a076eac6.b4101",
+        "id": "bbedabe9.bd4b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1629.566650390625,
-        "y": 249,
-        "z": "8603b63b.c1c358",
+        "x": 1726.3333129882812,
+        "y": 264.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "46ace79f.7f246"
+                "c71ad5b.64b44a8"
             ]
         ]
     },
     {
-        "id": "488c763c.46cdf",
+        "id": "34793819.776c6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1629.566650390625,
-        "y": 298,
-        "z": "8603b63b.c1c358",
+        "x": 1726.3333129882812,
+        "y": 313.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "46ace79f.7f246",
+        "id": "c71ad5b.64b44a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1813.566650390625,
-        "y": 335,
-        "z": "8603b63b.c1c358",
+        "x": 1910.3333129882812,
+        "y": 350.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5d0d530d.21fb2c",
-                "d6a4c941.f116b8",
-                "84203861.d12558"
+                "3dd08dae.27e4a2",
+                "52a060f7.3567c8",
+                "a8591f2d.71e23"
             ]
         ]
     },
     {
-        "id": "578597dc.f76518",
+        "id": "e6629469.2dd4b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 172.566650390625,
-        "y": 76,
-        "z": "8603b63b.c1c358",
+        "x": 269.33331298828125,
+        "y": 91.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3273c1f.6d67d3e"
+                "e4a2a292.f645d8"
             ]
         ]
     },
     {
-        "id": "3273c1f.6d67d3e",
+        "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": 456.8523406982422,
-        "y": 137.23810863494873,
-        "z": "8603b63b.c1c358",
+        "x": 553.6190032958984,
+        "y": 152.23811626434326,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bc88585a.07ae"
+                "94591033.455c8"
             ]
         ]
     },
     {
-        "id": "bc88585a.07ae",
+        "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": 462.99525451660156,
-        "y": 222.00003051757812,
-        "z": "8603b63b.c1c358",
+        "x": 559.7619171142578,
+        "y": 237.00003814697266,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c722c351.6c9218"
+                "fa712947.37c038"
             ]
         ]
     },
     {
-        "id": "c722c351.6c9218",
+        "id": "fa712947.37c038",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 772.8046875,
-        "y": 213.66668701171875,
-        "z": "8603b63b.c1c358",
+        "x": 869.5713500976562,
+        "y": 228.66669464111328,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "190659b8.bcae0e",
-                "faef4429.aa2c8",
-                "54215ea2.f0c928",
-                "8ba173b9.e36f",
-                "e82defb9.e02d8"
+                "9ee6a3c1.bedb",
+                "b5b4ab5e.850cd8",
+                "8297c516.b14308",
+                "e7860d61.a71378",
+                "a8115aec.3c3d6"
             ]
         ]
     },
     {
-        "id": "5d0d530d.21fb2c",
+        "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": 2030.566650390625,
-        "y": 273,
-        "z": "8603b63b.c1c358",
+        "x": 2127.3333129882812,
+        "y": 288.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "6fabd371.f1d30c",
+        "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": 4199.566650390625,
-        "y": 159,
-        "z": "8603b63b.c1c358",
+        "x": 4296.333312988281,
+        "y": 174.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "aa17cc43.b708b",
+        "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": 4280.566650390625,
-        "y": 474,
-        "z": "8603b63b.c1c358",
+        "x": 4377.333312988281,
+        "y": 489.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "709fb1ba.ca1bd",
-                "a7a19ece.dc1ae"
+                "d90569fe.c301e",
+                "9a0fd68f.7364"
             ]
         ]
     },
     {
-        "id": "709fb1ba.ca1bd",
+        "id": "d90569fe.c301e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4590.066650390625,
-        "y": 443,
-        "z": "8603b63b.c1c358",
+        "x": 4686.833312988281,
+        "y": 458.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5cd036bd.ebcf28"
+                "bfcc154c.9d015"
             ]
         ]
     },
     {
-        "id": "a7a19ece.dc1ae",
+        "id": "9a0fd68f.7364",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4595.066650390625,
-        "y": 508,
-        "z": "8603b63b.c1c358",
+        "x": 4691.833312988281,
+        "y": 523.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "fddf1c47.d3871"
+                "5fe18426.281bd4"
             ]
         ]
     },
     {
-        "id": "5cd036bd.ebcf28",
+        "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": 4766.066650390625,
-        "y": 443,
-        "z": "8603b63b.c1c358",
+        "x": 4862.833312988281,
+        "y": 458.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "fddf1c47.d3871",
+        "id": "5fe18426.281bd4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4761.566650390625,
-        "y": 508,
-        "z": "8603b63b.c1c358",
+        "x": 4858.333312988281,
+        "y": 523.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "41b8dfa5.7b07b8",
+        "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": 4145.066650390625,
-        "y": 728,
-        "z": "8603b63b.c1c358",
+        "x": 4241.833312988281,
+        "y": 743.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a2bed09b.bd073",
+        "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": 4299.066650390625,
-        "y": 776,
-        "z": "8603b63b.c1c358",
+        "x": 4395.833312988281,
+        "y": 791.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8f1feb66.a203a8",
-                "bdea130f.d138e8"
+                "826c2f73.5d5e88",
+                "403359b0.843728"
             ]
         ]
     },
     {
-        "id": "8f1feb66.a203a8",
+        "id": "826c2f73.5d5e88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4644.566650390625,
-        "y": 757,
-        "z": "8603b63b.c1c358",
+        "x": 4741.333312988281,
+        "y": 772.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2db058d.5e37da8"
+                "80c327f3.9b168"
             ]
         ]
     },
     {
-        "id": "bdea130f.d138e8",
+        "id": "403359b0.843728",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4648.566650390625,
-        "y": 797,
-        "z": "8603b63b.c1c358",
+        "x": 4745.333312988281,
+        "y": 812.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bfbb3301.3c3"
+                "6ab9c98a.fce4d8"
             ]
         ]
     },
     {
-        "id": "2db058d.5e37da8",
+        "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": 4802.566650390625,
-        "y": 757,
-        "z": "8603b63b.c1c358",
+        "x": 4899.333312988281,
+        "y": 772.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "bfbb3301.3c3",
+        "id": "6ab9c98a.fce4d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4806.066650390625,
-        "y": 797,
-        "z": "8603b63b.c1c358",
+        "x": 4902.833312988281,
+        "y": 812.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "737d402b.600cc",
-                "9643556e.80a7d8"
+                "e1c867b8.192bd",
+                "913acec9.956098"
             ]
         ]
     },
     {
-        "id": "737d402b.600cc",
+        "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": 5136.566650390625,
-        "y": 762,
-        "z": "8603b63b.c1c358",
+        "x": 5233.333312988281,
+        "y": 777.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "340d03c1.bc10a4",
+        "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": 5000.566650390625,
-        "y": 721,
-        "z": "8603b63b.c1c358",
+        "x": 5097.333312988281,
+        "y": 736.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9643556e.80a7d8",
+        "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": 5063.566650390625,
-        "y": 808,
-        "z": "8603b63b.c1c358",
+        "x": 5160.333312988281,
+        "y": 823.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "3e996a09.c24c1e",
+        "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": 4137.566650390625,
-        "y": 207,
-        "z": "8603b63b.c1c358",
+        "x": 4234.333312988281,
+        "y": 222.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "73cd2276.fc690c",
+        "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": 4163.566650390625,
-        "y": 324,
-        "z": "8603b63b.c1c358",
+        "x": 4260.333312988281,
+        "y": 339.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2ce54c47.fa0e34",
-                "f2bf065e.86763",
-                "a6105f6e.dd58c"
+                "fe7b0b4f.4f25b8",
+                "1f23a1db.9239d6",
+                "80067a1b.7e8398"
             ]
         ]
     },
     {
-        "id": "2ce54c47.fa0e34",
+        "id": "fe7b0b4f.4f25b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4359.0667724609375,
-        "y": 276,
-        "z": "8603b63b.c1c358",
+        "x": 4455.833435058594,
+        "y": 291.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ed0df0d0.842f2"
+                "b7ec9659.601c4"
             ]
         ]
     },
     {
-        "id": "f2bf065e.86763",
+        "id": "1f23a1db.9239d6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4351.0667724609375,
-        "y": 331,
-        "z": "8603b63b.c1c358",
+        "x": 4447.833435058594,
+        "y": 346.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "40cafd9.39fe684"
+                "fe1da93b.8b0db8"
             ]
         ]
     },
     {
-        "id": "ed0df0d0.842f2",
+        "id": "b7ec9659.601c4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4503.4490966796875,
-        "y": 275.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 4600.215759277344,
+        "y": 290.65567779541016,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "404c86f.cf51c78"
+                "5d87f5d0.3bfe2c"
             ]
         ]
     },
     {
-        "id": "4841f833.0282b8",
+        "id": "4b9cdc3a.96a434",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5085.566650390625,
-        "y": 278,
-        "z": "8603b63b.c1c358",
+        "x": 5182.333312988281,
+        "y": 293.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "13a4c0ae.89b21f"
+                "c5c0e693.b5a978"
             ]
         ]
     },
     {
-        "id": "404c86f.cf51c78",
+        "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": 4687.566650390625,
-        "y": 274,
-        "z": "8603b63b.c1c358",
+        "x": 4784.333312988281,
+        "y": 289.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b62cc523.462948"
+                "3668fdab.2d6312"
             ]
         ]
     },
     {
-        "id": "b62cc523.462948",
+        "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": 4882.566650390625,
-        "y": 274,
-        "z": "8603b63b.c1c358",
+        "x": 4979.333312988281,
+        "y": 289.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4841f833.0282b8"
+                "4b9cdc3a.96a434"
             ]
         ]
     },
     {
-        "id": "a6105f6e.dd58c",
+        "id": "80067a1b.7e8398",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4356.0667724609375,
-        "y": 388,
-        "z": "8603b63b.c1c358",
+        "x": 4452.833435058594,
+        "y": 403.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "62b98530.ba575c"
+                "72f714cc.b21364"
             ]
         ]
     },
     {
-        "id": "62b98530.ba575c",
+        "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": 4508.0667724609375,
-        "y": 389,
-        "z": "8603b63b.c1c358",
+        "x": 4604.833435058594,
+        "y": 404.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "40cafd9.39fe684",
+        "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": 4519.0667724609375,
-        "y": 332,
-        "z": "8603b63b.c1c358",
+        "x": 4615.833435058594,
+        "y": 347.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ac0364e.0ddc498",
+        "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": 5470.566650390625,
-        "y": 291,
-        "z": "8603b63b.c1c358",
+        "x": 5567.333312988281,
+        "y": 306.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "52afc77f.66ed58",
-                "690d4481.5a01f4",
-                "561d9e01.bb6af8"
+                "2769fc5a.203d24",
+                "510b4bec.e64154",
+                "dc91b912.6316b8"
             ]
         ]
     },
     {
-        "id": "13a4c0ae.89b21f",
+        "id": "c5c0e693.b5a978",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5264.566650390625,
-        "y": 278,
-        "z": "8603b63b.c1c358",
+        "x": 5361.333312988281,
+        "y": 293.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3f0e652f.aee95a",
-                "ac0364e.0ddc498"
+                "d3a253e8.52c87",
+                "247e40ac.03f008"
             ]
         ]
     },
     {
-        "id": "3f0e652f.aee95a",
+        "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": 5500.566650390625,
-        "y": 239,
-        "z": "8603b63b.c1c358",
+        "x": 5597.333312988281,
+        "y": 254.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "52afc77f.66ed58",
+        "id": "2769fc5a.203d24",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5680.566650390625,
-        "y": 282,
-        "z": "8603b63b.c1c358",
+        "x": 5777.333312988281,
+        "y": 297.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2a8d9ba9.4de844"
+                "373ad72a.24ed2"
             ]
         ]
     },
     {
-        "id": "690d4481.5a01f4",
+        "id": "510b4bec.e64154",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5672.566650390625,
-        "y": 337,
-        "z": "8603b63b.c1c358",
+        "x": 5769.333312988281,
+        "y": 352.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "54eb498f.c93a58"
+                "fed052ea.46fa"
             ]
         ]
     },
     {
-        "id": "561d9e01.bb6af8",
+        "id": "dc91b912.6316b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5677.566650390625,
-        "y": 394,
-        "z": "8603b63b.c1c358",
+        "x": 5774.333312988281,
+        "y": 409.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ab202d02.2d5188"
+                "62129ad3.e59fd4"
             ]
         ]
     },
     {
-        "id": "ab202d02.2d5188",
+        "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": 5829.566650390625,
-        "y": 395,
-        "z": "8603b63b.c1c358",
+        "x": 5926.333312988281,
+        "y": 410.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "54eb498f.c93a58",
+        "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": 5840.566650390625,
-        "y": 340,
-        "z": "8603b63b.c1c358",
+        "x": 5937.333312988281,
+        "y": 355.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2a8d9ba9.4de844",
+        "id": "373ad72a.24ed2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5824.948974609375,
-        "y": 279.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 5921.715637207031,
+        "y": 294.65567779541016,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "fdb43e15.dd2458"
+                "53739ad0.387d34"
             ]
         ]
     },
     {
-        "id": "fdb43e15.dd2458",
+        "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": 6039.566650390625,
-        "y": 276,
-        "z": "8603b63b.c1c358",
+        "x": 6136.333312988281,
+        "y": 291.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ad465d2.36cfe2",
+        "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": 3606.566650390625,
-        "y": 1616,
-        "z": "8603b63b.c1c358",
+        "x": 3703.3333129882812,
+        "y": 1631.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "1622f07d.ae60d",
+        "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": 3669.566650390625,
-        "y": 1945,
-        "z": "8603b63b.c1c358",
+        "x": 3766.3333129882812,
+        "y": 1960.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e470471b.4d3ef",
-                "8ee5f8b0.1b5738"
+                "1746de51.5350e2",
+                "3d545b09.cac1fc"
             ]
         ]
     },
     {
-        "id": "e470471b.4d3ef",
+        "id": "1746de51.5350e2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3965.066650390625,
-        "y": 1912,
-        "z": "8603b63b.c1c358",
+        "x": 4061.8333129882812,
+        "y": 1927.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "fbda4868.d5b3c"
+                "fee57d61.96dd7"
             ]
         ]
     },
     {
-        "id": "8ee5f8b0.1b5738",
+        "id": "3d545b09.cac1fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3970.066650390625,
-        "y": 1977,
-        "z": "8603b63b.c1c358",
+        "x": 4066.8333129882812,
+        "y": 1992.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "13ccd918.a15e2f"
+                "3e571aef.d1d9c6"
             ]
         ]
     },
     {
-        "id": "fbda4868.d5b3c",
+        "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": 4133.066650390625,
-        "y": 1912,
-        "z": "8603b63b.c1c358",
+        "x": 4229.833312988281,
+        "y": 1927.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "13ccd918.a15e2f",
+        "id": "3e571aef.d1d9c6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4143.566650390625,
-        "y": 1977,
-        "z": "8603b63b.c1c358",
+        "x": 4240.333312988281,
+        "y": 1992.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6aa679a5.fc13d8",
+        "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": 3545.566650390625,
-        "y": 1673,
-        "z": "8603b63b.c1c358",
+        "x": 3642.3333129882812,
+        "y": 1688.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "63f314c3.d2093c",
+        "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": 3565.566650390625,
-        "y": 1770,
-        "z": "8603b63b.c1c358",
+        "x": 3662.3333129882812,
+        "y": 1785.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "cb2cd4ea.b10f5",
-                "da2dd809.2eaba8",
-                "b7e5de7f.bd9438"
+                "b8613e52.06e248",
+                "b100c849.f8697",
+                "9726d82.0cb02a8"
             ]
         ]
     },
     {
-        "id": "cb2cd4ea.b10f5",
+        "id": "b8613e52.06e248",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3768.0667724609375,
-        "y": 1723,
-        "z": "8603b63b.c1c358",
+        "x": 3864.8334350585938,
+        "y": 1738.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "92ce9c5d.eb149"
+                "fe5dc3f.664f44"
             ]
         ]
     },
     {
-        "id": "da2dd809.2eaba8",
+        "id": "b100c849.f8697",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3760.0667724609375,
-        "y": 1778,
-        "z": "8603b63b.c1c358",
+        "x": 3856.8334350585938,
+        "y": 1793.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d2833ad2.c8fbd8"
+                "45b746dd.1fc3c8"
             ]
         ]
     },
     {
-        "id": "92ce9c5d.eb149",
+        "id": "fe5dc3f.664f44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3912.4490966796875,
-        "y": 1720.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 4009.2157592773438,
+        "y": 1735.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7c59c7e4.737078"
+                "38c123a7.87ff54"
             ]
         ]
     },
     {
-        "id": "7c59c7e4.737078",
+        "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": 4096.566650390625,
-        "y": 1735,
-        "z": "8603b63b.c1c358",
+        "x": 4193.333312988281,
+        "y": 1750.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4a60b77a.b003e"
+                "8269be24.8785c8"
             ]
         ]
     },
     {
-        "id": "b7e5de7f.bd9438",
+        "id": "9726d82.0cb02a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3765.0667724609375,
-        "y": 1835,
-        "z": "8603b63b.c1c358",
+        "x": 3861.8334350585938,
+        "y": 1850.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "482f9215.08666c"
+                "920b3194.25369"
             ]
         ]
     },
     {
-        "id": "482f9215.08666c",
+        "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": 3917.0667724609375,
-        "y": 1836,
-        "z": "8603b63b.c1c358",
+        "x": 4013.8334350585938,
+        "y": 1851.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d2833ad2.c8fbd8",
+        "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": 3928.0667724609375,
-        "y": 1781,
-        "z": "8603b63b.c1c358",
+        "x": 4024.8334350585938,
+        "y": 1796.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "8251a2fe.8b6a98",
+        "id": "3be7fe46.7bed5a",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4494.566650390625,
-        "y": 1739,
-        "z": "8603b63b.c1c358",
+        "x": 4591.333312988281,
+        "y": 1754.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3fea75ef.6caa7a"
+                "9242c93c.f02488"
             ]
         ]
     },
     {
-        "id": "4a60b77a.b003e",
+        "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": 4291.566650390625,
-        "y": 1735,
-        "z": "8603b63b.c1c358",
+        "x": 4388.333312988281,
+        "y": 1750.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8251a2fe.8b6a98"
+                "3be7fe46.7bed5a"
             ]
         ]
     },
     {
-        "id": "49b53839.01783",
+        "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": 4879.566650390625,
-        "y": 1738,
-        "z": "8603b63b.c1c358",
+        "x": 4976.333312988281,
+        "y": 1753.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b2b3032.264fd8",
-                "373b81c5.683f3e",
-                "869370b9.925f48"
+                "7fafe45b.58f05c",
+                "c7d3d0e7.e6edb8",
+                "2bbce26d.997346"
             ]
         ]
     },
     {
-        "id": "3fea75ef.6caa7a",
+        "id": "9242c93c.f02488",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4671.566650390625,
-        "y": 1731,
-        "z": "8603b63b.c1c358",
+        "x": 4768.333312988281,
+        "y": 1746.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "dd88623a.123e",
-                "49b53839.01783"
+                "4aece362.c97204",
+                "24d5bcbc.e5fd54"
             ]
         ]
     },
     {
-        "id": "dd88623a.123e",
+        "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": 4909.566650390625,
-        "y": 1686,
-        "z": "8603b63b.c1c358",
+        "x": 5006.333312988281,
+        "y": 1701.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "8fb4dcc3.25c568",
+        "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": 5238.566650390625,
-        "y": 1842,
-        "z": "8603b63b.c1c358",
+        "x": 5335.333312988281,
+        "y": 1857.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "95a386c5.a58638",
+        "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": 5249.566650390625,
-        "y": 1787,
-        "z": "8603b63b.c1c358",
+        "x": 5346.333312988281,
+        "y": 1802.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "738801a1.4d047",
+        "id": "f903abd6.bcb5e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5233.948974609375,
-        "y": 1726.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 5330.715637207031,
+        "y": 1741.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "710bce1a.dc395"
+                "9d78b23c.6c7458"
             ]
         ]
     },
     {
-        "id": "710bce1a.dc395",
+        "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": 5448.566650390625,
-        "y": 1723,
-        "z": "8603b63b.c1c358",
+        "x": 5545.333312988281,
+        "y": 1738.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b2b3032.264fd8",
+        "id": "7fafe45b.58f05c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5089.566650390625,
-        "y": 1729,
-        "z": "8603b63b.c1c358",
+        "x": 5186.333312988281,
+        "y": 1744.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "738801a1.4d047"
+                "f903abd6.bcb5e"
             ]
         ]
     },
     {
-        "id": "373b81c5.683f3e",
+        "id": "c7d3d0e7.e6edb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5081.566650390625,
-        "y": 1784,
-        "z": "8603b63b.c1c358",
+        "x": 5178.333312988281,
+        "y": 1799.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "95a386c5.a58638"
+                "991ab386.c1ab2"
             ]
         ]
     },
     {
-        "id": "869370b9.925f48",
+        "id": "2bbce26d.997346",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5086.566650390625,
-        "y": 1841,
-        "z": "8603b63b.c1c358",
+        "x": 5183.333312988281,
+        "y": 1856.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8fb4dcc3.25c568"
+                "5653f279.fa187c"
             ]
         ]
     },
     {
-        "id": "60036337.4eba24",
+        "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": 3120.566650390625,
-        "y": 687,
-        "z": "8603b63b.c1c358",
+        "x": 3217.3333129882812,
+        "y": 702.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3dc5eab6.536eee",
-                "c84ae496.428be8"
+                "e3d89802.393a78",
+                "22a27baf.15e97c"
             ]
         ]
     },
     {
-        "id": "3dc5eab6.536eee",
+        "id": "e3d89802.393a78",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3334.566650390625,
-        "y": 724,
-        "z": "8603b63b.c1c358",
+        "x": 3431.3333129882812,
+        "y": 739.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "20d6afb2.5423d"
+                "793df4ee.f1df74"
             ]
         ]
     },
     {
-        "id": "c84ae496.428be8",
+        "id": "22a27baf.15e97c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3336.566650390625,
-        "y": 662,
-        "z": "8603b63b.c1c358",
+        "x": 3433.3333129882812,
+        "y": 677.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c6c4710b.3b446"
+                "7ecfd25a.90cdcc"
             ]
         ]
     },
     {
-        "id": "20d6afb2.5423d",
+        "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": 2914.566650390625,
-        "y": 1967,
-        "z": "8603b63b.c1c358",
+        "x": 3011.3333129882812,
+        "y": 1982.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f7e1076.b120ff8",
-                "38975d3e.e2ea2a"
+                "3123087e.cfd848",
+                "426b4898.f559d8"
             ]
         ]
     },
     {
-        "id": "f7e1076.b120ff8",
+        "id": "3123087e.cfd848",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3167.566650390625,
-        "y": 2001,
-        "z": "8603b63b.c1c358",
+        "x": 3264.3333129882812,
+        "y": 2016.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6af8dbb6.a59b4c"
+                "534033f3.f59e9c"
             ]
         ]
     },
     {
-        "id": "38975d3e.e2ea2a",
+        "id": "426b4898.f559d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3167.566650390625,
-        "y": 1945,
-        "z": "8603b63b.c1c358",
+        "x": 3264.3333129882812,
+        "y": 1960.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2e5f8334.fd5e8c"
+                "d5f2676f.c2a88"
             ]
         ]
     },
     {
-        "id": "6af8dbb6.a59b4c",
+        "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": 3318.566650390625,
-        "y": 2001,
-        "z": "8603b63b.c1c358",
+        "x": 3415.3333129882812,
+        "y": 2016.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d2d4d90e.2fae",
+        "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": 4194.566650390625,
-        "y": 99,
-        "z": "8603b63b.c1c358",
+        "x": 4291.333312988281,
+        "y": 114.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "33cb0d0f.4dfe6a",
+        "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": 3602.566650390625,
-        "y": 1558,
-        "z": "8603b63b.c1c358",
+        "x": 3699.3333129882812,
+        "y": 1573.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d855f72b.7e86a8",
+        "id": "7d0cb107.7824a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3885.566650390625,
-        "y": 356,
-        "z": "8603b63b.c1c358",
+        "x": 3982.3333129882812,
+        "y": 371.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d2d4d90e.2fae",
-                "6fabd371.f1d30c",
-                "3e996a09.c24c1e",
-                "73cd2276.fc690c",
-                "aa17cc43.b708b",
-                "2774aa91.aa9f06",
-                "8954306d.3c458",
-                "d41278c1.0e8268"
+                "c77b264c.fe2528",
+                "a8b9f4f8.1eb4e8",
+                "c0a903ed.d424f",
+                "c9a2a428.5985e8",
+                "24ae2ddb.2d91ca",
+                "1656bf6f.d0ade1",
+                "d2ff3c56.4372d",
+                "9499a947.255148"
             ]
         ]
     },
     {
-        "id": "2e5f8334.fd5e8c",
+        "id": "d5f2676f.c2a88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3318.566650390625,
-        "y": 1944,
-        "z": "8603b63b.c1c358",
+        "x": 3415.3333129882812,
+        "y": 1959.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "33cb0d0f.4dfe6a",
-                "ad465d2.36cfe2",
-                "6aa679a5.fc13d8",
-                "63f314c3.d2093c",
-                "1622f07d.ae60d",
-                "2d0bf44f.d7a87c",
-                "745353ea.a7c82c",
-                "a43e9ba4.30fe8"
+                "6ed23267.9185fc",
+                "a04b7e22.2aeb18",
+                "c298ee7.360a71",
+                "374df09c.221b4",
+                "a747fd61.4d43f8",
+                "ad599918.3fac7",
+                "cedd744c.d4173",
+                "c2c48b41.449c5"
             ]
         ]
     },
     {
-        "id": "ea6929ec.54f7c8",
+        "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": 3556.566650390625,
-        "y": 2243,
-        "z": "8603b63b.c1c358",
+        "x": 3653.3333129882812,
+        "y": 2258.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5471fe10.85fa48",
+        "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": 3710.566650390625,
-        "y": 2291,
-        "z": "8603b63b.c1c358",
+        "x": 3807.3333129882812,
+        "y": 2306.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "709844dc.12b89c",
-                "36a6ddd8.c214a2"
+                "3bc05be0.577364",
+                "9453988b.761fc"
             ]
         ]
     },
     {
-        "id": "709844dc.12b89c",
+        "id": "3bc05be0.577364",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4056.066650390625,
-        "y": 2272,
-        "z": "8603b63b.c1c358",
+        "x": 4152.833312988281,
+        "y": 2287.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b6a9b933.1ec16"
+                "48b1874d.6dc6a"
             ]
         ]
     },
     {
-        "id": "36a6ddd8.c214a2",
+        "id": "9453988b.761fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4060.066650390625,
-        "y": 2312,
-        "z": "8603b63b.c1c358",
+        "x": 4156.833312988281,
+        "y": 2327.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ef6de723.b6fb38"
+                "e2a44822.8eb888"
             ]
         ]
     },
     {
-        "id": "b6a9b933.1ec16",
+        "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": 4214.066650390625,
-        "y": 2272,
-        "z": "8603b63b.c1c358",
+        "x": 4310.833312988281,
+        "y": 2287.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ef6de723.b6fb38",
+        "id": "e2a44822.8eb888",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4217.566650390625,
-        "y": 2312,
-        "z": "8603b63b.c1c358",
+        "x": 4314.333312988281,
+        "y": 2327.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "dffbfe56.944988",
-                "8e76351f.3450b"
+                "3369ff99.af45f",
+                "6ce9279e.5956d"
             ]
         ]
     },
     {
-        "id": "dffbfe56.944988",
+        "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": 4557.566650390625,
-        "y": 2311,
-        "z": "8603b63b.c1c358",
+        "x": 4654.333312988281,
+        "y": 2326.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2006b0c.836e18",
+        "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": 4415.566650390625,
-        "y": 2269,
-        "z": "8603b63b.c1c358",
+        "x": 4512.333312988281,
+        "y": 2284.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "8e76351f.3450b",
+        "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": 4486.566650390625,
-        "y": 2360,
-        "z": "8603b63b.c1c358",
+        "x": 4583.333312988281,
+        "y": 2375.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "43b4f3be.c07abc",
+        "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": 3111.566650390625,
-        "y": 627,
-        "z": "8603b63b.c1c358",
+        "x": 3208.3333129882812,
+        "y": 642.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a5929ea4.d560e8",
+        "id": "6b6c5120.d697b",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3706.566650390625,
-        "y": 313,
-        "z": "8603b63b.c1c358",
+        "x": 3803.3333129882812,
+        "y": 328.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "40338a80.0ff774",
+        "id": "7a49b0ec.1116e8",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3263.566650390625,
-        "y": 1891,
-        "z": "8603b63b.c1c358",
+        "x": 3360.3333129882812,
+        "y": 1906.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c6c4710b.3b446",
+        "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": 3442.566650390625,
-        "y": 475,
-        "z": "8603b63b.c1c358",
+        "x": 3539.3333129882812,
+        "y": 490.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8c077d56.2d05a8",
-                "47f9e9e4.4ae948"
+                "c5975b58.7cfb78",
+                "8fa5c52a.f6d0f"
             ]
         ]
     },
     {
-        "id": "47f9e9e4.4ae948",
+        "id": "8fa5c52a.f6d0f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3684.566650390625,
-        "y": 1064,
-        "z": "8603b63b.c1c358",
+        "x": 3781.3333129882812,
+        "y": 1079.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "32d70917.41b9b6"
+                "1a8ceecd.14cfa1"
             ]
         ]
     },
     {
-        "id": "8c077d56.2d05a8",
+        "id": "c5975b58.7cfb78",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3678.566650390625,
-        "y": 355,
-        "z": "8603b63b.c1c358",
+        "x": 3775.3333129882812,
+        "y": 370.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d855f72b.7e86a8"
+                "7d0cb107.7824a8"
             ]
         ]
     },
     {
-        "id": "32d70917.41b9b6",
+        "id": "1a8ceecd.14cfa1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3842.566650390625,
-        "y": 1063,
-        "z": "8603b63b.c1c358",
+        "x": 3939.3333129882812,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ab9c9477.87e1",
-                "16a44de.db79032",
-                "42cda8d6.66eab8",
-                "aab7a1d7.f682c8",
-                "43e0f21e.8328e4",
-                "173252a4.3c7835"
+                "cfc45fbc.625408",
+                "87ccca6a.f8f9b8",
+                "e86d624f.d5f408",
+                "3e480e6a.3eb6c2",
+                "178f13fb.65189c",
+                "8c5d7664.9247c8"
             ]
         ]
     },
     {
-        "id": "16a44de.db79032",
+        "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": 4106.566650390625,
-        "y": 946,
-        "z": "8603b63b.c1c358",
+        "x": 4203.333312988281,
+        "y": 961.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "43e0f21e.8328e4",
+        "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": 4187.566650390625,
-        "y": 1261,
-        "z": "8603b63b.c1c358",
+        "x": 4284.333312988281,
+        "y": 1276.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ecdb1dc3.601aa",
-                "9e4afd98.6cdb48"
+                "47471e7d.1bf5e",
+                "2f64742a.d54c2c"
             ]
         ]
     },
     {
-        "id": "ecdb1dc3.601aa",
+        "id": "47471e7d.1bf5e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4497.066650390625,
-        "y": 1230,
-        "z": "8603b63b.c1c358",
+        "x": 4593.833312988281,
+        "y": 1245.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "111350dc.469227"
+                "27252576.feabca"
             ]
         ]
     },
     {
-        "id": "9e4afd98.6cdb48",
+        "id": "2f64742a.d54c2c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4502.066650390625,
-        "y": 1295,
-        "z": "8603b63b.c1c358",
+        "x": 4598.833312988281,
+        "y": 1310.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c6b74dac.622de"
+                "d2def383.359ac8"
             ]
         ]
     },
     {
-        "id": "111350dc.469227",
+        "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": 4673.066650390625,
-        "y": 1230,
-        "z": "8603b63b.c1c358",
+        "x": 4769.833312988281,
+        "y": 1245.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c6b74dac.622de",
+        "id": "d2def383.359ac8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4668.566650390625,
-        "y": 1295,
-        "z": "8603b63b.c1c358",
+        "x": 4765.333312988281,
+        "y": 1310.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "42cda8d6.66eab8",
+        "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": 4044.566650390625,
-        "y": 994,
-        "z": "8603b63b.c1c358",
+        "x": 4141.333312988281,
+        "y": 1009.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "aab7a1d7.f682c8",
+        "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": 4070.566650390625,
-        "y": 1111,
-        "z": "8603b63b.c1c358",
+        "x": 4167.333312988281,
+        "y": 1126.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "fc77fdb3.27d7c",
-                "3d52c0ff.052c58",
-                "d66dde94.6fdfd8"
+                "2fe7a70f.325738",
+                "de56dd13.56cbc",
+                "da128a7e.2de4c8"
             ]
         ]
     },
     {
-        "id": "fc77fdb3.27d7c",
+        "id": "2fe7a70f.325738",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4266.0667724609375,
-        "y": 1063,
-        "z": "8603b63b.c1c358",
+        "x": 4362.833435058594,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6a6dadc5.106a64"
+                "236585d1.bff802"
             ]
         ]
     },
     {
-        "id": "3d52c0ff.052c58",
+        "id": "de56dd13.56cbc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4258.0667724609375,
-        "y": 1118,
-        "z": "8603b63b.c1c358",
+        "x": 4354.833435058594,
+        "y": 1133.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6a18bc26.5dd68c"
+                "7ab4252e.e507d4"
             ]
         ]
     },
     {
-        "id": "6a6dadc5.106a64",
+        "id": "236585d1.bff802",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4410.4490966796875,
-        "y": 1062.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 4507.215759277344,
+        "y": 1077.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "abd6aa97.319628"
+                "d1f5d3f1.d937a8"
             ]
         ]
     },
     {
-        "id": "abd6aa97.319628",
+        "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": 4594.566650390625,
-        "y": 1061,
-        "z": "8603b63b.c1c358",
+        "x": 4691.333312988281,
+        "y": 1076.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d45837ad.7cfdd"
+                "b6dba6f2.6f5a68"
             ]
         ]
     },
     {
-        "id": "d45837ad.7cfdd",
+        "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": 4789.566650390625,
-        "y": 1061,
-        "z": "8603b63b.c1c358",
+        "x": 4886.333312988281,
+        "y": 1076.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "56faad34.523464"
+                "decb3043.cd12c"
             ]
         ]
     },
     {
-        "id": "d66dde94.6fdfd8",
+        "id": "da128a7e.2de4c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4263.0667724609375,
-        "y": 1175,
-        "z": "8603b63b.c1c358",
+        "x": 4359.833435058594,
+        "y": 1190.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "da706f47.bc937"
+                "98ee3a25.1ab9e"
             ]
         ]
     },
     {
-        "id": "da706f47.bc937",
+        "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": 4415.0667724609375,
-        "y": 1176,
-        "z": "8603b63b.c1c358",
+        "x": 4511.833435058594,
+        "y": 1191.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "6a18bc26.5dd68c",
+        "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": 4426.0667724609375,
-        "y": 1119,
-        "z": "8603b63b.c1c358",
+        "x": 4522.833435058594,
+        "y": 1134.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ab9c9477.87e1",
+        "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": 4101.566650390625,
-        "y": 886,
-        "z": "8603b63b.c1c358",
+        "x": 4198.333312988281,
+        "y": 901.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "56faad34.523464",
+        "id": "decb3043.cd12c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4992.566650390625,
-        "y": 1065,
-        "z": "8603b63b.c1c358",
+        "x": 5089.333312988281,
+        "y": 1080.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "30b949db.4c7a16"
+                "b6ba573a.60741"
             ]
         ]
     },
     {
-        "id": "df7b95f6.393d48",
+        "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": 5377.566650390625,
-        "y": 1078,
-        "z": "8603b63b.c1c358",
+        "x": 5474.333312988281,
+        "y": 1093.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "166f182a.55dd48",
-                "e1871eda.62c8a8",
-                "b691673d.bc8c3"
+                "e228c69c.360f98",
+                "9bce816d.2db348",
+                "41d83525.ce00b4"
             ]
         ]
     },
     {
-        "id": "30b949db.4c7a16",
+        "id": "b6ba573a.60741",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5171.566650390625,
-        "y": 1065,
-        "z": "8603b63b.c1c358",
+        "x": 5268.333312988281,
+        "y": 1080.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5671583d.41ed78",
-                "df7b95f6.393d48"
+                "5b50b3ea.1f8ef4",
+                "f4847f5f.1d887"
             ]
         ]
     },
     {
-        "id": "5671583d.41ed78",
+        "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": 5407.566650390625,
-        "y": 1026,
-        "z": "8603b63b.c1c358",
+        "x": 5504.333312988281,
+        "y": 1041.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "166f182a.55dd48",
+        "id": "e228c69c.360f98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5587.566650390625,
-        "y": 1069,
-        "z": "8603b63b.c1c358",
+        "x": 5684.333312988281,
+        "y": 1084.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "61f2e54a.d8bfcc"
+                "189e198c.62579e"
             ]
         ]
     },
     {
-        "id": "e1871eda.62c8a8",
+        "id": "9bce816d.2db348",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5579.566650390625,
-        "y": 1124,
-        "z": "8603b63b.c1c358",
+        "x": 5676.333312988281,
+        "y": 1139.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "95391466.b0fdc8"
+                "a893456b.716548"
             ]
         ]
     },
     {
-        "id": "b691673d.bc8c3",
+        "id": "41d83525.ce00b4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5584.566650390625,
-        "y": 1181,
-        "z": "8603b63b.c1c358",
+        "x": 5681.333312988281,
+        "y": 1196.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "eaaeed8c.dbf45"
+                "7bd5c1c9.c0b778"
             ]
         ]
     },
     {
-        "id": "eaaeed8c.dbf45",
+        "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": 5736.566650390625,
-        "y": 1182,
-        "z": "8603b63b.c1c358",
+        "x": 5833.333312988281,
+        "y": 1197.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "95391466.b0fdc8",
+        "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": 5747.566650390625,
-        "y": 1127,
-        "z": "8603b63b.c1c358",
+        "x": 5844.333312988281,
+        "y": 1142.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "61f2e54a.d8bfcc",
+        "id": "189e198c.62579e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5731.948974609375,
-        "y": 1066.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 5828.715637207031,
+        "y": 1081.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "573ef3d8.3e7cf4"
+                "ae6db88e.b087a"
             ]
         ]
     },
     {
-        "id": "573ef3d8.3e7cf4",
+        "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": 5946.566650390625,
-        "y": 1063,
-        "z": "8603b63b.c1c358",
+        "x": 6043.333312988281,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2171f884.ea7ea8",
+        "id": "56d817b5.d38a48",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3720.566650390625,
-        "y": 1004,
-        "z": "8603b63b.c1c358",
+        "x": 3817.3333129882812,
+        "y": 1019.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d6a4c941.f116b8",
+        "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": 2282.566650390625,
-        "y": 731,
-        "z": "8603b63b.c1c358",
+        "x": 2379.3333129882812,
+        "y": 746.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "49267234.da4bac",
-                "c034393e.41c88"
+                "f7d2b361.6e54e",
+                "d75a20a3.76dfd"
             ]
         ]
     },
     {
-        "id": "c034393e.41c88",
+        "id": "d75a20a3.76dfd",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2689.566650390625,
-        "y": 749,
-        "z": "8603b63b.c1c358",
+        "x": 2786.3333129882812,
+        "y": 764.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bc6b2cdd.907e6"
+                "87632a9d.0edf7"
             ]
         ]
     },
     {
-        "id": "49267234.da4bac",
+        "id": "f7d2b361.6e54e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2689.566650390625,
-        "y": 694,
-        "z": "8603b63b.c1c358",
+        "x": 2786.3333129882812,
+        "y": 709.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1c258f4d.ef4741"
+                "d139f1fa.1d1b08"
             ]
         ]
     },
     {
-        "id": "1c258f4d.ef4741",
+        "id": "d139f1fa.1d1b08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2845.566650390625,
-        "y": 692,
-        "z": "8603b63b.c1c358",
+        "x": 2942.3333129882812,
+        "y": 707.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "43b4f3be.c07abc",
-                "60036337.4eba24"
+                "8b193137.7290b",
+                "d6212bc2.789e7"
             ]
         ]
     },
     {
-        "id": "bc6b2cdd.907e6",
+        "id": "87632a9d.0edf7",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2822.566650390625,
-        "y": 750,
-        "z": "8603b63b.c1c358",
+        "x": 2919.3333129882812,
+        "y": 765.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "faef4429.aa2c8",
+        "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": 999.566650390625,
-        "y": 166,
-        "z": "8603b63b.c1c358",
+        "x": 1096.3333129882812,
+        "y": 181.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "cda219ec.f988b",
+        "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": 4116.566650390625,
-        "y": 584,
-        "z": "8603b63b.c1c358",
+        "x": 4213.333312988281,
+        "y": 599.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2774aa91.aa9f06",
+        "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": 4176.566650390625,
-        "y": 623,
-        "z": "8603b63b.c1c358",
+        "x": 4273.333312988281,
+        "y": 638.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "54215ea2.f0c928",
+        "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": 992.566650390625,
-        "y": 74,
-        "z": "8603b63b.c1c358",
+        "x": 1089.3333129882812,
+        "y": 89.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "96b9a282.e630c",
+        "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": 3528.566650390625,
-        "y": 2100,
-        "z": "8603b63b.c1c358",
+        "x": 3625.3333129882812,
+        "y": 2115.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2d0bf44f.d7a87c",
+        "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": 3584.566650390625,
-        "y": 2149,
-        "z": "8603b63b.c1c358",
+        "x": 3681.3333129882812,
+        "y": 2164.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5152a0e6.713128",
+        "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": 992.566650390625,
-        "y": 113,
-        "z": "8603b63b.c1c358",
+        "x": 1089.3333129882812,
+        "y": 128.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "8ba173b9.e36f",
+        "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": 1023.566650390625,
-        "y": 214,
-        "z": "8603b63b.c1c358",
+        "x": 1120.3333129882812,
+        "y": 229.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e82defb9.e02d8",
+        "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": 233.566650390625,
-        "y": 689,
-        "z": "8603b63b.c1c358",
+        "x": 330.33331298828125,
+        "y": 704.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2d5a1d5b.838492",
-                "889991f3.032d8",
-                "b5db494f.57cef8"
+                "9234c3d4.71d2d8",
+                "71dab0f1.557458",
+                "d5b7dbc9.87e818"
             ]
         ]
     },
     {
-        "id": "2d5a1d5b.838492",
+        "id": "9234c3d4.71d2d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 452.566650390625,
-        "y": 627,
-        "z": "8603b63b.c1c358",
+        "x": 549.3333129882812,
+        "y": 642.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "438119f5.89426"
+                "deed2b95.51b008"
             ]
         ]
     },
     {
-        "id": "889991f3.032d8",
+        "id": "71dab0f1.557458",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 462.0576171875,
-        "y": 669.5740356445312,
-        "z": "8603b63b.c1c358",
+        "x": 558.8242797851562,
+        "y": 684.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5db494f.57cef8",
+        "id": "d5b7dbc9.87e818",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 450.566650390625,
-        "y": 716,
-        "z": "8603b63b.c1c358",
+        "x": 547.3333129882812,
+        "y": 731.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "debce4b9.8571d"
+                "1f43e158.ba10c7"
             ]
         ]
     },
     {
-        "id": "438119f5.89426",
+        "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": 649.566650390625,
-        "y": 623,
-        "z": "8603b63b.c1c358",
+        "x": 746.3333129882812,
+        "y": 638.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e1b02bed.ab2ac8"
+                "2dc9974e.fd8eb"
             ]
         ]
     },
     {
-        "id": "debce4b9.8571d",
+        "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": 619.566650390625,
-        "y": 717,
-        "z": "8603b63b.c1c358",
+        "x": 716.3333129882812,
+        "y": 732.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "e1b02bed.ab2ac8",
+        "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": 872.900146484375,
-        "y": 622.9999389648438,
-        "z": "8603b63b.c1c358",
+        "x": 969.6668090820312,
+        "y": 637.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e03ee0c1.da854"
+                "ba6829c9.a61c58"
             ]
         ]
     },
     {
-        "id": "e03ee0c1.da854",
+        "id": "ba6829c9.a61c58",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1073.5667839050293,
-        "y": 624.000020980835,
-        "z": "8603b63b.c1c358",
+        "x": 1170.3334465026855,
+        "y": 639.0000286102295,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c4a6ee39.d82118"
+                "64a3ee9a.60466"
             ]
         ]
     },
     {
-        "id": "c4a6ee39.d82118",
+        "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": 203.566650390625,
-        "y": 886,
-        "z": "8603b63b.c1c358",
+        "x": 300.33331298828125,
+        "y": 901.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7634ec98.e6038c",
-                "916099a4.9dccf",
-                "c850e0b6.e35a68"
+                "b06f4672.19b5b",
+                "1bbc50b7.a546f7",
+                "46ec206d.bba02"
             ]
         ]
     },
     {
-        "id": "7634ec98.e6038c",
+        "id": "b06f4672.19b5b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 411.566650390625,
-        "y": 850,
-        "z": "8603b63b.c1c358",
+        "x": 508.33331298828125,
+        "y": 865.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "33f1fe4a.c9d6f2"
+                "71154b9b.41ff14"
             ]
         ]
     },
     {
-        "id": "916099a4.9dccf",
+        "id": "1bbc50b7.a546f7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 412.0576171875,
-        "y": 895.5740356445312,
-        "z": "8603b63b.c1c358",
+        "x": 508.82427978515625,
+        "y": 910.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c850e0b6.e35a68",
+        "id": "46ec206d.bba02",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 409.566650390625,
-        "y": 939,
-        "z": "8603b63b.c1c358",
+        "x": 506.33331298828125,
+        "y": 954.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "76c84cf.6c8b334"
+                "d5a43e3e.bfb46"
             ]
         ]
     },
     {
-        "id": "76c84cf.6c8b334",
+        "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": 578.566650390625,
-        "y": 940,
-        "z": "8603b63b.c1c358",
+        "x": 675.3333129882812,
+        "y": 955.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d82baf7f.56b2f",
+        "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": 550.566650390625,
-        "y": 1434,
-        "z": "8603b63b.c1c358",
+        "x": 647.3333129882812,
+        "y": 1449.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3c41a0c0.d2817"
+                "cf4994da.4e15f8"
             ]
         ]
     },
     {
-        "id": "3c41a0c0.d2817",
+        "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": 753.566650390625,
-        "y": 1446,
-        "z": "8603b63b.c1c358",
+        "x": 850.3333129882812,
+        "y": 1461.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "24edffac.eaf52"
+                "5493f71f.74de8"
             ]
         ]
     },
     {
-        "id": "24edffac.eaf52",
+        "id": "5493f71f.74de8",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 919.566650390625,
-        "y": 1443,
-        "z": "8603b63b.c1c358",
+        "x": 1016.3333129882812,
+        "y": 1458.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8767ddb8.be5188"
+                "ee9f0ecc.141c08"
             ]
         ]
     },
     {
-        "id": "8767ddb8.be5188",
+        "id": "ee9f0ecc.141c08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1080.566650390625,
-        "y": 1440,
-        "z": "8603b63b.c1c358",
+        "x": 1177.3333129882812,
+        "y": 1455.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "acad8b74.fa56d8",
-                "31574f1b.e35268",
-                "9a0e95d9.2f80c",
-                "559bb9d.67d2e48",
-                "d55a6f33.2c1388",
-                "bc764283.2e9fd8"
+                "4557d328.03c724",
+                "aa5d4b55.ae996",
+                "977d1c3.25b4f6",
+                "f4df7601.a8481",
+                "e57dfa3b.7a1478",
+                "7a26c91d.a51bf"
             ]
         ]
     },
     {
-        "id": "31574f1b.e35268",
+        "id": "aa5d4b55.ae996",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1286.566650390625,
-        "y": 1039.9999389648438,
-        "z": "8603b63b.c1c358",
+        "x": 1383.3333129882812,
+        "y": 1054.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "acad8b74.fa56d8",
+        "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": 1283.566650390625,
-        "y": 1084.9999389648438,
-        "z": "8603b63b.c1c358",
+        "x": 1380.3333129882812,
+        "y": 1099.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1904c12b.d430cf",
-                "4ab95198.c6613",
-                "5a08d5cf.278d24"
+                "93fcd434.d90c9",
+                "74ecef95.a69828",
+                "c24f7a8a.a1ade"
             ]
         ]
     },
     {
-        "id": "4ab95198.c6613",
+        "id": "74ecef95.a69828",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1479.0576171875,
-        "y": 1058.5739135742188,
-        "z": "8603b63b.c1c358",
+        "x": 1575.8242797851562,
+        "y": 1073.5739212036133,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ba7aa021.45bdf8"
+                "ae28b8c.fba5c48"
             ]
         ]
     },
     {
-        "id": "5a08d5cf.278d24",
+        "id": "c24f7a8a.a1ade",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1474.566650390625,
-        "y": 1102.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1571.3333129882812,
+        "y": 1117.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "785f1788.92249"
+                "90024c2d.8db9e"
             ]
         ]
     },
     {
-        "id": "ba7aa021.45bdf8",
+        "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": 1641.629150390625,
-        "y": 1057.859619140625,
-        "z": "8603b63b.c1c358",
+        "x": 1738.3958129882812,
+        "y": 1072.8596267700195,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "785f1788.92249",
+        "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": 1642.566650390625,
-        "y": 1102.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1739.3333129882812,
+        "y": 1117.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "cc679883.b7f1b8",
+        "id": "3a69019e.e0465e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1644.566650390625,
-        "y": 1149.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1741.3333129882812,
+        "y": 1164.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1904c12b.d430cf",
+        "id": "93fcd434.d90c9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1475.566650390625,
-        "y": 1149.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1572.3333129882812,
+        "y": 1164.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "cc679883.b7f1b8"
+                "3a69019e.e0465e"
             ]
         ]
     },
     {
-        "id": "1a421455.86d86c",
+        "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": 1257.566650390625,
-        "y": 1671,
-        "z": "8603b63b.c1c358",
+        "x": 1354.3333129882812,
+        "y": 1686.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9a0e95d9.2f80c",
+        "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": 1348.566650390625,
-        "y": 1725,
-        "z": "8603b63b.c1c358",
+        "x": 1445.3333129882812,
+        "y": 1740.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "62fb7c08.30d35c",
+        "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": 2025.066650390625,
-        "y": 1138,
-        "z": "8603b63b.c1c358",
+        "x": 2121.8333129882812,
+        "y": 1153.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b56049ef.636ab",
+        "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": 2030.066650390625,
-        "y": 1240,
-        "z": "8603b63b.c1c358",
+        "x": 2126.8333129882812,
+        "y": 1255.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "513cbd5b.994ffc",
+        "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": 513.566650390625,
-        "y": 1690,
-        "z": "8603b63b.c1c358",
+        "x": 610.3333129882812,
+        "y": 1705.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a14556b2.428608"
+                "aeacc57e.1c70e"
             ]
         ]
     },
     {
-        "id": "a14556b2.428608",
+        "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": 745.566650390625,
-        "y": 1689,
-        "z": "8603b63b.c1c358",
+        "x": 842.3333129882812,
+        "y": 1704.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e5395881.3f95e"
+                "dab1af90.85d2c"
             ]
         ]
     },
     {
-        "id": "e5395881.3f95e",
+        "id": "dab1af90.85d2c",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 957.566650390625,
-        "y": 1690,
-        "z": "8603b63b.c1c358",
+        "x": 1054.3333129882812,
+        "y": 1705.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ee871fda.29052"
+                "6cc09a7e.3eecf4"
             ]
         ]
     },
     {
-        "id": "ee871fda.29052",
+        "id": "6cc09a7e.3eecf4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 213.566650390625,
-        "y": 1846,
-        "z": "8603b63b.c1c358",
+        "x": 310.33331298828125,
+        "y": 1861.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d07450f8.7cfbd8",
-                "c80ac602.107b6"
+                "acf145f8.65836",
+                "d6c02212.5df71"
             ]
         ]
     },
     {
-        "id": "c80ac602.107b6",
+        "id": "d6c02212.5df71",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 448.566650390625,
-        "y": 1833,
-        "z": "8603b63b.c1c358",
+        "x": 545.3333129882812,
+        "y": 1848.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d07450f8.7cfbd8",
+        "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": 438.566650390625,
-        "y": 1894,
-        "z": "8603b63b.c1c358",
+        "x": 535.3333129882812,
+        "y": 1909.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3c9f89f1.b2d72e",
-                "7eb3712.5c8929",
-                "ab93aafa.12aed"
+                "87fb6e74.97fee8",
+                "cc7c3629.07cd7",
+                "419399de.ad60b8"
             ]
         ]
     },
     {
-        "id": "7eb3712.5c8929",
+        "id": "cc7c3629.07cd7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 652.0576171875,
-        "y": 1878.5740356445312,
-        "z": "8603b63b.c1c358",
+        "x": 748.8242797851562,
+        "y": 1893.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "abd0cdd.d934eb"
+                "739447c7.2df608"
             ]
         ]
     },
     {
-        "id": "ab93aafa.12aed",
+        "id": "419399de.ad60b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 647.566650390625,
-        "y": 1923,
-        "z": "8603b63b.c1c358",
+        "x": 744.3333129882812,
+        "y": 1938.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b79502c7.acaad8"
+                "a817deb7.6d09d"
             ]
         ]
     },
     {
-        "id": "3c9f89f1.b2d72e",
+        "id": "87fb6e74.97fee8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 649.566650390625,
-        "y": 1983,
-        "z": "8603b63b.c1c358",
+        "x": 746.3333129882812,
+        "y": 1998.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "509a448f.bd538c"
+                "40dff6fa.ed3558"
             ]
         ]
     },
     {
-        "id": "abd0cdd.d934eb",
+        "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": 814.629150390625,
-        "y": 1877.8597412109375,
-        "z": "8603b63b.c1c358",
+        "x": 911.3958129882812,
+        "y": 1892.859748840332,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b79502c7.acaad8",
+        "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": 815.566650390625,
-        "y": 1923,
-        "z": "8603b63b.c1c358",
+        "x": 912.3333129882812,
+        "y": 1938.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "509a448f.bd538c",
+        "id": "40dff6fa.ed3558",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 818.566650390625,
-        "y": 1982,
-        "z": "8603b63b.c1c358",
+        "x": 915.3333129882812,
+        "y": 1997.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "fd6f29b3.e5c99",
-                "f26de900.3c25f8"
+                "e2deabd9.c69c8",
+                "574db0eb.1dd5f"
             ]
         ]
     },
     {
-        "id": "3501776f.2dad38",
+        "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": 238.566650390625,
-        "y": 2484,
-        "z": "8603b63b.c1c358",
+        "x": 335.33331298828125,
+        "y": 2499.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ae9e098e.f50fb",
+        "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": 360.566650390625,
-        "y": 2541,
-        "z": "8603b63b.c1c358",
+        "x": 457.33331298828125,
+        "y": 2556.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "be334cda.e25598",
-                "43d4ffc9.f69dc"
+                "2e9bd62d.c02afa",
+                "55c19c27.0b4a64"
             ]
         ]
     },
     {
-        "id": "be334cda.e25598",
+        "id": "2e9bd62d.c02afa",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 673.066650390625,
-        "y": 2518,
-        "z": "8603b63b.c1c358",
+        "x": 769.8333129882812,
+        "y": 2533.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "43d4ffc9.f69dc",
+        "id": "55c19c27.0b4a64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 677.066650390625,
-        "y": 2558,
-        "z": "8603b63b.c1c358",
+        "x": 773.8333129882812,
+        "y": 2573.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f38c34e4.0af87"
+                "19a8d296.6252e5"
             ]
         ]
     },
     {
-        "id": "1415cbe4.3643cc",
+        "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": 853.066650390625,
-        "y": 2522,
-        "z": "8603b63b.c1c358",
+        "x": 949.8333129882812,
+        "y": 2537.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f38c34e4.0af87",
+        "id": "19a8d296.6252e5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 868.566650390625,
-        "y": 2576,
-        "z": "8603b63b.c1c358",
+        "x": 965.3333129882812,
+        "y": 2591.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "38f98e31.2df7c2",
-                "2709d484.f39df4",
-                "708149ff.3b7b8",
-                "40e18201.7f31fc"
+                "89591cea.6097a8",
+                "e0a0a9f7.c3b968",
+                "39281a09.347b8e",
+                "8394d0d1.93103"
             ]
         ]
     },
     {
-        "id": "4fb2f1f7.44fff8",
+        "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": 1164.066650390625,
-        "y": 2545,
-        "z": "8603b63b.c1c358",
+        "x": 1260.8333129882812,
+        "y": 2560.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "8d799ed5.7c896",
+        "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": 2631.066650390625,
-        "y": 1896,
-        "z": "8603b63b.c1c358",
+        "x": 2727.8333129882812,
+        "y": 1911.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "38f98e31.2df7c2",
+        "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": 1126.066650390625,
-        "y": 2587,
-        "z": "8603b63b.c1c358",
+        "x": 1222.8333129882812,
+        "y": 2602.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "421d14d0.8fa8dc",
+        "id": "7128141a.22afcc",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 1991.066650390625,
-        "y": 1176,
-        "z": "8603b63b.c1c358",
+        "x": 2087.8333129882812,
+        "y": 1191.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f196d566.5b274",
+        "id": "59bf9e6a.8c5448",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 1992.066650390625,
-        "y": 1280,
-        "z": "8603b63b.c1c358",
+        "x": 2088.8333129882812,
+        "y": 1295.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "8954306d.3c458",
+        "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": 4285.566650390625,
-        "y": 537,
-        "z": "8603b63b.c1c358",
+        "x": 4382.333312988281,
+        "y": 552.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "173252a4.3c7835",
+        "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": 4188.566650390625,
-        "y": 1356,
-        "z": "8603b63b.c1c358",
+        "x": 4285.333312988281,
+        "y": 1371.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "745353ea.a7c82c",
+        "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": 3682.566650390625,
-        "y": 2028,
-        "z": "8603b63b.c1c358",
+        "x": 3779.3333129882812,
+        "y": 2043.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "33f1fe4a.c9d6f2",
+        "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": 783.566650390625,
-        "y": 836,
-        "z": "8603b63b.c1c358",
+        "x": 880.3333129882812,
+        "y": 851.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c7ca69b2.c33e8",
-                "dbefa186.4d7f68"
+                "549c1dfb.8f3224",
+                "34cb7bd3.43733c"
             ]
         ]
     },
     {
-        "id": "c7ca69b2.c33e8",
+        "id": "549c1dfb.8f3224",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1146.566650390625,
-        "y": 859,
-        "z": "8603b63b.c1c358",
+        "x": 1243.3333129882812,
+        "y": 874.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "100503a.a2b7efc"
+                "e217a5f3.43edf8"
             ]
         ]
     },
     {
-        "id": "dbefa186.4d7f68",
+        "id": "34cb7bd3.43733c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1146.566650390625,
-        "y": 808,
-        "z": "8603b63b.c1c358",
+        "x": 1243.3333129882812,
+        "y": 823.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5ea3a0fe.77a12"
+                "845a9945.5ecef8"
             ]
         ]
     },
     {
-        "id": "100503a.a2b7efc",
+        "id": "e217a5f3.43edf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1302.566650390625,
-        "y": 857,
-        "z": "8603b63b.c1c358",
+        "x": 1399.3333129882812,
+        "y": 872.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8fcbaf21.052888"
+                "462f3353.3aa76c"
             ]
         ]
     },
     {
-        "id": "5ea3a0fe.77a12",
+        "id": "845a9945.5ecef8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1279.566650390625,
-        "y": 809,
-        "z": "8603b63b.c1c358",
+        "x": 1376.3333129882812,
+        "y": 824.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "84203861.d12558",
+        "id": "a8591f2d.71e23",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2039.566650390625,
-        "y": 207,
-        "z": "8603b63b.c1c358",
+        "x": 2136.3333129882812,
+        "y": 222.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a43e9ba4.30fe8",
+        "id": "c2c48b41.449c5",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3581.566650390625,
-        "y": 2188,
-        "z": "8603b63b.c1c358",
+        "x": 3678.3333129882812,
+        "y": 2203.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d41278c1.0e8268",
+        "id": "9499a947.255148",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4171.566650390625,
-        "y": 661,
-        "z": "8603b63b.c1c358",
+        "x": 4268.333312988281,
+        "y": 676.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "559bb9d.67d2e48",
+        "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": 1345.566650390625,
-        "y": 1767,
-        "z": "8603b63b.c1c358",
+        "x": 1442.3333129882812,
+        "y": 1782.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "11998164.d0953f",
+        "id": "c236e813.0b75c",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 524.566650390625,
-        "y": 1501,
-        "z": "8603b63b.c1c358",
+        "x": 621.3333129882812,
+        "y": 1516.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "3fbbcb97.f97994",
+        "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": 555.566650390625,
-        "y": 1541,
-        "z": "8603b63b.c1c358",
+        "x": 652.3333129882812,
+        "y": 1556.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd6f29b3.e5c99",
+        "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": 1103.566650390625,
-        "y": 1949,
-        "z": "8603b63b.c1c358",
+        "x": 1200.3333129882812,
+        "y": 1964.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f26de900.3c25f8",
+        "id": "574db0eb.1dd5f",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1106.566650390625,
-        "y": 1991,
-        "z": "8603b63b.c1c358",
+        "x": 1203.3333129882812,
+        "y": 2006.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "10dd7514.d835b3",
+        "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": 549.566650390625,
-        "y": 1631,
-        "z": "8603b63b.c1c358",
+        "x": 646.3333129882812,
+        "y": 1646.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9cbc66e4.acef28",
+        "id": "6dec5e05.6defc8",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 304.566650390625,
-        "y": 2010,
-        "z": "8603b63b.c1c358",
+        "x": 401.33331298828125,
+        "y": 2025.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2ee73d5.0d9a4c2",
+        "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": 312.566650390625,
-        "y": 2067,
-        "z": "8603b63b.c1c358",
+        "x": 409.33331298828125,
+        "y": 2082.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d55a6f33.2c1388",
+        "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": 1323.566650390625,
-        "y": 1616,
-        "z": "8603b63b.c1c358",
+        "x": 1420.3333129882812,
+        "y": 1631.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9cf30931.2c59c8",
-                "da4af294.46477"
+                "42d55673.4b259",
+                "c68b8996.7afed8"
             ]
         ]
     },
     {
-        "id": "da4af294.46477",
+        "id": "c68b8996.7afed8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1546.566650390625,
-        "y": 1571,
-        "z": "8603b63b.c1c358",
+        "x": 1643.3333129882812,
+        "y": 1586.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "66fe36a9.5f3c98"
+                "30a6d609.f0af22"
             ]
         ]
     },
     {
-        "id": "9cf30931.2c59c8",
+        "id": "42d55673.4b259",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1548.566650390625,
-        "y": 1635,
-        "z": "8603b63b.c1c358",
+        "x": 1645.3333129882812,
+        "y": 1650.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "204d74d2.252cac"
+                "36f16c60.30df3c"
             ]
         ]
     },
     {
-        "id": "66fe36a9.5f3c98",
+        "id": "30a6d609.f0af22",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1711.566650390625,
-        "y": 1568,
-        "z": "8603b63b.c1c358",
+        "x": 1808.3333129882812,
+        "y": 1583.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4c93c317.b90e14"
+                "33a6db5.6665724"
             ]
         ]
     },
     {
-        "id": "204d74d2.252cac",
+        "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": 1710.566650390625,
-        "y": 1631,
-        "z": "8603b63b.c1c358",
+        "x": 1807.3333129882812,
+        "y": 1646.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "4c93c317.b90e14",
+        "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": 1931.566650390625,
-        "y": 1582,
-        "z": "8603b63b.c1c358",
+        "x": 2028.3333129882812,
+        "y": 1597.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "83593740.e4ddd",
+        "id": "9a45a6ac.6bb008",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1476.566650390625,
-        "y": 2307,
-        "z": "8603b63b.c1c358",
+        "x": 1573.3333129882812,
+        "y": 2322.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bc0ef8cb.38db18"
+                "90552bad.c118e"
             ]
         ]
     },
     {
-        "id": "a1ab9a32.41426",
+        "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": 1861.566650390625,
-        "y": 2320,
-        "z": "8603b63b.c1c358",
+        "x": 1958.3333129882812,
+        "y": 2335.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "eafaddf4.4288",
-                "a1c53fdc.e94408",
-                "b9669b07.a51828"
+                "cc717bee.327628",
+                "4215d2eb.6b41b4",
+                "6de2353d.61ff6c"
             ]
         ]
     },
     {
-        "id": "bc0ef8cb.38db18",
+        "id": "90552bad.c118e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1655.566650390625,
-        "y": 2307,
-        "z": "8603b63b.c1c358",
+        "x": 1752.3333129882812,
+        "y": 2322.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2580690.f3eb118",
-                "a1ab9a32.41426"
+                "f2b28f1.371b57",
+                "746f3218.6a2f4c"
             ]
         ]
     },
     {
-        "id": "2580690.f3eb118",
+        "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": 1891.566650390625,
-        "y": 2268,
-        "z": "8603b63b.c1c358",
+        "x": 1988.3333129882812,
+        "y": 2283.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "eafaddf4.4288",
+        "id": "cc717bee.327628",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2071.566650390625,
-        "y": 2311,
-        "z": "8603b63b.c1c358",
+        "x": 2168.3333129882812,
+        "y": 2326.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "13cd3d1.ffcccc3"
+                "864e3f3b.37515"
             ]
         ]
     },
     {
-        "id": "a1c53fdc.e94408",
+        "id": "4215d2eb.6b41b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2063.566650390625,
-        "y": 2366,
-        "z": "8603b63b.c1c358",
+        "x": 2160.3333129882812,
+        "y": 2381.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7da7ccee.d6972c"
+                "dbafb74f.d2c48"
             ]
         ]
     },
     {
-        "id": "b9669b07.a51828",
+        "id": "6de2353d.61ff6c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2068.566650390625,
-        "y": 2423,
-        "z": "8603b63b.c1c358",
+        "x": 2165.3333129882812,
+        "y": 2438.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2930329b.329efe"
+                "d9191b0b.ddee58"
             ]
         ]
     },
     {
-        "id": "2930329b.329efe",
+        "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": 2220.566650390625,
-        "y": 2424,
-        "z": "8603b63b.c1c358",
+        "x": 2317.3333129882812,
+        "y": 2439.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7da7ccee.d6972c",
+        "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": 2231.566650390625,
-        "y": 2369,
-        "z": "8603b63b.c1c358",
+        "x": 2328.3333129882812,
+        "y": 2384.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "13cd3d1.ffcccc3",
+        "id": "864e3f3b.37515",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2215.948974609375,
-        "y": 2308.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 2312.7156372070312,
+        "y": 2323.65567779541,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "febf727.ffe5c9"
+                "f35ba5bd.48a6c8"
             ]
         ]
     },
     {
-        "id": "febf727.ffe5c9",
+        "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": 2430.566650390625,
-        "y": 2305,
-        "z": "8603b63b.c1c358",
+        "x": 2527.3333129882812,
+        "y": 2320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2716544d.2e4214",
+        "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": 554.566650390625,
-        "y": 2353,
-        "z": "8603b63b.c1c358",
+        "x": 651.3333129882812,
+        "y": 2368.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a2a1891d.4d5168",
-                "9cd28e00.2567d",
-                "a8c6a166.3984e"
+                "372d54fa.9f96f4",
+                "9dc1c4cc.c7a94",
+                "2d38b1b0.a69f26"
             ]
         ]
     },
     {
-        "id": "a2a1891d.4d5168",
+        "id": "372d54fa.9f96f4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 750.0667724609375,
-        "y": 2305,
-        "z": "8603b63b.c1c358",
+        "x": 846.8334350585938,
+        "y": 2320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6cfc839f.58b674"
+                "eb66892d.1f2808"
             ]
         ]
     },
     {
-        "id": "9cd28e00.2567d",
+        "id": "9dc1c4cc.c7a94",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 742.0667724609375,
-        "y": 2360,
-        "z": "8603b63b.c1c358",
+        "x": 838.8334350585938,
+        "y": 2375.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7eb3886b.0a9b58"
+                "79e4473c.6cea88"
             ]
         ]
     },
     {
-        "id": "6cfc839f.58b674",
+        "id": "eb66892d.1f2808",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 894.4490966796875,
-        "y": 2304.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 991.2157592773438,
+        "y": 2319.65567779541,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "cd8dae32.8ecf2"
+                "a488eeff.b05b28"
             ]
         ]
     },
     {
-        "id": "cd8dae32.8ecf2",
+        "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": 1078.566650390625,
-        "y": 2303,
-        "z": "8603b63b.c1c358",
+        "x": 1175.3333129882812,
+        "y": 2318.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2f1b8cbe.c629a4"
+                "52486109.89e3d"
             ]
         ]
     },
     {
-        "id": "2f1b8cbe.c629a4",
+        "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": 1273.566650390625,
-        "y": 2303,
-        "z": "8603b63b.c1c358",
+        "x": 1370.3333129882812,
+        "y": 2318.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "83593740.e4ddd"
+                "9a45a6ac.6bb008"
             ]
         ]
     },
     {
-        "id": "a8c6a166.3984e",
+        "id": "2d38b1b0.a69f26",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 747.0667724609375,
-        "y": 2417,
-        "z": "8603b63b.c1c358",
+        "x": 843.8334350585938,
+        "y": 2432.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1a3f5fd3.7d7ca8"
+                "7ec62576.a9581c"
             ]
         ]
     },
     {
-        "id": "1a3f5fd3.7d7ca8",
+        "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": 899.0667724609375,
-        "y": 2418,
-        "z": "8603b63b.c1c358",
+        "x": 995.8334350585938,
+        "y": 2433.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7eb3886b.0a9b58",
+        "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": 910.0667724609375,
-        "y": 2361,
-        "z": "8603b63b.c1c358",
+        "x": 1006.8334350585938,
+        "y": 2376.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7c9a9ea1.e0f0b",
+        "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": 544.566650390625,
-        "y": 2265,
-        "z": "8603b63b.c1c358",
+        "x": 641.3333129882812,
+        "y": 2280.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c2f9529c.5f262",
+        "id": "9e415421.d3d5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 289.566650390625,
-        "y": 2396,
-        "z": "8603b63b.c1c358",
+        "x": 386.33331298828125,
+        "y": 2411.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7c9a9ea1.e0f0b",
-                "2716544d.2e4214"
+                "46b10267.ea0e94",
+                "8481025.43fb9"
             ]
         ]
     },
     {
-        "id": "57a26dc0.1ee23c",
+        "id": "e5923dd1.06f5c",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1504.5333251953125,
-        "y": 213.88333129882812,
-        "z": "8603b63b.c1c358",
+        "x": 1601.2999877929688,
+        "y": 228.88333892822266,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7627d017.e729d8",
+        "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": 706.566650390625,
-        "y": 436,
-        "z": "8603b63b.c1c358",
+        "x": 803.3333129882812,
+        "y": 451.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "40266792.930ff8",
+        "id": "b87c2610.4dcfe8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 266.066650390625,
-        "y": 1405,
-        "z": "8603b63b.c1c358",
+        "x": 362.83331298828125,
+        "y": 1420.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d82baf7f.56b2f",
-                "513cbd5b.994ffc",
-                "11998164.d0953f",
-                "3fbbcb97.f97994",
-                "3501776f.2dad38",
-                "ae9e098e.f50fb",
-                "10dd7514.d835b3",
-                "9cbc66e4.acef28",
-                "2ee73d5.0d9a4c2",
-                "c2f9529c.5f262",
-                "cf851282.1a25c8"
+                "c36699ae.d9b4d8",
+                "d56221fe.c2bbf",
+                "c236e813.0b75c",
+                "ccf5136c.426918",
+                "bcc45625.ebbc48",
+                "fa8a8b3f.f0a5f8",
+                "67d19d91.7e0464",
+                "6dec5e05.6defc8",
+                "4d2f3635.de76f",
+                "9e415421.d3d5",
+                "4fcc44c7.7479d4"
             ]
         ]
     },
     {
-        "id": "bc764283.2e9fd8",
+        "id": "7a26c91d.a51bf",
         "type": "switchNode",
         "name": "switch uni type",
         "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1296.566650390625,
-        "y": 1243,
-        "z": "8603b63b.c1c358",
+        "x": 1393.3333129882812,
+        "y": 1258.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4133a5fe.bd0afc",
-                "cb7bb63e.a271e8",
-                "9b203a87.8531b",
-                "86f7d9c6.6cceb8"
+                "a9279133.62197",
+                "c4ef1cec.86081",
+                "5303ba0b.725dcc",
+                "84ee69ca.e736d8"
             ]
         ]
     },
     {
-        "id": "4133a5fe.bd0afc",
+        "id": "a9279133.62197",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1461.566650390625,
-        "y": 1225,
-        "z": "8603b63b.c1c358",
+        "x": 1558.3333129882812,
+        "y": 1240.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "34effc93.508fc4"
+                "df04fed1.2e9e3"
             ]
         ]
     },
     {
-        "id": "cb7bb63e.a271e8",
+        "id": "c4ef1cec.86081",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1464.566650390625,
-        "y": 1264,
-        "z": "8603b63b.c1c358",
+        "x": 1561.3333129882812,
+        "y": 1279.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ceed6ba9.27c0d"
+                "1437703.dec509"
             ]
         ]
     },
     {
-        "id": "86f7d9c6.6cceb8",
+        "id": "84ee69ca.e736d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1458.566650390625,
-        "y": 1342,
-        "z": "8603b63b.c1c358",
+        "x": 1555.3333129882812,
+        "y": 1357.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "971b0d55.da5e"
+                "c52f2275.ca0538"
             ]
         ]
     },
     {
-        "id": "9b203a87.8531b",
+        "id": "5303ba0b.725dcc",
         "type": "outcome",
         "name": "root-secondary",
         "xml": "<outcome value='root-secondary'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1481.566650390625,
-        "y": 1305,
-        "z": "8603b63b.c1c358",
+        "x": 1578.3333129882812,
+        "y": 1320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f1880c82.5bc33"
+                "bb188e14.1d1858"
             ]
         ]
     },
     {
-        "id": "f85814f1.078ec8",
+        "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": 2027.566650390625,
-        "y": 1338,
-        "z": "8603b63b.c1c358",
+        "x": 2124.3333129882812,
+        "y": 1353.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "17372550.7b802b",
+        "id": "a68d577a.75b008",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
         "comments": "",
-        "x": 1989.566650390625,
-        "y": 1378,
-        "z": "8603b63b.c1c358",
+        "x": 2086.3333129882812,
+        "y": 1393.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "971b0d55.da5e",
+        "id": "c52f2275.ca0538",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1610.566650390625,
-        "y": 1363,
-        "z": "8603b63b.c1c358",
+        "x": 1707.3333129882812,
+        "y": 1378.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2709d484.f39df4",
+        "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": 1200.1500244140625,
-        "y": 2662.3336181640625,
-        "z": "8603b63b.c1c358",
+        "x": 1296.9166870117188,
+        "y": 2677.333625793457,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "34effc93.508fc4",
+        "id": "df04fed1.2e9e3",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1596.4832763671875,
-        "y": 1221.333251953125,
-        "z": "8603b63b.c1c358",
+        "x": 1693.2499389648438,
+        "y": 1236.3332595825195,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "421d14d0.8fa8dc"
+                "7128141a.22afcc"
             ]
         ]
     },
     {
-        "id": "ceed6ba9.27c0d",
+        "id": "1437703.dec509",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1598.4832763671875,
-        "y": 1259.333251953125,
-        "z": "8603b63b.c1c358",
+        "x": 1695.2499389648438,
+        "y": 1274.3332595825195,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f196d566.5b274"
+                "59bf9e6a.8c5448"
             ]
         ]
     },
     {
-        "id": "f1880c82.5bc33",
+        "id": "bb188e14.1d1858",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1641.4832763671875,
-        "y": 1306.333251953125,
-        "z": "8603b63b.c1c358",
+        "x": 1738.2499389648438,
+        "y": 1321.3332595825195,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "17372550.7b802b"
+                "a68d577a.75b008"
             ]
         ]
     },
     {
-        "id": "708149ff.3b7b8",
+        "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": 1168.1500244140625,
-        "y": 2734.33349609375,
-        "z": "8603b63b.c1c358",
+        "x": 1264.9166870117188,
+        "y": 2749.3335037231445,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "40e18201.7f31fc",
+        "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": 1198.1500244140625,
-        "y": 2796.33349609375,
-        "z": "8603b63b.c1c358",
+        "x": 1294.9166870117188,
+        "y": 2811.3335037231445,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf851282.1a25c8",
+        "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": 591.566650390625,
-        "y": 1343.166748046875,
-        "z": "8603b63b.c1c358",
+        "x": 688.3333129882812,
+        "y": 1358.1667556762695,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "8fcbaf21.052888",
+        "id": "462f3353.3aa76c",
         "type": "switchNode",
         "name": "switch conn type",
         "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 132.56666564941406,
-        "y": 1054.1666259765625,
-        "z": "8603b63b.c1c358",
+        "x": 229.3333282470703,
+        "y": 1069.166633605957,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5e5b0dce.955fb4",
-                "7fcb1378.0439ec"
+                "66788e31.cd8e5",
+                "15c226b1.2f2f21"
             ]
         ]
     },
     {
-        "id": "7fcb1378.0439ec",
+        "id": "15c226b1.2f2f21",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 317.566650390625,
-        "y": 1228.1666259765625,
-        "z": "8603b63b.c1c358",
+        "x": 414.33331298828125,
+        "y": 1243.166633605957,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "40266792.930ff8"
+                "b87c2610.4dcfe8"
             ]
         ]
     },
     {
-        "id": "5e5b0dce.955fb4",
+        "id": "66788e31.cd8e5",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 320.566650390625,
-        "y": 1183.1666259765625,
-        "z": "8603b63b.c1c358",
+        "x": 417.33331298828125,
+        "y": 1198.166633605957,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "40266792.930ff8"
+                "b87c2610.4dcfe8"
             ]
         ]
     }