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=9697f1489c203e4cf3acbef969d61ccf1e54a783;hb=934becd6c3b0ecce44b1652820c6b4960ed5636f;hp=b318a7311e37871362051ecb0e2e1fa53973a44d;hpb=80bf0e3b814aa3a9cef81825c1b2da0925241d09;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
index b318a731..9697f148 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,199 +1,199 @@
 [
     {
-        "id": "190659b8.bcae0e",
+        "id": "a7aee3f0.b04268",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 353.566650390625,
-        "y": 335,
-        "z": "8603b63b.c1c358",
+        "x": 400.566650390625,
+        "y": 374,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "b2e66c4e.a3d2f8",
-                "35dfe125.6c620e",
-                "69d67799.ffee68"
+                "96c8722a.b993c",
+                "e5061783.573db8",
+                "6a27552b.ad1ba4"
             ]
         ]
     },
     {
-        "id": "b2e66c4e.a3d2f8",
+        "id": "96c8722a.b993c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 541.566650390625,
-        "y": 348,
-        "z": "8603b63b.c1c358",
+        "x": 588.566650390625,
+        "y": 387,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "a7669132.5699f8"
+                "41e4d89f.ed1468"
             ]
         ]
     },
     {
-        "id": "35dfe125.6c620e",
+        "id": "e5061783.573db8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 549.0575866699219,
-        "y": 390.57403564453125,
-        "z": "8603b63b.c1c358",
+        "x": 596.0575866699219,
+        "y": 429.57403564453125,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "69d67799.ffee68",
+        "id": "6a27552b.ad1ba4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 539.566650390625,
-        "y": 437,
-        "z": "8603b63b.c1c358",
+        "x": 586.566650390625,
+        "y": 476,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7627d017.e729d8"
+                "a92b97b8.4129e8"
             ]
         ]
     },
     {
-        "id": "a7669132.5699f8",
+        "id": "41e4d89f.ed1468",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 714.566650390625,
-        "y": 346,
-        "z": "8603b63b.c1c358",
+        "x": 761.566650390625,
+        "y": 385,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "efea1cd6.23d6f8"
+                "cbc7d636.2def18"
             ]
         ]
     },
     {
-        "id": "efea1cd6.23d6f8",
+        "id": "cbc7d636.2def18",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 943.566650390625,
-        "y": 347,
-        "z": "8603b63b.c1c358",
+        "x": 990.566650390625,
+        "y": 386,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "afe63db8.26dbd8"
+                "39ab6bfa.74801c"
             ]
         ]
     },
     {
-        "id": "afe63db8.26dbd8",
+        "id": "39ab6bfa.74801c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1158.566650390625,
-        "y": 348,
-        "z": "8603b63b.c1c358",
+        "x": 1205.566650390625,
+        "y": 387,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "46ace79f.7f246"
+                "e124b2ef.0bfdc8"
             ]
         ]
     },
     {
-        "id": "356939c7.7d339e",
+        "id": "f6144c8.446efb",
         "type": "switchNode",
         "name": "switch vpnuuid is for this slice",
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1412.566650390625,
-        "y": 270,
-        "z": "8603b63b.c1c358",
+        "x": 1459.566650390625,
+        "y": 309,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "a076eac6.b4101",
-                "488c763c.46cdf"
+                "dc53b823.c6e998",
+                "b2e345a3.6b81"
             ]
         ]
     },
     {
-        "id": "a076eac6.b4101",
+        "id": "dc53b823.c6e998",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1629.566650390625,
-        "y": 249,
-        "z": "8603b63b.c1c358",
+        "x": 1676.566650390625,
+        "y": 288,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "46ace79f.7f246"
+                "e124b2ef.0bfdc8"
             ]
         ]
     },
     {
-        "id": "488c763c.46cdf",
+        "id": "b2e345a3.6b81",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1629.566650390625,
-        "y": 298,
-        "z": "8603b63b.c1c358",
+        "x": 1676.566650390625,
+        "y": 337,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "46ace79f.7f246",
+        "id": "e124b2ef.0bfdc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1813.566650390625,
-        "y": 335,
-        "z": "8603b63b.c1c358",
+        "x": 1860.566650390625,
+        "y": 374,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "5d0d530d.21fb2c",
-                "d6a4c941.f116b8",
-                "84203861.d12558"
+                "2ac81333.5163cc",
+                "ce04a89c.bde61",
+                "b01d3963.8ea8b8"
             ]
         ]
     },
     {
-        "id": "578597dc.f76518",
+        "id": "daba1b59.df55a",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 172.566650390625,
-        "y": 76,
-        "z": "8603b63b.c1c358",
+        "x": 219.566650390625,
+        "y": 115,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3273c1f.6d67d3e"
+                "53bce33c.ae731c"
             ]
         ]
     },
     {
-        "id": "3273c1f.6d67d3e",
+        "id": "53bce33c.ae731c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3711 +201,3711 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 456.8523406982422,
-        "y": 137.23810863494873,
-        "z": "8603b63b.c1c358",
+        "x": 503.8523406982422,
+        "y": 176.23810863494873,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "bc88585a.07ae"
+                "13dd53c4.ce4fbc"
             ]
         ]
     },
     {
-        "id": "bc88585a.07ae",
+        "id": "13dd53c4.ce4fbc",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-F1-Activate",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 462.99525451660156,
-        "y": 222.00003051757812,
-        "z": "8603b63b.c1c358",
+        "x": 509.99525451660156,
+        "y": 261.0000305175781,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "c722c351.6c9218"
+                "60b5835f.a436c4"
             ]
         ]
     },
     {
-        "id": "c722c351.6c9218",
+        "id": "60b5835f.a436c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 772.8046875,
-        "y": 213.66668701171875,
-        "z": "8603b63b.c1c358",
+        "x": 819.8046875,
+        "y": 252.66668701171875,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "190659b8.bcae0e",
-                "faef4429.aa2c8",
-                "54215ea2.f0c928",
-                "8ba173b9.e36f",
-                "e82defb9.e02d8"
+                "a7aee3f0.b04268",
+                "6d17c7fb.4906d8",
+                "7de7f253.4369ac",
+                "731e9165.7bfe5",
+                "c3d34fd5.00b8e8"
             ]
         ]
     },
     {
-        "id": "5d0d530d.21fb2c",
+        "id": "2ac81333.5163cc",
         "type": "set",
         "name": "set tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
         "comments": "",
-        "x": 2030.566650390625,
-        "y": 273,
-        "z": "8603b63b.c1c358",
+        "x": 2077.566650390625,
+        "y": 312,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "6fabd371.f1d30c",
+        "id": "581b9833.ca5308",
         "type": "set",
         "name": "set attachment_param for OTN A",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
         "comments": "",
-        "x": 4199.566650390625,
-        "y": 159,
-        "z": "8603b63b.c1c358",
+        "x": 4246.566650390625,
+        "y": 198,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "aa17cc43.b708b",
+        "id": "c57ed1b4.089b78",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4280.566650390625,
-        "y": 474,
-        "z": "8603b63b.c1c358",
+        "x": 4327.566650390625,
+        "y": 513,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "709fb1ba.ca1bd",
-                "a7a19ece.dc1ae"
+                "6866347a.b34054",
+                "d9ef66bb.b2e3a"
             ]
         ]
     },
     {
-        "id": "709fb1ba.ca1bd",
+        "id": "6866347a.b34054",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4590.066650390625,
-        "y": 443,
-        "z": "8603b63b.c1c358",
+        "x": 4637.066650390625,
+        "y": 482,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "5cd036bd.ebcf28"
+                "351f2ca1.efff8c"
             ]
         ]
     },
     {
-        "id": "a7a19ece.dc1ae",
+        "id": "d9ef66bb.b2e3a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4595.066650390625,
-        "y": 508,
-        "z": "8603b63b.c1c358",
+        "x": 4642.066650390625,
+        "y": 547,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "fddf1c47.d3871"
+                "7ec1daf0.49ebbc"
             ]
         ]
     },
     {
-        "id": "5cd036bd.ebcf28",
+        "id": "351f2ca1.efff8c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4766.066650390625,
-        "y": 443,
-        "z": "8603b63b.c1c358",
+        "x": 4813.066650390625,
+        "y": 482,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "fddf1c47.d3871",
+        "id": "7ec1daf0.49ebbc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4761.566650390625,
-        "y": 508,
-        "z": "8603b63b.c1c358",
+        "x": 4808.566650390625,
+        "y": 547,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "41b8dfa5.7b07b8",
+        "id": "fe354f09.d7eaa",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
         "comments": "",
-        "x": 4145.066650390625,
-        "y": 728,
-        "z": "8603b63b.c1c358",
+        "x": 4192.066650390625,
+        "y": 767,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "a2bed09b.bd073",
+        "id": "f82c7890.c5a3a",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4299.066650390625,
-        "y": 776,
-        "z": "8603b63b.c1c358",
+        "x": 4346.066650390625,
+        "y": 815,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8f1feb66.a203a8",
-                "bdea130f.d138e8"
+                "66ca2f72.5d0ea",
+                "384ae824.cd397"
             ]
         ]
     },
     {
-        "id": "8f1feb66.a203a8",
+        "id": "66ca2f72.5d0ea",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4644.566650390625,
-        "y": 757,
-        "z": "8603b63b.c1c358",
+        "x": 4691.566650390625,
+        "y": 796,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2db058d.5e37da8"
+                "8897aa30.2d04c"
             ]
         ]
     },
     {
-        "id": "bdea130f.d138e8",
+        "id": "384ae824.cd397",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4648.566650390625,
-        "y": 797,
-        "z": "8603b63b.c1c358",
+        "x": 4695.566650390625,
+        "y": 836,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "bfbb3301.3c3"
+                "e98f7531.5d07d8"
             ]
         ]
     },
     {
-        "id": "2db058d.5e37da8",
+        "id": "8897aa30.2d04c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4802.566650390625,
-        "y": 757,
-        "z": "8603b63b.c1c358",
+        "x": 4849.566650390625,
+        "y": 796,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "bfbb3301.3c3",
+        "id": "e98f7531.5d07d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4806.066650390625,
-        "y": 797,
-        "z": "8603b63b.c1c358",
+        "x": 4853.066650390625,
+        "y": 836,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "737d402b.600cc",
-                "9643556e.80a7d8"
+                "3b168b09.265424",
+                "f9e9fb1f.d5d228"
             ]
         ]
     },
     {
-        "id": "737d402b.600cc",
+        "id": "3b168b09.265424",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5136.566650390625,
-        "y": 762,
-        "z": "8603b63b.c1c358",
+        "x": 5183.566650390625,
+        "y": 801,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "340d03c1.bc10a4",
+        "id": "293d08cf.5ba9b",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 5000.566650390625,
-        "y": 721,
-        "z": "8603b63b.c1c358",
+        "x": 5047.566650390625,
+        "y": 760,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "9643556e.80a7d8",
+        "id": "f9e9fb1f.d5d228",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5063.566650390625,
-        "y": 808,
-        "z": "8603b63b.c1c358",
+        "x": 5110.566650390625,
+        "y": 847,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3e996a09.c24c1e",
+        "id": "5b448e3f.d6f97",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4137.566650390625,
-        "y": 207,
-        "z": "8603b63b.c1c358",
+        "x": 4184.566650390625,
+        "y": 246,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "73cd2276.fc690c",
+        "id": "11357d7a.7ec893",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4163.566650390625,
-        "y": 324,
-        "z": "8603b63b.c1c358",
+        "x": 4210.566650390625,
+        "y": 363,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2ce54c47.fa0e34",
-                "f2bf065e.86763",
-                "a6105f6e.dd58c"
+                "9cee4545.4afd2",
+                "c87207dc.1fc4c8",
+                "a541f904.08a73"
             ]
         ]
     },
     {
-        "id": "2ce54c47.fa0e34",
+        "id": "9cee4545.4afd2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4359.0667724609375,
-        "y": 276,
-        "z": "8603b63b.c1c358",
+        "x": 4406.0667724609375,
+        "y": 315,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ed0df0d0.842f2"
+                "174041c6.ef00ae"
             ]
         ]
     },
     {
-        "id": "f2bf065e.86763",
+        "id": "c87207dc.1fc4c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4351.0667724609375,
-        "y": 331,
-        "z": "8603b63b.c1c358",
+        "x": 4398.0667724609375,
+        "y": 370,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "40cafd9.39fe684"
+                "2578a714.32fd88"
             ]
         ]
     },
     {
-        "id": "ed0df0d0.842f2",
+        "id": "174041c6.ef00ae",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4503.4490966796875,
-        "y": 275.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 4550.4490966796875,
+        "y": 314.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "404c86f.cf51c78"
+                "44c47bf6.544e84"
             ]
         ]
     },
     {
-        "id": "4841f833.0282b8",
+        "id": "416e074e.1652a8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5085.566650390625,
-        "y": 278,
-        "z": "8603b63b.c1c358",
+        "x": 5132.566650390625,
+        "y": 317,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "13a4c0ae.89b21f"
+                "77699d71.cb9cbc"
             ]
         ]
     },
     {
-        "id": "404c86f.cf51c78",
+        "id": "44c47bf6.544e84",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4687.566650390625,
-        "y": 274,
-        "z": "8603b63b.c1c358",
+        "x": 4734.566650390625,
+        "y": 313,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "b62cc523.462948"
+                "ec3ad4d7.e6b51"
             ]
         ]
     },
     {
-        "id": "b62cc523.462948",
+        "id": "ec3ad4d7.e6b51",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4882.566650390625,
-        "y": 274,
-        "z": "8603b63b.c1c358",
+        "x": 4929.566650390625,
+        "y": 313,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "4841f833.0282b8"
+                "416e074e.1652a8"
             ]
         ]
     },
     {
-        "id": "a6105f6e.dd58c",
+        "id": "a541f904.08a73",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4356.0667724609375,
-        "y": 388,
-        "z": "8603b63b.c1c358",
+        "x": 4403.0667724609375,
+        "y": 427,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "62b98530.ba575c"
+                "44c8faa6.17201c"
             ]
         ]
     },
     {
-        "id": "62b98530.ba575c",
+        "id": "44c8faa6.17201c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4508.0667724609375,
-        "y": 389,
-        "z": "8603b63b.c1c358",
+        "x": 4555.0667724609375,
+        "y": 428,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "40cafd9.39fe684",
+        "id": "2578a714.32fd88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4519.0667724609375,
-        "y": 332,
-        "z": "8603b63b.c1c358",
+        "x": 4566.0667724609375,
+        "y": 371,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "ac0364e.0ddc498",
+        "id": "157b4f1e.ec4409",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5470.566650390625,
-        "y": 291,
-        "z": "8603b63b.c1c358",
+        "x": 5517.566650390625,
+        "y": 330,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "52afc77f.66ed58",
-                "690d4481.5a01f4",
-                "561d9e01.bb6af8"
+                "5eb578c.a510488",
+                "646e1345.d32534",
+                "d2cac0b5.69fe18"
             ]
         ]
     },
     {
-        "id": "13a4c0ae.89b21f",
+        "id": "77699d71.cb9cbc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5264.566650390625,
-        "y": 278,
-        "z": "8603b63b.c1c358",
+        "x": 5311.566650390625,
+        "y": 317,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3f0e652f.aee95a",
-                "ac0364e.0ddc498"
+                "e5b6fb7a.6fa868",
+                "157b4f1e.ec4409"
             ]
         ]
     },
     {
-        "id": "3f0e652f.aee95a",
+        "id": "e5b6fb7a.6fa868",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5500.566650390625,
-        "y": 239,
-        "z": "8603b63b.c1c358",
+        "x": 5547.566650390625,
+        "y": 278,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "52afc77f.66ed58",
+        "id": "5eb578c.a510488",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5680.566650390625,
-        "y": 282,
-        "z": "8603b63b.c1c358",
+        "x": 5727.566650390625,
+        "y": 321,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2a8d9ba9.4de844"
+                "e92c3ae0.67c78"
             ]
         ]
     },
     {
-        "id": "690d4481.5a01f4",
+        "id": "646e1345.d32534",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5672.566650390625,
-        "y": 337,
-        "z": "8603b63b.c1c358",
+        "x": 5719.566650390625,
+        "y": 376,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "54eb498f.c93a58"
+                "bbc83f99.73f6"
             ]
         ]
     },
     {
-        "id": "561d9e01.bb6af8",
+        "id": "d2cac0b5.69fe18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5677.566650390625,
-        "y": 394,
-        "z": "8603b63b.c1c358",
+        "x": 5724.566650390625,
+        "y": 433,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ab202d02.2d5188"
+                "2b4662b0.39c236"
             ]
         ]
     },
     {
-        "id": "ab202d02.2d5188",
+        "id": "2b4662b0.39c236",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5829.566650390625,
-        "y": 395,
-        "z": "8603b63b.c1c358",
+        "x": 5876.566650390625,
+        "y": 434,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "54eb498f.c93a58",
+        "id": "bbc83f99.73f6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5840.566650390625,
-        "y": 340,
-        "z": "8603b63b.c1c358",
+        "x": 5887.566650390625,
+        "y": 379,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2a8d9ba9.4de844",
+        "id": "e92c3ae0.67c78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5824.948974609375,
-        "y": 279.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 5871.948974609375,
+        "y": 318.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "fdb43e15.dd2458"
+                "79f8358f.b45374"
             ]
         ]
     },
     {
-        "id": "fdb43e15.dd2458",
+        "id": "79f8358f.b45374",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 6039.566650390625,
-        "y": 276,
-        "z": "8603b63b.c1c358",
+        "x": 6086.566650390625,
+        "y": 315,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "ad465d2.36cfe2",
+        "id": "ffd19574.4197a8",
         "type": "set",
         "name": "set attachment_param for OTN B",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
-        "x": 3606.566650390625,
-        "y": 1616,
-        "z": "8603b63b.c1c358",
+        "x": 3653.566650390625,
+        "y": 1655,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "1622f07d.ae60d",
+        "id": "bd3c5166.6aead",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3669.566650390625,
-        "y": 1945,
-        "z": "8603b63b.c1c358",
+        "x": 3716.566650390625,
+        "y": 1984,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "e470471b.4d3ef",
-                "8ee5f8b0.1b5738"
+                "85a267fb.c74d5",
+                "1abf40e9.7b1f1f"
             ]
         ]
     },
     {
-        "id": "e470471b.4d3ef",
+        "id": "85a267fb.c74d5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3965.066650390625,
-        "y": 1912,
-        "z": "8603b63b.c1c358",
+        "x": 4012.066650390625,
+        "y": 1951,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "fbda4868.d5b3c"
+                "8944bada.8beb4"
             ]
         ]
     },
     {
-        "id": "8ee5f8b0.1b5738",
+        "id": "1abf40e9.7b1f1f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3970.066650390625,
-        "y": 1977,
-        "z": "8603b63b.c1c358",
+        "x": 4017.066650390625,
+        "y": 2016,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "13ccd918.a15e2f"
+                "fa8bf7ac.5ecf28"
             ]
         ]
     },
     {
-        "id": "fbda4868.d5b3c",
+        "id": "8944bada.8beb4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4133.066650390625,
-        "y": 1912,
-        "z": "8603b63b.c1c358",
+        "x": 4180.066650390625,
+        "y": 1951,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "13ccd918.a15e2f",
+        "id": "fa8bf7ac.5ecf28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4143.566650390625,
-        "y": 1977,
-        "z": "8603b63b.c1c358",
+        "x": 4190.566650390625,
+        "y": 2016,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6aa679a5.fc13d8",
+        "id": "e3d71f0.616b0e",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
         "comments": "",
-        "x": 3545.566650390625,
-        "y": 1673,
-        "z": "8603b63b.c1c358",
+        "x": 3592.566650390625,
+        "y": 1712,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "63f314c3.d2093c",
+        "id": "5f81a64c.5bf2a",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3565.566650390625,
-        "y": 1770,
-        "z": "8603b63b.c1c358",
+        "x": 3612.566650390625,
+        "y": 1809,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "cb2cd4ea.b10f5",
-                "da2dd809.2eaba8",
-                "b7e5de7f.bd9438"
+                "1781a1bd.0348ce",
+                "e03bcd54.697738",
+                "94b9ef51.5409d"
             ]
         ]
     },
     {
-        "id": "cb2cd4ea.b10f5",
+        "id": "1781a1bd.0348ce",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3768.0667724609375,
-        "y": 1723,
-        "z": "8603b63b.c1c358",
+        "x": 3815.0667724609375,
+        "y": 1762,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "92ce9c5d.eb149"
+                "a95165c1.f614f8"
             ]
         ]
     },
     {
-        "id": "da2dd809.2eaba8",
+        "id": "e03bcd54.697738",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3760.0667724609375,
-        "y": 1778,
-        "z": "8603b63b.c1c358",
+        "x": 3807.0667724609375,
+        "y": 1817,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d2833ad2.c8fbd8"
+                "b5b6c797.75de6"
             ]
         ]
     },
     {
-        "id": "92ce9c5d.eb149",
+        "id": "a95165c1.f614f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3912.4490966796875,
-        "y": 1720.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 3959.4490966796875,
+        "y": 1759.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7c59c7e4.737078"
+                "5bb225c8.c4c70c"
             ]
         ]
     },
     {
-        "id": "7c59c7e4.737078",
+        "id": "5bb225c8.c4c70c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4096.566650390625,
-        "y": 1735,
-        "z": "8603b63b.c1c358",
+        "x": 4143.566650390625,
+        "y": 1774,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "4a60b77a.b003e"
+                "7747e85a.705d5"
             ]
         ]
     },
     {
-        "id": "b7e5de7f.bd9438",
+        "id": "94b9ef51.5409d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3765.0667724609375,
-        "y": 1835,
-        "z": "8603b63b.c1c358",
+        "x": 3812.0667724609375,
+        "y": 1874,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "482f9215.08666c"
+                "9d4f33d7.c972d"
             ]
         ]
     },
     {
-        "id": "482f9215.08666c",
+        "id": "9d4f33d7.c972d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3917.0667724609375,
-        "y": 1836,
-        "z": "8603b63b.c1c358",
+        "x": 3964.0667724609375,
+        "y": 1875,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d2833ad2.c8fbd8",
+        "id": "b5b6c797.75de6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3928.0667724609375,
-        "y": 1781,
-        "z": "8603b63b.c1c358",
+        "x": 3975.0667724609375,
+        "y": 1820,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8251a2fe.8b6a98",
+        "id": "7641eade.641374",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4494.566650390625,
-        "y": 1739,
-        "z": "8603b63b.c1c358",
+        "x": 4541.566650390625,
+        "y": 1778,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3fea75ef.6caa7a"
+                "745d7190.9cf208"
             ]
         ]
     },
     {
-        "id": "4a60b77a.b003e",
+        "id": "7747e85a.705d5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4291.566650390625,
-        "y": 1735,
-        "z": "8603b63b.c1c358",
+        "x": 4338.566650390625,
+        "y": 1774,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8251a2fe.8b6a98"
+                "7641eade.641374"
             ]
         ]
     },
     {
-        "id": "49b53839.01783",
+        "id": "95464c66.d9ff8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4879.566650390625,
-        "y": 1738,
-        "z": "8603b63b.c1c358",
+        "x": 4926.566650390625,
+        "y": 1777,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "b2b3032.264fd8",
-                "373b81c5.683f3e",
-                "869370b9.925f48"
+                "bb6dbaba.ff1548",
+                "a59e3175.15a9b",
+                "4bc34556.41323c"
             ]
         ]
     },
     {
-        "id": "3fea75ef.6caa7a",
+        "id": "745d7190.9cf208",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4671.566650390625,
-        "y": 1731,
-        "z": "8603b63b.c1c358",
+        "x": 4718.566650390625,
+        "y": 1770,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "dd88623a.123e",
-                "49b53839.01783"
+                "80afd84e.d6bdd8",
+                "95464c66.d9ff8"
             ]
         ]
     },
     {
-        "id": "dd88623a.123e",
+        "id": "80afd84e.d6bdd8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4909.566650390625,
-        "y": 1686,
-        "z": "8603b63b.c1c358",
+        "x": 4956.566650390625,
+        "y": 1725,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8fb4dcc3.25c568",
+        "id": "42edd12e.5451d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5238.566650390625,
-        "y": 1842,
-        "z": "8603b63b.c1c358",
+        "x": 5285.566650390625,
+        "y": 1881,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "95a386c5.a58638",
+        "id": "ea697aed.d1f358",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5249.566650390625,
-        "y": 1787,
-        "z": "8603b63b.c1c358",
+        "x": 5296.566650390625,
+        "y": 1826,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "738801a1.4d047",
+        "id": "edcb3571.8c6728",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5233.948974609375,
-        "y": 1726.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 5280.948974609375,
+        "y": 1765.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "710bce1a.dc395"
+                "6d55462a.8f8fa8"
             ]
         ]
     },
     {
-        "id": "710bce1a.dc395",
+        "id": "6d55462a.8f8fa8",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5448.566650390625,
-        "y": 1723,
-        "z": "8603b63b.c1c358",
+        "x": 5495.566650390625,
+        "y": 1762,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "b2b3032.264fd8",
+        "id": "bb6dbaba.ff1548",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5089.566650390625,
-        "y": 1729,
-        "z": "8603b63b.c1c358",
+        "x": 5136.566650390625,
+        "y": 1768,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "738801a1.4d047"
+                "edcb3571.8c6728"
             ]
         ]
     },
     {
-        "id": "373b81c5.683f3e",
+        "id": "a59e3175.15a9b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5081.566650390625,
-        "y": 1784,
-        "z": "8603b63b.c1c358",
+        "x": 5128.566650390625,
+        "y": 1823,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "95a386c5.a58638"
+                "ea697aed.d1f358"
             ]
         ]
     },
     {
-        "id": "869370b9.925f48",
+        "id": "4bc34556.41323c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5086.566650390625,
-        "y": 1841,
-        "z": "8603b63b.c1c358",
+        "x": 5133.566650390625,
+        "y": 1880,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8fb4dcc3.25c568"
+                "42edd12e.5451d"
             ]
         ]
     },
     {
-        "id": "60036337.4eba24",
+        "id": "64ebcb8e.6a273c",
         "type": "switchNode",
         "name": "switch vpn-binding has dst-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3120.566650390625,
-        "y": 687,
-        "z": "8603b63b.c1c358",
+        "x": 3167.566650390625,
+        "y": 726,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3dc5eab6.536eee",
-                "c84ae496.428be8"
+                "635bfedd.0eff1",
+                "4466b072.e153e8"
             ]
         ]
     },
     {
-        "id": "3dc5eab6.536eee",
+        "id": "635bfedd.0eff1",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3334.566650390625,
-        "y": 724,
-        "z": "8603b63b.c1c358",
+        "x": 3381.566650390625,
+        "y": 763,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "20d6afb2.5423d"
+                "f20f4b09.4270d8"
             ]
         ]
     },
     {
-        "id": "c84ae496.428be8",
+        "id": "4466b072.e153e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3336.566650390625,
-        "y": 662,
-        "z": "8603b63b.c1c358",
+        "x": 3383.566650390625,
+        "y": 701,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "c6c4710b.3b446"
+                "388a019b.9b73c6"
             ]
         ]
     },
     {
-        "id": "20d6afb2.5423d",
+        "id": "f20f4b09.4270d8",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2914.566650390625,
-        "y": 1967,
-        "z": "8603b63b.c1c358",
+        "x": 2961.566650390625,
+        "y": 2006,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "f7e1076.b120ff8",
-                "38975d3e.e2ea2a"
+                "69af1ba1.41260c",
+                "13b2b9f.1f67dc6"
             ]
         ]
     },
     {
-        "id": "f7e1076.b120ff8",
+        "id": "69af1ba1.41260c",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3167.566650390625,
-        "y": 2001,
-        "z": "8603b63b.c1c358",
+        "x": 3214.566650390625,
+        "y": 2040,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "6af8dbb6.a59b4c"
+                "c8858f37.c3f05"
             ]
         ]
     },
     {
-        "id": "38975d3e.e2ea2a",
+        "id": "13b2b9f.1f67dc6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3167.566650390625,
-        "y": 1945,
-        "z": "8603b63b.c1c358",
+        "x": 3214.566650390625,
+        "y": 1984,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2e5f8334.fd5e8c"
+                "be4790f9.3bf898"
             ]
         ]
     },
     {
-        "id": "6af8dbb6.a59b4c",
+        "id": "c8858f37.c3f05",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3318.566650390625,
-        "y": 2001,
-        "z": "8603b63b.c1c358",
+        "x": 3365.566650390625,
+        "y": 2040,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d2d4d90e.2fae",
+        "id": "7a5e210e.9e5d48",
         "type": "set",
         "name": "set vpn-bindingA and connectivityA",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4194.566650390625,
-        "y": 99,
-        "z": "8603b63b.c1c358",
+        "x": 4241.566650390625,
+        "y": 138,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "33cb0d0f.4dfe6a",
+        "id": "163461bd.87a87e",
         "type": "set",
         "name": "set vpn-bindingB and connectivityB",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
         "comments": "",
-        "x": 3602.566650390625,
-        "y": 1558,
-        "z": "8603b63b.c1c358",
+        "x": 3649.566650390625,
+        "y": 1597,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d855f72b.7e86a8",
+        "id": "354c57ea.e71ee8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3885.566650390625,
-        "y": 356,
-        "z": "8603b63b.c1c358",
+        "x": 3932.566650390625,
+        "y": 395,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d2d4d90e.2fae",
-                "6fabd371.f1d30c",
-                "3e996a09.c24c1e",
-                "73cd2276.fc690c",
-                "aa17cc43.b708b",
-                "2774aa91.aa9f06",
-                "8954306d.3c458",
-                "d41278c1.0e8268"
+                "7a5e210e.9e5d48",
+                "581b9833.ca5308",
+                "5b448e3f.d6f97",
+                "11357d7a.7ec893",
+                "c57ed1b4.089b78",
+                "5d6e99f5.a1e2d",
+                "1771c9d3.36c546",
+                "d9cf64bd.4ed12"
             ]
         ]
     },
     {
-        "id": "2e5f8334.fd5e8c",
+        "id": "be4790f9.3bf898",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3318.566650390625,
-        "y": 1944,
-        "z": "8603b63b.c1c358",
+        "x": 3365.566650390625,
+        "y": 1983,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "33cb0d0f.4dfe6a",
-                "ad465d2.36cfe2",
-                "6aa679a5.fc13d8",
-                "63f314c3.d2093c",
-                "1622f07d.ae60d",
-                "2d0bf44f.d7a87c",
-                "745353ea.a7c82c",
-                "a43e9ba4.30fe8"
+                "163461bd.87a87e",
+                "ffd19574.4197a8",
+                "e3d71f0.616b0e",
+                "5f81a64c.5bf2a",
+                "bd3c5166.6aead",
+                "b596d9f.c7daaa8",
+                "2308c235.08d20e",
+                "5a0cb184.9cdf98"
             ]
         ]
     },
     {
-        "id": "ea6929ec.54f7c8",
+        "id": "12d5b667.53ec1a",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
-        "x": 3556.566650390625,
-        "y": 2243,
-        "z": "8603b63b.c1c358",
+        "x": 3603.566650390625,
+        "y": 2282,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "5471fe10.85fa48",
+        "id": "b0af817e.3df5c",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3710.566650390625,
-        "y": 2291,
-        "z": "8603b63b.c1c358",
+        "x": 3757.566650390625,
+        "y": 2330,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "709844dc.12b89c",
-                "36a6ddd8.c214a2"
+                "8bd672ae.f97518",
+                "171382a6.de96c5"
             ]
         ]
     },
     {
-        "id": "709844dc.12b89c",
+        "id": "8bd672ae.f97518",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4056.066650390625,
-        "y": 2272,
-        "z": "8603b63b.c1c358",
+        "x": 4103.066650390625,
+        "y": 2311,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "b6a9b933.1ec16"
+                "26f501a4.aaf356"
             ]
         ]
     },
     {
-        "id": "36a6ddd8.c214a2",
+        "id": "171382a6.de96c5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4060.066650390625,
-        "y": 2312,
-        "z": "8603b63b.c1c358",
+        "x": 4107.066650390625,
+        "y": 2351,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ef6de723.b6fb38"
+                "81506f95.53e78"
             ]
         ]
     },
     {
-        "id": "b6a9b933.1ec16",
+        "id": "26f501a4.aaf356",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4214.066650390625,
-        "y": 2272,
-        "z": "8603b63b.c1c358",
+        "x": 4261.066650390625,
+        "y": 2311,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "ef6de723.b6fb38",
+        "id": "81506f95.53e78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4217.566650390625,
-        "y": 2312,
-        "z": "8603b63b.c1c358",
+        "x": 4264.566650390625,
+        "y": 2351,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "dffbfe56.944988",
-                "8e76351f.3450b"
+                "8a72bd7f.2b673",
+                "2efc6876.725c8"
             ]
         ]
     },
     {
-        "id": "dffbfe56.944988",
+        "id": "8a72bd7f.2b673",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4557.566650390625,
-        "y": 2311,
-        "z": "8603b63b.c1c358",
+        "x": 4604.566650390625,
+        "y": 2350,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2006b0c.836e18",
+        "id": "52aaed09.836384",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4415.566650390625,
-        "y": 2269,
-        "z": "8603b63b.c1c358",
+        "x": 4462.566650390625,
+        "y": 2308,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8e76351f.3450b",
+        "id": "2efc6876.725c8",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4486.566650390625,
-        "y": 2360,
-        "z": "8603b63b.c1c358",
+        "x": 4533.566650390625,
+        "y": 2399,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "43b4f3be.c07abc",
+        "id": "601ee7c2.7cf4c8",
         "type": "set",
         "name": "set attachment_param (gfp-n) for OTN",
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
         "comments": "",
-        "x": 3111.566650390625,
-        "y": 627,
-        "z": "8603b63b.c1c358",
+        "x": 3158.566650390625,
+        "y": 666,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "a5929ea4.d560e8",
+        "id": "f8b99cf2.a93e78",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3706.566650390625,
-        "y": 313,
-        "z": "8603b63b.c1c358",
+        "x": 3753.566650390625,
+        "y": 352,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "40338a80.0ff774",
+        "id": "ba2b5c4f.29126",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3263.566650390625,
-        "y": 1891,
-        "z": "8603b63b.c1c358",
+        "x": 3310.566650390625,
+        "y": 1930,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "c6c4710b.3b446",
+        "id": "388a019b.9b73c6",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3442.566650390625,
-        "y": 475,
-        "z": "8603b63b.c1c358",
+        "x": 3489.566650390625,
+        "y": 514,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8c077d56.2d05a8",
-                "47f9e9e4.4ae948"
+                "60287d21.a15fac",
+                "e673bc57.d2c08"
             ]
         ]
     },
     {
-        "id": "47f9e9e4.4ae948",
+        "id": "e673bc57.d2c08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3684.566650390625,
-        "y": 1064,
-        "z": "8603b63b.c1c358",
+        "x": 3731.566650390625,
+        "y": 1103,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "32d70917.41b9b6"
+                "8e141356.94256"
             ]
         ]
     },
     {
-        "id": "8c077d56.2d05a8",
+        "id": "60287d21.a15fac",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3678.566650390625,
-        "y": 355,
-        "z": "8603b63b.c1c358",
+        "x": 3725.566650390625,
+        "y": 394,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d855f72b.7e86a8"
+                "354c57ea.e71ee8"
             ]
         ]
     },
     {
-        "id": "32d70917.41b9b6",
+        "id": "8e141356.94256",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3842.566650390625,
-        "y": 1063,
-        "z": "8603b63b.c1c358",
+        "x": 3889.566650390625,
+        "y": 1102,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ab9c9477.87e1",
-                "16a44de.db79032",
-                "42cda8d6.66eab8",
-                "aab7a1d7.f682c8",
-                "43e0f21e.8328e4",
-                "173252a4.3c7835"
+                "660dd4a0.d8f1f4",
+                "bd6ec24f.7d2838",
+                "2d50a497.118c24",
+                "60d7ef05.f89ff8",
+                "feec0e79.04d7e8",
+                "6270f9ff.6a6b4"
             ]
         ]
     },
     {
-        "id": "16a44de.db79032",
+        "id": "bd6ec24f.7d2838",
         "type": "set",
         "name": "set attachment_param for OTN G",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
         "comments": "",
-        "x": 4106.566650390625,
-        "y": 946,
-        "z": "8603b63b.c1c358",
+        "x": 4153.566650390625,
+        "y": 985,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "43e0f21e.8328e4",
+        "id": "feec0e79.04d7e8",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4187.566650390625,
-        "y": 1261,
-        "z": "8603b63b.c1c358",
+        "x": 4234.566650390625,
+        "y": 1300,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ecdb1dc3.601aa",
-                "9e4afd98.6cdb48"
+                "1829c13e.6c182f",
+                "cdc3e429.be6fa"
             ]
         ]
     },
     {
-        "id": "ecdb1dc3.601aa",
+        "id": "1829c13e.6c182f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4497.066650390625,
-        "y": 1230,
-        "z": "8603b63b.c1c358",
+        "x": 4544.066650390625,
+        "y": 1269,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "111350dc.469227"
+                "5b91a7ec.2e4658"
             ]
         ]
     },
     {
-        "id": "9e4afd98.6cdb48",
+        "id": "cdc3e429.be6fa",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4502.066650390625,
-        "y": 1295,
-        "z": "8603b63b.c1c358",
+        "x": 4549.066650390625,
+        "y": 1334,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "c6b74dac.622de"
+                "8046aee4.83e438"
             ]
         ]
     },
     {
-        "id": "111350dc.469227",
+        "id": "5b91a7ec.2e4658",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4673.066650390625,
-        "y": 1230,
-        "z": "8603b63b.c1c358",
+        "x": 4720.066650390625,
+        "y": 1269,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "c6b74dac.622de",
+        "id": "8046aee4.83e438",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4668.566650390625,
-        "y": 1295,
-        "z": "8603b63b.c1c358",
+        "x": 4715.566650390625,
+        "y": 1334,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "42cda8d6.66eab8",
+        "id": "2d50a497.118c24",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4044.566650390625,
-        "y": 994,
-        "z": "8603b63b.c1c358",
+        "x": 4091.566650390625,
+        "y": 1033,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "aab7a1d7.f682c8",
+        "id": "60d7ef05.f89ff8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4070.566650390625,
-        "y": 1111,
-        "z": "8603b63b.c1c358",
+        "x": 4117.566650390625,
+        "y": 1150,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "fc77fdb3.27d7c",
-                "3d52c0ff.052c58",
-                "d66dde94.6fdfd8"
+                "684da58c.28fc44",
+                "7420bdce.6aab1c",
+                "21d55314.ed559c"
             ]
         ]
     },
     {
-        "id": "fc77fdb3.27d7c",
+        "id": "684da58c.28fc44",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4266.0667724609375,
-        "y": 1063,
-        "z": "8603b63b.c1c358",
+        "x": 4313.0667724609375,
+        "y": 1102,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "6a6dadc5.106a64"
+                "64489fc6.c8241"
             ]
         ]
     },
     {
-        "id": "3d52c0ff.052c58",
+        "id": "7420bdce.6aab1c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4258.0667724609375,
-        "y": 1118,
-        "z": "8603b63b.c1c358",
+        "x": 4305.0667724609375,
+        "y": 1157,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "6a18bc26.5dd68c"
+                "92f1b89c.1ab69"
             ]
         ]
     },
     {
-        "id": "6a6dadc5.106a64",
+        "id": "64489fc6.c8241",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4410.4490966796875,
-        "y": 1062.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 4457.4490966796875,
+        "y": 1101.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "abd6aa97.319628"
+                "48d2ac4e.25f6b4"
             ]
         ]
     },
     {
-        "id": "abd6aa97.319628",
+        "id": "48d2ac4e.25f6b4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4594.566650390625,
-        "y": 1061,
-        "z": "8603b63b.c1c358",
+        "x": 4641.566650390625,
+        "y": 1100,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d45837ad.7cfdd"
+                "714ce556.4f2fcc"
             ]
         ]
     },
     {
-        "id": "d45837ad.7cfdd",
+        "id": "714ce556.4f2fcc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4789.566650390625,
-        "y": 1061,
-        "z": "8603b63b.c1c358",
+        "x": 4836.566650390625,
+        "y": 1100,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "56faad34.523464"
+                "2076535.8c263ac"
             ]
         ]
     },
     {
-        "id": "d66dde94.6fdfd8",
+        "id": "21d55314.ed559c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4263.0667724609375,
-        "y": 1175,
-        "z": "8603b63b.c1c358",
+        "x": 4310.0667724609375,
+        "y": 1214,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "da706f47.bc937"
+                "45f37411.31ce94"
             ]
         ]
     },
     {
-        "id": "da706f47.bc937",
+        "id": "45f37411.31ce94",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4415.0667724609375,
-        "y": 1176,
-        "z": "8603b63b.c1c358",
+        "x": 4462.0667724609375,
+        "y": 1215,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "6a18bc26.5dd68c",
+        "id": "92f1b89c.1ab69",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4426.0667724609375,
-        "y": 1119,
-        "z": "8603b63b.c1c358",
+        "x": 4473.0667724609375,
+        "y": 1158,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "ab9c9477.87e1",
+        "id": "660dd4a0.d8f1f4",
         "type": "set",
         "name": "set vpn-bindingG and connectivityG",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4101.566650390625,
-        "y": 886,
-        "z": "8603b63b.c1c358",
+        "x": 4148.566650390625,
+        "y": 925,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "56faad34.523464",
+        "id": "2076535.8c263ac",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4992.566650390625,
-        "y": 1065,
-        "z": "8603b63b.c1c358",
+        "x": 5039.566650390625,
+        "y": 1104,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "30b949db.4c7a16"
+                "f782ae02.7309d8"
             ]
         ]
     },
     {
-        "id": "df7b95f6.393d48",
+        "id": "4c7d2512.5b4fb4",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5377.566650390625,
-        "y": 1078,
-        "z": "8603b63b.c1c358",
+        "x": 5424.566650390625,
+        "y": 1117,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "166f182a.55dd48",
-                "e1871eda.62c8a8",
-                "b691673d.bc8c3"
+                "f27cc561.589478",
+                "533a9a4e.562074",
+                "f04fcd62.bdef1"
             ]
         ]
     },
     {
-        "id": "30b949db.4c7a16",
+        "id": "f782ae02.7309d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5171.566650390625,
-        "y": 1065,
-        "z": "8603b63b.c1c358",
+        "x": 5218.566650390625,
+        "y": 1104,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "5671583d.41ed78",
-                "df7b95f6.393d48"
+                "eec3155e.2bcec8",
+                "4c7d2512.5b4fb4"
             ]
         ]
     },
     {
-        "id": "5671583d.41ed78",
+        "id": "eec3155e.2bcec8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5407.566650390625,
-        "y": 1026,
-        "z": "8603b63b.c1c358",
+        "x": 5454.566650390625,
+        "y": 1065,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "166f182a.55dd48",
+        "id": "f27cc561.589478",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5587.566650390625,
-        "y": 1069,
-        "z": "8603b63b.c1c358",
+        "x": 5634.566650390625,
+        "y": 1108,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "61f2e54a.d8bfcc"
+                "20cc7528.d35caa"
             ]
         ]
     },
     {
-        "id": "e1871eda.62c8a8",
+        "id": "533a9a4e.562074",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5579.566650390625,
-        "y": 1124,
-        "z": "8603b63b.c1c358",
+        "x": 5626.566650390625,
+        "y": 1163,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "95391466.b0fdc8"
+                "a99b13d6.7a5b4"
             ]
         ]
     },
     {
-        "id": "b691673d.bc8c3",
+        "id": "f04fcd62.bdef1",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5584.566650390625,
-        "y": 1181,
-        "z": "8603b63b.c1c358",
+        "x": 5631.566650390625,
+        "y": 1220,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "eaaeed8c.dbf45"
+                "76e3f44a.1be574"
             ]
         ]
     },
     {
-        "id": "eaaeed8c.dbf45",
+        "id": "76e3f44a.1be574",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5736.566650390625,
-        "y": 1182,
-        "z": "8603b63b.c1c358",
+        "x": 5783.566650390625,
+        "y": 1221,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "95391466.b0fdc8",
+        "id": "a99b13d6.7a5b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5747.566650390625,
-        "y": 1127,
-        "z": "8603b63b.c1c358",
+        "x": 5794.566650390625,
+        "y": 1166,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "61f2e54a.d8bfcc",
+        "id": "20cc7528.d35caa",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5731.948974609375,
-        "y": 1066.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 5778.948974609375,
+        "y": 1105.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "573ef3d8.3e7cf4"
+                "52e6acc9.c6278c"
             ]
         ]
     },
     {
-        "id": "573ef3d8.3e7cf4",
+        "id": "52e6acc9.c6278c",
         "type": "set",
         "name": "set controller domainG data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5946.566650390625,
-        "y": 1063,
-        "z": "8603b63b.c1c358",
+        "x": 5993.566650390625,
+        "y": 1102,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2171f884.ea7ea8",
+        "id": "7dd287b6.719d08",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3720.566650390625,
-        "y": 1004,
-        "z": "8603b63b.c1c358",
+        "x": 3767.566650390625,
+        "y": 1043,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d6a4c941.f116b8",
+        "id": "ce04a89c.bde61",
         "type": "switchNode",
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2282.566650390625,
-        "y": 731,
-        "z": "8603b63b.c1c358",
+        "x": 2329.566650390625,
+        "y": 770,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "49267234.da4bac",
-                "c034393e.41c88"
+                "f4c77699.53d898",
+                "9865c4e0.3bcc6"
             ]
         ]
     },
     {
-        "id": "c034393e.41c88",
+        "id": "9865c4e0.3bcc6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2689.566650390625,
-        "y": 749,
-        "z": "8603b63b.c1c358",
+        "x": 2736.566650390625,
+        "y": 788,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "bc6b2cdd.907e6"
+                "ad8883f5.8e3298"
             ]
         ]
     },
     {
-        "id": "49267234.da4bac",
+        "id": "f4c77699.53d898",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2689.566650390625,
-        "y": 694,
-        "z": "8603b63b.c1c358",
+        "x": 2736.566650390625,
+        "y": 733,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "1c258f4d.ef4741"
+                "e8f3ed6f.2eafd"
             ]
         ]
     },
     {
-        "id": "1c258f4d.ef4741",
+        "id": "e8f3ed6f.2eafd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2845.566650390625,
-        "y": 692,
-        "z": "8603b63b.c1c358",
+        "x": 2892.566650390625,
+        "y": 731,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "43b4f3be.c07abc",
-                "60036337.4eba24"
+                "601ee7c2.7cf4c8",
+                "64ebcb8e.6a273c"
             ]
         ]
     },
     {
-        "id": "bc6b2cdd.907e6",
+        "id": "ad8883f5.8e3298",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2822.566650390625,
-        "y": 750,
-        "z": "8603b63b.c1c358",
+        "x": 2869.566650390625,
+        "y": 789,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "faef4429.aa2c8",
+        "id": "6d17c7fb.4906d8",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 999.566650390625,
-        "y": 166,
-        "z": "8603b63b.c1c358",
+        "x": 1046.566650390625,
+        "y": 205,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "cda219ec.f988b",
+        "id": "c6c6f64f.fccbe8",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 4116.566650390625,
-        "y": 584,
-        "z": "8603b63b.c1c358",
+        "x": 4163.566650390625,
+        "y": 623,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2774aa91.aa9f06",
+        "id": "5d6e99f5.a1e2d",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4176.566650390625,
-        "y": 623,
-        "z": "8603b63b.c1c358",
+        "x": 4223.566650390625,
+        "y": 662,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "54215ea2.f0c928",
+        "id": "7de7f253.4369ac",
         "type": "set",
         "name": "unset leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",
         "comments": "",
-        "x": 992.566650390625,
-        "y": 74,
-        "z": "8603b63b.c1c358",
+        "x": 1039.566650390625,
+        "y": 113,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "96b9a282.e630c",
+        "id": "9d19ef7b.02af28",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 3528.566650390625,
-        "y": 2100,
-        "z": "8603b63b.c1c358",
+        "x": 3575.566650390625,
+        "y": 2139,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2d0bf44f.d7a87c",
+        "id": "b596d9f.c7daaa8",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3584.566650390625,
-        "y": 2149,
-        "z": "8603b63b.c1c358",
+        "x": 3631.566650390625,
+        "y": 2188,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "5152a0e6.713128",
+        "id": "aeebae01.261168",
         "type": "set",
         "name": "unset root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",
         "comments": "",
-        "x": 992.566650390625,
-        "y": 113,
-        "z": "8603b63b.c1c358",
+        "x": 1039.566650390625,
+        "y": 152,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8ba173b9.e36f",
+        "id": "731e9165.7bfe5",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1023.566650390625,
-        "y": 214,
-        "z": "8603b63b.c1c358",
+        "x": 1070.566650390625,
+        "y": 253,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e82defb9.e02d8",
+        "id": "c3d34fd5.00b8e8",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 233.566650390625,
-        "y": 689,
-        "z": "8603b63b.c1c358",
+        "x": 280.566650390625,
+        "y": 728,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2d5a1d5b.838492",
-                "889991f3.032d8",
-                "b5db494f.57cef8"
+                "39350f2.499cf7",
+                "6ce2e49e.7b3484",
+                "5333638f.7ecf8c"
             ]
         ]
     },
     {
-        "id": "2d5a1d5b.838492",
+        "id": "39350f2.499cf7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 452.566650390625,
-        "y": 627,
-        "z": "8603b63b.c1c358",
+        "x": 499.566650390625,
+        "y": 666,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "438119f5.89426"
+                "36841c29.6decdc"
             ]
         ]
     },
     {
-        "id": "889991f3.032d8",
+        "id": "6ce2e49e.7b3484",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 462.0576171875,
-        "y": 669.5740356445312,
-        "z": "8603b63b.c1c358",
+        "x": 509.0576171875,
+        "y": 708.5740356445312,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5db494f.57cef8",
+        "id": "5333638f.7ecf8c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 450.566650390625,
-        "y": 716,
-        "z": "8603b63b.c1c358",
+        "x": 497.566650390625,
+        "y": 755,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "debce4b9.8571d"
+                "3e93247c.aebb34"
             ]
         ]
     },
     {
-        "id": "438119f5.89426",
+        "id": "36841c29.6decdc",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 649.566650390625,
-        "y": 623,
-        "z": "8603b63b.c1c358",
+        "x": 696.566650390625,
+        "y": 662,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "e1b02bed.ab2ac8"
+                "1f2c86c7.cadda9"
             ]
         ]
     },
     {
-        "id": "debce4b9.8571d",
+        "id": "3e93247c.aebb34",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 619.566650390625,
-        "y": 717,
-        "z": "8603b63b.c1c358",
+        "x": 666.566650390625,
+        "y": 756,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "e1b02bed.ab2ac8",
+        "id": "1f2c86c7.cadda9",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 872.900146484375,
-        "y": 622.9999389648438,
-        "z": "8603b63b.c1c358",
+        "x": 919.900146484375,
+        "y": 661.9999389648438,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "e03ee0c1.da854"
+                "a1cbb7bd.24594"
             ]
         ]
     },
     {
-        "id": "e03ee0c1.da854",
+        "id": "a1cbb7bd.24594",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1073.5667839050293,
-        "y": 624.000020980835,
-        "z": "8603b63b.c1c358",
+        "x": 1120.5667839050293,
+        "y": 663.000020980835,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "c4a6ee39.d82118"
+                "1f60fbe4.6df234"
             ]
         ]
     },
     {
-        "id": "c4a6ee39.d82118",
+        "id": "1f60fbe4.6df234",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 203.566650390625,
-        "y": 886,
-        "z": "8603b63b.c1c358",
+        "x": 250.566650390625,
+        "y": 925,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7634ec98.e6038c",
-                "916099a4.9dccf",
-                "c850e0b6.e35a68"
+                "63c00e4f.b84e58",
+                "13815c78.95eb5c",
+                "e5780368.e11db"
             ]
         ]
     },
     {
-        "id": "7634ec98.e6038c",
+        "id": "63c00e4f.b84e58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 411.566650390625,
-        "y": 850,
-        "z": "8603b63b.c1c358",
+        "x": 458.566650390625,
+        "y": 889,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "33f1fe4a.c9d6f2"
+                "c1076b8e.81d988"
             ]
         ]
     },
     {
-        "id": "916099a4.9dccf",
+        "id": "13815c78.95eb5c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 412.0576171875,
-        "y": 895.5740356445312,
-        "z": "8603b63b.c1c358",
+        "x": 459.0576171875,
+        "y": 934.5740356445312,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c850e0b6.e35a68",
+        "id": "e5780368.e11db",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 409.566650390625,
-        "y": 939,
-        "z": "8603b63b.c1c358",
+        "x": 456.566650390625,
+        "y": 978,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "76c84cf.6c8b334"
+                "96cea788.4bc5b"
             ]
         ]
     },
     {
-        "id": "76c84cf.6c8b334",
+        "id": "96cea788.4bc5b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 578.566650390625,
-        "y": 940,
-        "z": "8603b63b.c1c358",
+        "x": 625.566650390625,
+        "y": 979,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d82baf7f.56b2f",
+        "id": "ec5bb05c.091188",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 550.566650390625,
-        "y": 1434,
-        "z": "8603b63b.c1c358",
+        "x": 597.566650390625,
+        "y": 1473,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3c41a0c0.d2817"
+                "19a0d254.b680d6"
             ]
         ]
     },
     {
-        "id": "3c41a0c0.d2817",
+        "id": "19a0d254.b680d6",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 753.566650390625,
-        "y": 1446,
-        "z": "8603b63b.c1c358",
+        "x": 800.566650390625,
+        "y": 1485,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "24edffac.eaf52"
+                "5cf33a37.92a98c"
             ]
         ]
     },
     {
-        "id": "24edffac.eaf52",
+        "id": "5cf33a37.92a98c",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 919.566650390625,
-        "y": 1443,
-        "z": "8603b63b.c1c358",
+        "x": 966.566650390625,
+        "y": 1482,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8767ddb8.be5188"
+                "60d055a9.95f0c4"
             ]
         ]
     },
     {
-        "id": "8767ddb8.be5188",
+        "id": "60d055a9.95f0c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1080.566650390625,
-        "y": 1440,
-        "z": "8603b63b.c1c358",
+        "x": 1127.566650390625,
+        "y": 1479,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "acad8b74.fa56d8",
-                "31574f1b.e35268",
-                "9a0e95d9.2f80c",
-                "559bb9d.67d2e48",
-                "d55a6f33.2c1388",
-                "bc764283.2e9fd8"
+                "325c2337.f5bbac",
+                "282c70ac.7ebb8",
+                "790547b3.03e69",
+                "be332a4a.d8db58",
+                "88b6396e.dee88",
+                "3f4654a9.b7d9fc"
             ]
         ]
     },
     {
-        "id": "31574f1b.e35268",
+        "id": "282c70ac.7ebb8",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1286.566650390625,
-        "y": 1039.9999389648438,
-        "z": "8603b63b.c1c358",
+        "x": 1333.566650390625,
+        "y": 1078.9999389648438,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "acad8b74.fa56d8",
+        "id": "325c2337.f5bbac",
         "type": "save",
         "name": "get uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1283.566650390625,
-        "y": 1084.9999389648438,
-        "z": "8603b63b.c1c358",
+        "x": 1330.566650390625,
+        "y": 1123.9999389648438,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "1904c12b.d430cf",
-                "4ab95198.c6613",
-                "5a08d5cf.278d24"
+                "5ebf3dd3.403df4",
+                "df8620f2.fcde78",
+                "4f82abb0.8dd704"
             ]
         ]
     },
     {
-        "id": "4ab95198.c6613",
+        "id": "df8620f2.fcde78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1479.0576171875,
-        "y": 1058.5739135742188,
-        "z": "8603b63b.c1c358",
+        "x": 1526.0576171875,
+        "y": 1097.5739135742188,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ba7aa021.45bdf8"
+                "f317bbdf.6454e"
             ]
         ]
     },
     {
-        "id": "5a08d5cf.278d24",
+        "id": "4f82abb0.8dd704",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1474.566650390625,
-        "y": 1102.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1521.566650390625,
+        "y": 1141.9998779296875,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "785f1788.92249"
+                "ba985891.b5d178"
             ]
         ]
     },
     {
-        "id": "ba7aa021.45bdf8",
+        "id": "f317bbdf.6454e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1641.629150390625,
-        "y": 1057.859619140625,
-        "z": "8603b63b.c1c358",
+        "x": 1688.629150390625,
+        "y": 1096.859619140625,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "785f1788.92249",
+        "id": "ba985891.b5d178",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1642.566650390625,
-        "y": 1102.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1689.566650390625,
+        "y": 1141.9998779296875,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "cc679883.b7f1b8",
+        "id": "d594aca6.9a4aa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1644.566650390625,
-        "y": 1149.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1691.566650390625,
+        "y": 1188.9998779296875,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1904c12b.d430cf",
+        "id": "5ebf3dd3.403df4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1475.566650390625,
-        "y": 1149.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1522.566650390625,
+        "y": 1188.9998779296875,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "cc679883.b7f1b8"
+                "d594aca6.9a4aa"
             ]
         ]
     },
     {
-        "id": "1a421455.86d86c",
+        "id": "f22d69be.3697f8",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 1257.566650390625,
-        "y": 1671,
-        "z": "8603b63b.c1c358",
+        "x": 1304.566650390625,
+        "y": 1710,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "9a0e95d9.2f80c",
+        "id": "790547b3.03e69",
         "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": 1348.566650390625,
-        "y": 1725,
-        "z": "8603b63b.c1c358",
+        "x": 1395.566650390625,
+        "y": 1764,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "62fb7c08.30d35c",
+        "id": "a6f0acc2.4c1e8",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2025.066650390625,
-        "y": 1138,
-        "z": "8603b63b.c1c358",
+        "x": 2072.066650390625,
+        "y": 1177,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "b56049ef.636ab",
+        "id": "ff492e23.69ead8",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2030.066650390625,
-        "y": 1240,
-        "z": "8603b63b.c1c358",
+        "x": 2077.066650390625,
+        "y": 1279,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "513cbd5b.994ffc",
+        "id": "f2cd3854.ada88",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 513.566650390625,
-        "y": 1690,
-        "z": "8603b63b.c1c358",
+        "x": 560.566650390625,
+        "y": 1729,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "a14556b2.428608"
+                "6040df7.067df2"
             ]
         ]
     },
     {
-        "id": "a14556b2.428608",
+        "id": "6040df7.067df2",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 745.566650390625,
-        "y": 1689,
-        "z": "8603b63b.c1c358",
+        "x": 792.566650390625,
+        "y": 1728,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "e5395881.3f95e"
+                "f4813036.0e422"
             ]
         ]
     },
     {
-        "id": "e5395881.3f95e",
+        "id": "f4813036.0e422",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 957.566650390625,
-        "y": 1690,
-        "z": "8603b63b.c1c358",
+        "x": 1004.566650390625,
+        "y": 1729,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ee871fda.29052"
+                "21d7816d.cb9a2e"
             ]
         ]
     },
     {
-        "id": "ee871fda.29052",
+        "id": "21d7816d.cb9a2e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 213.566650390625,
-        "y": 1846,
-        "z": "8603b63b.c1c358",
+        "x": 260.566650390625,
+        "y": 1885,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d07450f8.7cfbd8",
-                "c80ac602.107b6"
+                "99bd9d6a.34096",
+                "25dea7fd.0f37b"
             ]
         ]
     },
     {
-        "id": "c80ac602.107b6",
+        "id": "25dea7fd.0f37b",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 448.566650390625,
-        "y": 1833,
-        "z": "8603b63b.c1c358",
+        "x": 495.566650390625,
+        "y": 1872,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d07450f8.7cfbd8",
+        "id": "99bd9d6a.34096",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 438.566650390625,
-        "y": 1894,
-        "z": "8603b63b.c1c358",
+        "x": 485.566650390625,
+        "y": 1933,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3c9f89f1.b2d72e",
-                "7eb3712.5c8929",
-                "ab93aafa.12aed"
+                "74a706a.d47d878",
+                "7274c8e3.f8fec8",
+                "b6208f6.4c1eb7"
             ]
         ]
     },
     {
-        "id": "7eb3712.5c8929",
+        "id": "7274c8e3.f8fec8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 652.0576171875,
-        "y": 1878.5740356445312,
-        "z": "8603b63b.c1c358",
+        "x": 699.0576171875,
+        "y": 1917.5740356445312,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "abd0cdd.d934eb"
+                "7f886391.998a1c"
             ]
         ]
     },
     {
-        "id": "ab93aafa.12aed",
+        "id": "b6208f6.4c1eb7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 647.566650390625,
-        "y": 1923,
-        "z": "8603b63b.c1c358",
+        "x": 694.566650390625,
+        "y": 1962,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "b79502c7.acaad8"
+                "3f233556.698682"
             ]
         ]
     },
     {
-        "id": "3c9f89f1.b2d72e",
+        "id": "74a706a.d47d878",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 649.566650390625,
-        "y": 1983,
-        "z": "8603b63b.c1c358",
+        "x": 696.566650390625,
+        "y": 2022,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "509a448f.bd538c"
+                "721ed34e.4f1714"
             ]
         ]
     },
     {
-        "id": "abd0cdd.d934eb",
+        "id": "7f886391.998a1c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 814.629150390625,
-        "y": 1877.8597412109375,
-        "z": "8603b63b.c1c358",
+        "x": 861.629150390625,
+        "y": 1916.8597412109375,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "b79502c7.acaad8",
+        "id": "3f233556.698682",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 815.566650390625,
-        "y": 1923,
-        "z": "8603b63b.c1c358",
+        "x": 862.566650390625,
+        "y": 1962,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "509a448f.bd538c",
+        "id": "721ed34e.4f1714",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 818.566650390625,
-        "y": 1982,
-        "z": "8603b63b.c1c358",
+        "x": 865.566650390625,
+        "y": 2021,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "fd6f29b3.e5c99",
-                "f26de900.3c25f8"
+                "fb6c612a.831f28",
+                "af0310e2.931fe8"
             ]
         ]
     },
     {
-        "id": "3501776f.2dad38",
+        "id": "a05b5003.46c7e8",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
         "comments": "",
-        "x": 238.566650390625,
-        "y": 2484,
-        "z": "8603b63b.c1c358",
+        "x": 285.566650390625,
+        "y": 2523,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "ae9e098e.f50fb",
+        "id": "c5885881.921d18",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 360.566650390625,
-        "y": 2541,
-        "z": "8603b63b.c1c358",
+        "x": 407.566650390625,
+        "y": 2580,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "be334cda.e25598",
-                "43d4ffc9.f69dc"
+                "1736d2be.a7f385",
+                "11bf3fb5.747c4"
             ]
         ]
     },
     {
-        "id": "be334cda.e25598",
+        "id": "1736d2be.a7f385",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 673.066650390625,
-        "y": 2518,
-        "z": "8603b63b.c1c358",
+        "x": 720.066650390625,
+        "y": 2557,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "43d4ffc9.f69dc",
+        "id": "11bf3fb5.747c4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 677.066650390625,
-        "y": 2558,
-        "z": "8603b63b.c1c358",
+        "x": 724.066650390625,
+        "y": 2597,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "f38c34e4.0af87"
+                "9fa6731e.bfdda"
             ]
         ]
     },
     {
-        "id": "1415cbe4.3643cc",
+        "id": "d975bee8.cbb1b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 853.066650390625,
-        "y": 2522,
-        "z": "8603b63b.c1c358",
+        "x": 900.066650390625,
+        "y": 2561,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "f38c34e4.0af87",
+        "id": "9fa6731e.bfdda",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 868.566650390625,
-        "y": 2576,
-        "z": "8603b63b.c1c358",
+        "x": 915.566650390625,
+        "y": 2615,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "38f98e31.2df7c2",
-                "2709d484.f39df4",
-                "708149ff.3b7b8",
-                "40e18201.7f31fc"
+                "26102eb4.5bf9d2",
+                "a5cf86e7.fd2ae8",
+                "94107493.94d3e8",
+                "c85f3994.bd81f"
             ]
         ]
     },
     {
-        "id": "4fb2f1f7.44fff8",
+        "id": "3a7c38a3.d1311",
         "type": "save",
         "name": "update vpn-binding resource (aka. OTN ) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1164.066650390625,
-        "y": 2545,
-        "z": "8603b63b.c1c358",
+        "x": 1211.066650390625,
+        "y": 2584,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8d799ed5.7c896",
+        "id": "d5ebfe0.284f7",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 2631.066650390625,
-        "y": 1896,
-        "z": "8603b63b.c1c358",
+        "x": 2678.066650390625,
+        "y": 1935,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "38f98e31.2df7c2",
+        "id": "26102eb4.5bf9d2",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1126.066650390625,
-        "y": 2587,
-        "z": "8603b63b.c1c358",
+        "x": 1173.066650390625,
+        "y": 2626,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "421d14d0.8fa8dc",
+        "id": "eaf51112.30b59",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 1991.066650390625,
-        "y": 1176,
-        "z": "8603b63b.c1c358",
+        "x": 2038.066650390625,
+        "y": 1215,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "f196d566.5b274",
+        "id": "77e27285.394bfc",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 1992.066650390625,
-        "y": 1280,
-        "z": "8603b63b.c1c358",
+        "x": 2039.066650390625,
+        "y": 1319,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8954306d.3c458",
+        "id": "1771c9d3.36c546",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4285.566650390625,
-        "y": 537,
-        "z": "8603b63b.c1c358",
+        "x": 4332.566650390625,
+        "y": 576,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "173252a4.3c7835",
+        "id": "6270f9ff.6a6b4",
         "type": "save",
         "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4188.566650390625,
-        "y": 1356,
-        "z": "8603b63b.c1c358",
+        "x": 4235.566650390625,
+        "y": 1395,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "745353ea.a7c82c",
+        "id": "2308c235.08d20e",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3682.566650390625,
-        "y": 2028,
-        "z": "8603b63b.c1c358",
+        "x": 3729.566650390625,
+        "y": 2067,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "33f1fe4a.c9d6f2",
+        "id": "c1076b8e.81d988",
         "type": "switchNode",
         "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 783.566650390625,
-        "y": 836,
-        "z": "8603b63b.c1c358",
+        "x": 830.566650390625,
+        "y": 875,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "c7ca69b2.c33e8",
-                "dbefa186.4d7f68"
+                "451a757.6fc508c",
+                "8b0542af.2f9d78"
             ]
         ]
     },
     {
-        "id": "c7ca69b2.c33e8",
+        "id": "451a757.6fc508c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1146.566650390625,
-        "y": 859,
-        "z": "8603b63b.c1c358",
+        "x": 1193.566650390625,
+        "y": 898,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "100503a.a2b7efc"
+                "f1ea0737.b79178"
             ]
         ]
     },
     {
-        "id": "dbefa186.4d7f68",
+        "id": "8b0542af.2f9d78",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1146.566650390625,
-        "y": 808,
-        "z": "8603b63b.c1c358",
+        "x": 1193.566650390625,
+        "y": 847,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "5ea3a0fe.77a12"
+                "3e6bbe33.acc602"
             ]
         ]
     },
     {
-        "id": "100503a.a2b7efc",
+        "id": "f1ea0737.b79178",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1302.566650390625,
-        "y": 857,
-        "z": "8603b63b.c1c358",
+        "x": 1349.566650390625,
+        "y": 896,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8fcbaf21.052888"
+                "cb3a4052.881008"
             ]
         ]
     },
     {
-        "id": "5ea3a0fe.77a12",
+        "id": "3e6bbe33.acc602",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1279.566650390625,
-        "y": 809,
-        "z": "8603b63b.c1c358",
+        "x": 1326.566650390625,
+        "y": 848,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "84203861.d12558",
+        "id": "b01d3963.8ea8b8",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2039.566650390625,
-        "y": 207,
-        "z": "8603b63b.c1c358",
+        "x": 2086.566650390625,
+        "y": 246,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "a43e9ba4.30fe8",
+        "id": "5a0cb184.9cdf98",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3581.566650390625,
-        "y": 2188,
-        "z": "8603b63b.c1c358",
+        "x": 3628.566650390625,
+        "y": 2227,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d41278c1.0e8268",
+        "id": "d9cf64bd.4ed12",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4171.566650390625,
-        "y": 661,
-        "z": "8603b63b.c1c358",
+        "x": 4218.566650390625,
+        "y": 700,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "559bb9d.67d2e48",
+        "id": "be332a4a.d8db58",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1345.566650390625,
-        "y": 1767,
-        "z": "8603b63b.c1c358",
+        "x": 1392.566650390625,
+        "y": 1806,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "11998164.d0953f",
+        "id": "3501da3.a014526",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 524.566650390625,
-        "y": 1501,
-        "z": "8603b63b.c1c358",
+        "x": 571.566650390625,
+        "y": 1540,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "3fbbcb97.f97994",
+        "id": "2c2649c2.53ac7e",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 555.566650390625,
-        "y": 1541,
-        "z": "8603b63b.c1c358",
+        "x": 602.566650390625,
+        "y": 1580,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd6f29b3.e5c99",
+        "id": "fb6c612a.831f28",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1103.566650390625,
-        "y": 1949,
-        "z": "8603b63b.c1c358",
+        "x": 1150.566650390625,
+        "y": 1988,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "f26de900.3c25f8",
+        "id": "af0310e2.931fe8",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1106.566650390625,
-        "y": 1991,
-        "z": "8603b63b.c1c358",
+        "x": 1153.566650390625,
+        "y": 2030,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "10dd7514.d835b3",
+        "id": "694d6c2f.8edccc",
         "type": "set",
         "name": "unset otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",
         "comments": "",
-        "x": 549.566650390625,
-        "y": 1631,
-        "z": "8603b63b.c1c358",
+        "x": 596.566650390625,
+        "y": 1670,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "9cbc66e4.acef28",
+        "id": "4b32fbef.652bc4",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 304.566650390625,
-        "y": 2010,
-        "z": "8603b63b.c1c358",
+        "x": 351.566650390625,
+        "y": 2049,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2ee73d5.0d9a4c2",
+        "id": "caa8a64f.1936",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 312.566650390625,
-        "y": 2067,
-        "z": "8603b63b.c1c358",
+        "x": 359.566650390625,
+        "y": 2106,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d55a6f33.2c1388",
+        "id": "88b6396e.dee88",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1323.566650390625,
-        "y": 1616,
-        "z": "8603b63b.c1c358",
+        "x": 1370.566650390625,
+        "y": 1655,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "9cf30931.2c59c8",
-                "da4af294.46477"
+                "45e3fdbe.201574",
+                "86940004.bfdd7"
             ]
         ]
     },
     {
-        "id": "da4af294.46477",
+        "id": "86940004.bfdd7",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1546.566650390625,
-        "y": 1571,
-        "z": "8603b63b.c1c358",
+        "x": 1593.566650390625,
+        "y": 1610,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "66fe36a9.5f3c98"
+                "c31b8cce.808f08"
             ]
         ]
     },
     {
-        "id": "9cf30931.2c59c8",
+        "id": "45e3fdbe.201574",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1548.566650390625,
-        "y": 1635,
-        "z": "8603b63b.c1c358",
+        "x": 1595.566650390625,
+        "y": 1674,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "204d74d2.252cac"
+                "1cc861e4.834c36"
             ]
         ]
     },
     {
-        "id": "66fe36a9.5f3c98",
+        "id": "c31b8cce.808f08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1711.566650390625,
-        "y": 1568,
-        "z": "8603b63b.c1c358",
+        "x": 1758.566650390625,
+        "y": 1607,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "4c93c317.b90e14"
+                "b2423aca.7a4fa8"
             ]
         ]
     },
     {
-        "id": "204d74d2.252cac",
+        "id": "1cc861e4.834c36",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 1710.566650390625,
-        "y": 1631,
-        "z": "8603b63b.c1c358",
+        "x": 1757.566650390625,
+        "y": 1670,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "4c93c317.b90e14",
+        "id": "b2423aca.7a4fa8",
         "type": "set",
         "name": "set tmp.uni-node-id-short",
         "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",
         "comments": "",
-        "x": 1931.566650390625,
-        "y": 1582,
-        "z": "8603b63b.c1c358",
+        "x": 1978.566650390625,
+        "y": 1621,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "83593740.e4ddd",
+        "id": "45f30159.842648",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1476.566650390625,
-        "y": 2307,
-        "z": "8603b63b.c1c358",
+        "x": 1523.566650390625,
+        "y": 2346,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "bc0ef8cb.38db18"
+                "195465ca.996e92"
             ]
         ]
     },
     {
-        "id": "a1ab9a32.41426",
+        "id": "ac9df433.f2c8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 1861.566650390625,
-        "y": 2320,
-        "z": "8603b63b.c1c358",
+        "x": 1908.566650390625,
+        "y": 2359,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "eafaddf4.4288",
-                "a1c53fdc.e94408",
-                "b9669b07.a51828"
+                "565cac1f.04fa64",
+                "e43b7ac1.fcb9e",
+                "7ad49b0d.e0614c"
             ]
         ]
     },
     {
-        "id": "bc0ef8cb.38db18",
+        "id": "195465ca.996e92",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1655.566650390625,
-        "y": 2307,
-        "z": "8603b63b.c1c358",
+        "x": 1702.566650390625,
+        "y": 2346,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2580690.f3eb118",
-                "a1ab9a32.41426"
+                "94dbb559.adb488",
+                "ac9df433.f2c8"
             ]
         ]
     },
     {
-        "id": "2580690.f3eb118",
+        "id": "94dbb559.adb488",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainConn id",
         "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 1891.566650390625,
-        "y": 2268,
-        "z": "8603b63b.c1c358",
+        "x": 1938.566650390625,
+        "y": 2307,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "eafaddf4.4288",
+        "id": "565cac1f.04fa64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2071.566650390625,
-        "y": 2311,
-        "z": "8603b63b.c1c358",
+        "x": 2118.566650390625,
+        "y": 2350,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "13cd3d1.ffcccc3"
+                "b1dc084c.7cde9"
             ]
         ]
     },
     {
-        "id": "a1c53fdc.e94408",
+        "id": "e43b7ac1.fcb9e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2063.566650390625,
-        "y": 2366,
-        "z": "8603b63b.c1c358",
+        "x": 2110.566650390625,
+        "y": 2405,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7da7ccee.d6972c"
+                "385c483c.3ef568"
             ]
         ]
     },
     {
-        "id": "b9669b07.a51828",
+        "id": "7ad49b0d.e0614c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2068.566650390625,
-        "y": 2423,
-        "z": "8603b63b.c1c358",
+        "x": 2115.566650390625,
+        "y": 2462,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2930329b.329efe"
+                "35f4b5a3.f8aa4a"
             ]
         ]
     },
     {
-        "id": "2930329b.329efe",
+        "id": "35f4b5a3.f8aa4a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2220.566650390625,
-        "y": 2424,
-        "z": "8603b63b.c1c358",
+        "x": 2267.566650390625,
+        "y": 2463,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "7da7ccee.d6972c",
+        "id": "385c483c.3ef568",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2231.566650390625,
-        "y": 2369,
-        "z": "8603b63b.c1c358",
+        "x": 2278.566650390625,
+        "y": 2408,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "13cd3d1.ffcccc3",
+        "id": "b1dc084c.7cde9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2215.948974609375,
-        "y": 2308.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 2262.948974609375,
+        "y": 2347.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "febf727.ffe5c9"
+                "5d32a434.f7be54"
             ]
         ]
     },
     {
-        "id": "febf727.ffe5c9",
+        "id": "5d32a434.f7be54",
         "type": "set",
         "name": "set controller domainConn data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 2430.566650390625,
-        "y": 2305,
-        "z": "8603b63b.c1c358",
+        "x": 2477.566650390625,
+        "y": 2344,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2716544d.2e4214",
+        "id": "51bc490a.0719c",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 554.566650390625,
-        "y": 2353,
-        "z": "8603b63b.c1c358",
+        "x": 601.566650390625,
+        "y": 2392,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "a2a1891d.4d5168",
-                "9cd28e00.2567d",
-                "a8c6a166.3984e"
+                "9a98fb41.58116",
+                "d11dcfed.810438",
+                "f803d5ab.85238"
             ]
         ]
     },
     {
-        "id": "a2a1891d.4d5168",
+        "id": "9a98fb41.58116",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 750.0667724609375,
-        "y": 2305,
-        "z": "8603b63b.c1c358",
+        "x": 797.0667724609375,
+        "y": 2344,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "6cfc839f.58b674"
+                "98bce7a3.da5e"
             ]
         ]
     },
     {
-        "id": "9cd28e00.2567d",
+        "id": "d11dcfed.810438",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 742.0667724609375,
-        "y": 2360,
-        "z": "8603b63b.c1c358",
+        "x": 789.0667724609375,
+        "y": 2399,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7eb3886b.0a9b58"
+                "71f2762f.659628"
             ]
         ]
     },
     {
-        "id": "6cfc839f.58b674",
+        "id": "98bce7a3.da5e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 894.4490966796875,
-        "y": 2304.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 941.4490966796875,
+        "y": 2343.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "cd8dae32.8ecf2"
+                "c67046c0.c64788"
             ]
         ]
     },
     {
-        "id": "cd8dae32.8ecf2",
+        "id": "c67046c0.c64788",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1078.566650390625,
-        "y": 2303,
-        "z": "8603b63b.c1c358",
+        "x": 1125.566650390625,
+        "y": 2342,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2f1b8cbe.c629a4"
+                "5f0a1eb2.b2273"
             ]
         ]
     },
     {
-        "id": "2f1b8cbe.c629a4",
+        "id": "5f0a1eb2.b2273",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1273.566650390625,
-        "y": 2303,
-        "z": "8603b63b.c1c358",
+        "x": 1320.566650390625,
+        "y": 2342,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "83593740.e4ddd"
+                "45f30159.842648"
             ]
         ]
     },
     {
-        "id": "a8c6a166.3984e",
+        "id": "f803d5ab.85238",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 747.0667724609375,
-        "y": 2417,
-        "z": "8603b63b.c1c358",
+        "x": 794.0667724609375,
+        "y": 2456,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "1a3f5fd3.7d7ca8"
+                "33262ba5.8d682c"
             ]
         ]
     },
     {
-        "id": "1a3f5fd3.7d7ca8",
+        "id": "33262ba5.8d682c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 899.0667724609375,
-        "y": 2418,
-        "z": "8603b63b.c1c358",
+        "x": 946.0667724609375,
+        "y": 2457,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "7eb3886b.0a9b58",
+        "id": "71f2762f.659628",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 910.0667724609375,
-        "y": 2361,
-        "z": "8603b63b.c1c358",
+        "x": 957.0667724609375,
+        "y": 2400,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "7c9a9ea1.e0f0b",
+        "id": "808535b.d0bfd48",
         "type": "set",
         "name": "set tmp.pnf-name-forUrl",
         "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
         "comments": "",
-        "x": 544.566650390625,
-        "y": 2265,
-        "z": "8603b63b.c1c358",
+        "x": 591.566650390625,
+        "y": 2304,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "c2f9529c.5f262",
+        "id": "6e3ab27b.a7f37c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 289.566650390625,
-        "y": 2396,
-        "z": "8603b63b.c1c358",
+        "x": 336.566650390625,
+        "y": 2435,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7c9a9ea1.e0f0b",
-                "2716544d.2e4214"
+                "808535b.d0bfd48",
+                "51bc490a.0719c"
             ]
         ]
     },
     {
-        "id": "57a26dc0.1ee23c",
+        "id": "dc357fe5.d2f6d8",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1504.5333251953125,
-        "y": 213.88333129882812,
-        "z": "8603b63b.c1c358",
+        "x": 1551.5333251953125,
+        "y": 252.88333129882812,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "7627d017.e729d8",
+        "id": "a92b97b8.4129e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 706.566650390625,
-        "y": 436,
-        "z": "8603b63b.c1c358",
+        "x": 753.566650390625,
+        "y": 475,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "40266792.930ff8",
+        "id": "baa368e2.d0057",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 266.066650390625,
-        "y": 1405,
-        "z": "8603b63b.c1c358",
+        "x": 313.066650390625,
+        "y": 1444,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d82baf7f.56b2f",
-                "513cbd5b.994ffc",
-                "11998164.d0953f",
-                "3fbbcb97.f97994",
-                "3501776f.2dad38",
-                "ae9e098e.f50fb",
-                "10dd7514.d835b3",
-                "9cbc66e4.acef28",
-                "2ee73d5.0d9a4c2",
-                "c2f9529c.5f262",
-                "cf851282.1a25c8"
+                "ec5bb05c.091188",
+                "f2cd3854.ada88",
+                "3501da3.a014526",
+                "2c2649c2.53ac7e",
+                "a05b5003.46c7e8",
+                "c5885881.921d18",
+                "694d6c2f.8edccc",
+                "4b32fbef.652bc4",
+                "caa8a64f.1936",
+                "6e3ab27b.a7f37c",
+                "5a72a2f9.fe54bc"
             ]
         ]
     },
     {
-        "id": "bc764283.2e9fd8",
+        "id": "3f4654a9.b7d9fc",
         "type": "switchNode",
         "name": "switch uni type",
         "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1296.566650390625,
-        "y": 1243,
-        "z": "8603b63b.c1c358",
+        "x": 1343.566650390625,
+        "y": 1282,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "4133a5fe.bd0afc",
-                "cb7bb63e.a271e8",
-                "9b203a87.8531b",
-                "86f7d9c6.6cceb8"
+                "118223c9.ee1e8c",
+                "5e72886e.16b82",
+                "9ad14e96.a683a8",
+                "b20e668c.49e0a"
             ]
         ]
     },
     {
-        "id": "4133a5fe.bd0afc",
+        "id": "118223c9.ee1e8c",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1461.566650390625,
-        "y": 1225,
-        "z": "8603b63b.c1c358",
+        "x": 1508.566650390625,
+        "y": 1264,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "34effc93.508fc4"
+                "4829f132.924c9"
             ]
         ]
     },
     {
-        "id": "cb7bb63e.a271e8",
+        "id": "5e72886e.16b82",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1464.566650390625,
-        "y": 1264,
-        "z": "8603b63b.c1c358",
+        "x": 1511.566650390625,
+        "y": 1303,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ceed6ba9.27c0d"
+                "1b6bbf84.2b9b8"
             ]
         ]
     },
     {
-        "id": "86f7d9c6.6cceb8",
+        "id": "b20e668c.49e0a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1458.566650390625,
-        "y": 1342,
-        "z": "8603b63b.c1c358",
+        "x": 1505.566650390625,
+        "y": 1381,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "971b0d55.da5e"
+                "23f70279.3c530e"
             ]
         ]
     },
     {
-        "id": "9b203a87.8531b",
+        "id": "9ad14e96.a683a8",
         "type": "outcome",
         "name": "root-secondary",
         "xml": "<outcome value='root-secondary'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1481.566650390625,
-        "y": 1305,
-        "z": "8603b63b.c1c358",
+        "x": 1528.566650390625,
+        "y": 1344,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "f1880c82.5bc33"
+                "690a7c3c.e28bc4"
             ]
         ]
     },
     {
-        "id": "f85814f1.078ec8",
+        "id": "34596fcc.944e58",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2027.566650390625,
-        "y": 1338,
-        "z": "8603b63b.c1c358",
+        "x": 2074.566650390625,
+        "y": 1377,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "17372550.7b802b",
+        "id": "36c4b896.3cd558",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
         "comments": "",
-        "x": 1989.566650390625,
-        "y": 1378,
-        "z": "8603b63b.c1c358",
+        "x": 2036.566650390625,
+        "y": 1417,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "971b0d55.da5e",
+        "id": "23f70279.3c530e",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1610.566650390625,
-        "y": 1363,
-        "z": "8603b63b.c1c358",
+        "x": 1657.566650390625,
+        "y": 1402,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2709d484.f39df4",
+        "id": "a5cf86e7.fd2ae8",
         "type": "execute",
         "name": "execute RestApiCallNode Create Performance Monitoring Data",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1200.1500244140625,
-        "y": 2662.3336181640625,
-        "z": "8603b63b.c1c358",
+        "x": 1247.1500244140625,
+        "y": 2701.3336181640625,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "34effc93.508fc4",
+        "id": "4829f132.924c9",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1596.4832763671875,
-        "y": 1221.333251953125,
-        "z": "8603b63b.c1c358",
+        "x": 1643.4832763671875,
+        "y": 1260.333251953125,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "421d14d0.8fa8dc"
+                "eaf51112.30b59"
             ]
         ]
     },
     {
-        "id": "ceed6ba9.27c0d",
+        "id": "1b6bbf84.2b9b8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1598.4832763671875,
-        "y": 1259.333251953125,
-        "z": "8603b63b.c1c358",
+        "x": 1645.4832763671875,
+        "y": 1298.333251953125,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "f196d566.5b274"
+                "77e27285.394bfc"
             ]
         ]
     },
     {
-        "id": "f1880c82.5bc33",
+        "id": "690a7c3c.e28bc4",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1641.4832763671875,
-        "y": 1306.333251953125,
-        "z": "8603b63b.c1c358",
+        "x": 1688.4832763671875,
+        "y": 1345.333251953125,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "17372550.7b802b"
+                "36c4b896.3cd558"
             ]
         ]
     },
     {
-        "id": "708149ff.3b7b8",
+        "id": "94107493.94d3e8",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishSubscription",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1168.1500244140625,
-        "y": 2734.33349609375,
-        "z": "8603b63b.c1c358",
+        "x": 1215.1500244140625,
+        "y": 2773.33349609375,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "40e18201.7f31fc",
+        "id": "c85f3994.bd81f",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishPersistentConnection",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1198.1500244140625,
-        "y": 2796.33349609375,
-        "z": "8603b63b.c1c358",
+        "x": 1245.1500244140625,
+        "y": 2835.33349609375,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf851282.1a25c8",
+        "id": "5a72a2f9.fe54bc",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 591.566650390625,
-        "y": 1343.166748046875,
-        "z": "8603b63b.c1c358",
+        "x": 638.566650390625,
+        "y": 1382.166748046875,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8fcbaf21.052888",
+        "id": "cb3a4052.881008",
         "type": "switchNode",
         "name": "switch conn type",
         "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 132.56666564941406,
-        "y": 1054.1666259765625,
-        "z": "8603b63b.c1c358",
+        "x": 179.56666564941406,
+        "y": 1093.1666259765625,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "5e5b0dce.955fb4",
-                "7fcb1378.0439ec"
+                "f5718cb9.775688",
+                "eaa991b9.45489"
             ]
         ]
     },
     {
-        "id": "7fcb1378.0439ec",
+        "id": "eaa991b9.45489",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 317.566650390625,
-        "y": 1228.1666259765625,
-        "z": "8603b63b.c1c358",
+        "x": 364.566650390625,
+        "y": 1267.1666259765625,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "40266792.930ff8"
+                "baa368e2.d0057"
             ]
         ]
     },
     {
-        "id": "5e5b0dce.955fb4",
+        "id": "f5718cb9.775688",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 320.566650390625,
-        "y": 1183.1666259765625,
-        "z": "8603b63b.c1c358",
+        "x": 367.566650390625,
+        "y": 1222.1666259765625,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "40266792.930ff8"
+                "baa368e2.d0057"
             ]
         ]
     }