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=1828f879b6104e5ec711b7936733820a5f16ac82;hpb=0a1a40c657d27608bbad79c0a00355212d94c5e5;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 1828f879..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": "4a53e986.e1345",
+        "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": 401.8833312988281,
-        "y": 341,
-        "z": "db287b1f.2984a8",
+        "x": 450.33331298828125,
+        "y": 350.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bee28b81.87faf8",
-                "2e0d3206.b3958e",
-                "2caa6605.779652"
+                "3d418b0.8302bf6",
+                "48d7e3bc.f2883c",
+                "8ec621b1.80ebc8"
             ]
         ]
     },
     {
-        "id": "bee28b81.87faf8",
+        "id": "3d418b0.8302bf6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 589.8833312988281,
-        "y": 354,
-        "z": "db287b1f.2984a8",
+        "x": 638.3333129882812,
+        "y": 363.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "db2a2eb9.c4729"
+                "9c98306.e2cffd"
             ]
         ]
     },
     {
-        "id": "2e0d3206.b3958e",
+        "id": "48d7e3bc.f2883c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 597.374267578125,
-        "y": 396.57403564453125,
-        "z": "db287b1f.2984a8",
+        "x": 645.8242492675781,
+        "y": 405.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2caa6605.779652",
+        "id": "8ec621b1.80ebc8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 587.8833312988281,
-        "y": 443,
-        "z": "db287b1f.2984a8",
+        "x": 636.3333129882812,
+        "y": 452.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9a0e1ef7.428b9"
+                "57052eb0.583298"
             ]
         ]
     },
     {
-        "id": "db2a2eb9.c4729",
+        "id": "9c98306.e2cffd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 762.8833312988281,
-        "y": 352,
-        "z": "db287b1f.2984a8",
+        "x": 811.3333129882812,
+        "y": 361.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b1233538.ceab4"
+                "53767e53.94959"
             ]
         ]
     },
     {
-        "id": "b1233538.ceab4",
+        "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": 991.8833312988281,
-        "y": 353,
-        "z": "db287b1f.2984a8",
+        "x": 1040.3333129882812,
+        "y": 362.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f68da0c8.dc2638"
+                "c415e278.f5611"
             ]
         ]
     },
     {
-        "id": "f68da0c8.dc2638",
+        "id": "c415e278.f5611",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1206.8833312988281,
-        "y": 354,
-        "z": "db287b1f.2984a8",
+        "x": 1255.3333129882812,
+        "y": 363.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "947d4965.a799f8"
+                "c71ad5b.64b44a8"
             ]
         ]
     },
     {
-        "id": "ab775a4c.a509d",
+        "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": 1460.8833312988281,
-        "y": 276,
-        "z": "db287b1f.2984a8",
+        "x": 1509.3333129882812,
+        "y": 285.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1ae0d7f3.280b18",
-                "b7c135fb.7fc808"
+                "bbedabe9.bd4b",
+                "34793819.776c6"
             ]
         ]
     },
     {
-        "id": "1ae0d7f3.280b18",
+        "id": "bbedabe9.bd4b",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1677.8833312988281,
-        "y": 255,
-        "z": "db287b1f.2984a8",
+        "x": 1726.3333129882812,
+        "y": 264.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "947d4965.a799f8"
+                "c71ad5b.64b44a8"
             ]
         ]
     },
     {
-        "id": "b7c135fb.7fc808",
+        "id": "34793819.776c6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1677.8833312988281,
-        "y": 304,
-        "z": "db287b1f.2984a8",
+        "x": 1726.3333129882812,
+        "y": 313.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "947d4965.a799f8",
+        "id": "c71ad5b.64b44a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1861.8833312988281,
-        "y": 341,
-        "z": "db287b1f.2984a8",
+        "x": 1910.3333129882812,
+        "y": 350.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7307d136.f98668",
-                "d6d93ab.df041c8",
-                "ed4d0298.cdb578"
+                "3dd08dae.27e4a2",
+                "52a060f7.3567c8",
+                "a8591f2d.71e23"
             ]
         ]
     },
     {
-        "id": "d12da893.5808e",
+        "id": "e6629469.2dd4b8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 220.88333129882812,
-        "y": 82,
-        "z": "db287b1f.2984a8",
+        "x": 269.33331298828125,
+        "y": 91.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ba22940.68974f"
+                "e4a2a292.f645d8"
             ]
         ]
     },
     {
-        "id": "ba22940.68974f",
+        "id": "e4a2a292.f645d8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3545 +201,3712 @@
         "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": 505.1690216064453,
-        "y": 143.23810863494873,
-        "z": "db287b1f.2984a8",
+        "x": 553.6190032958984,
+        "y": 152.23811626434326,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f0aeb23e.8f1f7"
+                "94591033.455c8"
             ]
         ]
     },
     {
-        "id": "f0aeb23e.8f1f7",
+        "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": 511.3119354248047,
-        "y": 228.00003051757812,
-        "z": "db287b1f.2984a8",
+        "x": 559.7619171142578,
+        "y": 237.00003814697266,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "849eab75.e48858"
+                "fa712947.37c038"
             ]
         ]
     },
     {
-        "id": "849eab75.e48858",
+        "id": "fa712947.37c038",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 821.1213684082031,
-        "y": 219.66668701171875,
-        "z": "db287b1f.2984a8",
+        "x": 869.5713500976562,
+        "y": 228.66669464111328,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4a53e986.e1345",
-                "9dad0003.283738",
-                "47e937a3.3ee608",
-                "fa83bc41.1d8b08",
-                "39b1b2.d055464e"
+                "9ee6a3c1.bedb",
+                "b5b4ab5e.850cd8",
+                "8297c516.b14308",
+                "e7860d61.a71378",
+                "a8115aec.3c3d6"
             ]
         ]
     },
     {
-        "id": "7307d136.f98668",
+        "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": 2078.883331298828,
-        "y": 279,
-        "z": "db287b1f.2984a8",
+        "x": 2127.3333129882812,
+        "y": 288.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5be24b21.11ebc4",
+        "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": 4247.883331298828,
-        "y": 165,
-        "z": "db287b1f.2984a8",
+        "x": 4296.333312988281,
+        "y": 174.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "66c2f1fa.df4e",
+        "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": 4328.883331298828,
-        "y": 480,
-        "z": "db287b1f.2984a8",
+        "x": 4377.333312988281,
+        "y": 489.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "78ae8a16.bcde6c",
-                "163e60b5.f624ef"
+                "d90569fe.c301e",
+                "9a0fd68f.7364"
             ]
         ]
     },
     {
-        "id": "78ae8a16.bcde6c",
+        "id": "d90569fe.c301e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4638.383331298828,
-        "y": 449,
-        "z": "db287b1f.2984a8",
+        "x": 4686.833312988281,
+        "y": 458.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a86780cc.869ba"
+                "bfcc154c.9d015"
             ]
         ]
     },
     {
-        "id": "163e60b5.f624ef",
+        "id": "9a0fd68f.7364",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4643.383331298828,
-        "y": 514,
-        "z": "db287b1f.2984a8",
+        "x": 4691.833312988281,
+        "y": 523.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "496a02d9.361154"
+                "5fe18426.281bd4"
             ]
         ]
     },
     {
-        "id": "a86780cc.869ba",
+        "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": 4814.383331298828,
-        "y": 449,
-        "z": "db287b1f.2984a8",
+        "x": 4862.833312988281,
+        "y": 458.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "496a02d9.361154",
+        "id": "5fe18426.281bd4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4809.883331298828,
-        "y": 514,
-        "z": "db287b1f.2984a8",
+        "x": 4858.333312988281,
+        "y": 523.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4c8b1659.abc1b",
+        "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": 4193.383331298828,
-        "y": 734,
-        "z": "db287b1f.2984a8",
+        "x": 4241.833312988281,
+        "y": 743.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "902cb9fb.0d496",
+        "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": 4347.383331298828,
-        "y": 782,
-        "z": "db287b1f.2984a8",
+        "x": 4395.833312988281,
+        "y": 791.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f961065e.0e576",
-                "6ca1f611.56dee"
+                "826c2f73.5d5e88",
+                "403359b0.843728"
             ]
         ]
     },
     {
-        "id": "f961065e.0e576",
+        "id": "826c2f73.5d5e88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4692.883331298828,
-        "y": 763,
-        "z": "db287b1f.2984a8",
+        "x": 4741.333312988281,
+        "y": 772.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6296fab8.967dac"
+                "80c327f3.9b168"
             ]
         ]
     },
     {
-        "id": "6ca1f611.56dee",
+        "id": "403359b0.843728",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4696.883331298828,
-        "y": 803,
-        "z": "db287b1f.2984a8",
+        "x": 4745.333312988281,
+        "y": 812.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ef7067c4.7ea328"
+                "6ab9c98a.fce4d8"
             ]
         ]
     },
     {
-        "id": "6296fab8.967dac",
+        "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": 4850.883331298828,
-        "y": 763,
-        "z": "db287b1f.2984a8",
+        "x": 4899.333312988281,
+        "y": 772.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ef7067c4.7ea328",
+        "id": "6ab9c98a.fce4d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4854.383331298828,
-        "y": 803,
-        "z": "db287b1f.2984a8",
+        "x": 4902.833312988281,
+        "y": 812.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ee477ca2.a65568",
-                "5e527e99.1f4728"
+                "e1c867b8.192bd",
+                "913acec9.956098"
             ]
         ]
     },
     {
-        "id": "ee477ca2.a65568",
+        "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": 5184.883331298828,
-        "y": 768,
-        "z": "db287b1f.2984a8",
+        "x": 5233.333312988281,
+        "y": 777.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "f9d5afb7.0291b",
+        "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": 5048.883331298828,
-        "y": 727,
-        "z": "db287b1f.2984a8",
+        "x": 5097.333312988281,
+        "y": 736.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5e527e99.1f4728",
+        "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": 5111.883331298828,
-        "y": 814,
-        "z": "db287b1f.2984a8",
+        "x": 5160.333312988281,
+        "y": 823.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "48c30a65.f0f584",
+        "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": 4185.883331298828,
-        "y": 213,
-        "z": "db287b1f.2984a8",
+        "x": 4234.333312988281,
+        "y": 222.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "bc523ecb.f956a8",
+        "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": 4211.883331298828,
-        "y": 330,
-        "z": "db287b1f.2984a8",
+        "x": 4260.333312988281,
+        "y": 339.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a72840b5.dc70e",
-                "54e4a8de.9445f8",
-                "4012660e.b55b2"
+                "fe7b0b4f.4f25b8",
+                "1f23a1db.9239d6",
+                "80067a1b.7e8398"
             ]
         ]
     },
     {
-        "id": "a72840b5.dc70e",
+        "id": "fe7b0b4f.4f25b8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4407.383453369141,
-        "y": 282,
-        "z": "db287b1f.2984a8",
+        "x": 4455.833435058594,
+        "y": 291.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9d071aa.9c29c68"
+                "b7ec9659.601c4"
             ]
         ]
     },
     {
-        "id": "54e4a8de.9445f8",
+        "id": "1f23a1db.9239d6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4399.383453369141,
-        "y": 337,
-        "z": "db287b1f.2984a8",
+        "x": 4447.833435058594,
+        "y": 346.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3662c50c.d754d2"
+                "fe1da93b.8b0db8"
             ]
         ]
     },
     {
-        "id": "9d071aa.9c29c68",
+        "id": "b7ec9659.601c4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4551.765777587891,
-        "y": 281.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 4600.215759277344,
+        "y": 290.65567779541016,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c1155c42.4dc2e8"
+                "5d87f5d0.3bfe2c"
             ]
         ]
     },
     {
-        "id": "a3b68f87.0c3248",
+        "id": "4b9cdc3a.96a434",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5133.883331298828,
-        "y": 284,
-        "z": "db287b1f.2984a8",
+        "x": 5182.333312988281,
+        "y": 293.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e6d1f56a.1147f8"
+                "c5c0e693.b5a978"
             ]
         ]
     },
     {
-        "id": "c1155c42.4dc2e8",
+        "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": 4735.883331298828,
-        "y": 280,
-        "z": "db287b1f.2984a8",
+        "x": 4784.333312988281,
+        "y": 289.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e3565ab9.0a825"
+                "3668fdab.2d6312"
             ]
         ]
     },
     {
-        "id": "e3565ab9.0a825",
+        "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": 4930.883331298828,
-        "y": 280,
-        "z": "db287b1f.2984a8",
+        "x": 4979.333312988281,
+        "y": 289.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a3b68f87.0c3248"
+                "4b9cdc3a.96a434"
             ]
         ]
     },
     {
-        "id": "4012660e.b55b2",
+        "id": "80067a1b.7e8398",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4404.383453369141,
-        "y": 394,
-        "z": "db287b1f.2984a8",
+        "x": 4452.833435058594,
+        "y": 403.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7e9c03d8.c41c7c"
+                "72f714cc.b21364"
             ]
         ]
     },
     {
-        "id": "7e9c03d8.c41c7c",
+        "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": 4556.383453369141,
-        "y": 395,
-        "z": "db287b1f.2984a8",
+        "x": 4604.833435058594,
+        "y": 404.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "3662c50c.d754d2",
+        "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": 4567.383453369141,
-        "y": 338,
-        "z": "db287b1f.2984a8",
+        "x": 4615.833435058594,
+        "y": 347.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "99fa8e6f.e803d8",
+        "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": 5518.883331298828,
-        "y": 297,
-        "z": "db287b1f.2984a8",
+        "x": 5567.333312988281,
+        "y": 306.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a38e0436.5aedc",
-                "80f6747e.265c78",
-                "c370b7ba.84a26"
+                "2769fc5a.203d24",
+                "510b4bec.e64154",
+                "dc91b912.6316b8"
             ]
         ]
     },
     {
-        "id": "e6d1f56a.1147f8",
+        "id": "c5c0e693.b5a978",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5312.883331298828,
-        "y": 284,
-        "z": "db287b1f.2984a8",
+        "x": 5361.333312988281,
+        "y": 293.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4599703a.c42f3",
-                "99fa8e6f.e803d8"
+                "d3a253e8.52c87",
+                "247e40ac.03f008"
             ]
         ]
     },
     {
-        "id": "4599703a.c42f3",
+        "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": 5548.883331298828,
-        "y": 245,
-        "z": "db287b1f.2984a8",
+        "x": 5597.333312988281,
+        "y": 254.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a38e0436.5aedc",
+        "id": "2769fc5a.203d24",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5728.883331298828,
-        "y": 288,
-        "z": "db287b1f.2984a8",
+        "x": 5777.333312988281,
+        "y": 297.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8c88cbf0.e09b1"
+                "373ad72a.24ed2"
             ]
         ]
     },
     {
-        "id": "80f6747e.265c78",
+        "id": "510b4bec.e64154",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5720.883331298828,
-        "y": 343,
-        "z": "db287b1f.2984a8",
+        "x": 5769.333312988281,
+        "y": 352.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e2be9acb.77d62"
+                "fed052ea.46fa"
             ]
         ]
     },
     {
-        "id": "c370b7ba.84a26",
+        "id": "dc91b912.6316b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5725.883331298828,
-        "y": 400,
-        "z": "db287b1f.2984a8",
+        "x": 5774.333312988281,
+        "y": 409.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "856ee89c.2898"
+                "62129ad3.e59fd4"
             ]
         ]
     },
     {
-        "id": "856ee89c.2898",
+        "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": 5877.883331298828,
-        "y": 401,
-        "z": "db287b1f.2984a8",
+        "x": 5926.333312988281,
+        "y": 410.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "e2be9acb.77d62",
+        "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": 5888.883331298828,
-        "y": 346,
-        "z": "db287b1f.2984a8",
+        "x": 5937.333312988281,
+        "y": 355.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "8c88cbf0.e09b1",
+        "id": "373ad72a.24ed2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5873.265655517578,
-        "y": 285.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 5921.715637207031,
+        "y": 294.65567779541016,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a4a57efc.888ff8"
+                "53739ad0.387d34"
             ]
         ]
     },
     {
-        "id": "a4a57efc.888ff8",
+        "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": 6087.883331298828,
-        "y": 282,
-        "z": "db287b1f.2984a8",
+        "x": 6136.333312988281,
+        "y": 291.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "172d91c5.a78676",
+        "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": 3654.883331298828,
-        "y": 1622,
-        "z": "db287b1f.2984a8",
+        "x": 3703.3333129882812,
+        "y": 1631.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f13d198f.d5c79",
+        "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": 3717.883331298828,
-        "y": 1951,
-        "z": "db287b1f.2984a8",
+        "x": 3766.3333129882812,
+        "y": 1960.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3640aede.8913a2",
-                "f1b1c8d.9945bb8"
+                "1746de51.5350e2",
+                "3d545b09.cac1fc"
             ]
         ]
     },
     {
-        "id": "3640aede.8913a2",
+        "id": "1746de51.5350e2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4013.383331298828,
-        "y": 1918,
-        "z": "db287b1f.2984a8",
+        "x": 4061.8333129882812,
+        "y": 1927.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4b0d0deb.6577e4"
+                "fee57d61.96dd7"
             ]
         ]
     },
     {
-        "id": "f1b1c8d.9945bb8",
+        "id": "3d545b09.cac1fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4018.383331298828,
-        "y": 1983,
-        "z": "db287b1f.2984a8",
+        "x": 4066.8333129882812,
+        "y": 1992.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5da14040.cb50b8"
+                "3e571aef.d1d9c6"
             ]
         ]
     },
     {
-        "id": "4b0d0deb.6577e4",
+        "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": 4181.383331298828,
-        "y": 1918,
-        "z": "db287b1f.2984a8",
+        "x": 4229.833312988281,
+        "y": 1927.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5da14040.cb50b8",
+        "id": "3e571aef.d1d9c6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4191.883331298828,
-        "y": 1983,
-        "z": "db287b1f.2984a8",
+        "x": 4240.333312988281,
+        "y": 1992.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e50105a.a8b96",
+        "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": 3593.883331298828,
-        "y": 1679,
-        "z": "db287b1f.2984a8",
+        "x": 3642.3333129882812,
+        "y": 1688.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "dfe45c65.d48f6",
+        "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": 3613.883331298828,
-        "y": 1776,
-        "z": "db287b1f.2984a8",
+        "x": 3662.3333129882812,
+        "y": 1785.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "56d2f84a.b524e8",
-                "43f5b436.ace8b4",
-                "a9c884c3.3b2c18"
+                "b8613e52.06e248",
+                "b100c849.f8697",
+                "9726d82.0cb02a8"
             ]
         ]
     },
     {
-        "id": "56d2f84a.b524e8",
+        "id": "b8613e52.06e248",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3816.3834533691406,
-        "y": 1729,
-        "z": "db287b1f.2984a8",
+        "x": 3864.8334350585938,
+        "y": 1738.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "10cf7345.17615d"
+                "fe5dc3f.664f44"
             ]
         ]
     },
     {
-        "id": "43f5b436.ace8b4",
+        "id": "b100c849.f8697",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3808.3834533691406,
-        "y": 1784,
-        "z": "db287b1f.2984a8",
+        "x": 3856.8334350585938,
+        "y": 1793.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "40e41e98.b2ab3"
+                "45b746dd.1fc3c8"
             ]
         ]
     },
     {
-        "id": "10cf7345.17615d",
+        "id": "fe5dc3f.664f44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3960.7657775878906,
-        "y": 1726.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 4009.2157592773438,
+        "y": 1735.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "69889215.886b4c"
+                "38c123a7.87ff54"
             ]
         ]
     },
     {
-        "id": "69889215.886b4c",
+        "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": 4144.883331298828,
-        "y": 1741,
-        "z": "db287b1f.2984a8",
+        "x": 4193.333312988281,
+        "y": 1750.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3c1ff953.79a23e"
+                "8269be24.8785c8"
             ]
         ]
     },
     {
-        "id": "a9c884c3.3b2c18",
+        "id": "9726d82.0cb02a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3813.3834533691406,
-        "y": 1841,
-        "z": "db287b1f.2984a8",
+        "x": 3861.8334350585938,
+        "y": 1850.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8ab7ecfb.f03ee"
+                "920b3194.25369"
             ]
         ]
     },
     {
-        "id": "8ab7ecfb.f03ee",
+        "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": 3965.3834533691406,
-        "y": 1842,
-        "z": "db287b1f.2984a8",
+        "x": 4013.8334350585938,
+        "y": 1851.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "40e41e98.b2ab3",
+        "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": 3976.3834533691406,
-        "y": 1787,
-        "z": "db287b1f.2984a8",
+        "x": 4024.8334350585938,
+        "y": 1796.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "37ef2104.1e9d5e",
+        "id": "3be7fe46.7bed5a",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4542.883331298828,
-        "y": 1745,
-        "z": "db287b1f.2984a8",
+        "x": 4591.333312988281,
+        "y": 1754.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "901dac81.52118"
+                "9242c93c.f02488"
             ]
         ]
     },
     {
-        "id": "3c1ff953.79a23e",
+        "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": 4339.883331298828,
-        "y": 1741,
-        "z": "db287b1f.2984a8",
+        "x": 4388.333312988281,
+        "y": 1750.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "37ef2104.1e9d5e"
+                "3be7fe46.7bed5a"
             ]
         ]
     },
     {
-        "id": "86b8c4cb.c3747",
+        "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": 4927.883331298828,
-        "y": 1744,
-        "z": "db287b1f.2984a8",
+        "x": 4976.333312988281,
+        "y": 1753.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b5f45931.a1805",
-                "34bcb3b6.e69b1c",
-                "d4cc1381.862c48"
+                "7fafe45b.58f05c",
+                "c7d3d0e7.e6edb8",
+                "2bbce26d.997346"
             ]
         ]
     },
     {
-        "id": "901dac81.52118",
+        "id": "9242c93c.f02488",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4719.883331298828,
-        "y": 1737,
-        "z": "db287b1f.2984a8",
+        "x": 4768.333312988281,
+        "y": 1746.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "81cd4229.29ba8",
-                "86b8c4cb.c3747"
+                "4aece362.c97204",
+                "24d5bcbc.e5fd54"
             ]
         ]
     },
     {
-        "id": "81cd4229.29ba8",
+        "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": 4957.883331298828,
-        "y": 1692,
-        "z": "db287b1f.2984a8",
+        "x": 5006.333312988281,
+        "y": 1701.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a6f965e8.0bb248",
+        "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": 5286.883331298828,
-        "y": 1848,
-        "z": "db287b1f.2984a8",
+        "x": 5335.333312988281,
+        "y": 1857.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "3b503e2a.8c5dd2",
+        "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": 5297.883331298828,
-        "y": 1793,
-        "z": "db287b1f.2984a8",
+        "x": 5346.333312988281,
+        "y": 1802.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a84f2510.1ebf08",
+        "id": "f903abd6.bcb5e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5282.265655517578,
-        "y": 1732.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 5330.715637207031,
+        "y": 1741.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f83738f1.e5e14"
+                "9d78b23c.6c7458"
             ]
         ]
     },
     {
-        "id": "f83738f1.e5e14",
+        "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": 5496.883331298828,
-        "y": 1729,
-        "z": "db287b1f.2984a8",
+        "x": 5545.333312988281,
+        "y": 1738.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b5f45931.a1805",
+        "id": "7fafe45b.58f05c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5137.883331298828,
-        "y": 1735,
-        "z": "db287b1f.2984a8",
+        "x": 5186.333312988281,
+        "y": 1744.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a84f2510.1ebf08"
+                "f903abd6.bcb5e"
             ]
         ]
     },
     {
-        "id": "34bcb3b6.e69b1c",
+        "id": "c7d3d0e7.e6edb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5129.883331298828,
-        "y": 1790,
-        "z": "db287b1f.2984a8",
+        "x": 5178.333312988281,
+        "y": 1799.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3b503e2a.8c5dd2"
+                "991ab386.c1ab2"
             ]
         ]
     },
     {
-        "id": "d4cc1381.862c48",
+        "id": "2bbce26d.997346",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5134.883331298828,
-        "y": 1847,
-        "z": "db287b1f.2984a8",
+        "x": 5183.333312988281,
+        "y": 1856.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a6f965e8.0bb248"
+                "5653f279.fa187c"
             ]
         ]
     },
     {
-        "id": "4a95df1.67c3fa",
+        "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": 3168.883331298828,
-        "y": 693,
-        "z": "db287b1f.2984a8",
+        "x": 3217.3333129882812,
+        "y": 702.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "60b8b463.e4925c",
-                "5e23be29.1eb6a"
+                "e3d89802.393a78",
+                "22a27baf.15e97c"
             ]
         ]
     },
     {
-        "id": "60b8b463.e4925c",
+        "id": "e3d89802.393a78",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3382.883331298828,
-        "y": 730,
-        "z": "db287b1f.2984a8",
+        "x": 3431.3333129882812,
+        "y": 739.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4d4203c4.4fd81c"
+                "793df4ee.f1df74"
             ]
         ]
     },
     {
-        "id": "5e23be29.1eb6a",
+        "id": "22a27baf.15e97c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3384.883331298828,
-        "y": 668,
-        "z": "db287b1f.2984a8",
+        "x": 3433.3333129882812,
+        "y": 677.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "402d5674.bb5698"
+                "7ecfd25a.90cdcc"
             ]
         ]
     },
     {
-        "id": "4d4203c4.4fd81c",
+        "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": 2962.883331298828,
-        "y": 1973,
-        "z": "db287b1f.2984a8",
+        "x": 3011.3333129882812,
+        "y": 1982.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4155de88.54a1f",
-                "11e38b5d.85c715"
+                "3123087e.cfd848",
+                "426b4898.f559d8"
             ]
         ]
     },
     {
-        "id": "4155de88.54a1f",
+        "id": "3123087e.cfd848",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3215.883331298828,
-        "y": 2007,
-        "z": "db287b1f.2984a8",
+        "x": 3264.3333129882812,
+        "y": 2016.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "97b4f973.8f85a8"
+                "534033f3.f59e9c"
             ]
         ]
     },
     {
-        "id": "11e38b5d.85c715",
+        "id": "426b4898.f559d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3215.883331298828,
-        "y": 1951,
-        "z": "db287b1f.2984a8",
+        "x": 3264.3333129882812,
+        "y": 1960.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4bdf7725.9cef3"
+                "d5f2676f.c2a88"
             ]
         ]
     },
     {
-        "id": "97b4f973.8f85a8",
+        "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": 3366.883331298828,
-        "y": 2007,
-        "z": "db287b1f.2984a8",
+        "x": 3415.3333129882812,
+        "y": 2016.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "15e2350c.3f989b",
+        "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": 4242.883331298828,
-        "y": 105,
-        "z": "db287b1f.2984a8",
+        "x": 4291.333312988281,
+        "y": 114.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "22f55219.d9af6e",
+        "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": 3650.883331298828,
-        "y": 1564,
-        "z": "db287b1f.2984a8",
+        "x": 3699.3333129882812,
+        "y": 1573.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9157e39e.50973",
+        "id": "7d0cb107.7824a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3933.883331298828,
-        "y": 362,
-        "z": "db287b1f.2984a8",
+        "x": 3982.3333129882812,
+        "y": 371.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "15e2350c.3f989b",
-                "5be24b21.11ebc4",
-                "48c30a65.f0f584",
-                "bc523ecb.f956a8",
-                "66c2f1fa.df4e",
-                "738a4fa7.5a68d",
-                "9521e4ca.a61af",
-                "224f4283.917d26"
+                "c77b264c.fe2528",
+                "a8b9f4f8.1eb4e8",
+                "c0a903ed.d424f",
+                "c9a2a428.5985e8",
+                "24ae2ddb.2d91ca",
+                "1656bf6f.d0ade1",
+                "d2ff3c56.4372d",
+                "9499a947.255148"
             ]
         ]
     },
     {
-        "id": "4bdf7725.9cef3",
+        "id": "d5f2676f.c2a88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3366.883331298828,
-        "y": 1950,
-        "z": "db287b1f.2984a8",
+        "x": 3415.3333129882812,
+        "y": 1959.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "22f55219.d9af6e",
-                "172d91c5.a78676",
-                "1e50105a.a8b96",
-                "dfe45c65.d48f6",
-                "f13d198f.d5c79",
-                "78f084cb.41e754",
-                "e35a6c95.6b3d6",
-                "1ced8517.ce35e3"
+                "6ed23267.9185fc",
+                "a04b7e22.2aeb18",
+                "c298ee7.360a71",
+                "374df09c.221b4",
+                "a747fd61.4d43f8",
+                "ad599918.3fac7",
+                "cedd744c.d4173",
+                "c2c48b41.449c5"
             ]
         ]
     },
     {
-        "id": "e7e7eca7.931088",
+        "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": 3604.883331298828,
-        "y": 2249,
-        "z": "db287b1f.2984a8",
+        "x": 3653.3333129882812,
+        "y": 2258.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5544b67f.df3238",
+        "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": 3758.883331298828,
-        "y": 2297,
-        "z": "db287b1f.2984a8",
+        "x": 3807.3333129882812,
+        "y": 2306.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b36c5e4.a4b982",
-                "75e03418.7b0a3c"
+                "3bc05be0.577364",
+                "9453988b.761fc"
             ]
         ]
     },
     {
-        "id": "b36c5e4.a4b982",
+        "id": "3bc05be0.577364",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4104.383331298828,
-        "y": 2278,
-        "z": "db287b1f.2984a8",
+        "x": 4152.833312988281,
+        "y": 2287.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "996a2de3.86ff68"
+                "48b1874d.6dc6a"
             ]
         ]
     },
     {
-        "id": "75e03418.7b0a3c",
+        "id": "9453988b.761fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4108.383331298828,
-        "y": 2318,
-        "z": "db287b1f.2984a8",
+        "x": 4156.833312988281,
+        "y": 2327.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1787d971.8d0d67"
+                "e2a44822.8eb888"
             ]
         ]
     },
     {
-        "id": "996a2de3.86ff68",
+        "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": 4262.383331298828,
-        "y": 2278,
-        "z": "db287b1f.2984a8",
+        "x": 4310.833312988281,
+        "y": 2287.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "1787d971.8d0d67",
+        "id": "e2a44822.8eb888",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4265.883331298828,
-        "y": 2318,
-        "z": "db287b1f.2984a8",
+        "x": 4314.333312988281,
+        "y": 2327.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "79bbcc28.d4fd3c",
-                "137b8fb9.4aaa78"
+                "3369ff99.af45f",
+                "6ce9279e.5956d"
             ]
         ]
     },
     {
-        "id": "79bbcc28.d4fd3c",
+        "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": 4605.883331298828,
-        "y": 2317,
-        "z": "db287b1f.2984a8",
+        "x": 4654.333312988281,
+        "y": 2326.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "9aab71de.3f671",
+        "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": 4463.883331298828,
-        "y": 2275,
-        "z": "db287b1f.2984a8",
+        "x": 4512.333312988281,
+        "y": 2284.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "137b8fb9.4aaa78",
+        "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": 4534.883331298828,
-        "y": 2366,
-        "z": "db287b1f.2984a8",
+        "x": 4583.333312988281,
+        "y": 2375.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e7a16254.b52678",
+        "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": 3159.883331298828,
-        "y": 633,
-        "z": "db287b1f.2984a8",
+        "x": 3208.3333129882812,
+        "y": 642.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b98d7c04.aadb6",
+        "id": "6b6c5120.d697b",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3754.883331298828,
-        "y": 319,
-        "z": "db287b1f.2984a8",
+        "x": 3803.3333129882812,
+        "y": 328.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f9466402.70d608",
+        "id": "7a49b0ec.1116e8",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3311.883331298828,
-        "y": 1897,
-        "z": "db287b1f.2984a8",
+        "x": 3360.3333129882812,
+        "y": 1906.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "402d5674.bb5698",
+        "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": 3490.883331298828,
-        "y": 481,
-        "z": "db287b1f.2984a8",
+        "x": 3539.3333129882812,
+        "y": 490.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "40174504.12275c",
-                "483f6800.997ef8"
+                "c5975b58.7cfb78",
+                "8fa5c52a.f6d0f"
             ]
         ]
     },
     {
-        "id": "483f6800.997ef8",
+        "id": "8fa5c52a.f6d0f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3732.883331298828,
-        "y": 1070,
-        "z": "db287b1f.2984a8",
+        "x": 3781.3333129882812,
+        "y": 1079.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f91cd9b2.b4ebc8"
+                "1a8ceecd.14cfa1"
             ]
         ]
     },
     {
-        "id": "40174504.12275c",
+        "id": "c5975b58.7cfb78",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3726.883331298828,
-        "y": 361,
-        "z": "db287b1f.2984a8",
+        "x": 3775.3333129882812,
+        "y": 370.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9157e39e.50973"
+                "7d0cb107.7824a8"
             ]
         ]
     },
     {
-        "id": "f91cd9b2.b4ebc8",
+        "id": "1a8ceecd.14cfa1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3890.883331298828,
-        "y": 1069,
-        "z": "db287b1f.2984a8",
+        "x": 3939.3333129882812,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e0a89dfb.b97bd8",
-                "356efc92.1be0c4",
-                "b98c51bd.b1df7",
-                "c9386596.fb5188",
-                "99a335d9.47dc9",
-                "1d1e23b2.17cb04"
+                "cfc45fbc.625408",
+                "87ccca6a.f8f9b8",
+                "e86d624f.d5f408",
+                "3e480e6a.3eb6c2",
+                "178f13fb.65189c",
+                "8c5d7664.9247c8"
             ]
         ]
     },
     {
-        "id": "356efc92.1be0c4",
+        "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": 4154.883331298828,
-        "y": 952,
-        "z": "db287b1f.2984a8",
+        "x": 4203.333312988281,
+        "y": 961.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "99a335d9.47dc9",
+        "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": 4235.883331298828,
-        "y": 1267,
-        "z": "db287b1f.2984a8",
+        "x": 4284.333312988281,
+        "y": 1276.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2ae3d84f.15cb3",
-                "a0cd8374.ae65d8"
+                "47471e7d.1bf5e",
+                "2f64742a.d54c2c"
             ]
         ]
     },
     {
-        "id": "2ae3d84f.15cb3",
+        "id": "47471e7d.1bf5e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4545.383331298828,
-        "y": 1236,
-        "z": "db287b1f.2984a8",
+        "x": 4593.833312988281,
+        "y": 1245.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d03fdf1c.3b45d"
+                "27252576.feabca"
             ]
         ]
     },
     {
-        "id": "a0cd8374.ae65d8",
+        "id": "2f64742a.d54c2c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4550.383331298828,
-        "y": 1301,
-        "z": "db287b1f.2984a8",
+        "x": 4598.833312988281,
+        "y": 1310.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f8c3fa12.5c834"
+                "d2def383.359ac8"
             ]
         ]
     },
     {
-        "id": "d03fdf1c.3b45d",
+        "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": 4721.383331298828,
-        "y": 1236,
-        "z": "db287b1f.2984a8",
+        "x": 4769.833312988281,
+        "y": 1245.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f8c3fa12.5c834",
+        "id": "d2def383.359ac8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4716.883331298828,
-        "y": 1301,
-        "z": "db287b1f.2984a8",
+        "x": 4765.333312988281,
+        "y": 1310.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b98c51bd.b1df7",
+        "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": 4092.883331298828,
-        "y": 1000,
-        "z": "db287b1f.2984a8",
+        "x": 4141.333312988281,
+        "y": 1009.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c9386596.fb5188",
+        "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": 4118.883331298828,
-        "y": 1117,
-        "z": "db287b1f.2984a8",
+        "x": 4167.333312988281,
+        "y": 1126.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "312e9154.f9dbd6",
-                "38e6d39b.3fc964",
-                "d52b1c1f.8a6ca8"
+                "2fe7a70f.325738",
+                "de56dd13.56cbc",
+                "da128a7e.2de4c8"
             ]
         ]
     },
     {
-        "id": "312e9154.f9dbd6",
+        "id": "2fe7a70f.325738",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4314.383453369141,
-        "y": 1069,
-        "z": "db287b1f.2984a8",
+        "x": 4362.833435058594,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6d3eafaf.02fb48"
+                "236585d1.bff802"
             ]
         ]
     },
     {
-        "id": "38e6d39b.3fc964",
+        "id": "de56dd13.56cbc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4306.383453369141,
-        "y": 1124,
-        "z": "db287b1f.2984a8",
+        "x": 4354.833435058594,
+        "y": 1133.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3519bfd5.fa4b3"
+                "7ab4252e.e507d4"
             ]
         ]
     },
     {
-        "id": "6d3eafaf.02fb48",
+        "id": "236585d1.bff802",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4458.765777587891,
-        "y": 1068.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 4507.215759277344,
+        "y": 1077.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "6a66b1f9.955598"
+                "d1f5d3f1.d937a8"
             ]
         ]
     },
     {
-        "id": "6a66b1f9.955598",
+        "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": 4642.883331298828,
-        "y": 1067,
-        "z": "db287b1f.2984a8",
+        "x": 4691.333312988281,
+        "y": 1076.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "43b05855.517cf"
+                "b6dba6f2.6f5a68"
             ]
         ]
     },
     {
-        "id": "43b05855.517cf",
+        "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": 4837.883331298828,
-        "y": 1067,
-        "z": "db287b1f.2984a8",
+        "x": 4886.333312988281,
+        "y": 1076.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c21a24cd.dd2528"
+                "decb3043.cd12c"
             ]
         ]
     },
     {
-        "id": "d52b1c1f.8a6ca8",
+        "id": "da128a7e.2de4c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4311.383453369141,
-        "y": 1181,
-        "z": "db287b1f.2984a8",
+        "x": 4359.833435058594,
+        "y": 1190.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "db81dd24.8006b"
+                "98ee3a25.1ab9e"
             ]
         ]
     },
     {
-        "id": "db81dd24.8006b",
+        "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": 4463.383453369141,
-        "y": 1182,
-        "z": "db287b1f.2984a8",
+        "x": 4511.833435058594,
+        "y": 1191.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "3519bfd5.fa4b3",
+        "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": 4474.383453369141,
-        "y": 1125,
-        "z": "db287b1f.2984a8",
+        "x": 4522.833435058594,
+        "y": 1134.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "e0a89dfb.b97bd8",
+        "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": 4149.883331298828,
-        "y": 892,
-        "z": "db287b1f.2984a8",
+        "x": 4198.333312988281,
+        "y": 901.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c21a24cd.dd2528",
+        "id": "decb3043.cd12c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5040.883331298828,
-        "y": 1071,
-        "z": "db287b1f.2984a8",
+        "x": 5089.333312988281,
+        "y": 1080.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f7c609f5.0c2d28"
+                "b6ba573a.60741"
             ]
         ]
     },
     {
-        "id": "dff3e5ec.9273",
+        "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": 5425.883331298828,
-        "y": 1084,
-        "z": "db287b1f.2984a8",
+        "x": 5474.333312988281,
+        "y": 1093.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2769bc77.6b9fa4",
-                "7925966f.3df658",
-                "161a4207.178c96"
+                "e228c69c.360f98",
+                "9bce816d.2db348",
+                "41d83525.ce00b4"
             ]
         ]
     },
     {
-        "id": "f7c609f5.0c2d28",
+        "id": "b6ba573a.60741",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5219.883331298828,
-        "y": 1071,
-        "z": "db287b1f.2984a8",
+        "x": 5268.333312988281,
+        "y": 1080.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3634d6f2.f94292",
-                "dff3e5ec.9273"
+                "5b50b3ea.1f8ef4",
+                "f4847f5f.1d887"
             ]
         ]
     },
     {
-        "id": "3634d6f2.f94292",
+        "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": 5455.883331298828,
-        "y": 1032,
-        "z": "db287b1f.2984a8",
+        "x": 5504.333312988281,
+        "y": 1041.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "2769bc77.6b9fa4",
+        "id": "e228c69c.360f98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5635.883331298828,
-        "y": 1075,
-        "z": "db287b1f.2984a8",
+        "x": 5684.333312988281,
+        "y": 1084.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "8b0e2b2b.7a21d"
+                "189e198c.62579e"
             ]
         ]
     },
     {
-        "id": "7925966f.3df658",
+        "id": "9bce816d.2db348",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5627.883331298828,
-        "y": 1130,
-        "z": "db287b1f.2984a8",
+        "x": 5676.333312988281,
+        "y": 1139.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b9107d6e.7c0358"
+                "a893456b.716548"
             ]
         ]
     },
     {
-        "id": "161a4207.178c96",
+        "id": "41d83525.ce00b4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5632.883331298828,
-        "y": 1187,
-        "z": "db287b1f.2984a8",
+        "x": 5681.333312988281,
+        "y": 1196.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d5598bab.3dfb58"
+                "7bd5c1c9.c0b778"
             ]
         ]
     },
     {
-        "id": "d5598bab.3dfb58",
+        "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": 5784.883331298828,
-        "y": 1188,
-        "z": "db287b1f.2984a8",
+        "x": 5833.333312988281,
+        "y": 1197.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b9107d6e.7c0358",
+        "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": 5795.883331298828,
-        "y": 1133,
-        "z": "db287b1f.2984a8",
+        "x": 5844.333312988281,
+        "y": 1142.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "8b0e2b2b.7a21d",
+        "id": "189e198c.62579e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5780.265655517578,
-        "y": 1072.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 5828.715637207031,
+        "y": 1081.6556777954102,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f80d31a9.31f3d"
+                "ae6db88e.b087a"
             ]
         ]
     },
     {
-        "id": "f80d31a9.31f3d",
+        "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": 5994.883331298828,
-        "y": 1069,
-        "z": "db287b1f.2984a8",
+        "x": 6043.333312988281,
+        "y": 1078.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d718b282.287ca",
+        "id": "56d817b5.d38a48",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3768.883331298828,
-        "y": 1010,
-        "z": "db287b1f.2984a8",
+        "x": 3817.3333129882812,
+        "y": 1019.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d6d93ab.df041c8",
+        "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": 2330.883331298828,
-        "y": 737,
-        "z": "db287b1f.2984a8",
+        "x": 2379.3333129882812,
+        "y": 746.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7d753f63.af1d7",
-                "7719dbd9.957fc4"
+                "f7d2b361.6e54e",
+                "d75a20a3.76dfd"
             ]
         ]
     },
     {
-        "id": "7719dbd9.957fc4",
+        "id": "d75a20a3.76dfd",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2737.883331298828,
-        "y": 755,
-        "z": "db287b1f.2984a8",
+        "x": 2786.3333129882812,
+        "y": 764.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2b5dce30.392f92"
+                "87632a9d.0edf7"
             ]
         ]
     },
     {
-        "id": "7d753f63.af1d7",
+        "id": "f7d2b361.6e54e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2737.883331298828,
-        "y": 700,
-        "z": "db287b1f.2984a8",
+        "x": 2786.3333129882812,
+        "y": 709.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "155f7f13.57fce1"
+                "d139f1fa.1d1b08"
             ]
         ]
     },
     {
-        "id": "155f7f13.57fce1",
+        "id": "d139f1fa.1d1b08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2893.883331298828,
-        "y": 698,
-        "z": "db287b1f.2984a8",
+        "x": 2942.3333129882812,
+        "y": 707.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e7a16254.b52678",
-                "4a95df1.67c3fa"
+                "8b193137.7290b",
+                "d6212bc2.789e7"
             ]
         ]
     },
     {
-        "id": "2b5dce30.392f92",
+        "id": "87632a9d.0edf7",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2870.883331298828,
-        "y": 756,
-        "z": "db287b1f.2984a8",
+        "x": 2919.3333129882812,
+        "y": 765.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "9dad0003.283738",
+        "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": 1047.8833312988281,
-        "y": 172,
-        "z": "db287b1f.2984a8",
+        "x": 1096.3333129882812,
+        "y": 181.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a6d3cb9.27687b8",
+        "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": 4164.883331298828,
-        "y": 590,
-        "z": "db287b1f.2984a8",
+        "x": 4213.333312988281,
+        "y": 599.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "738a4fa7.5a68d",
+        "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": 4224.883331298828,
-        "y": 629,
-        "z": "db287b1f.2984a8",
+        "x": 4273.333312988281,
+        "y": 638.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "47e937a3.3ee608",
+        "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": 1040.8833312988281,
-        "y": 80,
-        "z": "db287b1f.2984a8",
+        "x": 1089.3333129882812,
+        "y": 89.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "6f67cdff.5c5554",
+        "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": 3576.883331298828,
-        "y": 2106,
-        "z": "db287b1f.2984a8",
+        "x": 3625.3333129882812,
+        "y": 2115.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "78f084cb.41e754",
+        "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": 3632.883331298828,
-        "y": 2155,
-        "z": "db287b1f.2984a8",
+        "x": 3681.3333129882812,
+        "y": 2164.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "912dde6.9b60fa",
+        "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": 1040.8833312988281,
-        "y": 119,
-        "z": "db287b1f.2984a8",
+        "x": 1089.3333129882812,
+        "y": 128.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "fa83bc41.1d8b08",
+        "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": 1071.8833312988281,
-        "y": 220,
-        "z": "db287b1f.2984a8",
+        "x": 1120.3333129882812,
+        "y": 229.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "39b1b2.d055464e",
+        "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": 281.8833312988281,
-        "y": 695,
-        "z": "db287b1f.2984a8",
+        "x": 330.33331298828125,
+        "y": 704.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "e70c3582.89ad08",
-                "3aeaa08a.574a",
-                "1322af3c.bc6319"
+                "9234c3d4.71d2d8",
+                "71dab0f1.557458",
+                "d5b7dbc9.87e818"
             ]
         ]
     },
     {
-        "id": "e70c3582.89ad08",
+        "id": "9234c3d4.71d2d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 500.8833312988281,
-        "y": 633,
-        "z": "db287b1f.2984a8",
+        "x": 549.3333129882812,
+        "y": 642.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9c476365.2b909"
+                "deed2b95.51b008"
             ]
         ]
     },
     {
-        "id": "3aeaa08a.574a",
+        "id": "71dab0f1.557458",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 510.3742980957031,
-        "y": 675.5740356445312,
-        "z": "db287b1f.2984a8",
+        "x": 558.8242797851562,
+        "y": 684.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1322af3c.bc6319",
+        "id": "d5b7dbc9.87e818",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 498.8833312988281,
-        "y": 722,
-        "z": "db287b1f.2984a8",
+        "x": 547.3333129882812,
+        "y": 731.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "23db95da.1941e2"
+                "1f43e158.ba10c7"
             ]
         ]
     },
     {
-        "id": "9c476365.2b909",
+        "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": 697.8833312988281,
-        "y": 629,
-        "z": "db287b1f.2984a8",
+        "x": 746.3333129882812,
+        "y": 638.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1a5a20de.60b4cf"
+                "2dc9974e.fd8eb"
             ]
         ]
     },
     {
-        "id": "23db95da.1941e2",
+        "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": 667.8833312988281,
-        "y": 723,
-        "z": "db287b1f.2984a8",
+        "x": 716.3333129882812,
+        "y": 732.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "1a5a20de.60b4cf",
+        "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": 921.2168273925781,
-        "y": 628.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 969.6668090820312,
+        "y": 637.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "59a859e2.c48ca8"
+                "ba6829c9.a61c58"
             ]
         ]
     },
     {
-        "id": "59a859e2.c48ca8",
+        "id": "ba6829c9.a61c58",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1121.8834648132324,
-        "y": 630.000020980835,
-        "z": "db287b1f.2984a8",
+        "x": 1170.3334465026855,
+        "y": 639.0000286102295,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ae28be96.a81b18"
+                "64a3ee9a.60466"
             ]
         ]
     },
     {
-        "id": "ae28be96.a81b18",
+        "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": 251.88333129882812,
-        "y": 892,
-        "z": "db287b1f.2984a8",
+        "x": 300.33331298828125,
+        "y": 901.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4595d435.587aa4",
-                "60a8c3ff.237aec",
-                "18e77ed.3460901"
+                "b06f4672.19b5b",
+                "1bbc50b7.a546f7",
+                "46ec206d.bba02"
             ]
         ]
     },
     {
-        "id": "4595d435.587aa4",
+        "id": "b06f4672.19b5b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 459.8833312988281,
-        "y": 856,
-        "z": "db287b1f.2984a8",
+        "x": 508.33331298828125,
+        "y": 865.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9c5806bb.83c05"
+                "71154b9b.41ff14"
             ]
         ]
     },
     {
-        "id": "60a8c3ff.237aec",
+        "id": "1bbc50b7.a546f7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 460.3742980957031,
-        "y": 901.5740356445312,
-        "z": "db287b1f.2984a8",
+        "x": 508.82427978515625,
+        "y": 910.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "18e77ed.3460901",
+        "id": "46ec206d.bba02",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 457.8833312988281,
-        "y": 945,
-        "z": "db287b1f.2984a8",
+        "x": 506.33331298828125,
+        "y": 954.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a170b783.101ed"
+                "d5a43e3e.bfb46"
             ]
         ]
     },
     {
-        "id": "a170b783.101ed",
+        "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": 626.8833312988281,
-        "y": 946,
-        "z": "db287b1f.2984a8",
+        "x": 675.3333129882812,
+        "y": 955.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "aaf101ae.84a298",
+        "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": 598.8833312988281,
-        "y": 1440,
-        "z": "db287b1f.2984a8",
+        "x": 647.3333129882812,
+        "y": 1449.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "48f75925.f13078"
+                "cf4994da.4e15f8"
             ]
         ]
     },
     {
-        "id": "48f75925.f13078",
+        "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": 801.8833312988281,
-        "y": 1452,
-        "z": "db287b1f.2984a8",
+        "x": 850.3333129882812,
+        "y": 1461.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "dc596581.8a224"
+                "5493f71f.74de8"
             ]
         ]
     },
     {
-        "id": "dc596581.8a224",
+        "id": "5493f71f.74de8",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 967.8833312988281,
-        "y": 1449,
-        "z": "db287b1f.2984a8",
+        "x": 1016.3333129882812,
+        "y": 1458.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "63611a55.44e3fc"
+                "ee9f0ecc.141c08"
             ]
         ]
     },
     {
-        "id": "63611a55.44e3fc",
+        "id": "ee9f0ecc.141c08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1128.8833312988281,
-        "y": 1446,
-        "z": "db287b1f.2984a8",
+        "x": 1177.3333129882812,
+        "y": 1455.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "155181d9.def56e",
-                "450c0202.9562fc",
-                "e522d7e8.f0b6d",
-                "b85bac18.623698",
-                "d97c4e37.51bad8"
+                "4557d328.03c724",
+                "aa5d4b55.ae996",
+                "977d1c3.25b4f6",
+                "f4df7601.a8481",
+                "e57dfa3b.7a1478",
+                "7a26c91d.a51bf"
             ]
         ]
     },
     {
-        "id": "450c0202.9562fc",
+        "id": "aa5d4b55.ae996",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1332.8833312988281,
-        "y": 1404,
-        "z": "db287b1f.2984a8",
+        "x": 1383.3333129882812,
+        "y": 1054.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "155181d9.def56e",
+        "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": 1329.8833312988281,
-        "y": 1449,
-        "z": "db287b1f.2984a8",
+        "x": 1380.3333129882812,
+        "y": 1099.9999465942383,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c73d859f.d40f2",
-                "cdecbb41.644898",
-                "ca040aae.e9fa08"
+                "93fcd434.d90c9",
+                "74ecef95.a69828",
+                "c24f7a8a.a1ade"
             ]
         ]
     },
     {
-        "id": "cdecbb41.644898",
+        "id": "74ecef95.a69828",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1525.3742980957031,
-        "y": 1422.573974609375,
-        "z": "db287b1f.2984a8",
+        "x": 1575.8242797851562,
+        "y": 1073.5739212036133,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "dcd0fdd9.1c84f"
+                "ae28b8c.fba5c48"
             ]
         ]
     },
     {
-        "id": "ca040aae.e9fa08",
+        "id": "c24f7a8a.a1ade",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1520.8833312988281,
-        "y": 1466.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 1571.3333129882812,
+        "y": 1117.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7c23dd25.00653c"
+                "90024c2d.8db9e"
             ]
         ]
     },
     {
-        "id": "dcd0fdd9.1c84f",
+        "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": 1687.9458312988281,
-        "y": 1421.8596801757812,
-        "z": "db287b1f.2984a8",
+        "x": 1738.3958129882812,
+        "y": 1072.8596267700195,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7c23dd25.00653c",
+        "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": 1688.8833312988281,
-        "y": 1466.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 1739.3333129882812,
+        "y": 1117.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "c84187cf.6e6008",
+        "id": "3a69019e.e0465e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1690.8833312988281,
-        "y": 1513.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 1741.3333129882812,
+        "y": 1164.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c73d859f.d40f2",
+        "id": "93fcd434.d90c9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521.8833312988281,
-        "y": 1513.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 1572.3333129882812,
+        "y": 1164.999885559082,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c84187cf.6e6008"
+                "3a69019e.e0465e"
             ]
         ]
     },
     {
-        "id": "a7f36b9f.f75b88",
-        "type": "switchNode",
-        "name": "switch conn type",
-        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 211.38333129882812,
-        "y": 1111,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "b58d5b5e.9a197",
-                "5c723a86.22c16c",
-                "fb40210e.8c5be8"
-            ]
-        ]
-    },
-    {
-        "id": "ce504b34.d68ac8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 322.3833312988281,
-        "y": 1467,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b58d5b5e.9a197",
-        "type": "outcome",
-        "name": "leaf",
-        "xml": "<outcome value='leaf'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 197.38333129882812,
-        "y": 1357,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "67ff853e.386644"
-            ]
-        ]
-    },
-    {
-        "id": "5c723a86.22c16c",
-        "type": "outcome",
-        "name": "root",
-        "xml": "<outcome value='root'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 198.38333129882812,
-        "y": 1415,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "402699af.4c591"
-            ]
-        ]
-    },
-    {
-        "id": "fb40210e.8c5be8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 200.38333129882812,
-        "y": 1469,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "ce504b34.d68ac8"
-            ]
-        ]
-    },
-    {
-        "id": "5d006f15.710a08",
+        "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": 1305.8833312988281,
-        "y": 1677,
-        "z": "db287b1f.2984a8",
+        "x": 1354.3333129882812,
+        "y": 1686.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "e522d7e8.f0b6d",
+        "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": 1396.8833312988281,
-        "y": 1731,
-        "z": "db287b1f.2984a8",
+        "x": 1445.3333129882812,
+        "y": 1740.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "402699af.4c591",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 314.3833312988281,
-        "y": 1411,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "784b1e5c.92c77",
-                "aaf101ae.84a298",
-                "dfffb0d0.b2d2d",
-                "3502903c.982ab",
-                "5524ecac.5cf47c",
-                "a12bd239.f8368",
-                "f8f2651c.3a035",
-                "f84d6f72.692148",
-                "5d1396ed.19b6f8",
-                "1b4871a6.1cd8a6",
-                "48083140.e99758",
-                "d94511cd.5d63f"
-            ]
-        ]
-    },
-    {
-        "id": "67ff853e.386644",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 326.3833312988281,
-        "y": 1348,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "aaf101ae.84a298",
-                "80e8f9a6.45b808",
-                "70ed09af.22122",
-                "3502903c.982ab",
-                "5524ecac.5cf47c",
-                "a12bd239.f8368",
-                "f8f2651c.3a035",
-                "f84d6f72.692148",
-                "5d1396ed.19b6f8",
-                "1b4871a6.1cd8a6",
-                "48083140.e99758",
-                "d94511cd.5d63f"
-            ]
-        ]
-    },
-    {
-        "id": "80e8f9a6.45b808",
+        "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": 618.3833312988281,
-        "y": 1233,
-        "z": "db287b1f.2984a8",
+        "x": 2121.8333129882812,
+        "y": 1153.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "784b1e5c.92c77",
+        "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": 635.3833312988281,
-        "y": 1327,
-        "z": "db287b1f.2984a8",
+        "x": 2126.8333129882812,
+        "y": 1255.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "3502903c.982ab",
+        "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": 561.8833312988281,
-        "y": 1696,
-        "z": "db287b1f.2984a8",
+        "x": 610.3333129882812,
+        "y": 1705.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "2dc7d020.0f01c8"
+                "aeacc57e.1c70e"
             ]
         ]
     },
     {
-        "id": "2dc7d020.0f01c8",
+        "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": 793.8833312988281,
-        "y": 1695,
-        "z": "db287b1f.2984a8",
+        "x": 842.3333129882812,
+        "y": 1704.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9a9b2fc1.cfc378"
+                "dab1af90.85d2c"
             ]
         ]
     },
     {
-        "id": "9a9b2fc1.cfc378",
+        "id": "dab1af90.85d2c",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1005.8833312988281,
-        "y": 1696,
-        "z": "db287b1f.2984a8",
+        "x": 1054.3333129882812,
+        "y": 1705.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3ee84e3e.71c9c2"
+                "6cc09a7e.3eecf4"
             ]
         ]
     },
     {
-        "id": "3ee84e3e.71c9c2",
+        "id": "6cc09a7e.3eecf4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 261.8833312988281,
-        "y": 1852,
-        "z": "db287b1f.2984a8",
+        "x": 310.33331298828125,
+        "y": 1861.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a6f3ac42.8fbf28",
-                "c5253df7.0ed11"
+                "acf145f8.65836",
+                "d6c02212.5df71"
             ]
         ]
     },
     {
-        "id": "c5253df7.0ed11",
+        "id": "d6c02212.5df71",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 496.8833312988281,
-        "y": 1839,
-        "z": "db287b1f.2984a8",
+        "x": 545.3333129882812,
+        "y": 1848.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a6f3ac42.8fbf28",
+        "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": 486.8833312988281,
-        "y": 1900,
-        "z": "db287b1f.2984a8",
+        "x": 535.3333129882812,
+        "y": 1909.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b27c66fe.f461f8",
-                "d86a808d.b5d38",
-                "51be47ba.06369"
+                "87fb6e74.97fee8",
+                "cc7c3629.07cd7",
+                "419399de.ad60b8"
             ]
         ]
     },
     {
-        "id": "d86a808d.b5d38",
+        "id": "cc7c3629.07cd7",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 700.3742980957031,
-        "y": 1884.5740356445312,
-        "z": "db287b1f.2984a8",
+        "x": 748.8242797851562,
+        "y": 1893.5740432739258,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "40ccd27e.7bf8ec"
+                "739447c7.2df608"
             ]
         ]
     },
     {
-        "id": "51be47ba.06369",
+        "id": "419399de.ad60b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 695.8833312988281,
-        "y": 1929,
-        "z": "db287b1f.2984a8",
+        "x": 744.3333129882812,
+        "y": 1938.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "10ad75eb.cd3092"
+                "a817deb7.6d09d"
             ]
         ]
     },
     {
-        "id": "b27c66fe.f461f8",
+        "id": "87fb6e74.97fee8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 697.8833312988281,
-        "y": 1989,
-        "z": "db287b1f.2984a8",
+        "x": 746.3333129882812,
+        "y": 1998.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "f72f31f7.42e17"
+                "40dff6fa.ed3558"
             ]
         ]
     },
     {
-        "id": "40ccd27e.7bf8ec",
+        "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": 862.9458312988281,
-        "y": 1883.8597412109375,
-        "z": "db287b1f.2984a8",
+        "x": 911.3958129882812,
+        "y": 1892.859748840332,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "10ad75eb.cd3092",
+        "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": 863.8833312988281,
-        "y": 1929,
-        "z": "db287b1f.2984a8",
+        "x": 912.3333129882812,
+        "y": 1938.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f72f31f7.42e17",
+        "id": "40dff6fa.ed3558",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 866.8833312988281,
-        "y": 1988,
-        "z": "db287b1f.2984a8",
+        "x": 915.3333129882812,
+        "y": 1997.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c01095c8.c5a848",
-                "1e0b480.37d7ab8"
+                "e2deabd9.c69c8",
+                "574db0eb.1dd5f"
             ]
         ]
     },
     {
-        "id": "f8f2651c.3a035",
+        "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='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": 265.8833312988281,
-        "y": 2487,
-        "z": "db287b1f.2984a8",
+        "x": 335.33331298828125,
+        "y": 2499.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "f84d6f72.692148",
+        "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": 408.8833312988281,
-        "y": 2547,
-        "z": "db287b1f.2984a8",
+        "x": 457.33331298828125,
+        "y": 2556.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7174c4fb.4236d4",
-                "3df090d7.e28cf"
+                "2e9bd62d.c02afa",
+                "55c19c27.0b4a64"
             ]
         ]
     },
     {
-        "id": "7174c4fb.4236d4",
+        "id": "2e9bd62d.c02afa",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 721.3833312988281,
-        "y": 2524,
-        "z": "db287b1f.2984a8",
+        "x": 769.8333129882812,
+        "y": 2533.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "3df090d7.e28cf",
+        "id": "55c19c27.0b4a64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 725.3833312988281,
-        "y": 2564,
-        "z": "db287b1f.2984a8",
+        "x": 773.8333129882812,
+        "y": 2573.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bbef1ecc.7916"
+                "19a8d296.6252e5"
             ]
         ]
     },
     {
-        "id": "4d6cfe8e.59e2a",
+        "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": 901.3833312988281,
-        "y": 2528,
-        "z": "db287b1f.2984a8",
+        "x": 949.8333129882812,
+        "y": 2537.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "bbef1ecc.7916",
+        "id": "19a8d296.6252e5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 916.8833312988281,
-        "y": 2582,
-        "z": "db287b1f.2984a8",
+        "x": 965.3333129882812,
+        "y": 2591.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b94bbfec.158258"
+                "89591cea.6097a8",
+                "e0a0a9f7.c3b968",
+                "39281a09.347b8e",
+                "8394d0d1.93103"
             ]
         ]
     },
     {
-        "id": "b2dda6de.cb3b28",
+        "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": 1212.3833312988281,
-        "y": 2551,
-        "z": "db287b1f.2984a8",
+        "x": 1260.8333129882812,
+        "y": 2560.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1cb10652.ba5e0a",
+        "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": 2679.383331298828,
-        "y": 1902,
-        "z": "db287b1f.2984a8",
+        "x": 2727.8333129882812,
+        "y": 1911.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b94bbfec.158258",
+        "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": 1174.3833312988281,
-        "y": 2593,
-        "z": "db287b1f.2984a8",
+        "x": 1222.8333129882812,
+        "y": 2602.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "70ed09af.22122",
+        "id": "7128141a.22afcc",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 584.3833312988281,
-        "y": 1271,
-        "z": "db287b1f.2984a8",
+        "x": 2087.8333129882812,
+        "y": 1191.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "dfffb0d0.b2d2d",
+        "id": "59bf9e6a.8c5448",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 597.3833312988281,
-        "y": 1367,
-        "z": "db287b1f.2984a8",
+        "x": 2088.8333129882812,
+        "y": 1295.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9521e4ca.a61af",
+        "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": 4333.883331298828,
-        "y": 543,
-        "z": "db287b1f.2984a8",
+        "x": 4382.333312988281,
+        "y": 552.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d1e23b2.17cb04",
+        "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": 4236.883331298828,
-        "y": 1362,
-        "z": "db287b1f.2984a8",
+        "x": 4285.333312988281,
+        "y": 1371.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e35a6c95.6b3d6",
+        "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": 3730.883331298828,
-        "y": 2034,
-        "z": "db287b1f.2984a8",
+        "x": 3779.3333129882812,
+        "y": 2043.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c5806bb.83c05",
+        "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": 831.8833312988281,
-        "y": 842,
-        "z": "db287b1f.2984a8",
+        "x": 880.3333129882812,
+        "y": 851.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "24382f34.66808",
-                "ea56d949.8ce4b"
+                "549c1dfb.8f3224",
+                "34cb7bd3.43733c"
             ]
         ]
     },
     {
-        "id": "24382f34.66808",
+        "id": "549c1dfb.8f3224",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194.8833312988281,
-        "y": 865,
-        "z": "db287b1f.2984a8",
+        "x": 1243.3333129882812,
+        "y": 874.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "d7ed30c6.74c9b"
+                "e217a5f3.43edf8"
             ]
         ]
     },
     {
-        "id": "ea56d949.8ce4b",
+        "id": "34cb7bd3.43733c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194.8833312988281,
-        "y": 814,
-        "z": "db287b1f.2984a8",
+        "x": 1243.3333129882812,
+        "y": 823.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3707e8cf.65827"
+                "845a9945.5ecef8"
             ]
         ]
     },
     {
-        "id": "d7ed30c6.74c9b",
+        "id": "e217a5f3.43edf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1350.8833312988281,
-        "y": 863,
-        "z": "db287b1f.2984a8",
+        "x": 1399.3333129882812,
+        "y": 872.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "a7f36b9f.f75b88"
+                "462f3353.3aa76c"
             ]
         ]
     },
     {
-        "id": "3707e8cf.65827",
+        "id": "845a9945.5ecef8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1327.8833312988281,
-        "y": 815,
-        "z": "db287b1f.2984a8",
+        "x": 1376.3333129882812,
+        "y": 824.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "ed4d0298.cdb578",
+        "id": "a8591f2d.71e23",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2087.883331298828,
-        "y": 213,
-        "z": "db287b1f.2984a8",
+        "x": 2136.3333129882812,
+        "y": 222.00000762939453,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "1ced8517.ce35e3",
+        "id": "c2c48b41.449c5",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3629.883331298828,
-        "y": 2194,
-        "z": "db287b1f.2984a8",
+        "x": 3678.3333129882812,
+        "y": 2203.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "224f4283.917d26",
+        "id": "9499a947.255148",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4219.883331298828,
-        "y": 667,
-        "z": "db287b1f.2984a8",
+        "x": 4268.333312988281,
+        "y": 676.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "b85bac18.623698",
+        "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": 1393.8833312988281,
-        "y": 1773,
-        "z": "db287b1f.2984a8",
+        "x": 1442.3333129882812,
+        "y": 1782.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5524ecac.5cf47c",
+        "id": "c236e813.0b75c",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 572.8833312988281,
-        "y": 1507,
-        "z": "db287b1f.2984a8",
+        "x": 621.3333129882812,
+        "y": 1516.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "a12bd239.f8368",
+        "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": 603.8833312988281,
-        "y": 1547,
-        "z": "db287b1f.2984a8",
+        "x": 652.3333129882812,
+        "y": 1556.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c01095c8.c5a848",
+        "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": 1151.8833312988281,
-        "y": 1955,
-        "z": "db287b1f.2984a8",
+        "x": 1200.3333129882812,
+        "y": 1964.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "1e0b480.37d7ab8",
+        "id": "574db0eb.1dd5f",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1154.8833312988281,
-        "y": 1997,
-        "z": "db287b1f.2984a8",
+        "x": 1203.3333129882812,
+        "y": 2006.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5d1396ed.19b6f8",
+        "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": 597.8833312988281,
-        "y": 1637,
-        "z": "db287b1f.2984a8",
+        "x": 646.3333129882812,
+        "y": 1646.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "1b4871a6.1cd8a6",
+        "id": "6dec5e05.6defc8",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 352.8833312988281,
-        "y": 2016,
-        "z": "db287b1f.2984a8",
+        "x": 401.33331298828125,
+        "y": 2025.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "48083140.e99758",
+        "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": 360.8833312988281,
-        "y": 2073,
-        "z": "db287b1f.2984a8",
+        "x": 409.33331298828125,
+        "y": 2082.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d97c4e37.51bad8",
+        "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": 1371.8833312988281,
-        "y": 1622,
-        "z": "db287b1f.2984a8",
+        "x": 1420.3333129882812,
+        "y": 1631.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3df77641.8d727a",
-                "f024d61d.5a31c"
+                "42d55673.4b259",
+                "c68b8996.7afed8"
             ]
         ]
     },
     {
-        "id": "f024d61d.5a31c",
+        "id": "c68b8996.7afed8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1594.8833312988281,
-        "y": 1577,
-        "z": "db287b1f.2984a8",
+        "x": 1643.3333129882812,
+        "y": 1586.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "3c67000e.e921c"
+                "30a6d609.f0af22"
             ]
         ]
     },
     {
-        "id": "3df77641.8d727a",
+        "id": "42d55673.4b259",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1596.8833312988281,
-        "y": 1641,
-        "z": "db287b1f.2984a8",
+        "x": 1645.3333129882812,
+        "y": 1650.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "de64177a.8916f"
+                "36f16c60.30df3c"
             ]
         ]
     },
     {
-        "id": "3c67000e.e921c",
+        "id": "30a6d609.f0af22",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1759.8833312988281,
-        "y": 1574,
-        "z": "db287b1f.2984a8",
+        "x": 1808.3333129882812,
+        "y": 1583.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "9bea7c66.5f62c8"
+                "33a6db5.6665724"
             ]
         ]
     },
     {
-        "id": "de64177a.8916f",
+        "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": 1758.8833312988281,
-        "y": 1637,
-        "z": "db287b1f.2984a8",
+        "x": 1807.3333129882812,
+        "y": 1646.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9bea7c66.5f62c8",
+        "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": 1979.8833312988281,
-        "y": 1588,
-        "z": "db287b1f.2984a8",
+        "x": 2028.3333129882812,
+        "y": 1597.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7a38583b.020a88",
+        "id": "9a45a6ac.6bb008",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1524.8833312988281,
-        "y": 2313,
-        "z": "db287b1f.2984a8",
+        "x": 1573.3333129882812,
+        "y": 2322.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "c388a6bf.f87f3"
+                "90552bad.c118e"
             ]
         ]
     },
     {
-        "id": "a2f5b878.ad169",
+        "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": 1909.8833312988281,
-        "y": 2326,
-        "z": "db287b1f.2984a8",
+        "x": 1958.3333129882812,
+        "y": 2335.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7866488b.2039a8",
-                "bdc692ef.1c0858",
-                "823a852f.40d29"
+                "cc717bee.327628",
+                "4215d2eb.6b41b4",
+                "6de2353d.61ff6c"
             ]
         ]
     },
     {
-        "id": "c388a6bf.f87f3",
+        "id": "90552bad.c118e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1703.8833312988281,
-        "y": 2313,
-        "z": "db287b1f.2984a8",
+        "x": 1752.3333129882812,
+        "y": 2322.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5c79d6d8.a6a8e",
-                "a2f5b878.ad169"
+                "f2b28f1.371b57",
+                "746f3218.6a2f4c"
             ]
         ]
     },
     {
-        "id": "5c79d6d8.a6a8e",
+        "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": 1939.8833312988281,
-        "y": 2274,
-        "z": "db287b1f.2984a8",
+        "x": 1988.3333129882812,
+        "y": 2283.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "7866488b.2039a8",
+        "id": "cc717bee.327628",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2119.883331298828,
-        "y": 2317,
-        "z": "db287b1f.2984a8",
+        "x": 2168.3333129882812,
+        "y": 2326.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "4da79570.cd80cc"
+                "864e3f3b.37515"
             ]
         ]
     },
     {
-        "id": "bdc692ef.1c0858",
+        "id": "4215d2eb.6b41b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2111.883331298828,
-        "y": 2372,
-        "z": "db287b1f.2984a8",
+        "x": 2160.3333129882812,
+        "y": 2381.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "5ef7fec5.5efb98"
+                "dbafb74f.d2c48"
             ]
         ]
     },
     {
-        "id": "823a852f.40d29",
+        "id": "6de2353d.61ff6c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2116.883331298828,
-        "y": 2429,
-        "z": "db287b1f.2984a8",
+        "x": 2165.3333129882812,
+        "y": 2438.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "57488074.1d65e"
+                "d9191b0b.ddee58"
             ]
         ]
     },
     {
-        "id": "57488074.1d65e",
+        "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": 2268.883331298828,
-        "y": 2430,
-        "z": "db287b1f.2984a8",
+        "x": 2317.3333129882812,
+        "y": 2439.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "5ef7fec5.5efb98",
+        "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": 2279.883331298828,
-        "y": 2375,
-        "z": "db287b1f.2984a8",
+        "x": 2328.3333129882812,
+        "y": 2384.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "4da79570.cd80cc",
+        "id": "864e3f3b.37515",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2264.265655517578,
-        "y": 2314.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 2312.7156372070312,
+        "y": 2323.65567779541,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "69f8caaf.bba51c"
+                "f35ba5bd.48a6c8"
             ]
         ]
     },
     {
-        "id": "69f8caaf.bba51c",
+        "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": 2478.883331298828,
-        "y": 2311,
-        "z": "db287b1f.2984a8",
+        "x": 2527.3333129882812,
+        "y": 2320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "53cc84ce.e1faf4",
+        "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": 602.8833312988281,
-        "y": 2359,
-        "z": "db287b1f.2984a8",
+        "x": 651.3333129882812,
+        "y": 2368.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bb343bdc.881868",
-                "8bc84f5e.0473d8",
-                "78444b47.33ec34"
+                "372d54fa.9f96f4",
+                "9dc1c4cc.c7a94",
+                "2d38b1b0.a69f26"
             ]
         ]
     },
     {
-        "id": "bb343bdc.881868",
+        "id": "372d54fa.9f96f4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 798.3834533691406,
-        "y": 2311,
-        "z": "db287b1f.2984a8",
+        "x": 846.8334350585938,
+        "y": 2320.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "bf3ecbb9.4dd008"
+                "eb66892d.1f2808"
             ]
         ]
     },
     {
-        "id": "8bc84f5e.0473d8",
+        "id": "9dc1c4cc.c7a94",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 790.3834533691406,
-        "y": 2366,
-        "z": "db287b1f.2984a8",
+        "x": 838.8334350585938,
+        "y": 2375.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "ef40b092.bc09e"
+                "79e4473c.6cea88"
             ]
         ]
     },
     {
-        "id": "bf3ecbb9.4dd008",
+        "id": "eb66892d.1f2808",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 942.7657775878906,
-        "y": 2310.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 991.2157592773438,
+        "y": 2319.65567779541,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "1285266.d4ce8da"
+                "a488eeff.b05b28"
             ]
         ]
     },
     {
-        "id": "1285266.d4ce8da",
+        "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": 1126.8833312988281,
-        "y": 2309,
-        "z": "db287b1f.2984a8",
+        "x": 1175.3333129882812,
+        "y": 2318.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "640d04c1.8428dc"
+                "52486109.89e3d"
             ]
         ]
     },
     {
-        "id": "640d04c1.8428dc",
+        "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": 1321.8833312988281,
-        "y": 2309,
-        "z": "db287b1f.2984a8",
+        "x": 1370.3333129882812,
+        "y": 2318.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "7a38583b.020a88"
+                "9a45a6ac.6bb008"
             ]
         ]
     },
     {
-        "id": "78444b47.33ec34",
+        "id": "2d38b1b0.a69f26",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 795.3834533691406,
-        "y": 2423,
-        "z": "db287b1f.2984a8",
+        "x": 843.8334350585938,
+        "y": 2432.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "b417de17.8b3a6"
+                "7ec62576.a9581c"
             ]
         ]
     },
     {
-        "id": "b417de17.8b3a6",
+        "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": 947.3834533691406,
-        "y": 2424,
-        "z": "db287b1f.2984a8",
+        "x": 995.8334350585938,
+        "y": 2433.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "ef40b092.bc09e",
+        "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": 958.3834533691406,
-        "y": 2367,
-        "z": "db287b1f.2984a8",
+        "x": 1006.8334350585938,
+        "y": 2376.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "fc4eafc.4810e5",
+        "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": 592.8833312988281,
-        "y": 2271,
-        "z": "db287b1f.2984a8",
+        "x": 641.3333129882812,
+        "y": 2280.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "d94511cd.5d63f",
+        "id": "9e415421.d3d5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 337.8833312988281,
-        "y": 2402,
-        "z": "db287b1f.2984a8",
+        "x": 386.33331298828125,
+        "y": 2411.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": [
             [
-                "fc4eafc.4810e5",
-                "53cc84ce.e1faf4"
+                "46b10267.ea0e94",
+                "8481025.43fb9"
             ]
         ]
     },
     {
-        "id": "1a955b8d.047dd4",
+        "id": "e5923dd1.06f5c",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1552.8500061035156,
-        "y": 219.88333129882812,
-        "z": "db287b1f.2984a8",
+        "x": 1601.2999877929688,
+        "y": 228.88333892822266,
+        "z": "d12a8890.0a99a",
         "wires": []
     },
     {
-        "id": "9a0e1ef7.428b9",
+        "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": 754.8833312988281,
-        "y": 442,
-        "z": "db287b1f.2984a8",
+        "x": 803.3333129882812,
+        "y": 451.00000762939453,
+        "z": "d12a8890.0a99a",
+        "wires": []
+    },
+    {
+        "id": "b87c2610.4dcfe8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 362.83331298828125,
+        "y": 1420.0000076293945,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "c36699ae.d9b4d8",
+                "d56221fe.c2bbf",
+                "c236e813.0b75c",
+                "ccf5136c.426918",
+                "bcc45625.ebbc48",
+                "fa8a8b3f.f0a5f8",
+                "67d19d91.7e0464",
+                "6dec5e05.6defc8",
+                "4d2f3635.de76f",
+                "9e415421.d3d5",
+                "4fcc44c7.7479d4"
+            ]
+        ]
+    },
+    {
+        "id": "7a26c91d.a51bf",
+        "type": "switchNode",
+        "name": "switch uni type",
+        "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1393.3333129882812,
+        "y": 1258.0000076293945,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "a9279133.62197",
+                "c4ef1cec.86081",
+                "5303ba0b.725dcc",
+                "84ee69ca.e736d8"
+            ]
+        ]
+    },
+    {
+        "id": "a9279133.62197",
+        "type": "outcome",
+        "name": "leaf",
+        "xml": "<outcome value='leaf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1558.3333129882812,
+        "y": 1240.0000076293945,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "df04fed1.2e9e3"
+            ]
+        ]
+    },
+    {
+        "id": "c4ef1cec.86081",
+        "type": "outcome",
+        "name": "root",
+        "xml": "<outcome value='root'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1561.3333129882812,
+        "y": 1279.0000076293945,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "1437703.dec509"
+            ]
+        ]
+    },
+    {
+        "id": "84ee69ca.e736d8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1555.3333129882812,
+        "y": 1357.0000076293945,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "c52f2275.ca0538"
+            ]
+        ]
+    },
+    {
+        "id": "5303ba0b.725dcc",
+        "type": "outcome",
+        "name": "root-secondary",
+        "xml": "<outcome value='root-secondary'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1578.3333129882812,
+        "y": 1320.0000076293945,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "bb188e14.1d1858"
+            ]
+        ]
+    },
+    {
+        "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": 2124.3333129882812,
+        "y": 1353.0000076293945,
+        "z": "d12a8890.0a99a",
+        "wires": []
+    },
+    {
+        "id": "a68d577a.75b008",
+        "type": "set",
+        "name": "set leafOrRootAccess",
+        "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
+        "comments": "",
+        "x": 2086.3333129882812,
+        "y": 1393.0000076293945,
+        "z": "d12a8890.0a99a",
         "wires": []
+    },
+    {
+        "id": "c52f2275.ca0538",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1707.3333129882812,
+        "y": 1378.0000076293945,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "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": 1296.9166870117188,
+        "y": 2677.333625793457,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "df04fed1.2e9e3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1693.2499389648438,
+        "y": 1236.3332595825195,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "7128141a.22afcc"
+            ]
+        ]
+    },
+    {
+        "id": "1437703.dec509",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1695.2499389648438,
+        "y": 1274.3332595825195,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "59bf9e6a.8c5448"
+            ]
+        ]
+    },
+    {
+        "id": "bb188e14.1d1858",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1738.2499389648438,
+        "y": 1321.3332595825195,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "a68d577a.75b008"
+            ]
+        ]
+    },
+    {
+        "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": 1264.9166870117188,
+        "y": 2749.3335037231445,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "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": 1294.9166870117188,
+        "y": 2811.3335037231445,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "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": 688.3333129882812,
+        "y": 1358.1667556762695,
+        "z": "d12a8890.0a99a",
+        "wires": []
+    },
+    {
+        "id": "462f3353.3aa76c",
+        "type": "switchNode",
+        "name": "switch conn type",
+        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 229.3333282470703,
+        "y": 1069.166633605957,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "66788e31.cd8e5",
+                "15c226b1.2f2f21"
+            ]
+        ]
+    },
+    {
+        "id": "15c226b1.2f2f21",
+        "type": "outcome",
+        "name": "root",
+        "xml": "<outcome value='root'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 414.33331298828125,
+        "y": 1243.166633605957,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "b87c2610.4dcfe8"
+            ]
+        ]
+    },
+    {
+        "id": "66788e31.cd8e5",
+        "type": "outcome",
+        "name": "leaf",
+        "xml": "<outcome value='leaf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 417.33331298828125,
+        "y": 1198.166633605957,
+        "z": "d12a8890.0a99a",
+        "wires": [
+            [
+                "b87c2610.4dcfe8"
+            ]
+        ]
     }
 ]
\ No newline at end of file