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=4ba32b4674ad72501952d918c8682b537b12cdfb;hpb=66ed118c3fb375419c50e231fa4bc8aa028ca9bb;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 4ba32b46..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": "6467c9b6.3ea7b",
+        "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": 415.8833312988281,
-        "y": 377,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 372,
+        "y": 306,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1c0c6fa0.017178",
-                "ec984d7b.605098",
-                "25450eba.0fd99a"
+                "88d19ab1.10b18",
+                "8fd12759.af6e18",
+                "50405d21.7eae84"
             ]
         ]
     },
     {
-        "id": "1c0c6fa0.017178",
+        "id": "88d19ab1.10b18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 603.8833312988281,
-        "y": 390,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 560,
+        "y": 319,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "fcdf737f.3ba08"
+                "d472199a.beff9"
             ]
         ]
     },
     {
-        "id": "ec984d7b.605098",
+        "id": "8fd12759.af6e18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 611.374267578125,
-        "y": 432.57403564453125,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 567.4909362792969,
+        "y": 361.57403564453125,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "25450eba.0fd99a",
+        "id": "50405d21.7eae84",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 601.8833312988281,
-        "y": 479,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 558,
+        "y": 408,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f645589d.ed3d98"
+                "6b1a691d.f6617"
             ]
         ]
     },
     {
-        "id": "fcdf737f.3ba08",
+        "id": "d472199a.beff9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 776.8833312988281,
-        "y": 388,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 733,
+        "y": 317,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6641b1bb.011df8"
+                "f306805a.38d6f8"
             ]
         ]
     },
     {
-        "id": "6641b1bb.011df8",
+        "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": 1005.8833312988281,
-        "y": 389,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 962,
+        "y": 318,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "42fd94e4.9f459c"
+                "4a920666.d84d68"
             ]
         ]
     },
     {
-        "id": "42fd94e4.9f459c",
+        "id": "4a920666.d84d68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1220.8833312988281,
-        "y": 390,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1177,
+        "y": 319,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "341f3db4.7e268a"
+                "fc848cba.fc33d8"
             ]
         ]
     },
     {
-        "id": "802e937a.3ac",
+        "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": 1474.8833312988281,
-        "y": 312,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1431,
+        "y": 241,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ccfe4ade.41ae98",
-                "912c0faa.e5e1c8"
+                "98ef6cc.4725e9",
+                "ab42fe03.c49e3"
             ]
         ]
     },
     {
-        "id": "ccfe4ade.41ae98",
+        "id": "98ef6cc.4725e9",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1691.8833312988281,
-        "y": 291,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1648,
+        "y": 220,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "341f3db4.7e268a"
+                "fc848cba.fc33d8"
             ]
         ]
     },
     {
-        "id": "912c0faa.e5e1c8",
+        "id": "ab42fe03.c49e3",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1691.8833312988281,
-        "y": 340,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1648,
+        "y": 269,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "341f3db4.7e268a",
+        "id": "fc848cba.fc33d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1875.8833312988281,
-        "y": 377,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1832,
+        "y": 306,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b1ca96f9.f78f38",
-                "2c3b3231.83c2be",
-                "4660bf61.473a18"
+                "53692e4a.48cde",
+                "957d0d12.f7d338",
+                "1f9b767f.d670b2"
             ]
         ]
     },
     {
-        "id": "377c3031.0fc7c",
+        "id": "524dbe59.8ef8f",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 234.88333129882812,
-        "y": 118,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 191,
+        "y": 47,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "8b8ba227.5e7638"
+                "320667fa.12a2c"
             ]
         ]
     },
     {
-        "id": "8b8ba227.5e7638",
+        "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": 519.1690216064453,
-        "y": 179.23810863494873,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 475.2856903076172,
+        "y": 108.23810863494873,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6c55ded0.30c498"
+                "aa006c98.f12b58"
             ]
         ]
     },
     {
-        "id": "6c55ded0.30c498",
+        "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": 525.3119354248047,
-        "y": 264.0000305175781,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 481.42860412597656,
+        "y": 193.00003051757812,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b63c19cf.5911b8"
+                "72fe4a66.39584c"
             ]
         ]
     },
     {
-        "id": "b63c19cf.5911b8",
+        "id": "72fe4a66.39584c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 835.1213684082031,
-        "y": 255.66668701171875,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 791.238037109375,
+        "y": 184.66668701171875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6467c9b6.3ea7b",
-                "7714415.bcb45c",
-                "2cf2ff05.5ecb98",
-                "ff64d6f0.1d24e",
-                "c19ef147.be92d8"
+                "d35e2da9.70a7e",
+                "cce8745e.b515b8",
+                "706cb78c.da92b",
+                "88772a4.9b58658",
+                "4ace150.4554dec"
             ]
         ]
     },
     {
-        "id": "b1ca96f9.f78f38",
+        "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": 2092.883331298828,
-        "y": 315,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2049,
+        "y": 244,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f11c1dac.45c748",
+        "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": 4261.883331298828,
-        "y": 201,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4218,
+        "y": 130,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c95c33ef.381fa8",
+        "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": 4342.883331298828,
-        "y": 516,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4299,
+        "y": 445,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "89c7efd5.cb6558",
-                "d5cfec9d.5347f8"
+                "fedd6b9.d7f3318",
+                "39581c20.edb614"
             ]
         ]
     },
     {
-        "id": "89c7efd5.cb6558",
+        "id": "fedd6b9.d7f3318",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4652.383331298828,
-        "y": 485,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4608.5,
+        "y": 414,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "beffe966.8b1b08"
+                "c49081cf.377c78"
             ]
         ]
     },
     {
-        "id": "d5cfec9d.5347f8",
+        "id": "39581c20.edb614",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4657.383331298828,
-        "y": 550,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4613.5,
+        "y": 479,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "18fce568.1c292b"
+                "9c0572a4.3a997"
             ]
         ]
     },
     {
-        "id": "beffe966.8b1b08",
+        "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": 4828.383331298828,
-        "y": 485,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4784.5,
+        "y": 414,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "18fce568.1c292b",
+        "id": "9c0572a4.3a997",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4823.883331298828,
-        "y": 550,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4780,
+        "y": 479,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "64fdffc9.427678",
+        "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": 4207.383331298828,
-        "y": 770,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4163.5,
+        "y": 699,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c0e95206.343c2",
+        "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": 4361.383331298828,
-        "y": 818,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4317.5,
+        "y": 747,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7a1edf39.b6a0f8",
-                "b605ddae.9f2b2"
+                "2ade786d.c09b28",
+                "f17ad5b3.0ef818"
             ]
         ]
     },
     {
-        "id": "7a1edf39.b6a0f8",
+        "id": "2ade786d.c09b28",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4706.883331298828,
-        "y": 799,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4663,
+        "y": 728,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "db29824f.2b664"
+                "72718fb4.e15e78"
             ]
         ]
     },
     {
-        "id": "b605ddae.9f2b2",
+        "id": "f17ad5b3.0ef818",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4710.883331298828,
-        "y": 839,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4667,
+        "y": 768,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "10ebb808.22b9d8"
+                "98b1fdb0.a42648"
             ]
         ]
     },
     {
-        "id": "db29824f.2b664",
+        "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": 4864.883331298828,
-        "y": 799,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4821,
+        "y": 728,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "10ebb808.22b9d8",
+        "id": "98b1fdb0.a42648",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4868.383331298828,
-        "y": 839,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4824.5,
+        "y": 768,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6d35eb39.2fe42c",
-                "b62c3c22.2cb09"
+                "fe12ce9.6a53ab",
+                "4eba4c2.fda54b4"
             ]
         ]
     },
     {
-        "id": "6d35eb39.2fe42c",
+        "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": 5198.883331298828,
-        "y": 804,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5155,
+        "y": 733,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "3f34bcf0.b30eb4",
+        "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": 5062.883331298828,
-        "y": 763,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5019,
+        "y": 692,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b62c3c22.2cb09",
+        "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": 5125.883331298828,
-        "y": 850,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5082,
+        "y": 779,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc51dde.504a12",
+        "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": 4199.883331298828,
-        "y": 249,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4156,
+        "y": 178,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "25f0cbb9.ff400c",
+        "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": 4225.883331298828,
-        "y": 366,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4182,
+        "y": 295,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "26af6a64.84f75e",
-                "dfaad5e6.3e7388",
-                "d4f19086.9e394"
+                "544c4f89.eba52",
+                "eb873b5e.d10b8",
+                "d8377d86.76164"
             ]
         ]
     },
     {
-        "id": "26af6a64.84f75e",
+        "id": "544c4f89.eba52",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4421.383453369141,
-        "y": 318,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4377.5001220703125,
+        "y": 247,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "825f4729.b63ee8"
+                "cd232c91.ed7d5"
             ]
         ]
     },
     {
-        "id": "dfaad5e6.3e7388",
+        "id": "eb873b5e.d10b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4413.383453369141,
-        "y": 373,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4369.5001220703125,
+        "y": 302,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "92b1984a.bc8b"
+                "7e7e18a4.ea2a98"
             ]
         ]
     },
     {
-        "id": "825f4729.b63ee8",
+        "id": "cd232c91.ed7d5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4565.765777587891,
-        "y": 317.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4521.8824462890625,
+        "y": 246.65567016601562,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "415768e6.6651f8"
+                "d5d46c3b.524dc8"
             ]
         ]
     },
     {
-        "id": "a6a2d3e2.2e526",
+        "id": "4c85ec99.26bac4",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5147.883331298828,
-        "y": 320,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5104,
+        "y": 249,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e243a570.71b51"
+                "490c8cc0.c71134"
             ]
         ]
     },
     {
-        "id": "415768e6.6651f8",
+        "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": 4749.883331298828,
-        "y": 316,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4706,
+        "y": 245,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ab4dd1f4.04e1f"
+                "cc43f2ea.19847"
             ]
         ]
     },
     {
-        "id": "ab4dd1f4.04e1f",
+        "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": 4944.883331298828,
-        "y": 316,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4901,
+        "y": 245,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a6a2d3e2.2e526"
+                "4c85ec99.26bac4"
             ]
         ]
     },
     {
-        "id": "d4f19086.9e394",
+        "id": "d8377d86.76164",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4418.383453369141,
-        "y": 430,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4374.5001220703125,
+        "y": 359,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "28f88c03.cb5e5c"
+                "9cf617d3.aee3a8"
             ]
         ]
     },
     {
-        "id": "28f88c03.cb5e5c",
+        "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": 4570.383453369141,
-        "y": 431,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4526.5001220703125,
+        "y": 360,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "92b1984a.bc8b",
+        "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": 4581.383453369141,
-        "y": 374,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4537.5001220703125,
+        "y": 303,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "677439f1.5f7ed",
+        "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": 5532.883331298828,
-        "y": 333,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5489,
+        "y": 262,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e7fd97d3.bbcd08",
-                "38bba5b7.de41b2",
-                "6bf961e8.c56a58"
+                "f404a9ca.fbce2",
+                "3fd1ebaf.c62a54",
+                "66a3972e.71bfa8"
             ]
         ]
     },
     {
-        "id": "e243a570.71b51",
+        "id": "490c8cc0.c71134",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5326.883331298828,
-        "y": 320,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5283,
+        "y": 249,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "857cacb0.81444",
-                "677439f1.5f7ed"
+                "9ce5b4b0.4bb188",
+                "f42e9c90.ae58f"
             ]
         ]
     },
     {
-        "id": "857cacb0.81444",
+        "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": 5562.883331298828,
-        "y": 281,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5519,
+        "y": 210,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e7fd97d3.bbcd08",
+        "id": "f404a9ca.fbce2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5742.883331298828,
-        "y": 324,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5699,
+        "y": 253,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "60a50433.d26434"
+                "3597c274.50637e"
             ]
         ]
     },
     {
-        "id": "38bba5b7.de41b2",
+        "id": "3fd1ebaf.c62a54",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5734.883331298828,
-        "y": 379,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5691,
+        "y": 308,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "d9350787.861f1"
+                "ff90e84e.43d4b8"
             ]
         ]
     },
     {
-        "id": "6bf961e8.c56a58",
+        "id": "66a3972e.71bfa8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5739.883331298828,
-        "y": 436,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5696,
+        "y": 365,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1afc54ba.8ed313"
+                "ff823793.36814"
             ]
         ]
     },
     {
-        "id": "1afc54ba.8ed313",
+        "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": 5891.883331298828,
-        "y": 437,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5848,
+        "y": 366,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "d9350787.861f1",
+        "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": 5902.883331298828,
-        "y": 382,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5859,
+        "y": 311,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "60a50433.d26434",
+        "id": "3597c274.50637e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5887.265655517578,
-        "y": 321.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5843.38232421875,
+        "y": 250.65567016601562,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "8367dac2.ac8b98"
+                "d39e28b5.1aec5"
             ]
         ]
     },
     {
-        "id": "8367dac2.ac8b98",
+        "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": 6101.883331298828,
-        "y": 318,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 6058,
+        "y": 247,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "aa2473a.12d4d9",
+        "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": 3668.883331298828,
-        "y": 1658,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3625,
+        "y": 1587,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "28a663c6.7433b4",
+        "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": 3731.883331298828,
-        "y": 1987,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3688,
+        "y": 1916,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "422a3196.0fb7d",
-                "371e9e8f.f6f942"
+                "8895fa29.bf8e3",
+                "23c7c635.fd4722"
             ]
         ]
     },
     {
-        "id": "422a3196.0fb7d",
+        "id": "8895fa29.bf8e3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4027.383331298828,
-        "y": 1954,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3983.5,
+        "y": 1883,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c3084137.121c7"
+                "500b5538.e88684"
             ]
         ]
     },
     {
-        "id": "371e9e8f.f6f942",
+        "id": "23c7c635.fd4722",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4032.383331298828,
-        "y": 2019,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3988.5,
+        "y": 1948,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c6676165.ac5c"
+                "909dfd67.2300d8"
             ]
         ]
     },
     {
-        "id": "c3084137.121c7",
+        "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": 4195.383331298828,
-        "y": 1954,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4151.5,
+        "y": 1883,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c6676165.ac5c",
+        "id": "909dfd67.2300d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4205.883331298828,
-        "y": 2019,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4162,
+        "y": 1948,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "dfee532c.a1419",
+        "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": 3607.883331298828,
-        "y": 1715,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3564,
+        "y": 1644,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e52702af.314718",
+        "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": 3627.883331298828,
-        "y": 1812,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3584,
+        "y": 1741,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9ca1c561.5c796",
-                "9cf5cab4.99d6e",
-                "5d5762eb.724c64"
+                "1e5d6803.78b7d8",
+                "84307ec5.09a8d",
+                "b468d4fc.bc9c8"
             ]
         ]
     },
     {
-        "id": "9ca1c561.5c796",
+        "id": "1e5d6803.78b7d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3830.3834533691406,
-        "y": 1765,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3786.5001220703125,
+        "y": 1694,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "502f683e.00cf7"
+                "683b34d0.c1df64"
             ]
         ]
     },
     {
-        "id": "9cf5cab4.99d6e",
+        "id": "84307ec5.09a8d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3822.3834533691406,
-        "y": 1820,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3778.5001220703125,
+        "y": 1749,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9587c00d.994eb"
+                "72cad52e.cb1d74"
             ]
         ]
     },
     {
-        "id": "502f683e.00cf7",
+        "id": "683b34d0.c1df64",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3974.7657775878906,
-        "y": 1762.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3930.8824462890625,
+        "y": 1691.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "39b96666.82062a"
+                "8511cae6.cbf588"
             ]
         ]
     },
     {
-        "id": "39b96666.82062a",
+        "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": 4158.883331298828,
-        "y": 1777,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4115,
+        "y": 1706,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "94ae9a5d.e5d56"
+                "82496ff9.234ee"
             ]
         ]
     },
     {
-        "id": "5d5762eb.724c64",
+        "id": "b468d4fc.bc9c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3827.3834533691406,
-        "y": 1877,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3783.5001220703125,
+        "y": 1806,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7a00ac4a.8d918c"
+                "a6137ce1.b3b5c"
             ]
         ]
     },
     {
-        "id": "7a00ac4a.8d918c",
+        "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": 3979.3834533691406,
-        "y": 1878,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3935.5001220703125,
+        "y": 1807,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "9587c00d.994eb",
+        "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": 3990.3834533691406,
-        "y": 1823,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3946.5001220703125,
+        "y": 1752,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f1540d0.014217",
+        "id": "7b4a137a.364fcc",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4556.883331298828,
-        "y": 1781,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4513,
+        "y": 1710,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c932c6af.938f38"
+                "37fe69a9.07064e"
             ]
         ]
     },
     {
-        "id": "94ae9a5d.e5d56",
+        "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": 4353.883331298828,
-        "y": 1777,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4310,
+        "y": 1706,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f1540d0.014217"
+                "7b4a137a.364fcc"
             ]
         ]
     },
     {
-        "id": "2ff151e7.182fee",
+        "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": 4941.883331298828,
-        "y": 1780,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4898,
+        "y": 1709,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "40d3a7a.4400bd8",
-                "353377f9.20c718",
-                "f8f22501.0020d8"
+                "8afff046.26af98",
+                "5118b1e.53f805",
+                "5a800db8.063d6c"
             ]
         ]
     },
     {
-        "id": "c932c6af.938f38",
+        "id": "37fe69a9.07064e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4733.883331298828,
-        "y": 1773,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4690,
+        "y": 1702,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "53fc3a7e.05d404",
-                "2ff151e7.182fee"
+                "d299743b.8f6b68",
+                "4bdd9e57.a5e13"
             ]
         ]
     },
     {
-        "id": "53fc3a7e.05d404",
+        "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": 4971.883331298828,
-        "y": 1728,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4928,
+        "y": 1657,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "d551b07b.11f68",
+        "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": 5300.883331298828,
-        "y": 1884,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5257,
+        "y": 1813,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c19bb319.e0e2b8",
+        "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": 5311.883331298828,
-        "y": 1829,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5268,
+        "y": 1758,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "2dbaf595.6cfed2",
+        "id": "546ca846.269108",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5296.265655517578,
-        "y": 1768.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5252.38232421875,
+        "y": 1697.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "eaeaf1b8.196fc"
+                "fac7ab27.77dda8"
             ]
         ]
     },
     {
-        "id": "eaeaf1b8.196fc",
+        "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": 5510.883331298828,
-        "y": 1765,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5467,
+        "y": 1694,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "40d3a7a.4400bd8",
+        "id": "8afff046.26af98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5151.883331298828,
-        "y": 1771,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5108,
+        "y": 1700,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2dbaf595.6cfed2"
+                "546ca846.269108"
             ]
         ]
     },
     {
-        "id": "353377f9.20c718",
+        "id": "5118b1e.53f805",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5143.883331298828,
-        "y": 1826,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5100,
+        "y": 1755,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c19bb319.e0e2b8"
+                "6f850c0f.e212ac"
             ]
         ]
     },
     {
-        "id": "f8f22501.0020d8",
+        "id": "5a800db8.063d6c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5148.883331298828,
-        "y": 1883,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5105,
+        "y": 1812,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "d551b07b.11f68"
+                "2523ddf0.8e1c8a"
             ]
         ]
     },
     {
-        "id": "c7d66e95.fb47e",
+        "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": 3182.883331298828,
-        "y": 729,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3139,
+        "y": 658,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4d8bbec2.c0db6",
-                "507d82bd.8807cc"
+                "d4bdeded.3ef248",
+                "eead64c.0115918"
             ]
         ]
     },
     {
-        "id": "4d8bbec2.c0db6",
+        "id": "d4bdeded.3ef248",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3396.883331298828,
-        "y": 766,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3353,
+        "y": 695,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6524452d.4a2f94"
+                "614a0644.b0e3e"
             ]
         ]
     },
     {
-        "id": "507d82bd.8807cc",
+        "id": "eead64c.0115918",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3398.883331298828,
-        "y": 704,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3355,
+        "y": 633,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4b590d33.c81684"
+                "295e16ce.878c6a"
             ]
         ]
     },
     {
-        "id": "6524452d.4a2f94",
+        "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": 2976.883331298828,
-        "y": 2009,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2933,
+        "y": 1938,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "75800cfe.e64b04",
-                "28895848.af5c18"
+                "75bfd38b.356f64",
+                "f4c4b096.a3ce2"
             ]
         ]
     },
     {
-        "id": "75800cfe.e64b04",
+        "id": "75bfd38b.356f64",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3229.883331298828,
-        "y": 2043,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3186,
+        "y": 1972,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "34389e65.7f3f0a"
+                "b0597a28.514d3"
             ]
         ]
     },
     {
-        "id": "28895848.af5c18",
+        "id": "f4c4b096.a3ce2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3229.883331298828,
-        "y": 1987,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3186,
+        "y": 1916,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4c94a377.c6d4e4"
+                "64045150.224658"
             ]
         ]
     },
     {
-        "id": "34389e65.7f3f0a",
+        "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": 3380.883331298828,
-        "y": 2043,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3337,
+        "y": 1972,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "ff717106.1f6f7",
+        "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": 4256.883331298828,
-        "y": 141,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4213,
+        "y": 70,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "98bc8f5e.55646",
+        "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": 3664.883331298828,
-        "y": 1600,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3621,
+        "y": 1529,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1901ad68.6869bb",
+        "id": "552020c2.f01db",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3947.883331298828,
-        "y": 398,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3904,
+        "y": 327,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ff717106.1f6f7",
-                "f11c1dac.45c748",
-                "dc51dde.504a12",
-                "25f0cbb9.ff400c",
-                "c95c33ef.381fa8",
-                "7a0ef184.deb28",
-                "dd4c3392.e1b02",
-                "2a6ffb7c.8797f4"
+                "cf5b963d.2b5a08",
+                "123fcc82.b79ae3",
+                "fbd17573.b91cd8",
+                "985dbb20.1c3b78",
+                "e308a3a2.af826",
+                "ec3b4a19.7f5ee",
+                "881b2d7a.c4e888",
+                "1a392cd7.238923"
             ]
         ]
     },
     {
-        "id": "4c94a377.c6d4e4",
+        "id": "64045150.224658",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3380.883331298828,
-        "y": 1986,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3337,
+        "y": 1915,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "98bc8f5e.55646",
-                "aa2473a.12d4d9",
-                "dfee532c.a1419",
-                "e52702af.314718",
-                "28a663c6.7433b4",
-                "c984548c.2e537",
-                "88e8f378.a2b808",
-                "1fda4b4a.2131e5"
+                "4badfb31.b82c1c",
+                "139f2f1e.8fa159",
+                "a49aeabe.b5ff8",
+                "642d00da.b53c68",
+                "18d2c2bc.05fd85",
+                "724930a5.f44628",
+                "98331ea2.d141f",
+                "f84de17e.e8ea08"
             ]
         ]
     },
     {
-        "id": "d79079df.baf578",
+        "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": 3618.883331298828,
-        "y": 2285,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3575,
+        "y": 2214,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "45ccc628.f5551",
+        "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": 3772.883331298828,
-        "y": 2333,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3729,
+        "y": 2262,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6173b4db.203ce4",
-                "7f21396.e7ee248"
+                "aa1d9a65.d56ee",
+                "ce785491.f82258"
             ]
         ]
     },
     {
-        "id": "6173b4db.203ce4",
+        "id": "aa1d9a65.d56ee",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4118.383331298828,
-        "y": 2314,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4074.5,
+        "y": 2243,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2b5ddf83.e8a168"
+                "d8df230a.b47018"
             ]
         ]
     },
     {
-        "id": "7f21396.e7ee248",
+        "id": "ce785491.f82258",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4122.383331298828,
-        "y": 2354,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4078.5,
+        "y": 2283,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9fc151.f9cc46b"
+                "d2d57048.de12f"
             ]
         ]
     },
     {
-        "id": "2b5ddf83.e8a168",
+        "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": 4276.383331298828,
-        "y": 2314,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4232.5,
+        "y": 2243,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "9fc151.f9cc46b",
+        "id": "d2d57048.de12f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4279.883331298828,
-        "y": 2354,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4236,
+        "y": 2283,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ec406c4.a093b1",
-                "ba32c60f.0ec53"
+                "703675c3.1d187c",
+                "6a8e2764.0748e8"
             ]
         ]
     },
     {
-        "id": "ec406c4.a093b1",
+        "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": 4619.883331298828,
-        "y": 2353,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4576,
+        "y": 2282,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "650aeaf3.da502c",
+        "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": 4477.883331298828,
-        "y": 2311,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4434,
+        "y": 2240,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "ba32c60f.0ec53",
+        "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": 4548.883331298828,
-        "y": 2402,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4505,
+        "y": 2331,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "c8295377.ff6158",
+        "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": 3173.883331298828,
-        "y": 669,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3130,
+        "y": 598,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "17d3b71c.0a74f9",
+        "id": "29b91b19.d2edf4",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3768.883331298828,
-        "y": 355,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3725,
+        "y": 284,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "12dd212a.e5931f",
+        "id": "df88a98e.3b797",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3325.883331298828,
-        "y": 1933,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3282,
+        "y": 1862,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "4b590d33.c81684",
+        "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": 3504.883331298828,
-        "y": 517,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3461,
+        "y": 446,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e68f7957.57ea98",
-                "90c8120e.55a8c8"
+                "fdfbdf68.ace01",
+                "8f7ef737.3d4208"
             ]
         ]
     },
     {
-        "id": "90c8120e.55a8c8",
+        "id": "8f7ef737.3d4208",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3746.883331298828,
-        "y": 1106,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3703,
+        "y": 1035,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "5f92c041.e2a22"
+                "d545d977.39f008"
             ]
         ]
     },
     {
-        "id": "e68f7957.57ea98",
+        "id": "fdfbdf68.ace01",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3740.883331298828,
-        "y": 397,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3697,
+        "y": 326,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1901ad68.6869bb"
+                "552020c2.f01db"
             ]
         ]
     },
     {
-        "id": "5f92c041.e2a22",
+        "id": "d545d977.39f008",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3904.883331298828,
-        "y": 1105,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3861,
+        "y": 1034,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "eb5cd95b.b46698",
-                "bcb9498.a9205b8",
-                "24e13fd8.afe2d8",
-                "57e5431f.63be4c",
-                "8b688219.8ed198",
-                "9c0b0957.1e6c48"
+                "127c7c35.f5600c",
+                "aa22b9fb.8c00d",
+                "7a8bb8ff.a3807",
+                "b6e4b7cd.3aab58",
+                "9befe6d.bfbfb18",
+                "61ff745d.2cf8b4"
             ]
         ]
     },
     {
-        "id": "bcb9498.a9205b8",
+        "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": 4168.883331298828,
-        "y": 988,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4125,
+        "y": 917,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "8b688219.8ed198",
+        "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": 4249.883331298828,
-        "y": 1303,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4206,
+        "y": 1232,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4ea88210.ceec44",
-                "cd5b1128.4dbb9"
+                "602f32f4.cac7b4",
+                "1d093526.32224b"
             ]
         ]
     },
     {
-        "id": "4ea88210.ceec44",
+        "id": "602f32f4.cac7b4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4559.383331298828,
-        "y": 1272,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4515.5,
+        "y": 1201,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9646de5b.fe3c7"
+                "4513cd6b.369634"
             ]
         ]
     },
     {
-        "id": "cd5b1128.4dbb9",
+        "id": "1d093526.32224b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4564.383331298828,
-        "y": 1337,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4520.5,
+        "y": 1266,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "55735b11.27f424"
+                "7640c8ac.188fc8"
             ]
         ]
     },
     {
-        "id": "9646de5b.fe3c7",
+        "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": 4735.383331298828,
-        "y": 1272,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4691.5,
+        "y": 1201,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "55735b11.27f424",
+        "id": "7640c8ac.188fc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4730.883331298828,
-        "y": 1337,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4687,
+        "y": 1266,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "24e13fd8.afe2d8",
+        "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": 4106.883331298828,
-        "y": 1036,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4063,
+        "y": 965,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "57e5431f.63be4c",
+        "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": 4132.883331298828,
-        "y": 1153,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4089,
+        "y": 1082,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1d187a80.e65b15",
-                "370c15e3.9b5fca",
-                "703dc49a.960884"
+                "bc604696.f19bf",
+                "6b2ab2eb.e94cac",
+                "158e3d74.81687b"
             ]
         ]
     },
     {
-        "id": "1d187a80.e65b15",
+        "id": "bc604696.f19bf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4328.383453369141,
-        "y": 1105,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4284.5001220703125,
+        "y": 1034,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "5c6509dd.e3a81"
+                "fbbae41a.6bb8"
             ]
         ]
     },
     {
-        "id": "370c15e3.9b5fca",
+        "id": "6b2ab2eb.e94cac",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4320.383453369141,
-        "y": 1160,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4276.5001220703125,
+        "y": 1089,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ccfe239.f2e7de"
+                "5e10560f.7f2a6"
             ]
         ]
     },
     {
-        "id": "5c6509dd.e3a81",
+        "id": "fbbae41a.6bb8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4472.765777587891,
-        "y": 1104.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4428.8824462890625,
+        "y": 1033.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "35d4ca24.cf236e"
+                "4ab90ec7.0f8a1"
             ]
         ]
     },
     {
-        "id": "35d4ca24.cf236e",
+        "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": 4656.883331298828,
-        "y": 1103,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4613,
+        "y": 1032,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c8705d75.001f7"
+                "3bb025b6.92298a"
             ]
         ]
     },
     {
-        "id": "c8705d75.001f7",
+        "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": 4851.883331298828,
-        "y": 1103,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4808,
+        "y": 1032,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b9376422.2a71"
+                "ce204654.d589e8"
             ]
         ]
     },
     {
-        "id": "703dc49a.960884",
+        "id": "158e3d74.81687b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4325.383453369141,
-        "y": 1217,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4281.5001220703125,
+        "y": 1146,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ece92d94.dd0ac"
+                "cfe04507.17faa"
             ]
         ]
     },
     {
-        "id": "ece92d94.dd0ac",
+        "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": 4477.383453369141,
-        "y": 1218,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4433.5001220703125,
+        "y": 1147,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "ccfe239.f2e7de",
+        "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": 4488.383453369141,
-        "y": 1161,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4444.5001220703125,
+        "y": 1090,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "eb5cd95b.b46698",
+        "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": 4163.883331298828,
-        "y": 928,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4120,
+        "y": 857,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b9376422.2a71",
+        "id": "ce204654.d589e8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5054.883331298828,
-        "y": 1107,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5011,
+        "y": 1036,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "d2480516.2fc378"
+                "fea8f5c8.b664d8"
             ]
         ]
     },
     {
-        "id": "9cb817ae.cef538",
+        "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": 5439.883331298828,
-        "y": 1120,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5396,
+        "y": 1049,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a79825bb.dff1f8",
-                "1395d5f.298062a",
-                "7903ca2c.aa5cc4"
+                "bda3b861.07af08",
+                "8ce8739f.28fc08",
+                "8098fa71.4cbf3"
             ]
         ]
     },
     {
-        "id": "d2480516.2fc378",
+        "id": "fea8f5c8.b664d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5233.883331298828,
-        "y": 1107,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5190,
+        "y": 1036,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "fbf9e6b6.15b5c",
-                "9cb817ae.cef538"
+                "619520a0.18d9e",
+                "17936311.45c0f5"
             ]
         ]
     },
     {
-        "id": "fbf9e6b6.15b5c",
+        "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": 5469.883331298828,
-        "y": 1068,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5426,
+        "y": 997,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a79825bb.dff1f8",
+        "id": "bda3b861.07af08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5649.883331298828,
-        "y": 1111,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5606,
+        "y": 1040,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c7dce557.6dded"
+                "3c9ad3f5.e5e4a4"
             ]
         ]
     },
     {
-        "id": "1395d5f.298062a",
+        "id": "8ce8739f.28fc08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5641.883331298828,
-        "y": 1166,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5598,
+        "y": 1095,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "598e647b.5837b4"
+                "ec86cd9f.a15968"
             ]
         ]
     },
     {
-        "id": "7903ca2c.aa5cc4",
+        "id": "8098fa71.4cbf3",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5646.883331298828,
-        "y": 1223,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5603,
+        "y": 1152,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e6c7a6e7.b2f038"
+                "244270ad.8dfe1"
             ]
         ]
     },
     {
-        "id": "e6c7a6e7.b2f038",
+        "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": 5798.883331298828,
-        "y": 1224,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5755,
+        "y": 1153,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "598e647b.5837b4",
+        "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": 5809.883331298828,
-        "y": 1169,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5766,
+        "y": 1098,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c7dce557.6dded",
+        "id": "3c9ad3f5.e5e4a4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5794.265655517578,
-        "y": 1108.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5750.38232421875,
+        "y": 1037.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2cfbc0b6.6ae748"
+                "2068f2a1.5ec866"
             ]
         ]
     },
     {
-        "id": "2cfbc0b6.6ae748",
+        "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": 6008.883331298828,
-        "y": 1105,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5965,
+        "y": 1034,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "fca9cd7.3028eb",
+        "id": "e69cbe2a.82be58",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3782.883331298828,
-        "y": 1046,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3739,
+        "y": 975,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "2c3b3231.83c2be",
+        "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": 2344.883331298828,
-        "y": 773,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2301,
+        "y": 702,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "81a947d8.a13a68",
-                "b480f4ae.d59fb8"
+                "7969493f.6a54d",
+                "9a6050c4.300548"
             ]
         ]
     },
     {
-        "id": "b480f4ae.d59fb8",
+        "id": "9a6050c4.300548",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2751.883331298828,
-        "y": 791,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2708,
+        "y": 720,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "23d2aee5.d5b2fa"
+                "66cd0943.de62f"
             ]
         ]
     },
     {
-        "id": "81a947d8.a13a68",
+        "id": "7969493f.6a54d",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2751.883331298828,
-        "y": 736,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2708,
+        "y": 665,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "773948cf.a686e8"
+                "7c5fc999.6b62c"
             ]
         ]
     },
     {
-        "id": "773948cf.a686e8",
+        "id": "7c5fc999.6b62c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2907.883331298828,
-        "y": 734,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2864,
+        "y": 663,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c8295377.ff6158",
-                "c7d66e95.fb47e"
+                "641093d5.a73774",
+                "a1edca3.1a62bb8"
             ]
         ]
     },
     {
-        "id": "23d2aee5.d5b2fa",
+        "id": "66cd0943.de62f",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2884.883331298828,
-        "y": 792,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2841,
+        "y": 721,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "7714415.bcb45c",
+        "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": 1061.8833312988281,
-        "y": 208,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1018,
+        "y": 137,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "79981366.647454",
+        "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": 4178.883331298828,
-        "y": 626,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4135,
+        "y": 555,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "7a0ef184.deb28",
+        "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": 4238.883331298828,
-        "y": 665,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4195,
+        "y": 594,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "2cf2ff05.5ecb98",
+        "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": 1054.8833312988281,
-        "y": 116,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1011,
+        "y": 45,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "7871357e.92d2f4",
+        "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": 3590.883331298828,
-        "y": 2142,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3547,
+        "y": 2071,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c984548c.2e537",
+        "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": 3646.883331298828,
-        "y": 2191,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3603,
+        "y": 2120,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "efee660.b5b7f18",
+        "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": 1054.8833312988281,
-        "y": 155,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1011,
+        "y": 84,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "ff64d6f0.1d24e",
+        "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": 1085.8833312988281,
-        "y": 256,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1042,
+        "y": 185,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "c19ef147.be92d8",
+        "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": 295.8833312988281,
-        "y": 731,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 252,
+        "y": 660,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4acbe821.0c1ff8",
-                "63a107d4.a006c8",
-                "4bb92513.9b1ebc"
+                "ce4ab0d3.b836a",
+                "9dbee6c6.1a60a",
+                "290803ec.65c94c"
             ]
         ]
     },
     {
-        "id": "4acbe821.0c1ff8",
+        "id": "ce4ab0d3.b836a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 514.8833312988281,
-        "y": 669,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 471,
+        "y": 598,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "d6a121aa.ecf888"
+                "280015e3.c315e2"
             ]
         ]
     },
     {
-        "id": "63a107d4.a006c8",
+        "id": "9dbee6c6.1a60a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 524.3742980957031,
-        "y": 711.5740356445312,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 480.490966796875,
+        "y": 640.5740356445312,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "4bb92513.9b1ebc",
+        "id": "290803ec.65c94c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 512.8833312988281,
-        "y": 758,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 469,
+        "y": 687,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f58f94a6.d7fb9"
+                "f842cdf9.29a79"
             ]
         ]
     },
     {
-        "id": "d6a121aa.ecf888",
+        "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": 711.8833312988281,
-        "y": 665,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 668,
+        "y": 594,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "46606d75.f5af5c"
+                "cd508bdd.302a88"
             ]
         ]
     },
     {
-        "id": "f58f94a6.d7fb9",
+        "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": 681.8833312988281,
-        "y": 759,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 638,
+        "y": 688,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "46606d75.f5af5c",
+        "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": 935.2168273925781,
-        "y": 664.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 891.33349609375,
+        "y": 593.9999389648438,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1dffeedd.2e39d1"
+                "d4df8e14.56fc08"
             ]
         ]
     },
     {
-        "id": "1dffeedd.2e39d1",
+        "id": "d4df8e14.56fc08",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1135.8834648132324,
-        "y": 666.000020980835,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1092.0001335144043,
+        "y": 595.000020980835,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "5eeac4ab.784bec"
+                "b67eb6e5.58b31"
             ]
         ]
     },
     {
-        "id": "5eeac4ab.784bec",
+        "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": 265.8833312988281,
-        "y": 928,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 222,
+        "y": 857,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "93ffca07.c36c6",
-                "a6155e5c.4a2e4",
-                "edf3ae2.0898ad"
+                "eb910f68.8a5408",
+                "a6536ba8.c4e148",
+                "6d1288a7.3722b8"
             ]
         ]
     },
     {
-        "id": "93ffca07.c36c6",
+        "id": "eb910f68.8a5408",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 473.8833312988281,
-        "y": 892,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 430,
+        "y": 821,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "41f16b19.4ea28c"
+                "6687da8.fb06ca4"
             ]
         ]
     },
     {
-        "id": "a6155e5c.4a2e4",
+        "id": "a6536ba8.c4e148",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 474.3742980957031,
-        "y": 937.5740356445312,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 430.490966796875,
+        "y": 866.5740356445312,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "edf3ae2.0898ad",
+        "id": "6d1288a7.3722b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 471.8833312988281,
-        "y": 981,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 428,
+        "y": 910,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "77488207.b4a2f4"
+                "a3e6b31.4b2495"
             ]
         ]
     },
     {
-        "id": "77488207.b4a2f4",
+        "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": 640.8833312988281,
-        "y": 982,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 597,
+        "y": 911,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1853bc71.11bc54",
+        "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": 612.8833312988281,
-        "y": 1476,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 569,
+        "y": 1405,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "aa99b60e.a0ae8"
+                "f09d5f3a.90b09"
             ]
         ]
     },
     {
-        "id": "aa99b60e.a0ae8",
+        "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": 815.8833312988281,
-        "y": 1488,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 772,
+        "y": 1417,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6b5b67d6.d9cff8"
+                "be069a3d.2f258"
             ]
         ]
     },
     {
-        "id": "6b5b67d6.d9cff8",
+        "id": "be069a3d.2f258",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 981.8833312988281,
-        "y": 1485,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 938,
+        "y": 1414,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c9be5883.2f43"
+                "b33327bf.cf44b8"
             ]
         ]
     },
     {
-        "id": "c9be5883.2f43",
+        "id": "b33327bf.cf44b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1142.8833312988281,
-        "y": 1482,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1099,
+        "y": 1411,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "8328946b.83ccf",
-                "70436354.fbd2a4",
-                "71db6bb7.f92dd4",
-                "a3af61e2.8efbd8",
-                "1dbcecbe.b5c9a3"
+                "9b6250ff.75cf18",
+                "6e8e9c3e.00f634",
+                "db16830a.f6a5",
+                "611e4d54.277574",
+                "c0f4e533.035be8",
+                "ee82569c.a25768"
             ]
         ]
     },
     {
-        "id": "70436354.fbd2a4",
+        "id": "6e8e9c3e.00f634",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1346.8833312988281,
-        "y": 1440,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1305,
+        "y": 1010.9999389648438,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "8328946b.83ccf",
+        "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": 1343.8833312988281,
-        "y": 1485,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1302,
+        "y": 1055.9999389648438,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "95cc35e2.dbd57",
-                "6243e8b2.6e7d68",
-                "ea238384.cd0de8"
+                "1b290eb5.e974c9",
+                "b84573d.a8be19",
+                "ef2334eb.3c1b68"
             ]
         ]
     },
     {
-        "id": "6243e8b2.6e7d68",
+        "id": "b84573d.a8be19",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1539.3742980957031,
-        "y": 1458.573974609375,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1497.490966796875,
+        "y": 1029.5739135742188,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "60cc7ad4.175214"
+                "45bb14a8.1a7924"
             ]
         ]
     },
     {
-        "id": "ea238384.cd0de8",
+        "id": "ef2334eb.3c1b68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1534.8833312988281,
-        "y": 1502.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1493,
+        "y": 1073.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "33a586e8.574ea2"
+                "cd1f6950.fef1f"
             ]
         ]
     },
     {
-        "id": "60cc7ad4.175214",
+        "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": 1701.9458312988281,
-        "y": 1457.8596801757812,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1660.0625,
+        "y": 1028.859619140625,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "33a586e8.574ea2",
+        "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": 1702.8833312988281,
-        "y": 1502.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1661,
+        "y": 1073.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3ed2826e.143bbe",
+        "id": "cd4af41f.be1a78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1704.8833312988281,
-        "y": 1549.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1663,
+        "y": 1120.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "95cc35e2.dbd57",
+        "id": "1b290eb5.e974c9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1535.8833312988281,
-        "y": 1549.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
-        "wires": [
-            [
-                "3ed2826e.143bbe"
-            ]
-        ]
-    },
-    {
-        "id": "a3b35ff6.7d4a88",
-        "type": "switchNode",
-        "name": "switch conn type",
-        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 225.38333129882812,
-        "y": 1147,
-        "z": "3f6a2e0f.b66c8a",
-        "wires": [
-            [
-                "53e42336.cf6874",
-                "64e5ac9.b8c59d4",
-                "29d673d9.3ef8bc"
-            ]
-        ]
-    },
-    {
-        "id": "fdb5b362.28d2e8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 336.3833312988281,
-        "y": 1503,
-        "z": "3f6a2e0f.b66c8a",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "53e42336.cf6874",
-        "type": "outcome",
-        "name": "leaf",
-        "xml": "<outcome value='leaf'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 211.38333129882812,
-        "y": 1393,
-        "z": "3f6a2e0f.b66c8a",
-        "wires": [
-            [
-                "2d911faf.b625f"
-            ]
-        ]
-    },
-    {
-        "id": "64e5ac9.b8c59d4",
-        "type": "outcome",
-        "name": "root",
-        "xml": "<outcome value='root'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 212.38333129882812,
-        "y": 1451,
-        "z": "3f6a2e0f.b66c8a",
-        "wires": [
-            [
-                "c8a49fba.48732"
-            ]
-        ]
-    },
-    {
-        "id": "29d673d9.3ef8bc",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 214.38333129882812,
-        "y": 1505,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1494,
+        "y": 1120.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "fdb5b362.28d2e8"
+                "cd4af41f.be1a78"
             ]
         ]
     },
     {
-        "id": "893647bf.8d35f8",
+        "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": 1319.8833312988281,
-        "y": 1713,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1276,
+        "y": 1642,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "71db6bb7.f92dd4",
+        "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": 1410.8833312988281,
-        "y": 1767,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1367,
+        "y": 1696,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c8a49fba.48732",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 328.3833312988281,
-        "y": 1447,
-        "z": "3f6a2e0f.b66c8a",
-        "wires": [
-            [
-                "c9ed31d4.2a59a",
-                "1853bc71.11bc54",
-                "e2c4a442.f42cf",
-                "7b94a56a.0cc0c4",
-                "14d69ea3.c37079",
-                "e39ba7bd.aed5d8",
-                "9e9fd2d9.fce4a8",
-                "3e44ba6b.3875e6",
-                "de368aef.16cb",
-                "61a182f0.95ec2c",
-                "fae7aeca.a940b8",
-                "f92bafd0.7c69c8"
-            ]
-        ]
-    },
-    {
-        "id": "2d911faf.b625f",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 341.3833312988281,
-        "y": 1389,
-        "z": "3f6a2e0f.b66c8a",
-        "wires": [
-            [
-                "1853bc71.11bc54",
-                "30a75a3e.13e116",
-                "878444f9.a47b7",
-                "7b94a56a.0cc0c4",
-                "14d69ea3.c37079",
-                "e39ba7bd.aed5d8",
-                "9e9fd2d9.fce4a8",
-                "3e44ba6b.3875e6",
-                "de368aef.16cb",
-                "61a182f0.95ec2c",
-                "fae7aeca.a940b8",
-                "f92bafd0.7c69c8"
-            ]
-        ]
-    },
-    {
-        "id": "30a75a3e.13e116",
+        "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": 632.3833312988281,
-        "y": 1269,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2043.5,
+        "y": 1109,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c9ed31d4.2a59a",
+        "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": 649.3833312988281,
-        "y": 1363,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2048.5,
+        "y": 1211,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "7b94a56a.0cc0c4",
+        "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": 575.8833312988281,
-        "y": 1732,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 532,
+        "y": 1661,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "bd67d795.2e839"
+                "62852429.1f30ac"
             ]
         ]
     },
     {
-        "id": "bd67d795.2e839",
+        "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": 807.8833312988281,
-        "y": 1731,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 764,
+        "y": 1660,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "148b77ab.48b7a"
+                "ede4a749.9f1af8"
             ]
         ]
     },
     {
-        "id": "148b77ab.48b7a",
+        "id": "ede4a749.9f1af8",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1019.8833312988281,
-        "y": 1732,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 976,
+        "y": 1661,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "90ccd6ae.a26198"
+                "b699a292.eb6f88"
             ]
         ]
     },
     {
-        "id": "90ccd6ae.a26198",
+        "id": "b699a292.eb6f88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 275.8833312988281,
-        "y": 1888,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 232,
+        "y": 1817,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "8f4c1c14.35a72",
-                "c6a7aee9.6724"
+                "13d7e483.3188fb",
+                "74bc3a8f.9628d4"
             ]
         ]
     },
     {
-        "id": "c6a7aee9.6724",
+        "id": "74bc3a8f.9628d4",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 510.8833312988281,
-        "y": 1875,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 467,
+        "y": 1804,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "8f4c1c14.35a72",
+        "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": 500.8833312988281,
-        "y": 1936,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 457,
+        "y": 1865,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2e648939.1db066",
-                "6fc34533.3f02e4",
-                "f4ca0a98.2172d"
+                "bcef8cd9.e20998",
+                "764e27eb.b5496",
+                "21958602.3fa0ea"
             ]
         ]
     },
     {
-        "id": "6fc34533.3f02e4",
+        "id": "764e27eb.b5496",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 714.3742980957031,
-        "y": 1920.5740356445312,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 670.490966796875,
+        "y": 1849.5740356445312,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "24a8c225.12e4ae"
+                "9c812de2.87639"
             ]
         ]
     },
     {
-        "id": "f4ca0a98.2172d",
+        "id": "21958602.3fa0ea",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 709.8833312988281,
-        "y": 1965,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 666,
+        "y": 1894,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a2a9b29c.7bdb18"
+                "2915d3a6.63730c"
             ]
         ]
     },
     {
-        "id": "2e648939.1db066",
+        "id": "bcef8cd9.e20998",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 711.8833312988281,
-        "y": 2025,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 668,
+        "y": 1954,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6e035263.0ab9c4"
+                "bb26f0d0.bc6288"
             ]
         ]
     },
     {
-        "id": "24a8c225.12e4ae",
+        "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": 876.9458312988281,
-        "y": 1919.8597412109375,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 833.0625,
+        "y": 1848.8597412109375,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a2a9b29c.7bdb18",
+        "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": 877.8833312988281,
-        "y": 1965,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 834,
+        "y": 1894,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "6e035263.0ab9c4",
+        "id": "bb26f0d0.bc6288",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 880.8833312988281,
-        "y": 2024,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 837,
+        "y": 1953,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "fc704734.f5a92",
-                "534cefd0.094168"
+                "e8fb0469.22a408",
+                "b503b0ba.b1ff6"
             ]
         ]
     },
     {
-        "id": "9e9fd2d9.fce4a8",
+        "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": 279.8833312988281,
-        "y": 2523,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 236,
+        "y": 2452,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3e44ba6b.3875e6",
+        "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": 422.8833312988281,
-        "y": 2583,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 379,
+        "y": 2512,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b4c4bd8d.d5bdc",
-                "c813638c.89d0f"
+                "345842a4.88ef2e",
+                "a4dc32a8.6620d8"
             ]
         ]
     },
     {
-        "id": "b4c4bd8d.d5bdc",
+        "id": "345842a4.88ef2e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 735.3833312988281,
-        "y": 2560,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 691.5,
+        "y": 2489,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "c813638c.89d0f",
+        "id": "a4dc32a8.6620d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 739.3833312988281,
-        "y": 2600,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 695.5,
+        "y": 2529,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3e668730.81c5e8"
+                "d1fda3bb.92b0e"
             ]
         ]
     },
     {
-        "id": "1c6aee6c.a3a53a",
+        "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": 915.3833312988281,
-        "y": 2564,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 871.5,
+        "y": 2493,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3e668730.81c5e8",
+        "id": "d1fda3bb.92b0e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 930.8833312988281,
-        "y": 2618,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 887,
+        "y": 2547,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e6168d7c.f871d"
+                "a9ee92c3.93f6e8"
             ]
         ]
     },
     {
-        "id": "59cef6d7.b8a21",
+        "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": 1226.3833312988281,
-        "y": 2587,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1182.5,
+        "y": 2516,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5303ab1.d78928",
+        "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": 2693.383331298828,
-        "y": 1938,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2649.5,
+        "y": 1867,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e6168d7c.f871d",
+        "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": 1188.3833312988281,
-        "y": 2629,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1144.5,
+        "y": 2558,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "878444f9.a47b7",
+        "id": "9d25e547.75567",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 598.3833312988281,
-        "y": 1307,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2009.5,
+        "y": 1147,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e2c4a442.f42cf",
+        "id": "52a255e0.e77dec",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 611.3833312988281,
-        "y": 1403,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2010.5,
+        "y": 1251,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "dd4c3392.e1b02",
+        "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": 4347.883331298828,
-        "y": 579,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4304,
+        "y": 508,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c0b0957.1e6c48",
+        "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": 4250.883331298828,
-        "y": 1398,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4207,
+        "y": 1327,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "88e8f378.a2b808",
+        "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": 3744.883331298828,
-        "y": 2070,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3701,
+        "y": 1999,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "41f16b19.4ea28c",
+        "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": 845.8833312988281,
-        "y": 878,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 802,
+        "y": 807,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7bf4aa70.c75d74",
-                "a798281b.2c68d8"
+                "11a4a5f5.385f32",
+                "192499d2.667f1e"
             ]
         ]
     },
     {
-        "id": "7bf4aa70.c75d74",
+        "id": "11a4a5f5.385f32",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1208.8833312988281,
-        "y": 901,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1165,
+        "y": 830,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e5a55559.f1ecf"
+                "1fc9c5be.8fac2a"
             ]
         ]
     },
     {
-        "id": "a798281b.2c68d8",
+        "id": "192499d2.667f1e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1208.8833312988281,
-        "y": 850,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1165,
+        "y": 779,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "486913c4.08fb54"
+                "5fe8520c.50e664"
             ]
         ]
     },
     {
-        "id": "e5a55559.f1ecf",
+        "id": "1fc9c5be.8fac2a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1364.8833312988281,
-        "y": 899,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1321,
+        "y": 828,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a3b35ff6.7d4a88"
+                "a46faf22.6dbda8"
             ]
         ]
     },
     {
-        "id": "486913c4.08fb54",
+        "id": "5fe8520c.50e664",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1341.8833312988281,
-        "y": 851,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1298,
+        "y": 780,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "4660bf61.473a18",
+        "id": "1f9b767f.d670b2",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2101.883331298828,
-        "y": 249,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2058,
+        "y": 178,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1fda4b4a.2131e5",
+        "id": "f84de17e.e8ea08",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3643.883331298828,
-        "y": 2230,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3600,
+        "y": 2159,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "2a6ffb7c.8797f4",
+        "id": "1a392cd7.238923",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4233.883331298828,
-        "y": 703,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4190,
+        "y": 632,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a3af61e2.8efbd8",
+        "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": 1407.8833312988281,
-        "y": 1809,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1364,
+        "y": 1738,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "14d69ea3.c37079",
+        "id": "dc7d7df9.afb81",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 586.8833312988281,
-        "y": 1543,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 543,
+        "y": 1472,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e39ba7bd.aed5d8",
+        "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": 617.8833312988281,
-        "y": 1583,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 574,
+        "y": 1512,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc704734.f5a92",
+        "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": 1165.8833312988281,
-        "y": 1991,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1122,
+        "y": 1920,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "534cefd0.094168",
+        "id": "b503b0ba.b1ff6",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1168.8833312988281,
-        "y": 2033,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1125,
+        "y": 1962,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "de368aef.16cb",
+        "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": 611.8833312988281,
-        "y": 1673,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 568,
+        "y": 1602,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "61a182f0.95ec2c",
+        "id": "93ecab9f.5bb27",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 366.8833312988281,
-        "y": 2052,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 323,
+        "y": 1981,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "fae7aeca.a940b8",
+        "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": 374.8833312988281,
-        "y": 2109,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 331,
+        "y": 2038,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "1dbcecbe.b5c9a3",
+        "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": 1385.8833312988281,
-        "y": 1658,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1342,
+        "y": 1587,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2facd73.aebb428",
-                "7c34f1f3.22e088"
+                "ff9a5641.69fda",
+                "a44c9ce4.5d2008"
             ]
         ]
     },
     {
-        "id": "7c34f1f3.22e088",
+        "id": "a44c9ce4.5d2008",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1608.8833312988281,
-        "y": 1613,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1565,
+        "y": 1542,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7e28ac3f.b53f7c"
+                "eaca171f.944a48"
             ]
         ]
     },
     {
-        "id": "2facd73.aebb428",
+        "id": "ff9a5641.69fda",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1610.8833312988281,
-        "y": 1677,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1567,
+        "y": 1606,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c1661a7d.0e642"
+                "93d69fa.52d496"
             ]
         ]
     },
     {
-        "id": "7e28ac3f.b53f7c",
+        "id": "eaca171f.944a48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1773.8833312988281,
-        "y": 1610,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1730,
+        "y": 1539,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a55c6cbe.f3cef"
+                "b0447236.92d3b"
             ]
         ]
     },
     {
-        "id": "c1661a7d.0e642",
+        "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": 1772.8833312988281,
-        "y": 1673,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1729,
+        "y": 1602,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a55c6cbe.f3cef",
+        "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 -3]`' />\n",
+        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",
         "comments": "",
-        "x": 1993.8833312988281,
-        "y": 1624,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1950,
+        "y": 1553,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a3eb9377.85c18",
+        "id": "ab15b7a9.bc6bc8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1538.8833312988281,
-        "y": 2349,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1495,
+        "y": 2278,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "fcb0361d.62eb48"
+                "be2440af.c20c98"
             ]
         ]
     },
     {
-        "id": "dcd8db20.d12b7",
+        "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": 1923.8833312988281,
-        "y": 2362,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1880,
+        "y": 2291,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "62f93408.d79154",
-                "c38cc9d8.7f1bc",
-                "576ffe09.c4abd8"
+                "facba133.b01618",
+                "36457cd.f85a104",
+                "a0c24437.cf174"
             ]
         ]
     },
     {
-        "id": "fcb0361d.62eb48",
+        "id": "be2440af.c20c98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1717.8833312988281,
-        "y": 2349,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1674,
+        "y": 2278,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "90857791.e16908",
-                "dcd8db20.d12b7"
+                "eec40e11.9fdab",
+                "1405448e.40f263"
             ]
         ]
     },
     {
-        "id": "90857791.e16908",
+        "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": 1953.8833312988281,
-        "y": 2310,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1910,
+        "y": 2239,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "62f93408.d79154",
+        "id": "facba133.b01618",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2133.883331298828,
-        "y": 2353,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2090,
+        "y": 2282,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2c548a06.655d4e"
+                "926a046d.eed228"
             ]
         ]
     },
     {
-        "id": "c38cc9d8.7f1bc",
+        "id": "36457cd.f85a104",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2125.883331298828,
-        "y": 2408,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2082,
+        "y": 2337,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "99196e80.99674"
+                "6ca22053.c9fba8"
             ]
         ]
     },
     {
-        "id": "576ffe09.c4abd8",
+        "id": "a0c24437.cf174",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2130.883331298828,
-        "y": 2465,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2087,
+        "y": 2394,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ea704904.f61c3"
+                "f91dd017.676d7"
             ]
         ]
     },
     {
-        "id": "ea704904.f61c3",
+        "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": 2282.883331298828,
-        "y": 2466,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2239,
+        "y": 2395,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "99196e80.99674",
+        "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": 2293.883331298828,
-        "y": 2411,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2250,
+        "y": 2340,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "2c548a06.655d4e",
+        "id": "926a046d.eed228",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2278.265655517578,
-        "y": 2350.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2234.38232421875,
+        "y": 2279.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "55de506e.ab2138"
+                "1e25e04f.ee7df"
             ]
         ]
     },
     {
-        "id": "55de506e.ab2138",
+        "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": 2492.883331298828,
-        "y": 2347,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2449,
+        "y": 2276,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "2eeb0084.f61b88",
+        "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": 616.8833312988281,
-        "y": 2395,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 573,
+        "y": 2324,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "21d8f2c9.3cd2be",
-                "32ff82a0.3bb24e",
-                "21eb3441.66cbb4"
+                "80e94eed.70f82",
+                "e1101309.b00428",
+                "6cefa506.12a2dc"
             ]
         ]
     },
     {
-        "id": "21d8f2c9.3cd2be",
+        "id": "80e94eed.70f82",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 812.3834533691406,
-        "y": 2347,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 768.5001220703125,
+        "y": 2276,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2571d7b1.c4fb5"
+                "a961cabf.5d77d8"
             ]
         ]
     },
     {
-        "id": "32ff82a0.3bb24e",
+        "id": "e1101309.b00428",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 804.3834533691406,
-        "y": 2402,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 760.5001220703125,
+        "y": 2331,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b0a2917a.ecde4"
+                "cfce6a08.8d1818"
             ]
         ]
     },
     {
-        "id": "2571d7b1.c4fb5",
+        "id": "a961cabf.5d77d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 956.7657775878906,
-        "y": 2346.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 912.8824462890625,
+        "y": 2275.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a50320.52c78ce"
+                "41f5578e.096c08"
             ]
         ]
     },
     {
-        "id": "a50320.52c78ce",
+        "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": 1140.8833312988281,
-        "y": 2345,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1097,
+        "y": 2274,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b3deb273.cebb88"
+                "78702bad.3695f4"
             ]
         ]
     },
     {
-        "id": "b3deb273.cebb88",
+        "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": 1335.8833312988281,
-        "y": 2345,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1292,
+        "y": 2274,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a3eb9377.85c18"
+                "ab15b7a9.bc6bc8"
             ]
         ]
     },
     {
-        "id": "21eb3441.66cbb4",
+        "id": "6cefa506.12a2dc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 809.3834533691406,
-        "y": 2459,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 765.5001220703125,
+        "y": 2388,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f2a9e7b0.6a4ff8"
+                "bbb236e9.1d475"
             ]
         ]
     },
     {
-        "id": "f2a9e7b0.6a4ff8",
+        "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": 961.3834533691406,
-        "y": 2460,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 917.5001220703125,
+        "y": 2389,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b0a2917a.ecde4",
+        "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": 972.3834533691406,
-        "y": 2403,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 928.5001220703125,
+        "y": 2332,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e821cf32.5b22f",
+        "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": 606.8833312988281,
-        "y": 2307,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 563,
+        "y": 2236,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f92bafd0.7c69c8",
+        "id": "2ab715a0.ab46a2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 351.8833312988281,
-        "y": 2438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 308,
+        "y": 2367,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e821cf32.5b22f",
-                "2eeb0084.f61b88"
+                "fd11a034.71ffe8",
+                "46842cb8.91c5bc"
             ]
         ]
     },
     {
-        "id": "a832f3b6.8874e",
+        "id": "c68339b5.636678",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1566.8500061035156,
-        "y": 255.88333129882812,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1522.9666748046875,
+        "y": 184.88333129882812,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f645589d.ed3d98",
+        "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": 768.8833312988281,
-        "y": 478,
-        "z": "3f6a2e0f.b66c8a",
+        "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