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=d58ad7bff7243a4f5b51008f924f20f8cb0aa9ee;hb=65388f15b90ed88de1102db09a7fa17168e7d236;hp=1828f879b6104e5ec711b7936733820a5f16ac82;hpb=09fcafbe6a01ae18abaf7211a21e1bd1cca10431;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..d58ad7bf 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": "d35e2da9.70a7e",
         "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": 372,
+        "y": 306,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "bee28b81.87faf8",
-                "2e0d3206.b3958e",
-                "2caa6605.779652"
+                "88d19ab1.10b18",
+                "8fd12759.af6e18",
+                "50405d21.7eae84"
             ]
         ]
     },
     {
-        "id": "bee28b81.87faf8",
+        "id": "88d19ab1.10b18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 589.8833312988281,
-        "y": 354,
-        "z": "db287b1f.2984a8",
+        "x": 560,
+        "y": 319,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "db2a2eb9.c4729"
+                "d472199a.beff9"
             ]
         ]
     },
     {
-        "id": "2e0d3206.b3958e",
+        "id": "8fd12759.af6e18",
         "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": 567.4909362792969,
+        "y": 361.57403564453125,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "2caa6605.779652",
+        "id": "50405d21.7eae84",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 587.8833312988281,
-        "y": 443,
-        "z": "db287b1f.2984a8",
+        "x": 558,
+        "y": 408,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9a0e1ef7.428b9"
+                "6b1a691d.f6617"
             ]
         ]
     },
     {
-        "id": "db2a2eb9.c4729",
+        "id": "d472199a.beff9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 762.8833312988281,
-        "y": 352,
-        "z": "db287b1f.2984a8",
+        "x": 733,
+        "y": 317,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b1233538.ceab4"
+                "f306805a.38d6f8"
             ]
         ]
     },
     {
-        "id": "b1233538.ceab4",
+        "id": "f306805a.38d6f8",
         "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": 962,
+        "y": 318,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f68da0c8.dc2638"
+                "4a920666.d84d68"
             ]
         ]
     },
     {
-        "id": "f68da0c8.dc2638",
+        "id": "4a920666.d84d68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1206.8833312988281,
-        "y": 354,
-        "z": "db287b1f.2984a8",
+        "x": 1177,
+        "y": 319,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "947d4965.a799f8"
+                "fc848cba.fc33d8"
             ]
         ]
     },
     {
-        "id": "ab775a4c.a509d",
+        "id": "841ae1dd.49d178",
         "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": 1431,
+        "y": 241,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1ae0d7f3.280b18",
-                "b7c135fb.7fc808"
+                "98ef6cc.4725e9",
+                "ab42fe03.c49e3"
             ]
         ]
     },
     {
-        "id": "1ae0d7f3.280b18",
+        "id": "98ef6cc.4725e9",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1677.8833312988281,
-        "y": 255,
-        "z": "db287b1f.2984a8",
+        "x": 1648,
+        "y": 220,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "947d4965.a799f8"
+                "fc848cba.fc33d8"
             ]
         ]
     },
     {
-        "id": "b7c135fb.7fc808",
+        "id": "ab42fe03.c49e3",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1677.8833312988281,
-        "y": 304,
-        "z": "db287b1f.2984a8",
+        "x": 1648,
+        "y": 269,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "947d4965.a799f8",
+        "id": "fc848cba.fc33d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1861.8833312988281,
-        "y": 341,
-        "z": "db287b1f.2984a8",
+        "x": 1832,
+        "y": 306,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7307d136.f98668",
-                "d6d93ab.df041c8",
-                "ed4d0298.cdb578"
+                "53692e4a.48cde",
+                "957d0d12.f7d338",
+                "1f9b767f.d670b2"
             ]
         ]
     },
     {
-        "id": "d12da893.5808e",
+        "id": "524dbe59.8ef8f",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 220.88333129882812,
-        "y": 82,
-        "z": "db287b1f.2984a8",
+        "x": 191,
+        "y": 47,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ba22940.68974f"
+                "320667fa.12a2c"
             ]
         ]
     },
     {
-        "id": "ba22940.68974f",
+        "id": "320667fa.12a2c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3545 +201,3558 @@
         "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": 475.2856903076172,
+        "y": 108.23810863494873,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f0aeb23e.8f1f7"
+                "aa006c98.f12b58"
             ]
         ]
     },
     {
-        "id": "f0aeb23e.8f1f7",
+        "id": "aa006c98.f12b58",
         "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": 481.42860412597656,
+        "y": 193.00003051757812,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "849eab75.e48858"
+                "72fe4a66.39584c"
             ]
         ]
     },
     {
-        "id": "849eab75.e48858",
+        "id": "72fe4a66.39584c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 821.1213684082031,
-        "y": 219.66668701171875,
-        "z": "db287b1f.2984a8",
+        "x": 791.238037109375,
+        "y": 184.66668701171875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4a53e986.e1345",
-                "9dad0003.283738",
-                "47e937a3.3ee608",
-                "fa83bc41.1d8b08",
-                "39b1b2.d055464e"
+                "d35e2da9.70a7e",
+                "cce8745e.b515b8",
+                "706cb78c.da92b",
+                "88772a4.9b58658",
+                "4ace150.4554dec"
             ]
         ]
     },
     {
-        "id": "7307d136.f98668",
+        "id": "53692e4a.48cde",
         "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": 2049,
+        "y": 244,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5be24b21.11ebc4",
+        "id": "123fcc82.b79ae3",
         "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": 4218,
+        "y": 130,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "66c2f1fa.df4e",
+        "id": "e308a3a2.af826",
         "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": 4299,
+        "y": 445,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "78ae8a16.bcde6c",
-                "163e60b5.f624ef"
+                "fedd6b9.d7f3318",
+                "39581c20.edb614"
             ]
         ]
     },
     {
-        "id": "78ae8a16.bcde6c",
+        "id": "fedd6b9.d7f3318",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4638.383331298828,
-        "y": 449,
-        "z": "db287b1f.2984a8",
+        "x": 4608.5,
+        "y": 414,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a86780cc.869ba"
+                "c49081cf.377c78"
             ]
         ]
     },
     {
-        "id": "163e60b5.f624ef",
+        "id": "39581c20.edb614",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4643.383331298828,
-        "y": 514,
-        "z": "db287b1f.2984a8",
+        "x": 4613.5,
+        "y": 479,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "496a02d9.361154"
+                "9c0572a4.3a997"
             ]
         ]
     },
     {
-        "id": "a86780cc.869ba",
+        "id": "c49081cf.377c78",
         "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": 4784.5,
+        "y": 414,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "496a02d9.361154",
+        "id": "9c0572a4.3a997",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4809.883331298828,
-        "y": 514,
-        "z": "db287b1f.2984a8",
+        "x": 4780,
+        "y": 479,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "4c8b1659.abc1b",
+        "id": "2d297001.689a7",
         "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": 4163.5,
+        "y": 699,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "902cb9fb.0d496",
+        "id": "54d9bbcc.0d0bac",
         "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": 4317.5,
+        "y": 747,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f961065e.0e576",
-                "6ca1f611.56dee"
+                "2ade786d.c09b28",
+                "f17ad5b3.0ef818"
             ]
         ]
     },
     {
-        "id": "f961065e.0e576",
+        "id": "2ade786d.c09b28",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4692.883331298828,
-        "y": 763,
-        "z": "db287b1f.2984a8",
+        "x": 4663,
+        "y": 728,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6296fab8.967dac"
+                "72718fb4.e15e78"
             ]
         ]
     },
     {
-        "id": "6ca1f611.56dee",
+        "id": "f17ad5b3.0ef818",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4696.883331298828,
-        "y": 803,
-        "z": "db287b1f.2984a8",
+        "x": 4667,
+        "y": 768,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ef7067c4.7ea328"
+                "98b1fdb0.a42648"
             ]
         ]
     },
     {
-        "id": "6296fab8.967dac",
+        "id": "72718fb4.e15e78",
         "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": 4821,
+        "y": 728,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "ef7067c4.7ea328",
+        "id": "98b1fdb0.a42648",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4854.383331298828,
-        "y": 803,
-        "z": "db287b1f.2984a8",
+        "x": 4824.5,
+        "y": 768,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ee477ca2.a65568",
-                "5e527e99.1f4728"
+                "fe12ce9.6a53ab",
+                "4eba4c2.fda54b4"
             ]
         ]
     },
     {
-        "id": "ee477ca2.a65568",
+        "id": "fe12ce9.6a53ab",
         "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": 5155,
+        "y": 733,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "f9d5afb7.0291b",
+        "id": "9e233ee4.5c90e",
         "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": 5019,
+        "y": 692,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5e527e99.1f4728",
+        "id": "4eba4c2.fda54b4",
         "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": 5082,
+        "y": 779,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "48c30a65.f0f584",
+        "id": "fbd17573.b91cd8",
         "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": 4156,
+        "y": 178,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "bc523ecb.f956a8",
+        "id": "985dbb20.1c3b78",
         "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": 4182,
+        "y": 295,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a72840b5.dc70e",
-                "54e4a8de.9445f8",
-                "4012660e.b55b2"
+                "544c4f89.eba52",
+                "eb873b5e.d10b8",
+                "d8377d86.76164"
             ]
         ]
     },
     {
-        "id": "a72840b5.dc70e",
+        "id": "544c4f89.eba52",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4407.383453369141,
-        "y": 282,
-        "z": "db287b1f.2984a8",
+        "x": 4377.5001220703125,
+        "y": 247,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9d071aa.9c29c68"
+                "cd232c91.ed7d5"
             ]
         ]
     },
     {
-        "id": "54e4a8de.9445f8",
+        "id": "eb873b5e.d10b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4399.383453369141,
-        "y": 337,
-        "z": "db287b1f.2984a8",
+        "x": 4369.5001220703125,
+        "y": 302,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3662c50c.d754d2"
+                "7e7e18a4.ea2a98"
             ]
         ]
     },
     {
-        "id": "9d071aa.9c29c68",
+        "id": "cd232c91.ed7d5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4551.765777587891,
-        "y": 281.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 4521.8824462890625,
+        "y": 246.65567016601562,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c1155c42.4dc2e8"
+                "d5d46c3b.524dc8"
             ]
         ]
     },
     {
-        "id": "a3b68f87.0c3248",
+        "id": "4c85ec99.26bac4",
         "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": 5104,
+        "y": 249,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e6d1f56a.1147f8"
+                "490c8cc0.c71134"
             ]
         ]
     },
     {
-        "id": "c1155c42.4dc2e8",
+        "id": "d5d46c3b.524dc8",
         "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": 4706,
+        "y": 245,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e3565ab9.0a825"
+                "cc43f2ea.19847"
             ]
         ]
     },
     {
-        "id": "e3565ab9.0a825",
+        "id": "cc43f2ea.19847",
         "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": 4901,
+        "y": 245,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a3b68f87.0c3248"
+                "4c85ec99.26bac4"
             ]
         ]
     },
     {
-        "id": "4012660e.b55b2",
+        "id": "d8377d86.76164",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4404.383453369141,
-        "y": 394,
-        "z": "db287b1f.2984a8",
+        "x": 4374.5001220703125,
+        "y": 359,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7e9c03d8.c41c7c"
+                "9cf617d3.aee3a8"
             ]
         ]
     },
     {
-        "id": "7e9c03d8.c41c7c",
+        "id": "9cf617d3.aee3a8",
         "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": 4526.5001220703125,
+        "y": 360,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3662c50c.d754d2",
+        "id": "7e7e18a4.ea2a98",
         "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": 4537.5001220703125,
+        "y": 303,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "99fa8e6f.e803d8",
+        "id": "f42e9c90.ae58f",
         "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": 5489,
+        "y": 262,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a38e0436.5aedc",
-                "80f6747e.265c78",
-                "c370b7ba.84a26"
+                "f404a9ca.fbce2",
+                "3fd1ebaf.c62a54",
+                "66a3972e.71bfa8"
             ]
         ]
     },
     {
-        "id": "e6d1f56a.1147f8",
+        "id": "490c8cc0.c71134",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5312.883331298828,
-        "y": 284,
-        "z": "db287b1f.2984a8",
+        "x": 5283,
+        "y": 249,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4599703a.c42f3",
-                "99fa8e6f.e803d8"
+                "9ce5b4b0.4bb188",
+                "f42e9c90.ae58f"
             ]
         ]
     },
     {
-        "id": "4599703a.c42f3",
+        "id": "9ce5b4b0.4bb188",
         "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": 5519,
+        "y": 210,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a38e0436.5aedc",
+        "id": "f404a9ca.fbce2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5728.883331298828,
-        "y": 288,
-        "z": "db287b1f.2984a8",
+        "x": 5699,
+        "y": 253,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "8c88cbf0.e09b1"
+                "3597c274.50637e"
             ]
         ]
     },
     {
-        "id": "80f6747e.265c78",
+        "id": "3fd1ebaf.c62a54",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5720.883331298828,
-        "y": 343,
-        "z": "db287b1f.2984a8",
+        "x": 5691,
+        "y": 308,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e2be9acb.77d62"
+                "ff90e84e.43d4b8"
             ]
         ]
     },
     {
-        "id": "c370b7ba.84a26",
+        "id": "66a3972e.71bfa8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5725.883331298828,
-        "y": 400,
-        "z": "db287b1f.2984a8",
+        "x": 5696,
+        "y": 365,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "856ee89c.2898"
+                "ff823793.36814"
             ]
         ]
     },
     {
-        "id": "856ee89c.2898",
+        "id": "ff823793.36814",
         "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": 5848,
+        "y": 366,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e2be9acb.77d62",
+        "id": "ff90e84e.43d4b8",
         "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": 5859,
+        "y": 311,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "8c88cbf0.e09b1",
+        "id": "3597c274.50637e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5873.265655517578,
-        "y": 285.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 5843.38232421875,
+        "y": 250.65567016601562,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a4a57efc.888ff8"
+                "d39e28b5.1aec5"
             ]
         ]
     },
     {
-        "id": "a4a57efc.888ff8",
+        "id": "d39e28b5.1aec5",
         "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": 6058,
+        "y": 247,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "172d91c5.a78676",
+        "id": "139f2f1e.8fa159",
         "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": 3625,
+        "y": 1587,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f13d198f.d5c79",
+        "id": "18d2c2bc.05fd85",
         "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": 3688,
+        "y": 1916,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3640aede.8913a2",
-                "f1b1c8d.9945bb8"
+                "8895fa29.bf8e3",
+                "23c7c635.fd4722"
             ]
         ]
     },
     {
-        "id": "3640aede.8913a2",
+        "id": "8895fa29.bf8e3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4013.383331298828,
-        "y": 1918,
-        "z": "db287b1f.2984a8",
+        "x": 3983.5,
+        "y": 1883,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4b0d0deb.6577e4"
+                "500b5538.e88684"
             ]
         ]
     },
     {
-        "id": "f1b1c8d.9945bb8",
+        "id": "23c7c635.fd4722",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4018.383331298828,
-        "y": 1983,
-        "z": "db287b1f.2984a8",
+        "x": 3988.5,
+        "y": 1948,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "5da14040.cb50b8"
+                "909dfd67.2300d8"
             ]
         ]
     },
     {
-        "id": "4b0d0deb.6577e4",
+        "id": "500b5538.e88684",
         "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": 4151.5,
+        "y": 1883,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5da14040.cb50b8",
+        "id": "909dfd67.2300d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4191.883331298828,
-        "y": 1983,
-        "z": "db287b1f.2984a8",
+        "x": 4162,
+        "y": 1948,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e50105a.a8b96",
+        "id": "a49aeabe.b5ff8",
         "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": 3564,
+        "y": 1644,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "dfe45c65.d48f6",
+        "id": "642d00da.b53c68",
         "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": 3584,
+        "y": 1741,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "56d2f84a.b524e8",
-                "43f5b436.ace8b4",
-                "a9c884c3.3b2c18"
+                "1e5d6803.78b7d8",
+                "84307ec5.09a8d",
+                "b468d4fc.bc9c8"
             ]
         ]
     },
     {
-        "id": "56d2f84a.b524e8",
+        "id": "1e5d6803.78b7d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3816.3834533691406,
-        "y": 1729,
-        "z": "db287b1f.2984a8",
+        "x": 3786.5001220703125,
+        "y": 1694,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "10cf7345.17615d"
+                "683b34d0.c1df64"
             ]
         ]
     },
     {
-        "id": "43f5b436.ace8b4",
+        "id": "84307ec5.09a8d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3808.3834533691406,
-        "y": 1784,
-        "z": "db287b1f.2984a8",
+        "x": 3778.5001220703125,
+        "y": 1749,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "40e41e98.b2ab3"
+                "72cad52e.cb1d74"
             ]
         ]
     },
     {
-        "id": "10cf7345.17615d",
+        "id": "683b34d0.c1df64",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3960.7657775878906,
-        "y": 1726.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 3930.8824462890625,
+        "y": 1691.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "69889215.886b4c"
+                "8511cae6.cbf588"
             ]
         ]
     },
     {
-        "id": "69889215.886b4c",
+        "id": "8511cae6.cbf588",
         "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": 4115,
+        "y": 1706,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3c1ff953.79a23e"
+                "82496ff9.234ee"
             ]
         ]
     },
     {
-        "id": "a9c884c3.3b2c18",
+        "id": "b468d4fc.bc9c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3813.3834533691406,
-        "y": 1841,
-        "z": "db287b1f.2984a8",
+        "x": 3783.5001220703125,
+        "y": 1806,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "8ab7ecfb.f03ee"
+                "a6137ce1.b3b5c"
             ]
         ]
     },
     {
-        "id": "8ab7ecfb.f03ee",
+        "id": "a6137ce1.b3b5c",
         "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": 3935.5001220703125,
+        "y": 1807,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "40e41e98.b2ab3",
+        "id": "72cad52e.cb1d74",
         "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": 3946.5001220703125,
+        "y": 1752,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "37ef2104.1e9d5e",
+        "id": "7b4a137a.364fcc",
         "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": 4513,
+        "y": 1710,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "901dac81.52118"
+                "37fe69a9.07064e"
             ]
         ]
     },
     {
-        "id": "3c1ff953.79a23e",
+        "id": "82496ff9.234ee",
         "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": 4310,
+        "y": 1706,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "37ef2104.1e9d5e"
+                "7b4a137a.364fcc"
             ]
         ]
     },
     {
-        "id": "86b8c4cb.c3747",
+        "id": "4bdd9e57.a5e13",
         "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": 4898,
+        "y": 1709,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b5f45931.a1805",
-                "34bcb3b6.e69b1c",
-                "d4cc1381.862c48"
+                "8afff046.26af98",
+                "5118b1e.53f805",
+                "5a800db8.063d6c"
             ]
         ]
     },
     {
-        "id": "901dac81.52118",
+        "id": "37fe69a9.07064e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4719.883331298828,
-        "y": 1737,
-        "z": "db287b1f.2984a8",
+        "x": 4690,
+        "y": 1702,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "81cd4229.29ba8",
-                "86b8c4cb.c3747"
+                "d299743b.8f6b68",
+                "4bdd9e57.a5e13"
             ]
         ]
     },
     {
-        "id": "81cd4229.29ba8",
+        "id": "d299743b.8f6b68",
         "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": 4928,
+        "y": 1657,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a6f965e8.0bb248",
+        "id": "2523ddf0.8e1c8a",
         "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": 5257,
+        "y": 1813,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3b503e2a.8c5dd2",
+        "id": "6f850c0f.e212ac",
         "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": 5268,
+        "y": 1758,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a84f2510.1ebf08",
+        "id": "546ca846.269108",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5282.265655517578,
-        "y": 1732.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 5252.38232421875,
+        "y": 1697.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f83738f1.e5e14"
+                "fac7ab27.77dda8"
             ]
         ]
     },
     {
-        "id": "f83738f1.e5e14",
+        "id": "fac7ab27.77dda8",
         "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": 5467,
+        "y": 1694,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b5f45931.a1805",
+        "id": "8afff046.26af98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5137.883331298828,
-        "y": 1735,
-        "z": "db287b1f.2984a8",
+        "x": 5108,
+        "y": 1700,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a84f2510.1ebf08"
+                "546ca846.269108"
             ]
         ]
     },
     {
-        "id": "34bcb3b6.e69b1c",
+        "id": "5118b1e.53f805",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5129.883331298828,
-        "y": 1790,
-        "z": "db287b1f.2984a8",
+        "x": 5100,
+        "y": 1755,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3b503e2a.8c5dd2"
+                "6f850c0f.e212ac"
             ]
         ]
     },
     {
-        "id": "d4cc1381.862c48",
+        "id": "5a800db8.063d6c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5134.883331298828,
-        "y": 1847,
-        "z": "db287b1f.2984a8",
+        "x": 5105,
+        "y": 1812,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a6f965e8.0bb248"
+                "2523ddf0.8e1c8a"
             ]
         ]
     },
     {
-        "id": "4a95df1.67c3fa",
+        "id": "a1edca3.1a62bb8",
         "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": 3139,
+        "y": 658,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "60b8b463.e4925c",
-                "5e23be29.1eb6a"
+                "d4bdeded.3ef248",
+                "eead64c.0115918"
             ]
         ]
     },
     {
-        "id": "60b8b463.e4925c",
+        "id": "d4bdeded.3ef248",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3382.883331298828,
-        "y": 730,
-        "z": "db287b1f.2984a8",
+        "x": 3353,
+        "y": 695,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4d4203c4.4fd81c"
+                "614a0644.b0e3e"
             ]
         ]
     },
     {
-        "id": "5e23be29.1eb6a",
+        "id": "eead64c.0115918",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3384.883331298828,
-        "y": 668,
-        "z": "db287b1f.2984a8",
+        "x": 3355,
+        "y": 633,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "402d5674.bb5698"
+                "295e16ce.878c6a"
             ]
         ]
     },
     {
-        "id": "4d4203c4.4fd81c",
+        "id": "614a0644.b0e3e",
         "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": 2933,
+        "y": 1938,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4155de88.54a1f",
-                "11e38b5d.85c715"
+                "75bfd38b.356f64",
+                "f4c4b096.a3ce2"
             ]
         ]
     },
     {
-        "id": "4155de88.54a1f",
+        "id": "75bfd38b.356f64",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3215.883331298828,
-        "y": 2007,
-        "z": "db287b1f.2984a8",
+        "x": 3186,
+        "y": 1972,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "97b4f973.8f85a8"
+                "b0597a28.514d3"
             ]
         ]
     },
     {
-        "id": "11e38b5d.85c715",
+        "id": "f4c4b096.a3ce2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3215.883331298828,
-        "y": 1951,
-        "z": "db287b1f.2984a8",
+        "x": 3186,
+        "y": 1916,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4bdf7725.9cef3"
+                "64045150.224658"
             ]
         ]
     },
     {
-        "id": "97b4f973.8f85a8",
+        "id": "b0597a28.514d3",
         "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": 3337,
+        "y": 1972,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "15e2350c.3f989b",
+        "id": "cf5b963d.2b5a08",
         "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": 4213,
+        "y": 70,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "22f55219.d9af6e",
+        "id": "4badfb31.b82c1c",
         "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": 3621,
+        "y": 1529,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "9157e39e.50973",
+        "id": "552020c2.f01db",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3933.883331298828,
-        "y": 362,
-        "z": "db287b1f.2984a8",
+        "x": 3904,
+        "y": 327,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "15e2350c.3f989b",
-                "5be24b21.11ebc4",
-                "48c30a65.f0f584",
-                "bc523ecb.f956a8",
-                "66c2f1fa.df4e",
-                "738a4fa7.5a68d",
-                "9521e4ca.a61af",
-                "224f4283.917d26"
+                "cf5b963d.2b5a08",
+                "123fcc82.b79ae3",
+                "fbd17573.b91cd8",
+                "985dbb20.1c3b78",
+                "e308a3a2.af826",
+                "ec3b4a19.7f5ee",
+                "881b2d7a.c4e888",
+                "1a392cd7.238923"
             ]
         ]
     },
     {
-        "id": "4bdf7725.9cef3",
+        "id": "64045150.224658",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3366.883331298828,
-        "y": 1950,
-        "z": "db287b1f.2984a8",
+        "x": 3337,
+        "y": 1915,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "22f55219.d9af6e",
-                "172d91c5.a78676",
-                "1e50105a.a8b96",
-                "dfe45c65.d48f6",
-                "f13d198f.d5c79",
-                "78f084cb.41e754",
-                "e35a6c95.6b3d6",
-                "1ced8517.ce35e3"
+                "4badfb31.b82c1c",
+                "139f2f1e.8fa159",
+                "a49aeabe.b5ff8",
+                "642d00da.b53c68",
+                "18d2c2bc.05fd85",
+                "724930a5.f44628",
+                "98331ea2.d141f",
+                "f84de17e.e8ea08"
             ]
         ]
     },
     {
-        "id": "e7e7eca7.931088",
+        "id": "ed40d4d6.135678",
         "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": 3575,
+        "y": 2214,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5544b67f.df3238",
+        "id": "b71c97.3dad8368",
         "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": 3729,
+        "y": 2262,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b36c5e4.a4b982",
-                "75e03418.7b0a3c"
+                "aa1d9a65.d56ee",
+                "ce785491.f82258"
             ]
         ]
     },
     {
-        "id": "b36c5e4.a4b982",
+        "id": "aa1d9a65.d56ee",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4104.383331298828,
-        "y": 2278,
-        "z": "db287b1f.2984a8",
+        "x": 4074.5,
+        "y": 2243,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "996a2de3.86ff68"
+                "d8df230a.b47018"
             ]
         ]
     },
     {
-        "id": "75e03418.7b0a3c",
+        "id": "ce785491.f82258",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4108.383331298828,
-        "y": 2318,
-        "z": "db287b1f.2984a8",
+        "x": 4078.5,
+        "y": 2283,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1787d971.8d0d67"
+                "d2d57048.de12f"
             ]
         ]
     },
     {
-        "id": "996a2de3.86ff68",
+        "id": "d8df230a.b47018",
         "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": 4232.5,
+        "y": 2243,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1787d971.8d0d67",
+        "id": "d2d57048.de12f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4265.883331298828,
-        "y": 2318,
-        "z": "db287b1f.2984a8",
+        "x": 4236,
+        "y": 2283,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "79bbcc28.d4fd3c",
-                "137b8fb9.4aaa78"
+                "703675c3.1d187c",
+                "6a8e2764.0748e8"
             ]
         ]
     },
     {
-        "id": "79bbcc28.d4fd3c",
+        "id": "703675c3.1d187c",
         "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": 4576,
+        "y": 2282,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "9aab71de.3f671",
+        "id": "b9adfc7b.f1d908",
         "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": 4434,
+        "y": 2240,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "137b8fb9.4aaa78",
+        "id": "6a8e2764.0748e8",
         "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": 4505,
+        "y": 2331,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "e7a16254.b52678",
+        "id": "641093d5.a73774",
         "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": 3130,
+        "y": 598,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b98d7c04.aadb6",
+        "id": "29b91b19.d2edf4",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3754.883331298828,
-        "y": 319,
-        "z": "db287b1f.2984a8",
+        "x": 3725,
+        "y": 284,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f9466402.70d608",
+        "id": "df88a98e.3b797",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3311.883331298828,
-        "y": 1897,
-        "z": "db287b1f.2984a8",
+        "x": 3282,
+        "y": 1862,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "402d5674.bb5698",
+        "id": "295e16ce.878c6a",
         "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": 3461,
+        "y": 446,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "40174504.12275c",
-                "483f6800.997ef8"
+                "fdfbdf68.ace01",
+                "8f7ef737.3d4208"
             ]
         ]
     },
     {
-        "id": "483f6800.997ef8",
+        "id": "8f7ef737.3d4208",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3732.883331298828,
-        "y": 1070,
-        "z": "db287b1f.2984a8",
+        "x": 3703,
+        "y": 1035,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f91cd9b2.b4ebc8"
+                "d545d977.39f008"
             ]
         ]
     },
     {
-        "id": "40174504.12275c",
+        "id": "fdfbdf68.ace01",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3726.883331298828,
-        "y": 361,
-        "z": "db287b1f.2984a8",
+        "x": 3697,
+        "y": 326,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9157e39e.50973"
+                "552020c2.f01db"
             ]
         ]
     },
     {
-        "id": "f91cd9b2.b4ebc8",
+        "id": "d545d977.39f008",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3890.883331298828,
-        "y": 1069,
-        "z": "db287b1f.2984a8",
+        "x": 3861,
+        "y": 1034,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e0a89dfb.b97bd8",
-                "356efc92.1be0c4",
-                "b98c51bd.b1df7",
-                "c9386596.fb5188",
-                "99a335d9.47dc9",
-                "1d1e23b2.17cb04"
+                "127c7c35.f5600c",
+                "aa22b9fb.8c00d",
+                "7a8bb8ff.a3807",
+                "b6e4b7cd.3aab58",
+                "9befe6d.bfbfb18",
+                "61ff745d.2cf8b4"
             ]
         ]
     },
     {
-        "id": "356efc92.1be0c4",
+        "id": "aa22b9fb.8c00d",
         "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": 4125,
+        "y": 917,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "99a335d9.47dc9",
+        "id": "9befe6d.bfbfb18",
         "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": 4206,
+        "y": 1232,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2ae3d84f.15cb3",
-                "a0cd8374.ae65d8"
+                "602f32f4.cac7b4",
+                "1d093526.32224b"
             ]
         ]
     },
     {
-        "id": "2ae3d84f.15cb3",
+        "id": "602f32f4.cac7b4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4545.383331298828,
-        "y": 1236,
-        "z": "db287b1f.2984a8",
+        "x": 4515.5,
+        "y": 1201,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "d03fdf1c.3b45d"
+                "4513cd6b.369634"
             ]
         ]
     },
     {
-        "id": "a0cd8374.ae65d8",
+        "id": "1d093526.32224b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4550.383331298828,
-        "y": 1301,
-        "z": "db287b1f.2984a8",
+        "x": 4520.5,
+        "y": 1266,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f8c3fa12.5c834"
+                "7640c8ac.188fc8"
             ]
         ]
     },
     {
-        "id": "d03fdf1c.3b45d",
+        "id": "4513cd6b.369634",
         "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": 4691.5,
+        "y": 1201,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f8c3fa12.5c834",
+        "id": "7640c8ac.188fc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4716.883331298828,
-        "y": 1301,
-        "z": "db287b1f.2984a8",
+        "x": 4687,
+        "y": 1266,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "b98c51bd.b1df7",
+        "id": "7a8bb8ff.a3807",
         "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": 4063,
+        "y": 965,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c9386596.fb5188",
+        "id": "b6e4b7cd.3aab58",
         "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": 4089,
+        "y": 1082,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "312e9154.f9dbd6",
-                "38e6d39b.3fc964",
-                "d52b1c1f.8a6ca8"
+                "bc604696.f19bf",
+                "6b2ab2eb.e94cac",
+                "158e3d74.81687b"
             ]
         ]
     },
     {
-        "id": "312e9154.f9dbd6",
+        "id": "bc604696.f19bf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4314.383453369141,
-        "y": 1069,
-        "z": "db287b1f.2984a8",
+        "x": 4284.5001220703125,
+        "y": 1034,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6d3eafaf.02fb48"
+                "fbbae41a.6bb8"
             ]
         ]
     },
     {
-        "id": "38e6d39b.3fc964",
+        "id": "6b2ab2eb.e94cac",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4306.383453369141,
-        "y": 1124,
-        "z": "db287b1f.2984a8",
+        "x": 4276.5001220703125,
+        "y": 1089,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3519bfd5.fa4b3"
+                "5e10560f.7f2a6"
             ]
         ]
     },
     {
-        "id": "6d3eafaf.02fb48",
+        "id": "fbbae41a.6bb8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4458.765777587891,
-        "y": 1068.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 4428.8824462890625,
+        "y": 1033.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6a66b1f9.955598"
+                "4ab90ec7.0f8a1"
             ]
         ]
     },
     {
-        "id": "6a66b1f9.955598",
+        "id": "4ab90ec7.0f8a1",
         "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": 4613,
+        "y": 1032,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "43b05855.517cf"
+                "3bb025b6.92298a"
             ]
         ]
     },
     {
-        "id": "43b05855.517cf",
+        "id": "3bb025b6.92298a",
         "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": 4808,
+        "y": 1032,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c21a24cd.dd2528"
+                "ce204654.d589e8"
             ]
         ]
     },
     {
-        "id": "d52b1c1f.8a6ca8",
+        "id": "158e3d74.81687b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4311.383453369141,
-        "y": 1181,
-        "z": "db287b1f.2984a8",
+        "x": 4281.5001220703125,
+        "y": 1146,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "db81dd24.8006b"
+                "cfe04507.17faa"
             ]
         ]
     },
     {
-        "id": "db81dd24.8006b",
+        "id": "cfe04507.17faa",
         "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": 4433.5001220703125,
+        "y": 1147,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3519bfd5.fa4b3",
+        "id": "5e10560f.7f2a6",
         "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": 4444.5001220703125,
+        "y": 1090,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e0a89dfb.b97bd8",
+        "id": "127c7c35.f5600c",
         "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": 4120,
+        "y": 857,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c21a24cd.dd2528",
+        "id": "ce204654.d589e8",
         "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": 5011,
+        "y": 1036,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f7c609f5.0c2d28"
+                "fea8f5c8.b664d8"
             ]
         ]
     },
     {
-        "id": "dff3e5ec.9273",
+        "id": "17936311.45c0f5",
         "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": 5396,
+        "y": 1049,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2769bc77.6b9fa4",
-                "7925966f.3df658",
-                "161a4207.178c96"
+                "bda3b861.07af08",
+                "8ce8739f.28fc08",
+                "8098fa71.4cbf3"
             ]
         ]
     },
     {
-        "id": "f7c609f5.0c2d28",
+        "id": "fea8f5c8.b664d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5219.883331298828,
-        "y": 1071,
-        "z": "db287b1f.2984a8",
+        "x": 5190,
+        "y": 1036,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3634d6f2.f94292",
-                "dff3e5ec.9273"
+                "619520a0.18d9e",
+                "17936311.45c0f5"
             ]
         ]
     },
     {
-        "id": "3634d6f2.f94292",
+        "id": "619520a0.18d9e",
         "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": 5426,
+        "y": 997,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "2769bc77.6b9fa4",
+        "id": "bda3b861.07af08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5635.883331298828,
-        "y": 1075,
-        "z": "db287b1f.2984a8",
+        "x": 5606,
+        "y": 1040,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "8b0e2b2b.7a21d"
+                "3c9ad3f5.e5e4a4"
             ]
         ]
     },
     {
-        "id": "7925966f.3df658",
+        "id": "8ce8739f.28fc08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5627.883331298828,
-        "y": 1130,
-        "z": "db287b1f.2984a8",
+        "x": 5598,
+        "y": 1095,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b9107d6e.7c0358"
+                "ec86cd9f.a15968"
             ]
         ]
     },
     {
-        "id": "161a4207.178c96",
+        "id": "8098fa71.4cbf3",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5632.883331298828,
-        "y": 1187,
-        "z": "db287b1f.2984a8",
+        "x": 5603,
+        "y": 1152,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "d5598bab.3dfb58"
+                "244270ad.8dfe1"
             ]
         ]
     },
     {
-        "id": "d5598bab.3dfb58",
+        "id": "244270ad.8dfe1",
         "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": 5755,
+        "y": 1153,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b9107d6e.7c0358",
+        "id": "ec86cd9f.a15968",
         "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": 5766,
+        "y": 1098,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "8b0e2b2b.7a21d",
+        "id": "3c9ad3f5.e5e4a4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5780.265655517578,
-        "y": 1072.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 5750.38232421875,
+        "y": 1037.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f80d31a9.31f3d"
+                "2068f2a1.5ec866"
             ]
         ]
     },
     {
-        "id": "f80d31a9.31f3d",
+        "id": "2068f2a1.5ec866",
         "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": 5965,
+        "y": 1034,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "d718b282.287ca",
+        "id": "e69cbe2a.82be58",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3768.883331298828,
-        "y": 1010,
-        "z": "db287b1f.2984a8",
+        "x": 3739,
+        "y": 975,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "d6d93ab.df041c8",
+        "id": "957d0d12.f7d338",
         "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": 2301,
+        "y": 702,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7d753f63.af1d7",
-                "7719dbd9.957fc4"
+                "7969493f.6a54d",
+                "9a6050c4.300548"
             ]
         ]
     },
     {
-        "id": "7719dbd9.957fc4",
+        "id": "9a6050c4.300548",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2737.883331298828,
-        "y": 755,
-        "z": "db287b1f.2984a8",
+        "x": 2708,
+        "y": 720,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2b5dce30.392f92"
+                "66cd0943.de62f"
             ]
         ]
     },
     {
-        "id": "7d753f63.af1d7",
+        "id": "7969493f.6a54d",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2737.883331298828,
-        "y": 700,
-        "z": "db287b1f.2984a8",
+        "x": 2708,
+        "y": 665,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "155f7f13.57fce1"
+                "7c5fc999.6b62c"
             ]
         ]
     },
     {
-        "id": "155f7f13.57fce1",
+        "id": "7c5fc999.6b62c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2893.883331298828,
-        "y": 698,
-        "z": "db287b1f.2984a8",
+        "x": 2864,
+        "y": 663,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e7a16254.b52678",
-                "4a95df1.67c3fa"
+                "641093d5.a73774",
+                "a1edca3.1a62bb8"
             ]
         ]
     },
     {
-        "id": "2b5dce30.392f92",
+        "id": "66cd0943.de62f",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2870.883331298828,
-        "y": 756,
-        "z": "db287b1f.2984a8",
+        "x": 2841,
+        "y": 721,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "9dad0003.283738",
+        "id": "cce8745e.b515b8",
         "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": 1018,
+        "y": 137,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a6d3cb9.27687b8",
+        "id": "48ad099a.c16688",
         "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": 4135,
+        "y": 555,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "738a4fa7.5a68d",
+        "id": "ec3b4a19.7f5ee",
         "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": 4195,
+        "y": 594,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "47e937a3.3ee608",
+        "id": "706cb78c.da92b",
         "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": 1011,
+        "y": 45,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "6f67cdff.5c5554",
+        "id": "9a38eb9e.71f4d8",
         "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": 3547,
+        "y": 2071,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "78f084cb.41e754",
+        "id": "724930a5.f44628",
         "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": 3603,
+        "y": 2120,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "912dde6.9b60fa",
+        "id": "2a414bdc.2311dc",
         "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": 1011,
+        "y": 84,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "fa83bc41.1d8b08",
+        "id": "88772a4.9b58658",
         "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": 1042,
+        "y": 185,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "39b1b2.d055464e",
+        "id": "4ace150.4554dec",
         "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": 252,
+        "y": 660,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e70c3582.89ad08",
-                "3aeaa08a.574a",
-                "1322af3c.bc6319"
+                "ce4ab0d3.b836a",
+                "9dbee6c6.1a60a",
+                "290803ec.65c94c"
             ]
         ]
     },
     {
-        "id": "e70c3582.89ad08",
+        "id": "ce4ab0d3.b836a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 500.8833312988281,
-        "y": 633,
-        "z": "db287b1f.2984a8",
+        "x": 471,
+        "y": 598,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9c476365.2b909"
+                "280015e3.c315e2"
             ]
         ]
     },
     {
-        "id": "3aeaa08a.574a",
+        "id": "9dbee6c6.1a60a",
         "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": 480.490966796875,
+        "y": 640.5740356445312,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "1322af3c.bc6319",
+        "id": "290803ec.65c94c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 498.8833312988281,
-        "y": 722,
-        "z": "db287b1f.2984a8",
+        "x": 469,
+        "y": 687,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "23db95da.1941e2"
+                "f842cdf9.29a79"
             ]
         ]
     },
     {
-        "id": "9c476365.2b909",
+        "id": "280015e3.c315e2",
         "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": 668,
+        "y": 594,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1a5a20de.60b4cf"
+                "cd508bdd.302a88"
             ]
         ]
     },
     {
-        "id": "23db95da.1941e2",
+        "id": "f842cdf9.29a79",
         "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": 638,
+        "y": 688,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1a5a20de.60b4cf",
+        "id": "cd508bdd.302a88",
         "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": 891.33349609375,
+        "y": 593.9999389648438,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "59a859e2.c48ca8"
+                "d4df8e14.56fc08"
             ]
         ]
     },
     {
-        "id": "59a859e2.c48ca8",
+        "id": "d4df8e14.56fc08",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1121.8834648132324,
-        "y": 630.000020980835,
-        "z": "db287b1f.2984a8",
+        "x": 1092.0001335144043,
+        "y": 595.000020980835,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ae28be96.a81b18"
+                "b67eb6e5.58b31"
             ]
         ]
     },
     {
-        "id": "ae28be96.a81b18",
+        "id": "b67eb6e5.58b31",
         "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": 222,
+        "y": 857,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4595d435.587aa4",
-                "60a8c3ff.237aec",
-                "18e77ed.3460901"
+                "eb910f68.8a5408",
+                "a6536ba8.c4e148",
+                "6d1288a7.3722b8"
             ]
         ]
     },
     {
-        "id": "4595d435.587aa4",
+        "id": "eb910f68.8a5408",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 459.8833312988281,
-        "y": 856,
-        "z": "db287b1f.2984a8",
+        "x": 430,
+        "y": 821,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9c5806bb.83c05"
+                "6687da8.fb06ca4"
             ]
         ]
     },
     {
-        "id": "60a8c3ff.237aec",
+        "id": "a6536ba8.c4e148",
         "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": 430.490966796875,
+        "y": 866.5740356445312,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "18e77ed.3460901",
+        "id": "6d1288a7.3722b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 457.8833312988281,
-        "y": 945,
-        "z": "db287b1f.2984a8",
+        "x": 428,
+        "y": 910,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a170b783.101ed"
+                "a3e6b31.4b2495"
             ]
         ]
     },
     {
-        "id": "a170b783.101ed",
+        "id": "a3e6b31.4b2495",
         "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": 597,
+        "y": 911,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "aaf101ae.84a298",
+        "id": "64de189c.ea0ca",
         "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": 569,
+        "y": 1405,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "48f75925.f13078"
+                "f09d5f3a.90b09"
             ]
         ]
     },
     {
-        "id": "48f75925.f13078",
+        "id": "f09d5f3a.90b09",
         "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": 772,
+        "y": 1417,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "dc596581.8a224"
+                "be069a3d.2f258"
             ]
         ]
     },
     {
-        "id": "dc596581.8a224",
+        "id": "be069a3d.2f258",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 967.8833312988281,
-        "y": 1449,
-        "z": "db287b1f.2984a8",
+        "x": 938,
+        "y": 1414,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "63611a55.44e3fc"
+                "b33327bf.cf44b8"
             ]
         ]
     },
     {
-        "id": "63611a55.44e3fc",
+        "id": "b33327bf.cf44b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1128.8833312988281,
-        "y": 1446,
-        "z": "db287b1f.2984a8",
+        "x": 1099,
+        "y": 1411,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "155181d9.def56e",
-                "450c0202.9562fc",
-                "e522d7e8.f0b6d",
-                "b85bac18.623698",
-                "d97c4e37.51bad8"
+                "9b6250ff.75cf18",
+                "6e8e9c3e.00f634",
+                "db16830a.f6a5",
+                "611e4d54.277574",
+                "c0f4e533.035be8",
+                "ee82569c.a25768"
             ]
         ]
     },
     {
-        "id": "450c0202.9562fc",
+        "id": "6e8e9c3e.00f634",
         "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": 1305,
+        "y": 1010.9999389648438,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "155181d9.def56e",
+        "id": "9b6250ff.75cf18",
         "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": 1302,
+        "y": 1055.9999389648438,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c73d859f.d40f2",
-                "cdecbb41.644898",
-                "ca040aae.e9fa08"
+                "1b290eb5.e974c9",
+                "b84573d.a8be19",
+                "ef2334eb.3c1b68"
             ]
         ]
     },
     {
-        "id": "cdecbb41.644898",
+        "id": "b84573d.a8be19",
         "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": 1497.490966796875,
+        "y": 1029.5739135742188,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "dcd0fdd9.1c84f"
+                "45bb14a8.1a7924"
             ]
         ]
     },
     {
-        "id": "ca040aae.e9fa08",
+        "id": "ef2334eb.3c1b68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1520.8833312988281,
-        "y": 1466.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 1493,
+        "y": 1073.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7c23dd25.00653c"
+                "cd1f6950.fef1f"
             ]
         ]
     },
     {
-        "id": "dcd0fdd9.1c84f",
+        "id": "45bb14a8.1a7924",
         "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": 1660.0625,
+        "y": 1028.859619140625,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "7c23dd25.00653c",
+        "id": "cd1f6950.fef1f",
         "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": 1661,
+        "y": 1073.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c84187cf.6e6008",
+        "id": "cd4af41f.be1a78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1690.8833312988281,
-        "y": 1513.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 1663,
+        "y": 1120.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "c73d859f.d40f2",
+        "id": "1b290eb5.e974c9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521.8833312988281,
-        "y": 1513.9999389648438,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "c84187cf.6e6008"
-            ]
-        ]
-    },
-    {
-        "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",
+        "x": 1494,
+        "y": 1120.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ce504b34.d68ac8"
+                "cd4af41f.be1a78"
             ]
         ]
     },
     {
-        "id": "5d006f15.710a08",
+        "id": "60f7024f.a382fc",
         "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": 1276,
+        "y": 1642,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e522d7e8.f0b6d",
+        "id": "db16830a.f6a5",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1396.8833312988281,
-        "y": 1731,
-        "z": "db287b1f.2984a8",
+        "x": 1367,
+        "y": 1696,
+        "z": "5a4cb919.dfff38",
         "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": "1989ebd9.8b76bc",
         "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": 2043.5,
+        "y": 1109,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "784b1e5c.92c77",
+        "id": "9da50ff.0241af",
         "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": 2048.5,
+        "y": 1211,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3502903c.982ab",
+        "id": "eda2f0f7.d8fb38",
         "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": 532,
+        "y": 1661,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2dc7d020.0f01c8"
+                "62852429.1f30ac"
             ]
         ]
     },
     {
-        "id": "2dc7d020.0f01c8",
+        "id": "62852429.1f30ac",
         "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": 764,
+        "y": 1660,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9a9b2fc1.cfc378"
+                "ede4a749.9f1af8"
             ]
         ]
     },
     {
-        "id": "9a9b2fc1.cfc378",
+        "id": "ede4a749.9f1af8",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1005.8833312988281,
-        "y": 1696,
-        "z": "db287b1f.2984a8",
+        "x": 976,
+        "y": 1661,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3ee84e3e.71c9c2"
+                "b699a292.eb6f88"
             ]
         ]
     },
     {
-        "id": "3ee84e3e.71c9c2",
+        "id": "b699a292.eb6f88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 261.8833312988281,
-        "y": 1852,
-        "z": "db287b1f.2984a8",
+        "x": 232,
+        "y": 1817,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a6f3ac42.8fbf28",
-                "c5253df7.0ed11"
+                "13d7e483.3188fb",
+                "74bc3a8f.9628d4"
             ]
         ]
     },
     {
-        "id": "c5253df7.0ed11",
+        "id": "74bc3a8f.9628d4",
         "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": 467,
+        "y": 1804,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a6f3ac42.8fbf28",
+        "id": "13d7e483.3188fb",
         "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": 457,
+        "y": 1865,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b27c66fe.f461f8",
-                "d86a808d.b5d38",
-                "51be47ba.06369"
+                "bcef8cd9.e20998",
+                "764e27eb.b5496",
+                "21958602.3fa0ea"
             ]
         ]
     },
     {
-        "id": "d86a808d.b5d38",
+        "id": "764e27eb.b5496",
         "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": 670.490966796875,
+        "y": 1849.5740356445312,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "40ccd27e.7bf8ec"
+                "9c812de2.87639"
             ]
         ]
     },
     {
-        "id": "51be47ba.06369",
+        "id": "21958602.3fa0ea",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 695.8833312988281,
-        "y": 1929,
-        "z": "db287b1f.2984a8",
+        "x": 666,
+        "y": 1894,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "10ad75eb.cd3092"
+                "2915d3a6.63730c"
             ]
         ]
     },
     {
-        "id": "b27c66fe.f461f8",
+        "id": "bcef8cd9.e20998",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 697.8833312988281,
-        "y": 1989,
-        "z": "db287b1f.2984a8",
+        "x": 668,
+        "y": 1954,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f72f31f7.42e17"
+                "bb26f0d0.bc6288"
             ]
         ]
     },
     {
-        "id": "40ccd27e.7bf8ec",
+        "id": "9c812de2.87639",
         "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": 833.0625,
+        "y": 1848.8597412109375,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "10ad75eb.cd3092",
+        "id": "2915d3a6.63730c",
         "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": 834,
+        "y": 1894,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f72f31f7.42e17",
+        "id": "bb26f0d0.bc6288",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 866.8833312988281,
-        "y": 1988,
-        "z": "db287b1f.2984a8",
+        "x": 837,
+        "y": 1953,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c01095c8.c5a848",
-                "1e0b480.37d7ab8"
+                "e8fb0469.22a408",
+                "b503b0ba.b1ff6"
             ]
         ]
     },
     {
-        "id": "f8f2651c.3a035",
+        "id": "445d8bb1.6c470c",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
         "comments": "",
-        "x": 265.8833312988281,
-        "y": 2487,
-        "z": "db287b1f.2984a8",
+        "x": 236,
+        "y": 2452,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f84d6f72.692148",
+        "id": "925823e9.1c4a4",
         "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": 379,
+        "y": 2512,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7174c4fb.4236d4",
-                "3df090d7.e28cf"
+                "345842a4.88ef2e",
+                "a4dc32a8.6620d8"
             ]
         ]
     },
     {
-        "id": "7174c4fb.4236d4",
+        "id": "345842a4.88ef2e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 721.3833312988281,
-        "y": 2524,
-        "z": "db287b1f.2984a8",
+        "x": 691.5,
+        "y": 2489,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "3df090d7.e28cf",
+        "id": "a4dc32a8.6620d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 725.3833312988281,
-        "y": 2564,
-        "z": "db287b1f.2984a8",
+        "x": 695.5,
+        "y": 2529,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "bbef1ecc.7916"
+                "d1fda3bb.92b0e"
             ]
         ]
     },
     {
-        "id": "4d6cfe8e.59e2a",
+        "id": "cde1b667.7c4d6",
         "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": 871.5,
+        "y": 2493,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "bbef1ecc.7916",
+        "id": "d1fda3bb.92b0e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 916.8833312988281,
-        "y": 2582,
-        "z": "db287b1f.2984a8",
+        "x": 887,
+        "y": 2547,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b94bbfec.158258"
+                "a9ee92c3.93f6e8"
             ]
         ]
     },
     {
-        "id": "b2dda6de.cb3b28",
+        "id": "459839ba.ae33c",
         "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": 1182.5,
+        "y": 2516,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "1cb10652.ba5e0a",
+        "id": "120147ed.79206",
         "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": 2649.5,
+        "y": 1867,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b94bbfec.158258",
+        "id": "a9ee92c3.93f6e8",
         "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": 1144.5,
+        "y": 2558,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "70ed09af.22122",
+        "id": "9d25e547.75567",
         "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": 2009.5,
+        "y": 1147,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "dfffb0d0.b2d2d",
+        "id": "52a255e0.e77dec",
         "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": 2010.5,
+        "y": 1251,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "9521e4ca.a61af",
+        "id": "881b2d7a.c4e888",
         "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": 4304,
+        "y": 508,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d1e23b2.17cb04",
+        "id": "61ff745d.2cf8b4",
         "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": 4207,
+        "y": 1327,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "e35a6c95.6b3d6",
+        "id": "98331ea2.d141f",
         "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": 3701,
+        "y": 1999,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c5806bb.83c05",
+        "id": "6687da8.fb06ca4",
         "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": 802,
+        "y": 807,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "24382f34.66808",
-                "ea56d949.8ce4b"
+                "11a4a5f5.385f32",
+                "192499d2.667f1e"
             ]
         ]
     },
     {
-        "id": "24382f34.66808",
+        "id": "11a4a5f5.385f32",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194.8833312988281,
-        "y": 865,
-        "z": "db287b1f.2984a8",
+        "x": 1165,
+        "y": 830,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "d7ed30c6.74c9b"
+                "1fc9c5be.8fac2a"
             ]
         ]
     },
     {
-        "id": "ea56d949.8ce4b",
+        "id": "192499d2.667f1e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194.8833312988281,
-        "y": 814,
-        "z": "db287b1f.2984a8",
+        "x": 1165,
+        "y": 779,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3707e8cf.65827"
+                "5fe8520c.50e664"
             ]
         ]
     },
     {
-        "id": "d7ed30c6.74c9b",
+        "id": "1fc9c5be.8fac2a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1350.8833312988281,
-        "y": 863,
-        "z": "db287b1f.2984a8",
+        "x": 1321,
+        "y": 828,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a7f36b9f.f75b88"
+                "a46faf22.6dbda8"
             ]
         ]
     },
     {
-        "id": "3707e8cf.65827",
+        "id": "5fe8520c.50e664",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1327.8833312988281,
-        "y": 815,
-        "z": "db287b1f.2984a8",
+        "x": 1298,
+        "y": 780,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "ed4d0298.cdb578",
+        "id": "1f9b767f.d670b2",
         "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": 2058,
+        "y": 178,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1ced8517.ce35e3",
+        "id": "f84de17e.e8ea08",
         "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": 3600,
+        "y": 2159,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "224f4283.917d26",
+        "id": "1a392cd7.238923",
         "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": 4190,
+        "y": 632,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b85bac18.623698",
+        "id": "611e4d54.277574",
         "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": 1364,
+        "y": 1738,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5524ecac.5cf47c",
+        "id": "dc7d7df9.afb81",
         "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": 543,
+        "y": 1472,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a12bd239.f8368",
+        "id": "c70f6326.e297a",
         "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": 574,
+        "y": 1512,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "c01095c8.c5a848",
+        "id": "e8fb0469.22a408",
         "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": 1122,
+        "y": 1920,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1e0b480.37d7ab8",
+        "id": "b503b0ba.b1ff6",
         "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": 1125,
+        "y": 1962,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5d1396ed.19b6f8",
+        "id": "f7d70d92.8a17d",
         "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": 568,
+        "y": 1602,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1b4871a6.1cd8a6",
+        "id": "93ecab9f.5bb27",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 352.8833312988281,
-        "y": 2016,
-        "z": "db287b1f.2984a8",
+        "x": 323,
+        "y": 1981,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "48083140.e99758",
+        "id": "e1bf516d.80132",
         "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": 331,
+        "y": 2038,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "d97c4e37.51bad8",
+        "id": "c0f4e533.035be8",
         "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": 1342,
+        "y": 1587,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3df77641.8d727a",
-                "f024d61d.5a31c"
+                "ff9a5641.69fda",
+                "a44c9ce4.5d2008"
             ]
         ]
     },
     {
-        "id": "f024d61d.5a31c",
+        "id": "a44c9ce4.5d2008",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1594.8833312988281,
-        "y": 1577,
-        "z": "db287b1f.2984a8",
+        "x": 1565,
+        "y": 1542,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3c67000e.e921c"
+                "eaca171f.944a48"
             ]
         ]
     },
     {
-        "id": "3df77641.8d727a",
+        "id": "ff9a5641.69fda",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1596.8833312988281,
-        "y": 1641,
-        "z": "db287b1f.2984a8",
+        "x": 1567,
+        "y": 1606,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "de64177a.8916f"
+                "93d69fa.52d496"
             ]
         ]
     },
     {
-        "id": "3c67000e.e921c",
+        "id": "eaca171f.944a48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1759.8833312988281,
-        "y": 1574,
-        "z": "db287b1f.2984a8",
+        "x": 1730,
+        "y": 1539,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9bea7c66.5f62c8"
+                "b0447236.92d3b"
             ]
         ]
     },
     {
-        "id": "de64177a.8916f",
+        "id": "93d69fa.52d496",
         "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": 1729,
+        "y": 1602,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "9bea7c66.5f62c8",
+        "id": "b0447236.92d3b",
         "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": 1950,
+        "y": 1553,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "7a38583b.020a88",
+        "id": "ab15b7a9.bc6bc8",
         "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": 1495,
+        "y": 2278,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c388a6bf.f87f3"
+                "be2440af.c20c98"
             ]
         ]
     },
     {
-        "id": "a2f5b878.ad169",
+        "id": "1405448e.40f263",
         "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": 1880,
+        "y": 2291,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7866488b.2039a8",
-                "bdc692ef.1c0858",
-                "823a852f.40d29"
+                "facba133.b01618",
+                "36457cd.f85a104",
+                "a0c24437.cf174"
             ]
         ]
     },
     {
-        "id": "c388a6bf.f87f3",
+        "id": "be2440af.c20c98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1703.8833312988281,
-        "y": 2313,
-        "z": "db287b1f.2984a8",
+        "x": 1674,
+        "y": 2278,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "5c79d6d8.a6a8e",
-                "a2f5b878.ad169"
+                "eec40e11.9fdab",
+                "1405448e.40f263"
             ]
         ]
     },
     {
-        "id": "5c79d6d8.a6a8e",
+        "id": "eec40e11.9fdab",
         "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": 1910,
+        "y": 2239,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "7866488b.2039a8",
+        "id": "facba133.b01618",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2119.883331298828,
-        "y": 2317,
-        "z": "db287b1f.2984a8",
+        "x": 2090,
+        "y": 2282,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4da79570.cd80cc"
+                "926a046d.eed228"
             ]
         ]
     },
     {
-        "id": "bdc692ef.1c0858",
+        "id": "36457cd.f85a104",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2111.883331298828,
-        "y": 2372,
-        "z": "db287b1f.2984a8",
+        "x": 2082,
+        "y": 2337,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "5ef7fec5.5efb98"
+                "6ca22053.c9fba8"
             ]
         ]
     },
     {
-        "id": "823a852f.40d29",
+        "id": "a0c24437.cf174",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2116.883331298828,
-        "y": 2429,
-        "z": "db287b1f.2984a8",
+        "x": 2087,
+        "y": 2394,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "57488074.1d65e"
+                "f91dd017.676d7"
             ]
         ]
     },
     {
-        "id": "57488074.1d65e",
+        "id": "f91dd017.676d7",
         "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": 2239,
+        "y": 2395,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5ef7fec5.5efb98",
+        "id": "6ca22053.c9fba8",
         "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": 2250,
+        "y": 2340,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "4da79570.cd80cc",
+        "id": "926a046d.eed228",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2264.265655517578,
-        "y": 2314.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 2234.38232421875,
+        "y": 2279.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "69f8caaf.bba51c"
+                "1e25e04f.ee7df"
             ]
         ]
     },
     {
-        "id": "69f8caaf.bba51c",
+        "id": "1e25e04f.ee7df",
         "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": 2449,
+        "y": 2276,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "53cc84ce.e1faf4",
+        "id": "46842cb8.91c5bc",
         "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": 573,
+        "y": 2324,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "bb343bdc.881868",
-                "8bc84f5e.0473d8",
-                "78444b47.33ec34"
+                "80e94eed.70f82",
+                "e1101309.b00428",
+                "6cefa506.12a2dc"
             ]
         ]
     },
     {
-        "id": "bb343bdc.881868",
+        "id": "80e94eed.70f82",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 798.3834533691406,
-        "y": 2311,
-        "z": "db287b1f.2984a8",
+        "x": 768.5001220703125,
+        "y": 2276,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "bf3ecbb9.4dd008"
+                "a961cabf.5d77d8"
             ]
         ]
     },
     {
-        "id": "8bc84f5e.0473d8",
+        "id": "e1101309.b00428",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 790.3834533691406,
-        "y": 2366,
-        "z": "db287b1f.2984a8",
+        "x": 760.5001220703125,
+        "y": 2331,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ef40b092.bc09e"
+                "cfce6a08.8d1818"
             ]
         ]
     },
     {
-        "id": "bf3ecbb9.4dd008",
+        "id": "a961cabf.5d77d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 942.7657775878906,
-        "y": 2310.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 912.8824462890625,
+        "y": 2275.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1285266.d4ce8da"
+                "41f5578e.096c08"
             ]
         ]
     },
     {
-        "id": "1285266.d4ce8da",
+        "id": "41f5578e.096c08",
         "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": 1097,
+        "y": 2274,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "640d04c1.8428dc"
+                "78702bad.3695f4"
             ]
         ]
     },
     {
-        "id": "640d04c1.8428dc",
+        "id": "78702bad.3695f4",
         "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": 1292,
+        "y": 2274,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7a38583b.020a88"
+                "ab15b7a9.bc6bc8"
             ]
         ]
     },
     {
-        "id": "78444b47.33ec34",
+        "id": "6cefa506.12a2dc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 795.3834533691406,
-        "y": 2423,
-        "z": "db287b1f.2984a8",
+        "x": 765.5001220703125,
+        "y": 2388,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b417de17.8b3a6"
+                "bbb236e9.1d475"
             ]
         ]
     },
     {
-        "id": "b417de17.8b3a6",
+        "id": "bbb236e9.1d475",
         "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": 917.5001220703125,
+        "y": 2389,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "ef40b092.bc09e",
+        "id": "cfce6a08.8d1818",
         "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": 928.5001220703125,
+        "y": 2332,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "fc4eafc.4810e5",
+        "id": "fd11a034.71ffe8",
         "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": 563,
+        "y": 2236,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "d94511cd.5d63f",
+        "id": "2ab715a0.ab46a2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 337.8833312988281,
-        "y": 2402,
-        "z": "db287b1f.2984a8",
+        "x": 308,
+        "y": 2367,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "fc4eafc.4810e5",
-                "53cc84ce.e1faf4"
+                "fd11a034.71ffe8",
+                "46842cb8.91c5bc"
             ]
         ]
     },
     {
-        "id": "1a955b8d.047dd4",
+        "id": "c68339b5.636678",
         "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": 1522.9666748046875,
+        "y": 184.88333129882812,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "9a0e1ef7.428b9",
+        "id": "6b1a691d.f6617",
         "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": 725,
+        "y": 407,
+        "z": "5a4cb919.dfff38",
         "wires": []
+    },
+    {
+        "id": "a46faf22.6dbda8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 284.5,
+        "y": 1376,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "64de189c.ea0ca",
+                "eda2f0f7.d8fb38",
+                "dc7d7df9.afb81",
+                "c70f6326.e297a",
+                "445d8bb1.6c470c",
+                "925823e9.1c4a4",
+                "f7d70d92.8a17d",
+                "93ecab9f.5bb27",
+                "e1bf516d.80132",
+                "2ab715a0.ab46a2"
+            ]
+        ]
+    },
+    {
+        "id": "ee82569c.a25768",
+        "type": "switchNode",
+        "name": "switch uni type",
+        "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1315,
+        "y": 1214,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "ef11d348.e67b18",
+                "db4eac49.9ee78",
+                "ccd7386e.438c4",
+                "8a1e26c1.925918"
+            ]
+        ]
+    },
+    {
+        "id": "ef11d348.e67b18",
+        "type": "outcome",
+        "name": "leaf",
+        "xml": "<outcome value='leaf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1480,
+        "y": 1196,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "1989ebd9.8b76bc",
+                "9d25e547.75567"
+            ]
+        ]
+    },
+    {
+        "id": "db4eac49.9ee78",
+        "type": "outcome",
+        "name": "root",
+        "xml": "<outcome value='root'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1483,
+        "y": 1235,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "9da50ff.0241af",
+                "52a255e0.e77dec"
+            ]
+        ]
+    },
+    {
+        "id": "8a1e26c1.925918",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1477,
+        "y": 1313,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "af3eb285.34bda8"
+            ]
+        ]
+    },
+    {
+        "id": "ccd7386e.438c4",
+        "type": "outcome",
+        "name": "root-secondary",
+        "xml": "<outcome value='root-secondary'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1500,
+        "y": 1276,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "8dd3ee03.704618",
+                "3acf3b0f.3b0184"
+            ]
+        ]
+    },
+    {
+        "id": "8dd3ee03.704618",
+        "type": "set",
+        "name": "unset ethernet-srv-end-points-list",
+        "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
+        "comments": "",
+        "x": 2046,
+        "y": 1309,
+        "z": "5a4cb919.dfff38",
+        "wires": []
+    },
+    {
+        "id": "3acf3b0f.3b0184",
+        "type": "set",
+        "name": "set leafOrRootAccess",
+        "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
+        "comments": "",
+        "x": 2008,
+        "y": 1349,
+        "z": "5a4cb919.dfff38",
+        "wires": []
+    },
+    {
+        "id": "af3eb285.34bda8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1629,
+        "y": 1334,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file