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=1828f879b6104e5ec711b7936733820a5f16ac82;hb=22d596935f2edeefbe3f0d5acc72cf39e27e17aa;hp=4ba32b4674ad72501952d918c8682b537b12cdfb;hpb=b7cd528f9b720b4f820ac5eb38f01df2b16c9817;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..1828f879 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": "4a53e986.e1345",
         "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": 401.8833312988281,
+        "y": 341,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1c0c6fa0.017178",
-                "ec984d7b.605098",
-                "25450eba.0fd99a"
+                "bee28b81.87faf8",
+                "2e0d3206.b3958e",
+                "2caa6605.779652"
             ]
         ]
     },
     {
-        "id": "1c0c6fa0.017178",
+        "id": "bee28b81.87faf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 603.8833312988281,
-        "y": 390,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 589.8833312988281,
+        "y": 354,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "fcdf737f.3ba08"
+                "db2a2eb9.c4729"
             ]
         ]
     },
     {
-        "id": "ec984d7b.605098",
+        "id": "2e0d3206.b3958e",
         "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": 597.374267578125,
+        "y": 396.57403564453125,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "25450eba.0fd99a",
+        "id": "2caa6605.779652",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 601.8833312988281,
-        "y": 479,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 587.8833312988281,
+        "y": 443,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "f645589d.ed3d98"
+                "9a0e1ef7.428b9"
             ]
         ]
     },
     {
-        "id": "fcdf737f.3ba08",
+        "id": "db2a2eb9.c4729",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 776.8833312988281,
-        "y": 388,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 762.8833312988281,
+        "y": 352,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6641b1bb.011df8"
+                "b1233538.ceab4"
             ]
         ]
     },
     {
-        "id": "6641b1bb.011df8",
+        "id": "b1233538.ceab4",
         "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": 991.8833312988281,
+        "y": 353,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "42fd94e4.9f459c"
+                "f68da0c8.dc2638"
             ]
         ]
     },
     {
-        "id": "42fd94e4.9f459c",
+        "id": "f68da0c8.dc2638",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1220.8833312988281,
-        "y": 390,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1206.8833312988281,
+        "y": 354,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "341f3db4.7e268a"
+                "947d4965.a799f8"
             ]
         ]
     },
     {
-        "id": "802e937a.3ac",
+        "id": "ab775a4c.a509d",
         "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": 1460.8833312988281,
+        "y": 276,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ccfe4ade.41ae98",
-                "912c0faa.e5e1c8"
+                "1ae0d7f3.280b18",
+                "b7c135fb.7fc808"
             ]
         ]
     },
     {
-        "id": "ccfe4ade.41ae98",
+        "id": "1ae0d7f3.280b18",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1691.8833312988281,
-        "y": 291,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1677.8833312988281,
+        "y": 255,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "341f3db4.7e268a"
+                "947d4965.a799f8"
             ]
         ]
     },
     {
-        "id": "912c0faa.e5e1c8",
+        "id": "b7c135fb.7fc808",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1691.8833312988281,
-        "y": 340,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1677.8833312988281,
+        "y": 304,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "341f3db4.7e268a",
+        "id": "947d4965.a799f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1875.8833312988281,
-        "y": 377,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1861.8833312988281,
+        "y": 341,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b1ca96f9.f78f38",
-                "2c3b3231.83c2be",
-                "4660bf61.473a18"
+                "7307d136.f98668",
+                "d6d93ab.df041c8",
+                "ed4d0298.cdb578"
             ]
         ]
     },
     {
-        "id": "377c3031.0fc7c",
+        "id": "d12da893.5808e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 234.88333129882812,
-        "y": 118,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 220.88333129882812,
+        "y": 82,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "8b8ba227.5e7638"
+                "ba22940.68974f"
             ]
         ]
     },
     {
-        "id": "8b8ba227.5e7638",
+        "id": "ba22940.68974f",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3545 +201,3545 @@
         "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": 505.1690216064453,
+        "y": 143.23810863494873,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6c55ded0.30c498"
+                "f0aeb23e.8f1f7"
             ]
         ]
     },
     {
-        "id": "6c55ded0.30c498",
+        "id": "f0aeb23e.8f1f7",
         "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": 511.3119354248047,
+        "y": 228.00003051757812,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b63c19cf.5911b8"
+                "849eab75.e48858"
             ]
         ]
     },
     {
-        "id": "b63c19cf.5911b8",
+        "id": "849eab75.e48858",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 835.1213684082031,
-        "y": 255.66668701171875,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 821.1213684082031,
+        "y": 219.66668701171875,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6467c9b6.3ea7b",
-                "7714415.bcb45c",
-                "2cf2ff05.5ecb98",
-                "ff64d6f0.1d24e",
-                "c19ef147.be92d8"
+                "4a53e986.e1345",
+                "9dad0003.283738",
+                "47e937a3.3ee608",
+                "fa83bc41.1d8b08",
+                "39b1b2.d055464e"
             ]
         ]
     },
     {
-        "id": "b1ca96f9.f78f38",
+        "id": "7307d136.f98668",
         "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": 2078.883331298828,
+        "y": 279,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "f11c1dac.45c748",
+        "id": "5be24b21.11ebc4",
         "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": 4247.883331298828,
+        "y": 165,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c95c33ef.381fa8",
+        "id": "66c2f1fa.df4e",
         "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": 4328.883331298828,
+        "y": 480,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "89c7efd5.cb6558",
-                "d5cfec9d.5347f8"
+                "78ae8a16.bcde6c",
+                "163e60b5.f624ef"
             ]
         ]
     },
     {
-        "id": "89c7efd5.cb6558",
+        "id": "78ae8a16.bcde6c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4652.383331298828,
-        "y": 485,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4638.383331298828,
+        "y": 449,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "beffe966.8b1b08"
+                "a86780cc.869ba"
             ]
         ]
     },
     {
-        "id": "d5cfec9d.5347f8",
+        "id": "163e60b5.f624ef",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4657.383331298828,
-        "y": 550,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4643.383331298828,
+        "y": 514,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "18fce568.1c292b"
+                "496a02d9.361154"
             ]
         ]
     },
     {
-        "id": "beffe966.8b1b08",
+        "id": "a86780cc.869ba",
         "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": 4814.383331298828,
+        "y": 449,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "18fce568.1c292b",
+        "id": "496a02d9.361154",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4823.883331298828,
-        "y": 550,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4809.883331298828,
+        "y": 514,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "64fdffc9.427678",
+        "id": "4c8b1659.abc1b",
         "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": 4193.383331298828,
+        "y": 734,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c0e95206.343c2",
+        "id": "902cb9fb.0d496",
         "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": 4347.383331298828,
+        "y": 782,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "7a1edf39.b6a0f8",
-                "b605ddae.9f2b2"
+                "f961065e.0e576",
+                "6ca1f611.56dee"
             ]
         ]
     },
     {
-        "id": "7a1edf39.b6a0f8",
+        "id": "f961065e.0e576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4706.883331298828,
-        "y": 799,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4692.883331298828,
+        "y": 763,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "db29824f.2b664"
+                "6296fab8.967dac"
             ]
         ]
     },
     {
-        "id": "b605ddae.9f2b2",
+        "id": "6ca1f611.56dee",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4710.883331298828,
-        "y": 839,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4696.883331298828,
+        "y": 803,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "10ebb808.22b9d8"
+                "ef7067c4.7ea328"
             ]
         ]
     },
     {
-        "id": "db29824f.2b664",
+        "id": "6296fab8.967dac",
         "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": 4850.883331298828,
+        "y": 763,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "10ebb808.22b9d8",
+        "id": "ef7067c4.7ea328",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4868.383331298828,
-        "y": 839,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4854.383331298828,
+        "y": 803,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6d35eb39.2fe42c",
-                "b62c3c22.2cb09"
+                "ee477ca2.a65568",
+                "5e527e99.1f4728"
             ]
         ]
     },
     {
-        "id": "6d35eb39.2fe42c",
+        "id": "ee477ca2.a65568",
         "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": 5184.883331298828,
+        "y": 768,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3f34bcf0.b30eb4",
+        "id": "f9d5afb7.0291b",
         "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": 5048.883331298828,
+        "y": 727,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "b62c3c22.2cb09",
+        "id": "5e527e99.1f4728",
         "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": 5111.883331298828,
+        "y": 814,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc51dde.504a12",
+        "id": "48c30a65.f0f584",
         "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": 4185.883331298828,
+        "y": 213,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "25f0cbb9.ff400c",
+        "id": "bc523ecb.f956a8",
         "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": 4211.883331298828,
+        "y": 330,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "26af6a64.84f75e",
-                "dfaad5e6.3e7388",
-                "d4f19086.9e394"
+                "a72840b5.dc70e",
+                "54e4a8de.9445f8",
+                "4012660e.b55b2"
             ]
         ]
     },
     {
-        "id": "26af6a64.84f75e",
+        "id": "a72840b5.dc70e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4421.383453369141,
-        "y": 318,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4407.383453369141,
+        "y": 282,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "825f4729.b63ee8"
+                "9d071aa.9c29c68"
             ]
         ]
     },
     {
-        "id": "dfaad5e6.3e7388",
+        "id": "54e4a8de.9445f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4413.383453369141,
-        "y": 373,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4399.383453369141,
+        "y": 337,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "92b1984a.bc8b"
+                "3662c50c.d754d2"
             ]
         ]
     },
     {
-        "id": "825f4729.b63ee8",
+        "id": "9d071aa.9c29c68",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4565.765777587891,
-        "y": 317.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4551.765777587891,
+        "y": 281.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "415768e6.6651f8"
+                "c1155c42.4dc2e8"
             ]
         ]
     },
     {
-        "id": "a6a2d3e2.2e526",
+        "id": "a3b68f87.0c3248",
         "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": 5133.883331298828,
+        "y": 284,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e243a570.71b51"
+                "e6d1f56a.1147f8"
             ]
         ]
     },
     {
-        "id": "415768e6.6651f8",
+        "id": "c1155c42.4dc2e8",
         "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": 4735.883331298828,
+        "y": 280,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ab4dd1f4.04e1f"
+                "e3565ab9.0a825"
             ]
         ]
     },
     {
-        "id": "ab4dd1f4.04e1f",
+        "id": "e3565ab9.0a825",
         "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": 4930.883331298828,
+        "y": 280,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a6a2d3e2.2e526"
+                "a3b68f87.0c3248"
             ]
         ]
     },
     {
-        "id": "d4f19086.9e394",
+        "id": "4012660e.b55b2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4418.383453369141,
-        "y": 430,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4404.383453369141,
+        "y": 394,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "28f88c03.cb5e5c"
+                "7e9c03d8.c41c7c"
             ]
         ]
     },
     {
-        "id": "28f88c03.cb5e5c",
+        "id": "7e9c03d8.c41c7c",
         "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": 4556.383453369141,
+        "y": 395,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "92b1984a.bc8b",
+        "id": "3662c50c.d754d2",
         "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": 4567.383453369141,
+        "y": 338,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "677439f1.5f7ed",
+        "id": "99fa8e6f.e803d8",
         "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": 5518.883331298828,
+        "y": 297,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e7fd97d3.bbcd08",
-                "38bba5b7.de41b2",
-                "6bf961e8.c56a58"
+                "a38e0436.5aedc",
+                "80f6747e.265c78",
+                "c370b7ba.84a26"
             ]
         ]
     },
     {
-        "id": "e243a570.71b51",
+        "id": "e6d1f56a.1147f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5326.883331298828,
-        "y": 320,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5312.883331298828,
+        "y": 284,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "857cacb0.81444",
-                "677439f1.5f7ed"
+                "4599703a.c42f3",
+                "99fa8e6f.e803d8"
             ]
         ]
     },
     {
-        "id": "857cacb0.81444",
+        "id": "4599703a.c42f3",
         "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": 5548.883331298828,
+        "y": 245,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e7fd97d3.bbcd08",
+        "id": "a38e0436.5aedc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5742.883331298828,
-        "y": 324,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5728.883331298828,
+        "y": 288,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "60a50433.d26434"
+                "8c88cbf0.e09b1"
             ]
         ]
     },
     {
-        "id": "38bba5b7.de41b2",
+        "id": "80f6747e.265c78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5734.883331298828,
-        "y": 379,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5720.883331298828,
+        "y": 343,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "d9350787.861f1"
+                "e2be9acb.77d62"
             ]
         ]
     },
     {
-        "id": "6bf961e8.c56a58",
+        "id": "c370b7ba.84a26",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5739.883331298828,
-        "y": 436,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5725.883331298828,
+        "y": 400,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1afc54ba.8ed313"
+                "856ee89c.2898"
             ]
         ]
     },
     {
-        "id": "1afc54ba.8ed313",
+        "id": "856ee89c.2898",
         "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": 5877.883331298828,
+        "y": 401,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "d9350787.861f1",
+        "id": "e2be9acb.77d62",
         "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": 5888.883331298828,
+        "y": 346,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "60a50433.d26434",
+        "id": "8c88cbf0.e09b1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5887.265655517578,
-        "y": 321.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5873.265655517578,
+        "y": 285.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "8367dac2.ac8b98"
+                "a4a57efc.888ff8"
             ]
         ]
     },
     {
-        "id": "8367dac2.ac8b98",
+        "id": "a4a57efc.888ff8",
         "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": 6087.883331298828,
+        "y": 282,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "aa2473a.12d4d9",
+        "id": "172d91c5.a78676",
         "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": 3654.883331298828,
+        "y": 1622,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "28a663c6.7433b4",
+        "id": "f13d198f.d5c79",
         "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": 3717.883331298828,
+        "y": 1951,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "422a3196.0fb7d",
-                "371e9e8f.f6f942"
+                "3640aede.8913a2",
+                "f1b1c8d.9945bb8"
             ]
         ]
     },
     {
-        "id": "422a3196.0fb7d",
+        "id": "3640aede.8913a2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4027.383331298828,
-        "y": 1954,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4013.383331298828,
+        "y": 1918,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c3084137.121c7"
+                "4b0d0deb.6577e4"
             ]
         ]
     },
     {
-        "id": "371e9e8f.f6f942",
+        "id": "f1b1c8d.9945bb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4032.383331298828,
-        "y": 2019,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4018.383331298828,
+        "y": 1983,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c6676165.ac5c"
+                "5da14040.cb50b8"
             ]
         ]
     },
     {
-        "id": "c3084137.121c7",
+        "id": "4b0d0deb.6577e4",
         "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": 4181.383331298828,
+        "y": 1918,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c6676165.ac5c",
+        "id": "5da14040.cb50b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4205.883331298828,
-        "y": 2019,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4191.883331298828,
+        "y": 1983,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "dfee532c.a1419",
+        "id": "1e50105a.a8b96",
         "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": 3593.883331298828,
+        "y": 1679,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e52702af.314718",
+        "id": "dfe45c65.d48f6",
         "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": 3613.883331298828,
+        "y": 1776,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "9ca1c561.5c796",
-                "9cf5cab4.99d6e",
-                "5d5762eb.724c64"
+                "56d2f84a.b524e8",
+                "43f5b436.ace8b4",
+                "a9c884c3.3b2c18"
             ]
         ]
     },
     {
-        "id": "9ca1c561.5c796",
+        "id": "56d2f84a.b524e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3830.3834533691406,
-        "y": 1765,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3816.3834533691406,
+        "y": 1729,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "502f683e.00cf7"
+                "10cf7345.17615d"
             ]
         ]
     },
     {
-        "id": "9cf5cab4.99d6e",
+        "id": "43f5b436.ace8b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3822.3834533691406,
-        "y": 1820,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3808.3834533691406,
+        "y": 1784,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "9587c00d.994eb"
+                "40e41e98.b2ab3"
             ]
         ]
     },
     {
-        "id": "502f683e.00cf7",
+        "id": "10cf7345.17615d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3974.7657775878906,
-        "y": 1762.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3960.7657775878906,
+        "y": 1726.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "39b96666.82062a"
+                "69889215.886b4c"
             ]
         ]
     },
     {
-        "id": "39b96666.82062a",
+        "id": "69889215.886b4c",
         "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": 4144.883331298828,
+        "y": 1741,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "94ae9a5d.e5d56"
+                "3c1ff953.79a23e"
             ]
         ]
     },
     {
-        "id": "5d5762eb.724c64",
+        "id": "a9c884c3.3b2c18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3827.3834533691406,
-        "y": 1877,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3813.3834533691406,
+        "y": 1841,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "7a00ac4a.8d918c"
+                "8ab7ecfb.f03ee"
             ]
         ]
     },
     {
-        "id": "7a00ac4a.8d918c",
+        "id": "8ab7ecfb.f03ee",
         "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": 3965.3834533691406,
+        "y": 1842,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "9587c00d.994eb",
+        "id": "40e41e98.b2ab3",
         "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": 3976.3834533691406,
+        "y": 1787,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "f1540d0.014217",
+        "id": "37ef2104.1e9d5e",
         "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": 4542.883331298828,
+        "y": 1745,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c932c6af.938f38"
+                "901dac81.52118"
             ]
         ]
     },
     {
-        "id": "94ae9a5d.e5d56",
+        "id": "3c1ff953.79a23e",
         "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": 4339.883331298828,
+        "y": 1741,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "f1540d0.014217"
+                "37ef2104.1e9d5e"
             ]
         ]
     },
     {
-        "id": "2ff151e7.182fee",
+        "id": "86b8c4cb.c3747",
         "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": 4927.883331298828,
+        "y": 1744,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "40d3a7a.4400bd8",
-                "353377f9.20c718",
-                "f8f22501.0020d8"
+                "b5f45931.a1805",
+                "34bcb3b6.e69b1c",
+                "d4cc1381.862c48"
             ]
         ]
     },
     {
-        "id": "c932c6af.938f38",
+        "id": "901dac81.52118",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4733.883331298828,
-        "y": 1773,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4719.883331298828,
+        "y": 1737,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "53fc3a7e.05d404",
-                "2ff151e7.182fee"
+                "81cd4229.29ba8",
+                "86b8c4cb.c3747"
             ]
         ]
     },
     {
-        "id": "53fc3a7e.05d404",
+        "id": "81cd4229.29ba8",
         "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": 4957.883331298828,
+        "y": 1692,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "d551b07b.11f68",
+        "id": "a6f965e8.0bb248",
         "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": 5286.883331298828,
+        "y": 1848,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c19bb319.e0e2b8",
+        "id": "3b503e2a.8c5dd2",
         "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": 5297.883331298828,
+        "y": 1793,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2dbaf595.6cfed2",
+        "id": "a84f2510.1ebf08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5296.265655517578,
-        "y": 1768.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5282.265655517578,
+        "y": 1732.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "eaeaf1b8.196fc"
+                "f83738f1.e5e14"
             ]
         ]
     },
     {
-        "id": "eaeaf1b8.196fc",
+        "id": "f83738f1.e5e14",
         "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": 5496.883331298828,
+        "y": 1729,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "40d3a7a.4400bd8",
+        "id": "b5f45931.a1805",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5151.883331298828,
-        "y": 1771,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5137.883331298828,
+        "y": 1735,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2dbaf595.6cfed2"
+                "a84f2510.1ebf08"
             ]
         ]
     },
     {
-        "id": "353377f9.20c718",
+        "id": "34bcb3b6.e69b1c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5143.883331298828,
-        "y": 1826,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5129.883331298828,
+        "y": 1790,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c19bb319.e0e2b8"
+                "3b503e2a.8c5dd2"
             ]
         ]
     },
     {
-        "id": "f8f22501.0020d8",
+        "id": "d4cc1381.862c48",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5148.883331298828,
-        "y": 1883,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5134.883331298828,
+        "y": 1847,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "d551b07b.11f68"
+                "a6f965e8.0bb248"
             ]
         ]
     },
     {
-        "id": "c7d66e95.fb47e",
+        "id": "4a95df1.67c3fa",
         "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": 3168.883331298828,
+        "y": 693,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "4d8bbec2.c0db6",
-                "507d82bd.8807cc"
+                "60b8b463.e4925c",
+                "5e23be29.1eb6a"
             ]
         ]
     },
     {
-        "id": "4d8bbec2.c0db6",
+        "id": "60b8b463.e4925c",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3396.883331298828,
-        "y": 766,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3382.883331298828,
+        "y": 730,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6524452d.4a2f94"
+                "4d4203c4.4fd81c"
             ]
         ]
     },
     {
-        "id": "507d82bd.8807cc",
+        "id": "5e23be29.1eb6a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3398.883331298828,
-        "y": 704,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3384.883331298828,
+        "y": 668,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "4b590d33.c81684"
+                "402d5674.bb5698"
             ]
         ]
     },
     {
-        "id": "6524452d.4a2f94",
+        "id": "4d4203c4.4fd81c",
         "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": 2962.883331298828,
+        "y": 1973,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "75800cfe.e64b04",
-                "28895848.af5c18"
+                "4155de88.54a1f",
+                "11e38b5d.85c715"
             ]
         ]
     },
     {
-        "id": "75800cfe.e64b04",
+        "id": "4155de88.54a1f",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3229.883331298828,
-        "y": 2043,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3215.883331298828,
+        "y": 2007,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "34389e65.7f3f0a"
+                "97b4f973.8f85a8"
             ]
         ]
     },
     {
-        "id": "28895848.af5c18",
+        "id": "11e38b5d.85c715",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3229.883331298828,
-        "y": 1987,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3215.883331298828,
+        "y": 1951,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "4c94a377.c6d4e4"
+                "4bdf7725.9cef3"
             ]
         ]
     },
     {
-        "id": "34389e65.7f3f0a",
+        "id": "97b4f973.8f85a8",
         "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": 3366.883331298828,
+        "y": 2007,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "ff717106.1f6f7",
+        "id": "15e2350c.3f989b",
         "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": 4242.883331298828,
+        "y": 105,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "98bc8f5e.55646",
+        "id": "22f55219.d9af6e",
         "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": 3650.883331298828,
+        "y": 1564,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "1901ad68.6869bb",
+        "id": "9157e39e.50973",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3947.883331298828,
-        "y": 398,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3933.883331298828,
+        "y": 362,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ff717106.1f6f7",
-                "f11c1dac.45c748",
-                "dc51dde.504a12",
-                "25f0cbb9.ff400c",
-                "c95c33ef.381fa8",
-                "7a0ef184.deb28",
-                "dd4c3392.e1b02",
-                "2a6ffb7c.8797f4"
+                "15e2350c.3f989b",
+                "5be24b21.11ebc4",
+                "48c30a65.f0f584",
+                "bc523ecb.f956a8",
+                "66c2f1fa.df4e",
+                "738a4fa7.5a68d",
+                "9521e4ca.a61af",
+                "224f4283.917d26"
             ]
         ]
     },
     {
-        "id": "4c94a377.c6d4e4",
+        "id": "4bdf7725.9cef3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3380.883331298828,
-        "y": 1986,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3366.883331298828,
+        "y": 1950,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "98bc8f5e.55646",
-                "aa2473a.12d4d9",
-                "dfee532c.a1419",
-                "e52702af.314718",
-                "28a663c6.7433b4",
-                "c984548c.2e537",
-                "88e8f378.a2b808",
-                "1fda4b4a.2131e5"
+                "22f55219.d9af6e",
+                "172d91c5.a78676",
+                "1e50105a.a8b96",
+                "dfe45c65.d48f6",
+                "f13d198f.d5c79",
+                "78f084cb.41e754",
+                "e35a6c95.6b3d6",
+                "1ced8517.ce35e3"
             ]
         ]
     },
     {
-        "id": "d79079df.baf578",
+        "id": "e7e7eca7.931088",
         "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": 3604.883331298828,
+        "y": 2249,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "45ccc628.f5551",
+        "id": "5544b67f.df3238",
         "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": 3758.883331298828,
+        "y": 2297,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6173b4db.203ce4",
-                "7f21396.e7ee248"
+                "b36c5e4.a4b982",
+                "75e03418.7b0a3c"
             ]
         ]
     },
     {
-        "id": "6173b4db.203ce4",
+        "id": "b36c5e4.a4b982",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4118.383331298828,
-        "y": 2314,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4104.383331298828,
+        "y": 2278,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2b5ddf83.e8a168"
+                "996a2de3.86ff68"
             ]
         ]
     },
     {
-        "id": "7f21396.e7ee248",
+        "id": "75e03418.7b0a3c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4122.383331298828,
-        "y": 2354,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4108.383331298828,
+        "y": 2318,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "9fc151.f9cc46b"
+                "1787d971.8d0d67"
             ]
         ]
     },
     {
-        "id": "2b5ddf83.e8a168",
+        "id": "996a2de3.86ff68",
         "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": 4262.383331298828,
+        "y": 2278,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "9fc151.f9cc46b",
+        "id": "1787d971.8d0d67",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4279.883331298828,
-        "y": 2354,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4265.883331298828,
+        "y": 2318,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ec406c4.a093b1",
-                "ba32c60f.0ec53"
+                "79bbcc28.d4fd3c",
+                "137b8fb9.4aaa78"
             ]
         ]
     },
     {
-        "id": "ec406c4.a093b1",
+        "id": "79bbcc28.d4fd3c",
         "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": 4605.883331298828,
+        "y": 2317,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "650aeaf3.da502c",
+        "id": "9aab71de.3f671",
         "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": 4463.883331298828,
+        "y": 2275,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "ba32c60f.0ec53",
+        "id": "137b8fb9.4aaa78",
         "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": 4534.883331298828,
+        "y": 2366,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c8295377.ff6158",
+        "id": "e7a16254.b52678",
         "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": 3159.883331298828,
+        "y": 633,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "17d3b71c.0a74f9",
+        "id": "b98d7c04.aadb6",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3768.883331298828,
-        "y": 355,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3754.883331298828,
+        "y": 319,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "12dd212a.e5931f",
+        "id": "f9466402.70d608",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3325.883331298828,
-        "y": 1933,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3311.883331298828,
+        "y": 1897,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "4b590d33.c81684",
+        "id": "402d5674.bb5698",
         "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": 3490.883331298828,
+        "y": 481,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e68f7957.57ea98",
-                "90c8120e.55a8c8"
+                "40174504.12275c",
+                "483f6800.997ef8"
             ]
         ]
     },
     {
-        "id": "90c8120e.55a8c8",
+        "id": "483f6800.997ef8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3746.883331298828,
-        "y": 1106,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3732.883331298828,
+        "y": 1070,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "5f92c041.e2a22"
+                "f91cd9b2.b4ebc8"
             ]
         ]
     },
     {
-        "id": "e68f7957.57ea98",
+        "id": "40174504.12275c",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3740.883331298828,
-        "y": 397,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3726.883331298828,
+        "y": 361,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1901ad68.6869bb"
+                "9157e39e.50973"
             ]
         ]
     },
     {
-        "id": "5f92c041.e2a22",
+        "id": "f91cd9b2.b4ebc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3904.883331298828,
-        "y": 1105,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3890.883331298828,
+        "y": 1069,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "eb5cd95b.b46698",
-                "bcb9498.a9205b8",
-                "24e13fd8.afe2d8",
-                "57e5431f.63be4c",
-                "8b688219.8ed198",
-                "9c0b0957.1e6c48"
+                "e0a89dfb.b97bd8",
+                "356efc92.1be0c4",
+                "b98c51bd.b1df7",
+                "c9386596.fb5188",
+                "99a335d9.47dc9",
+                "1d1e23b2.17cb04"
             ]
         ]
     },
     {
-        "id": "bcb9498.a9205b8",
+        "id": "356efc92.1be0c4",
         "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": 4154.883331298828,
+        "y": 952,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "8b688219.8ed198",
+        "id": "99a335d9.47dc9",
         "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": 4235.883331298828,
+        "y": 1267,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "4ea88210.ceec44",
-                "cd5b1128.4dbb9"
+                "2ae3d84f.15cb3",
+                "a0cd8374.ae65d8"
             ]
         ]
     },
     {
-        "id": "4ea88210.ceec44",
+        "id": "2ae3d84f.15cb3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4559.383331298828,
-        "y": 1272,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4545.383331298828,
+        "y": 1236,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "9646de5b.fe3c7"
+                "d03fdf1c.3b45d"
             ]
         ]
     },
     {
-        "id": "cd5b1128.4dbb9",
+        "id": "a0cd8374.ae65d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4564.383331298828,
-        "y": 1337,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4550.383331298828,
+        "y": 1301,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "55735b11.27f424"
+                "f8c3fa12.5c834"
             ]
         ]
     },
     {
-        "id": "9646de5b.fe3c7",
+        "id": "d03fdf1c.3b45d",
         "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": 4721.383331298828,
+        "y": 1236,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "55735b11.27f424",
+        "id": "f8c3fa12.5c834",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4730.883331298828,
-        "y": 1337,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4716.883331298828,
+        "y": 1301,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "24e13fd8.afe2d8",
+        "id": "b98c51bd.b1df7",
         "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": 4092.883331298828,
+        "y": 1000,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "57e5431f.63be4c",
+        "id": "c9386596.fb5188",
         "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": 4118.883331298828,
+        "y": 1117,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1d187a80.e65b15",
-                "370c15e3.9b5fca",
-                "703dc49a.960884"
+                "312e9154.f9dbd6",
+                "38e6d39b.3fc964",
+                "d52b1c1f.8a6ca8"
             ]
         ]
     },
     {
-        "id": "1d187a80.e65b15",
+        "id": "312e9154.f9dbd6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4328.383453369141,
-        "y": 1105,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4314.383453369141,
+        "y": 1069,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "5c6509dd.e3a81"
+                "6d3eafaf.02fb48"
             ]
         ]
     },
     {
-        "id": "370c15e3.9b5fca",
+        "id": "38e6d39b.3fc964",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4320.383453369141,
-        "y": 1160,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4306.383453369141,
+        "y": 1124,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ccfe239.f2e7de"
+                "3519bfd5.fa4b3"
             ]
         ]
     },
     {
-        "id": "5c6509dd.e3a81",
+        "id": "6d3eafaf.02fb48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4472.765777587891,
-        "y": 1104.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4458.765777587891,
+        "y": 1068.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "35d4ca24.cf236e"
+                "6a66b1f9.955598"
             ]
         ]
     },
     {
-        "id": "35d4ca24.cf236e",
+        "id": "6a66b1f9.955598",
         "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": 4642.883331298828,
+        "y": 1067,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c8705d75.001f7"
+                "43b05855.517cf"
             ]
         ]
     },
     {
-        "id": "c8705d75.001f7",
+        "id": "43b05855.517cf",
         "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": 4837.883331298828,
+        "y": 1067,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b9376422.2a71"
+                "c21a24cd.dd2528"
             ]
         ]
     },
     {
-        "id": "703dc49a.960884",
+        "id": "d52b1c1f.8a6ca8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4325.383453369141,
-        "y": 1217,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4311.383453369141,
+        "y": 1181,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ece92d94.dd0ac"
+                "db81dd24.8006b"
             ]
         ]
     },
     {
-        "id": "ece92d94.dd0ac",
+        "id": "db81dd24.8006b",
         "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": 4463.383453369141,
+        "y": 1182,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "ccfe239.f2e7de",
+        "id": "3519bfd5.fa4b3",
         "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": 4474.383453369141,
+        "y": 1125,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "eb5cd95b.b46698",
+        "id": "e0a89dfb.b97bd8",
         "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": 4149.883331298828,
+        "y": 892,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "b9376422.2a71",
+        "id": "c21a24cd.dd2528",
         "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": 5040.883331298828,
+        "y": 1071,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "d2480516.2fc378"
+                "f7c609f5.0c2d28"
             ]
         ]
     },
     {
-        "id": "9cb817ae.cef538",
+        "id": "dff3e5ec.9273",
         "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": 5425.883331298828,
+        "y": 1084,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a79825bb.dff1f8",
-                "1395d5f.298062a",
-                "7903ca2c.aa5cc4"
+                "2769bc77.6b9fa4",
+                "7925966f.3df658",
+                "161a4207.178c96"
             ]
         ]
     },
     {
-        "id": "d2480516.2fc378",
+        "id": "f7c609f5.0c2d28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5233.883331298828,
-        "y": 1107,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5219.883331298828,
+        "y": 1071,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "fbf9e6b6.15b5c",
-                "9cb817ae.cef538"
+                "3634d6f2.f94292",
+                "dff3e5ec.9273"
             ]
         ]
     },
     {
-        "id": "fbf9e6b6.15b5c",
+        "id": "3634d6f2.f94292",
         "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": 5455.883331298828,
+        "y": 1032,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "a79825bb.dff1f8",
+        "id": "2769bc77.6b9fa4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5649.883331298828,
-        "y": 1111,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5635.883331298828,
+        "y": 1075,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c7dce557.6dded"
+                "8b0e2b2b.7a21d"
             ]
         ]
     },
     {
-        "id": "1395d5f.298062a",
+        "id": "7925966f.3df658",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5641.883331298828,
-        "y": 1166,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5627.883331298828,
+        "y": 1130,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "598e647b.5837b4"
+                "b9107d6e.7c0358"
             ]
         ]
     },
     {
-        "id": "7903ca2c.aa5cc4",
+        "id": "161a4207.178c96",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5646.883331298828,
-        "y": 1223,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5632.883331298828,
+        "y": 1187,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e6c7a6e7.b2f038"
+                "d5598bab.3dfb58"
             ]
         ]
     },
     {
-        "id": "e6c7a6e7.b2f038",
+        "id": "d5598bab.3dfb58",
         "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": 5784.883331298828,
+        "y": 1188,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "598e647b.5837b4",
+        "id": "b9107d6e.7c0358",
         "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": 5795.883331298828,
+        "y": 1133,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c7dce557.6dded",
+        "id": "8b0e2b2b.7a21d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5794.265655517578,
-        "y": 1108.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5780.265655517578,
+        "y": 1072.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2cfbc0b6.6ae748"
+                "f80d31a9.31f3d"
             ]
         ]
     },
     {
-        "id": "2cfbc0b6.6ae748",
+        "id": "f80d31a9.31f3d",
         "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": 5994.883331298828,
+        "y": 1069,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "fca9cd7.3028eb",
+        "id": "d718b282.287ca",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3782.883331298828,
-        "y": 1046,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3768.883331298828,
+        "y": 1010,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2c3b3231.83c2be",
+        "id": "d6d93ab.df041c8",
         "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": 2330.883331298828,
+        "y": 737,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "81a947d8.a13a68",
-                "b480f4ae.d59fb8"
+                "7d753f63.af1d7",
+                "7719dbd9.957fc4"
             ]
         ]
     },
     {
-        "id": "b480f4ae.d59fb8",
+        "id": "7719dbd9.957fc4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2751.883331298828,
-        "y": 791,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2737.883331298828,
+        "y": 755,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "23d2aee5.d5b2fa"
+                "2b5dce30.392f92"
             ]
         ]
     },
     {
-        "id": "81a947d8.a13a68",
+        "id": "7d753f63.af1d7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2751.883331298828,
-        "y": 736,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2737.883331298828,
+        "y": 700,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "773948cf.a686e8"
+                "155f7f13.57fce1"
             ]
         ]
     },
     {
-        "id": "773948cf.a686e8",
+        "id": "155f7f13.57fce1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2907.883331298828,
-        "y": 734,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2893.883331298828,
+        "y": 698,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c8295377.ff6158",
-                "c7d66e95.fb47e"
+                "e7a16254.b52678",
+                "4a95df1.67c3fa"
             ]
         ]
     },
     {
-        "id": "23d2aee5.d5b2fa",
+        "id": "2b5dce30.392f92",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2884.883331298828,
-        "y": 792,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2870.883331298828,
+        "y": 756,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7714415.bcb45c",
+        "id": "9dad0003.283738",
         "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": 1047.8833312988281,
+        "y": 172,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "79981366.647454",
+        "id": "a6d3cb9.27687b8",
         "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": 4164.883331298828,
+        "y": 590,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "7a0ef184.deb28",
+        "id": "738a4fa7.5a68d",
         "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": 4224.883331298828,
+        "y": 629,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2cf2ff05.5ecb98",
+        "id": "47e937a3.3ee608",
         "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": 1040.8833312988281,
+        "y": 80,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "7871357e.92d2f4",
+        "id": "6f67cdff.5c5554",
         "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": 3576.883331298828,
+        "y": 2106,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c984548c.2e537",
+        "id": "78f084cb.41e754",
         "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": 3632.883331298828,
+        "y": 2155,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "efee660.b5b7f18",
+        "id": "912dde6.9b60fa",
         "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": 1040.8833312988281,
+        "y": 119,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "ff64d6f0.1d24e",
+        "id": "fa83bc41.1d8b08",
         "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": 1071.8833312988281,
+        "y": 220,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c19ef147.be92d8",
+        "id": "39b1b2.d055464e",
         "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": 281.8833312988281,
+        "y": 695,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "4acbe821.0c1ff8",
-                "63a107d4.a006c8",
-                "4bb92513.9b1ebc"
+                "e70c3582.89ad08",
+                "3aeaa08a.574a",
+                "1322af3c.bc6319"
             ]
         ]
     },
     {
-        "id": "4acbe821.0c1ff8",
+        "id": "e70c3582.89ad08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 514.8833312988281,
-        "y": 669,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 500.8833312988281,
+        "y": 633,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "d6a121aa.ecf888"
+                "9c476365.2b909"
             ]
         ]
     },
     {
-        "id": "63a107d4.a006c8",
+        "id": "3aeaa08a.574a",
         "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": 510.3742980957031,
+        "y": 675.5740356445312,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "4bb92513.9b1ebc",
+        "id": "1322af3c.bc6319",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 512.8833312988281,
-        "y": 758,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 498.8833312988281,
+        "y": 722,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "f58f94a6.d7fb9"
+                "23db95da.1941e2"
             ]
         ]
     },
     {
-        "id": "d6a121aa.ecf888",
+        "id": "9c476365.2b909",
         "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": 697.8833312988281,
+        "y": 629,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "46606d75.f5af5c"
+                "1a5a20de.60b4cf"
             ]
         ]
     },
     {
-        "id": "f58f94a6.d7fb9",
+        "id": "23db95da.1941e2",
         "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": 667.8833312988281,
+        "y": 723,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "46606d75.f5af5c",
+        "id": "1a5a20de.60b4cf",
         "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": 921.2168273925781,
+        "y": 628.9999389648438,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1dffeedd.2e39d1"
+                "59a859e2.c48ca8"
             ]
         ]
     },
     {
-        "id": "1dffeedd.2e39d1",
+        "id": "59a859e2.c48ca8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1135.8834648132324,
-        "y": 666.000020980835,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1121.8834648132324,
+        "y": 630.000020980835,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "5eeac4ab.784bec"
+                "ae28be96.a81b18"
             ]
         ]
     },
     {
-        "id": "5eeac4ab.784bec",
+        "id": "ae28be96.a81b18",
         "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": 251.88333129882812,
+        "y": 892,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "93ffca07.c36c6",
-                "a6155e5c.4a2e4",
-                "edf3ae2.0898ad"
+                "4595d435.587aa4",
+                "60a8c3ff.237aec",
+                "18e77ed.3460901"
             ]
         ]
     },
     {
-        "id": "93ffca07.c36c6",
+        "id": "4595d435.587aa4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 473.8833312988281,
-        "y": 892,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 459.8833312988281,
+        "y": 856,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "41f16b19.4ea28c"
+                "9c5806bb.83c05"
             ]
         ]
     },
     {
-        "id": "a6155e5c.4a2e4",
+        "id": "60a8c3ff.237aec",
         "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": 460.3742980957031,
+        "y": 901.5740356445312,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "edf3ae2.0898ad",
+        "id": "18e77ed.3460901",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 471.8833312988281,
-        "y": 981,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 457.8833312988281,
+        "y": 945,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "77488207.b4a2f4"
+                "a170b783.101ed"
             ]
         ]
     },
     {
-        "id": "77488207.b4a2f4",
+        "id": "a170b783.101ed",
         "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": 626.8833312988281,
+        "y": 946,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "1853bc71.11bc54",
+        "id": "aaf101ae.84a298",
         "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": 598.8833312988281,
+        "y": 1440,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "aa99b60e.a0ae8"
+                "48f75925.f13078"
             ]
         ]
     },
     {
-        "id": "aa99b60e.a0ae8",
+        "id": "48f75925.f13078",
         "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": 801.8833312988281,
+        "y": 1452,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6b5b67d6.d9cff8"
+                "dc596581.8a224"
             ]
         ]
     },
     {
-        "id": "6b5b67d6.d9cff8",
+        "id": "dc596581.8a224",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 981.8833312988281,
-        "y": 1485,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 967.8833312988281,
+        "y": 1449,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c9be5883.2f43"
+                "63611a55.44e3fc"
             ]
         ]
     },
     {
-        "id": "c9be5883.2f43",
+        "id": "63611a55.44e3fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1142.8833312988281,
-        "y": 1482,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1128.8833312988281,
+        "y": 1446,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "8328946b.83ccf",
-                "70436354.fbd2a4",
-                "71db6bb7.f92dd4",
-                "a3af61e2.8efbd8",
-                "1dbcecbe.b5c9a3"
+                "155181d9.def56e",
+                "450c0202.9562fc",
+                "e522d7e8.f0b6d",
+                "b85bac18.623698",
+                "d97c4e37.51bad8"
             ]
         ]
     },
     {
-        "id": "70436354.fbd2a4",
+        "id": "450c0202.9562fc",
         "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": 1332.8833312988281,
+        "y": 1404,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "8328946b.83ccf",
+        "id": "155181d9.def56e",
         "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": 1329.8833312988281,
+        "y": 1449,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "95cc35e2.dbd57",
-                "6243e8b2.6e7d68",
-                "ea238384.cd0de8"
+                "c73d859f.d40f2",
+                "cdecbb41.644898",
+                "ca040aae.e9fa08"
             ]
         ]
     },
     {
-        "id": "6243e8b2.6e7d68",
+        "id": "cdecbb41.644898",
         "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": 1525.3742980957031,
+        "y": 1422.573974609375,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "60cc7ad4.175214"
+                "dcd0fdd9.1c84f"
             ]
         ]
     },
     {
-        "id": "ea238384.cd0de8",
+        "id": "ca040aae.e9fa08",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1534.8833312988281,
-        "y": 1502.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1520.8833312988281,
+        "y": 1466.9999389648438,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "33a586e8.574ea2"
+                "7c23dd25.00653c"
             ]
         ]
     },
     {
-        "id": "60cc7ad4.175214",
+        "id": "dcd0fdd9.1c84f",
         "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": 1687.9458312988281,
+        "y": 1421.8596801757812,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "33a586e8.574ea2",
+        "id": "7c23dd25.00653c",
         "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": 1688.8833312988281,
+        "y": 1466.9999389648438,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "3ed2826e.143bbe",
+        "id": "c84187cf.6e6008",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1704.8833312988281,
-        "y": 1549.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1690.8833312988281,
+        "y": 1513.9999389648438,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "95cc35e2.dbd57",
+        "id": "c73d859f.d40f2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1535.8833312988281,
-        "y": 1549.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1521.8833312988281,
+        "y": 1513.9999389648438,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "3ed2826e.143bbe"
+                "c84187cf.6e6008"
             ]
         ]
     },
     {
-        "id": "a3b35ff6.7d4a88",
+        "id": "a7f36b9f.f75b88",
         "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",
+        "x": 211.38333129882812,
+        "y": 1111,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "53e42336.cf6874",
-                "64e5ac9.b8c59d4",
-                "29d673d9.3ef8bc"
+                "b58d5b5e.9a197",
+                "5c723a86.22c16c",
+                "fb40210e.8c5be8"
             ]
         ]
     },
     {
-        "id": "fdb5b362.28d2e8",
+        "id": "ce504b34.d68ac8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 336.3833312988281,
-        "y": 1503,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 322.3833312988281,
+        "y": 1467,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "53e42336.cf6874",
+        "id": "b58d5b5e.9a197",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 211.38333129882812,
-        "y": 1393,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 197.38333129882812,
+        "y": 1357,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2d911faf.b625f"
+                "67ff853e.386644"
             ]
         ]
     },
     {
-        "id": "64e5ac9.b8c59d4",
+        "id": "5c723a86.22c16c",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 212.38333129882812,
-        "y": 1451,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 198.38333129882812,
+        "y": 1415,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c8a49fba.48732"
+                "402699af.4c591"
             ]
         ]
     },
     {
-        "id": "29d673d9.3ef8bc",
+        "id": "fb40210e.8c5be8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 214.38333129882812,
-        "y": 1505,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 200.38333129882812,
+        "y": 1469,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "fdb5b362.28d2e8"
+                "ce504b34.d68ac8"
             ]
         ]
     },
     {
-        "id": "893647bf.8d35f8",
+        "id": "5d006f15.710a08",
         "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": 1305.8833312988281,
+        "y": 1677,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "71db6bb7.f92dd4",
+        "id": "e522d7e8.f0b6d",
         "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": 1396.8833312988281,
+        "y": 1731,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c8a49fba.48732",
+        "id": "402699af.4c591",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 328.3833312988281,
-        "y": 1447,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 314.3833312988281,
+        "y": 1411,
+        "z": "db287b1f.2984a8",
         "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"
+                "784b1e5c.92c77",
+                "aaf101ae.84a298",
+                "dfffb0d0.b2d2d",
+                "3502903c.982ab",
+                "5524ecac.5cf47c",
+                "a12bd239.f8368",
+                "f8f2651c.3a035",
+                "f84d6f72.692148",
+                "5d1396ed.19b6f8",
+                "1b4871a6.1cd8a6",
+                "48083140.e99758",
+                "d94511cd.5d63f"
             ]
         ]
     },
     {
-        "id": "2d911faf.b625f",
+        "id": "67ff853e.386644",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 341.3833312988281,
-        "y": 1389,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 326.3833312988281,
+        "y": 1348,
+        "z": "db287b1f.2984a8",
         "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"
+                "aaf101ae.84a298",
+                "80e8f9a6.45b808",
+                "70ed09af.22122",
+                "3502903c.982ab",
+                "5524ecac.5cf47c",
+                "a12bd239.f8368",
+                "f8f2651c.3a035",
+                "f84d6f72.692148",
+                "5d1396ed.19b6f8",
+                "1b4871a6.1cd8a6",
+                "48083140.e99758",
+                "d94511cd.5d63f"
             ]
         ]
     },
     {
-        "id": "30a75a3e.13e116",
+        "id": "80e8f9a6.45b808",
         "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": 618.3833312988281,
+        "y": 1233,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c9ed31d4.2a59a",
+        "id": "784b1e5c.92c77",
         "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": 635.3833312988281,
+        "y": 1327,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "7b94a56a.0cc0c4",
+        "id": "3502903c.982ab",
         "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": 561.8833312988281,
+        "y": 1696,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "bd67d795.2e839"
+                "2dc7d020.0f01c8"
             ]
         ]
     },
     {
-        "id": "bd67d795.2e839",
+        "id": "2dc7d020.0f01c8",
         "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": 793.8833312988281,
+        "y": 1695,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "148b77ab.48b7a"
+                "9a9b2fc1.cfc378"
             ]
         ]
     },
     {
-        "id": "148b77ab.48b7a",
+        "id": "9a9b2fc1.cfc378",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1019.8833312988281,
-        "y": 1732,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1005.8833312988281,
+        "y": 1696,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "90ccd6ae.a26198"
+                "3ee84e3e.71c9c2"
             ]
         ]
     },
     {
-        "id": "90ccd6ae.a26198",
+        "id": "3ee84e3e.71c9c2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 275.8833312988281,
-        "y": 1888,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 261.8833312988281,
+        "y": 1852,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "8f4c1c14.35a72",
-                "c6a7aee9.6724"
+                "a6f3ac42.8fbf28",
+                "c5253df7.0ed11"
             ]
         ]
     },
     {
-        "id": "c6a7aee9.6724",
+        "id": "c5253df7.0ed11",
         "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": 496.8833312988281,
+        "y": 1839,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "8f4c1c14.35a72",
+        "id": "a6f3ac42.8fbf28",
         "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": 486.8833312988281,
+        "y": 1900,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2e648939.1db066",
-                "6fc34533.3f02e4",
-                "f4ca0a98.2172d"
+                "b27c66fe.f461f8",
+                "d86a808d.b5d38",
+                "51be47ba.06369"
             ]
         ]
     },
     {
-        "id": "6fc34533.3f02e4",
+        "id": "d86a808d.b5d38",
         "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": 700.3742980957031,
+        "y": 1884.5740356445312,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "24a8c225.12e4ae"
+                "40ccd27e.7bf8ec"
             ]
         ]
     },
     {
-        "id": "f4ca0a98.2172d",
+        "id": "51be47ba.06369",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 709.8833312988281,
-        "y": 1965,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 695.8833312988281,
+        "y": 1929,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a2a9b29c.7bdb18"
+                "10ad75eb.cd3092"
             ]
         ]
     },
     {
-        "id": "2e648939.1db066",
+        "id": "b27c66fe.f461f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 711.8833312988281,
-        "y": 2025,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 697.8833312988281,
+        "y": 1989,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6e035263.0ab9c4"
+                "f72f31f7.42e17"
             ]
         ]
     },
     {
-        "id": "24a8c225.12e4ae",
+        "id": "40ccd27e.7bf8ec",
         "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": 862.9458312988281,
+        "y": 1883.8597412109375,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "a2a9b29c.7bdb18",
+        "id": "10ad75eb.cd3092",
         "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": 863.8833312988281,
+        "y": 1929,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "6e035263.0ab9c4",
+        "id": "f72f31f7.42e17",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 880.8833312988281,
-        "y": 2024,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 866.8833312988281,
+        "y": 1988,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "fc704734.f5a92",
-                "534cefd0.094168"
+                "c01095c8.c5a848",
+                "1e0b480.37d7ab8"
             ]
         ]
     },
     {
-        "id": "9e9fd2d9.fce4a8",
+        "id": "f8f2651c.3a035",
         "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": 265.8833312988281,
+        "y": 2487,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "3e44ba6b.3875e6",
+        "id": "f84d6f72.692148",
         "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": 408.8833312988281,
+        "y": 2547,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b4c4bd8d.d5bdc",
-                "c813638c.89d0f"
+                "7174c4fb.4236d4",
+                "3df090d7.e28cf"
             ]
         ]
     },
     {
-        "id": "b4c4bd8d.d5bdc",
+        "id": "7174c4fb.4236d4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 735.3833312988281,
-        "y": 2560,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 721.3833312988281,
+        "y": 2524,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c813638c.89d0f",
+        "id": "3df090d7.e28cf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 739.3833312988281,
-        "y": 2600,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 725.3833312988281,
+        "y": 2564,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "3e668730.81c5e8"
+                "bbef1ecc.7916"
             ]
         ]
     },
     {
-        "id": "1c6aee6c.a3a53a",
+        "id": "4d6cfe8e.59e2a",
         "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": 901.3833312988281,
+        "y": 2528,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "3e668730.81c5e8",
+        "id": "bbef1ecc.7916",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 930.8833312988281,
-        "y": 2618,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 916.8833312988281,
+        "y": 2582,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e6168d7c.f871d"
+                "b94bbfec.158258"
             ]
         ]
     },
     {
-        "id": "59cef6d7.b8a21",
+        "id": "b2dda6de.cb3b28",
         "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": 1212.3833312988281,
+        "y": 2551,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5303ab1.d78928",
+        "id": "1cb10652.ba5e0a",
         "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": 2679.383331298828,
+        "y": 1902,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e6168d7c.f871d",
+        "id": "b94bbfec.158258",
         "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": 1174.3833312988281,
+        "y": 2593,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "878444f9.a47b7",
+        "id": "70ed09af.22122",
         "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": 584.3833312988281,
+        "y": 1271,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e2c4a442.f42cf",
+        "id": "dfffb0d0.b2d2d",
         "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": 597.3833312988281,
+        "y": 1367,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "dd4c3392.e1b02",
+        "id": "9521e4ca.a61af",
         "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": 4333.883331298828,
+        "y": 543,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c0b0957.1e6c48",
+        "id": "1d1e23b2.17cb04",
         "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": 4236.883331298828,
+        "y": 1362,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "88e8f378.a2b808",
+        "id": "e35a6c95.6b3d6",
         "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": 3730.883331298828,
+        "y": 2034,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "41f16b19.4ea28c",
+        "id": "9c5806bb.83c05",
         "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": 831.8833312988281,
+        "y": 842,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "7bf4aa70.c75d74",
-                "a798281b.2c68d8"
+                "24382f34.66808",
+                "ea56d949.8ce4b"
             ]
         ]
     },
     {
-        "id": "7bf4aa70.c75d74",
+        "id": "24382f34.66808",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1208.8833312988281,
-        "y": 901,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1194.8833312988281,
+        "y": 865,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e5a55559.f1ecf"
+                "d7ed30c6.74c9b"
             ]
         ]
     },
     {
-        "id": "a798281b.2c68d8",
+        "id": "ea56d949.8ce4b",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1208.8833312988281,
-        "y": 850,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1194.8833312988281,
+        "y": 814,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "486913c4.08fb54"
+                "3707e8cf.65827"
             ]
         ]
     },
     {
-        "id": "e5a55559.f1ecf",
+        "id": "d7ed30c6.74c9b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1364.8833312988281,
-        "y": 899,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1350.8833312988281,
+        "y": 863,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a3b35ff6.7d4a88"
+                "a7f36b9f.f75b88"
             ]
         ]
     },
     {
-        "id": "486913c4.08fb54",
+        "id": "3707e8cf.65827",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1341.8833312988281,
-        "y": 851,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1327.8833312988281,
+        "y": 815,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "4660bf61.473a18",
+        "id": "ed4d0298.cdb578",
         "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": 2087.883331298828,
+        "y": 213,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "1fda4b4a.2131e5",
+        "id": "1ced8517.ce35e3",
         "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": 3629.883331298828,
+        "y": 2194,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2a6ffb7c.8797f4",
+        "id": "224f4283.917d26",
         "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": 4219.883331298828,
+        "y": 667,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "a3af61e2.8efbd8",
+        "id": "b85bac18.623698",
         "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": 1393.8833312988281,
+        "y": 1773,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "14d69ea3.c37079",
+        "id": "5524ecac.5cf47c",
         "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": 572.8833312988281,
+        "y": 1507,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e39ba7bd.aed5d8",
+        "id": "a12bd239.f8368",
         "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": 603.8833312988281,
+        "y": 1547,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc704734.f5a92",
+        "id": "c01095c8.c5a848",
         "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": 1151.8833312988281,
+        "y": 1955,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "534cefd0.094168",
+        "id": "1e0b480.37d7ab8",
         "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": 1154.8833312988281,
+        "y": 1997,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "de368aef.16cb",
+        "id": "5d1396ed.19b6f8",
         "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": 597.8833312988281,
+        "y": 1637,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "61a182f0.95ec2c",
+        "id": "1b4871a6.1cd8a6",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 366.8833312988281,
-        "y": 2052,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 352.8833312988281,
+        "y": 2016,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "fae7aeca.a940b8",
+        "id": "48083140.e99758",
         "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": 360.8833312988281,
+        "y": 2073,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1dbcecbe.b5c9a3",
+        "id": "d97c4e37.51bad8",
         "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": 1371.8833312988281,
+        "y": 1622,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2facd73.aebb428",
-                "7c34f1f3.22e088"
+                "3df77641.8d727a",
+                "f024d61d.5a31c"
             ]
         ]
     },
     {
-        "id": "7c34f1f3.22e088",
+        "id": "f024d61d.5a31c",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1608.8833312988281,
-        "y": 1613,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1594.8833312988281,
+        "y": 1577,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "7e28ac3f.b53f7c"
+                "3c67000e.e921c"
             ]
         ]
     },
     {
-        "id": "2facd73.aebb428",
+        "id": "3df77641.8d727a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1610.8833312988281,
-        "y": 1677,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1596.8833312988281,
+        "y": 1641,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c1661a7d.0e642"
+                "de64177a.8916f"
             ]
         ]
     },
     {
-        "id": "7e28ac3f.b53f7c",
+        "id": "3c67000e.e921c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1773.8833312988281,
-        "y": 1610,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1759.8833312988281,
+        "y": 1574,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a55c6cbe.f3cef"
+                "9bea7c66.5f62c8"
             ]
         ]
     },
     {
-        "id": "c1661a7d.0e642",
+        "id": "de64177a.8916f",
         "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": 1758.8833312988281,
+        "y": 1637,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "a55c6cbe.f3cef",
+        "id": "9bea7c66.5f62c8",
         "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": 1979.8833312988281,
+        "y": 1588,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "a3eb9377.85c18",
+        "id": "7a38583b.020a88",
         "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": 1524.8833312988281,
+        "y": 2313,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "fcb0361d.62eb48"
+                "c388a6bf.f87f3"
             ]
         ]
     },
     {
-        "id": "dcd8db20.d12b7",
+        "id": "a2f5b878.ad169",
         "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": 1909.8833312988281,
+        "y": 2326,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "62f93408.d79154",
-                "c38cc9d8.7f1bc",
-                "576ffe09.c4abd8"
+                "7866488b.2039a8",
+                "bdc692ef.1c0858",
+                "823a852f.40d29"
             ]
         ]
     },
     {
-        "id": "fcb0361d.62eb48",
+        "id": "c388a6bf.f87f3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1717.8833312988281,
-        "y": 2349,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1703.8833312988281,
+        "y": 2313,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "90857791.e16908",
-                "dcd8db20.d12b7"
+                "5c79d6d8.a6a8e",
+                "a2f5b878.ad169"
             ]
         ]
     },
     {
-        "id": "90857791.e16908",
+        "id": "5c79d6d8.a6a8e",
         "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": 1939.8833312988281,
+        "y": 2274,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "62f93408.d79154",
+        "id": "7866488b.2039a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2133.883331298828,
-        "y": 2353,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2119.883331298828,
+        "y": 2317,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2c548a06.655d4e"
+                "4da79570.cd80cc"
             ]
         ]
     },
     {
-        "id": "c38cc9d8.7f1bc",
+        "id": "bdc692ef.1c0858",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2125.883331298828,
-        "y": 2408,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2111.883331298828,
+        "y": 2372,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "99196e80.99674"
+                "5ef7fec5.5efb98"
             ]
         ]
     },
     {
-        "id": "576ffe09.c4abd8",
+        "id": "823a852f.40d29",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2130.883331298828,
-        "y": 2465,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2116.883331298828,
+        "y": 2429,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ea704904.f61c3"
+                "57488074.1d65e"
             ]
         ]
     },
     {
-        "id": "ea704904.f61c3",
+        "id": "57488074.1d65e",
         "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": 2268.883331298828,
+        "y": 2430,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "99196e80.99674",
+        "id": "5ef7fec5.5efb98",
         "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": 2279.883331298828,
+        "y": 2375,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2c548a06.655d4e",
+        "id": "4da79570.cd80cc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2278.265655517578,
-        "y": 2350.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2264.265655517578,
+        "y": 2314.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "55de506e.ab2138"
+                "69f8caaf.bba51c"
             ]
         ]
     },
     {
-        "id": "55de506e.ab2138",
+        "id": "69f8caaf.bba51c",
         "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": 2478.883331298828,
+        "y": 2311,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2eeb0084.f61b88",
+        "id": "53cc84ce.e1faf4",
         "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": 602.8833312988281,
+        "y": 2359,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "21d8f2c9.3cd2be",
-                "32ff82a0.3bb24e",
-                "21eb3441.66cbb4"
+                "bb343bdc.881868",
+                "8bc84f5e.0473d8",
+                "78444b47.33ec34"
             ]
         ]
     },
     {
-        "id": "21d8f2c9.3cd2be",
+        "id": "bb343bdc.881868",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 812.3834533691406,
-        "y": 2347,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 798.3834533691406,
+        "y": 2311,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2571d7b1.c4fb5"
+                "bf3ecbb9.4dd008"
             ]
         ]
     },
     {
-        "id": "32ff82a0.3bb24e",
+        "id": "8bc84f5e.0473d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 804.3834533691406,
-        "y": 2402,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 790.3834533691406,
+        "y": 2366,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b0a2917a.ecde4"
+                "ef40b092.bc09e"
             ]
         ]
     },
     {
-        "id": "2571d7b1.c4fb5",
+        "id": "bf3ecbb9.4dd008",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 956.7657775878906,
-        "y": 2346.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 942.7657775878906,
+        "y": 2310.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a50320.52c78ce"
+                "1285266.d4ce8da"
             ]
         ]
     },
     {
-        "id": "a50320.52c78ce",
+        "id": "1285266.d4ce8da",
         "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": 1126.8833312988281,
+        "y": 2309,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b3deb273.cebb88"
+                "640d04c1.8428dc"
             ]
         ]
     },
     {
-        "id": "b3deb273.cebb88",
+        "id": "640d04c1.8428dc",
         "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": 1321.8833312988281,
+        "y": 2309,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a3eb9377.85c18"
+                "7a38583b.020a88"
             ]
         ]
     },
     {
-        "id": "21eb3441.66cbb4",
+        "id": "78444b47.33ec34",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 809.3834533691406,
-        "y": 2459,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 795.3834533691406,
+        "y": 2423,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "f2a9e7b0.6a4ff8"
+                "b417de17.8b3a6"
             ]
         ]
     },
     {
-        "id": "f2a9e7b0.6a4ff8",
+        "id": "b417de17.8b3a6",
         "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": 947.3834533691406,
+        "y": 2424,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "b0a2917a.ecde4",
+        "id": "ef40b092.bc09e",
         "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": 958.3834533691406,
+        "y": 2367,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e821cf32.5b22f",
+        "id": "fc4eafc.4810e5",
         "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": 592.8833312988281,
+        "y": 2271,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "f92bafd0.7c69c8",
+        "id": "d94511cd.5d63f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 351.8833312988281,
-        "y": 2438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 337.8833312988281,
+        "y": 2402,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e821cf32.5b22f",
-                "2eeb0084.f61b88"
+                "fc4eafc.4810e5",
+                "53cc84ce.e1faf4"
             ]
         ]
     },
     {
-        "id": "a832f3b6.8874e",
+        "id": "1a955b8d.047dd4",
         "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": 1552.8500061035156,
+        "y": 219.88333129882812,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "f645589d.ed3d98",
+        "id": "9a0e1ef7.428b9",
         "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": 754.8833312988281,
+        "y": 442,
+        "z": "db287b1f.2984a8",
         "wires": []
     }
 ]
\ No newline at end of file