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-w-Protection.json;h=42f3ac6368648eb46cd4d78d1cc2c45c35ce0a81;hb=13b89ec32d7d0074117b3f136800bc93f67bf0f8;hp=2fdcec4350d18a7d0f6d5cfc161cd2ad830dbd63;hpb=d3db771262e602864d8189ce382f26f6e24b0654;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-w-Protection.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
index 2fdcec43..42f3ac63 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
@@ -1,199 +1,199 @@
 [
   {
-    "id": "61751fea.5e29c",
+    "id": "2c2eaaa6.595c6e",
     "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": 309,
-    "y": 328,
-    "z": "b60623c5.e2d9e8",
+    "x": 533.3333129882812,
+    "y": 388.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "9390d80.e27dda8",
-        "a2edd3b5.431178",
-        "d95bcddf.5304c8"
+        "b93bc255.06d818",
+        "e7d58f90.50f7a",
+        "d44dcc0c.074358"
       ]
     ]
   },
   {
-    "id": "9390d80.e27dda8",
+    "id": "b93bc255.06d818",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 497,
-    "y": 341,
-    "z": "b60623c5.e2d9e8",
+    "x": 721.3333129882812,
+    "y": 401.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "122deece.249539"
+        "351735cd.d4c382"
       ]
     ]
   },
   {
-    "id": "a2edd3b5.431178",
+    "id": "e7d58f90.50f7a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 504.4909362792969,
-    "y": 383.57403564453125,
-    "z": "b60623c5.e2d9e8",
+    "x": 728.8242492675781,
+    "y": 443.5740432739258,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "d95bcddf.5304c8",
+    "id": "d44dcc0c.074358",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 495,
-    "y": 430,
-    "z": "b60623c5.e2d9e8",
+    "x": 719.3333129882812,
+    "y": 490.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c3fd03f5.ced1a"
+        "9f7438aa.cfa3f8"
       ]
     ]
   },
   {
-    "id": "122deece.249539",
+    "id": "351735cd.d4c382",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 670,
-    "y": 339,
-    "z": "b60623c5.e2d9e8",
+    "x": 894.3333129882812,
+    "y": 399.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "26858e32.576aa2"
+        "6797a33f.6e9ecc"
       ]
     ]
   },
   {
-    "id": "26858e32.576aa2",
+    "id": "6797a33f.6e9ecc",
     "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": 899,
-    "y": 340,
-    "z": "b60623c5.e2d9e8",
+    "x": 1123.3333129882812,
+    "y": 400.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "b9b3eee1.451228"
+        "181a770b.23d341"
       ]
     ]
   },
   {
-    "id": "b9b3eee1.451228",
+    "id": "181a770b.23d341",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1114,
-    "y": 341,
-    "z": "b60623c5.e2d9e8",
+    "x": 1338.3333129882812,
+    "y": 401.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1ab82d5c.a19413"
+        "96414042.e1f2c8"
       ]
     ]
   },
   {
-    "id": "7e7f1310.5e5bcc",
+    "id": "e5c5abf.467ec58",
     "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": 1368,
-    "y": 263,
-    "z": "b60623c5.e2d9e8",
+    "x": 1592.3333129882812,
+    "y": 323.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "55ca13fd.72ee7c",
-        "6e8bc799.ce2fa8"
+        "71905208.3f5ca4",
+        "3be6bf3.b82124"
       ]
     ]
   },
   {
-    "id": "55ca13fd.72ee7c",
+    "id": "71905208.3f5ca4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1585,
-    "y": 242,
-    "z": "b60623c5.e2d9e8",
+    "x": 1809.3333129882812,
+    "y": 302.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1ab82d5c.a19413"
+        "96414042.e1f2c8"
       ]
     ]
   },
   {
-    "id": "6e8bc799.ce2fa8",
+    "id": "3be6bf3.b82124",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1585,
-    "y": 291,
-    "z": "b60623c5.e2d9e8",
+    "x": 1809.3333129882812,
+    "y": 351.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ab82d5c.a19413",
+    "id": "96414042.e1f2c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1769,
-    "y": 328,
-    "z": "b60623c5.e2d9e8",
+    "x": 1993.3333129882812,
+    "y": 388.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "554ac9a2.79f95",
-        "2ade390a.34dac6",
-        "c0e6872b.6bc578"
+        "95dd5e61.027198",
+        "877d8b16.d3994",
+        "b3333886.2341"
       ]
     ]
   },
   {
-    "id": "c3307b8c.0344e",
+    "id": "884050d1.040518",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 128,
-    "y": 69,
-    "z": "b60623c5.e2d9e8",
+    "x": 352.33331298828125,
+    "y": 129.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7e5b3842.1b2ff"
+        "d4acd14e.d29f88"
       ]
     ]
   },
   {
-    "id": "7e5b3842.1b2ff",
+    "id": "d4acd14e.d29f88",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -201,3650 +201,3695 @@
     "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": 412.2856903076172,
-    "y": 130.23810863494873,
-    "z": "b60623c5.e2d9e8",
+    "x": 636.6190032958984,
+    "y": 190.23811626434326,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "ff8ac0a6.a31ac8"
+        "659111a0.43dcc"
       ]
     ]
   },
   {
-    "id": "ff8ac0a6.a31ac8",
+    "id": "659111a0.43dcc",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-F1-Activate-w-Protection",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate-w-Protection' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 418.42860412597656,
-    "y": 215.00003051757812,
-    "z": "b60623c5.e2d9e8",
+    "x": 642.7619171142578,
+    "y": 275.00003814697266,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "610b4dde.c4293c"
+        "27f31a3d.0f29d6"
       ]
     ]
   },
   {
-    "id": "610b4dde.c4293c",
+    "id": "27f31a3d.0f29d6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 728.238037109375,
-    "y": 206.66668701171875,
-    "z": "b60623c5.e2d9e8",
+    "x": 952.5713500976562,
+    "y": 266.6666946411133,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "61751fea.5e29c",
-        "fda13949.60eb78",
-        "47d2cfff.4a0e4",
-        "8845442c.1d5de8",
-        "72564454.b964f4"
+        "2c2eaaa6.595c6e",
+        "cef7b9ce.1b3ba8",
+        "306cc859.5059d",
+        "5f84eccb.714dcc",
+        "3014f91f.87a3fe"
       ]
     ]
   },
   {
-    "id": "554ac9a2.79f95",
+    "id": "95dd5e61.027198",
     "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": 1986,
-    "y": 266,
-    "z": "b60623c5.e2d9e8",
+    "x": 2210.3333129882812,
+    "y": 326.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "e1c41eb3.6dc5b8",
+    "id": "e5ef1dc.853e7e",
     "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": 4155,
-    "y": 152,
-    "z": "b60623c5.e2d9e8",
+    "x": 4379.333312988281,
+    "y": 212.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "7981558d.d1f29c",
+    "id": "28eb1f3b.b8157",
     "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": 4236,
-    "y": 467,
-    "z": "b60623c5.e2d9e8",
+    "x": 4460.333312988281,
+    "y": 527.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "4cd7b5eb.5f75fc",
-        "8c7597f3.3a32c"
+        "1f9f84d9.8d553b",
+        "99de3b6c.89af8"
       ]
     ]
   },
   {
-    "id": "4cd7b5eb.5f75fc",
+    "id": "1f9f84d9.8d553b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4545.5,
-    "y": 436,
-    "z": "b60623c5.e2d9e8",
+    "x": 4769.833312988281,
+    "y": 496.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6a15735b.8f38bc"
+        "d7492135.ad5fc8"
       ]
     ]
   },
   {
-    "id": "8c7597f3.3a32c",
+    "id": "99de3b6c.89af8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4550.5,
-    "y": 501,
-    "z": "b60623c5.e2d9e8",
+    "x": 4774.833312988281,
+    "y": 561.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "531c74ae.aa6424"
+        "76880ad0.6601a4"
       ]
     ]
   },
   {
-    "id": "6a15735b.8f38bc",
+    "id": "d7492135.ad5fc8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
     "comments": "",
-    "x": 4721.5,
-    "y": 436,
-    "z": "b60623c5.e2d9e8",
+    "x": 4945.833312988281,
+    "y": 496.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "531c74ae.aa6424",
+    "id": "76880ad0.6601a4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4717,
-    "y": 501,
-    "z": "b60623c5.e2d9e8",
+    "x": 4941.333312988281,
+    "y": 561.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "43cf60a0.0fca68",
+    "id": "faa33d4e.9e9608",
     "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": 4100.5,
-    "y": 721,
-    "z": "b60623c5.e2d9e8",
+    "x": 4324.833312988281,
+    "y": 781.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1699b103.56f9ff",
+    "id": "2bce125e.cf653e",
     "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": 4254.5,
-    "y": 769,
-    "z": "b60623c5.e2d9e8",
+    "x": 4478.833312988281,
+    "y": 829.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "430829b5.022a48",
-        "ab60153e.89b358"
+        "ca07acfa.a5fa68",
+        "90e419cc.31d64"
       ]
     ]
   },
   {
-    "id": "430829b5.022a48",
+    "id": "ca07acfa.a5fa68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4600,
-    "y": 750,
-    "z": "b60623c5.e2d9e8",
+    "x": 4824.333312988281,
+    "y": 810.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "af17e669.a567c"
+        "4bb3503a.663a88"
       ]
     ]
   },
   {
-    "id": "ab60153e.89b358",
+    "id": "90e419cc.31d64",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4604,
-    "y": 790,
-    "z": "b60623c5.e2d9e8",
+    "x": 4828.333312988281,
+    "y": 850.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "879a181e.1e28f"
+        "d3e50925.f867c"
       ]
     ]
   },
   {
-    "id": "af17e669.a567c",
+    "id": "4bb3503a.663a88",
     "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": 4758,
-    "y": 750,
-    "z": "b60623c5.e2d9e8",
+    "x": 4982.333312988281,
+    "y": 810.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "879a181e.1e28f",
+    "id": "d3e50925.f867c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4761.5,
-    "y": 790,
-    "z": "b60623c5.e2d9e8",
+    "x": 4985.833312988281,
+    "y": 850.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c2dfb11c.b0c48",
-        "18154ac9.e63ffd"
+        "a6019d0e.791c3",
+        "1200fd09.b183c3"
       ]
     ]
   },
   {
-    "id": "c2dfb11c.b0c48",
+    "id": "a6019d0e.791c3",
     "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": 5092,
-    "y": 755,
-    "z": "b60623c5.e2d9e8",
+    "x": 5316.333312988281,
+    "y": 815.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "4bfe8ff3.b5155",
+    "id": "409f8a00.232b48",
     "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": 4956,
-    "y": 714,
-    "z": "b60623c5.e2d9e8",
+    "x": 5180.333312988281,
+    "y": 774.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "18154ac9.e63ffd",
+    "id": "1200fd09.b183c3",
     "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": 5019,
-    "y": 801,
-    "z": "b60623c5.e2d9e8",
+    "x": 5243.333312988281,
+    "y": 861.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "be8a4aef.c70ad",
+    "id": "d18efeb6.7196c8",
     "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": 4093,
-    "y": 200,
-    "z": "b60623c5.e2d9e8",
+    "x": 4317.333312988281,
+    "y": 260.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "c13323e9.9191e8",
+    "id": "3a9d4ff0.831a9",
     "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": 4119,
-    "y": 317,
-    "z": "b60623c5.e2d9e8",
+    "x": 4343.333312988281,
+    "y": 377.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fa844cfe.7b9158",
-        "40f7f2e0.45e324",
-        "9ec0d41c.764348"
+        "9519eb20.e7bb98",
+        "5232e91a.5e69a",
+        "d4898e73.a749e8"
       ]
     ]
   },
   {
-    "id": "fa844cfe.7b9158",
+    "id": "9519eb20.e7bb98",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4314.5001220703125,
-    "y": 269,
-    "z": "b60623c5.e2d9e8",
+    "x": 4538.833435058594,
+    "y": 329.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c5cba661.1feb9"
+        "4b08f17b.aadf2"
       ]
     ]
   },
   {
-    "id": "40f7f2e0.45e324",
+    "id": "5232e91a.5e69a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4306.5001220703125,
-    "y": 324,
-    "z": "b60623c5.e2d9e8",
+    "x": 4530.833435058594,
+    "y": 384.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fa86521c.e230b8"
+        "b87b6903.ae28e"
       ]
     ]
   },
   {
-    "id": "c5cba661.1feb9",
+    "id": "4b08f17b.aadf2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4458.8824462890625,
-    "y": 268.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 4683.215759277344,
+    "y": 328.65567779541016,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fff76825.ceb828"
+        "797a34c3.7e821c"
       ]
     ]
   },
   {
-    "id": "12d83cc7.207cc3",
+    "id": "85c5906d.e6a79",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5041,
-    "y": 271,
-    "z": "b60623c5.e2d9e8",
+    "x": 5265.333312988281,
+    "y": 331.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f3a906e6.516618"
+        "937745a8.a82728"
       ]
     ]
   },
   {
-    "id": "fff76825.ceb828",
+    "id": "797a34c3.7e821c",
     "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": 4643,
-    "y": 267,
-    "z": "b60623c5.e2d9e8",
+    "x": 4867.333312988281,
+    "y": 327.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "8f09ed7e.8205c8"
+        "bb125276.4bcb68"
       ]
     ]
   },
   {
-    "id": "8f09ed7e.8205c8",
+    "id": "bb125276.4bcb68",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4838,
-    "y": 267,
-    "z": "b60623c5.e2d9e8",
+    "x": 5062.333312988281,
+    "y": 327.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "12d83cc7.207cc3"
+        "85c5906d.e6a79"
       ]
     ]
   },
   {
-    "id": "9ec0d41c.764348",
+    "id": "d4898e73.a749e8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4311.5001220703125,
-    "y": 381,
-    "z": "b60623c5.e2d9e8",
+    "x": 4535.833435058594,
+    "y": 441.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "4cb38d5a.2cd9fc"
+        "54ed711f.a7d8c8"
       ]
     ]
   },
   {
-    "id": "4cb38d5a.2cd9fc",
+    "id": "54ed711f.a7d8c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4463.5001220703125,
-    "y": 382,
-    "z": "b60623c5.e2d9e8",
+    "x": 4687.833435058594,
+    "y": 442.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "fa86521c.e230b8",
+    "id": "b87b6903.ae28e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4474.5001220703125,
-    "y": 325,
-    "z": "b60623c5.e2d9e8",
+    "x": 4698.833435058594,
+    "y": 385.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "fd5c650b.7ed3f8",
+    "id": "d6320d33.cae9b",
     "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": 5426,
-    "y": 284,
-    "z": "b60623c5.e2d9e8",
+    "x": 5650.333312988281,
+    "y": 344.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "11189fd0.36c55",
-        "2f53389c.6ed7",
-        "160dc233.835476"
+        "bdc01a41.5b11d",
+        "19bd6ca2.3b24bb",
+        "3d79a005.c3b89"
       ]
     ]
   },
   {
-    "id": "f3a906e6.516618",
+    "id": "937745a8.a82728",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5220,
-    "y": 271,
-    "z": "b60623c5.e2d9e8",
+    "x": 5444.333312988281,
+    "y": 331.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "8e3bb227.50f04",
-        "fd5c650b.7ed3f8"
+        "624c597d.18779",
+        "d6320d33.cae9b"
       ]
     ]
   },
   {
-    "id": "8e3bb227.50f04",
+    "id": "624c597d.18779",
     "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": 5456,
-    "y": 232,
-    "z": "b60623c5.e2d9e8",
+    "x": 5680.333312988281,
+    "y": 292.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "11189fd0.36c55",
+    "id": "bdc01a41.5b11d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5636,
-    "y": 275,
-    "z": "b60623c5.e2d9e8",
+    "x": 5860.333312988281,
+    "y": 335.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "aadf27e6.e781b8"
+        "c6702adf.a8a4e8"
       ]
     ]
   },
   {
-    "id": "2f53389c.6ed7",
+    "id": "19bd6ca2.3b24bb",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5628,
-    "y": 330,
-    "z": "b60623c5.e2d9e8",
+    "x": 5852.333312988281,
+    "y": 390.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fd2ad840.4523f"
+        "14b63752.13b4e1"
       ]
     ]
   },
   {
-    "id": "160dc233.835476",
+    "id": "3d79a005.c3b89",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5633,
-    "y": 387,
-    "z": "b60623c5.e2d9e8",
+    "x": 5857.333312988281,
+    "y": 447.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2a94704d.0d4"
+        "52bfc859.8923c8"
       ]
     ]
   },
   {
-    "id": "2a94704d.0d4",
+    "id": "52bfc859.8923c8",
     "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": 5785,
-    "y": 388,
-    "z": "b60623c5.e2d9e8",
+    "x": 6009.333312988281,
+    "y": 448.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "fd2ad840.4523f",
+    "id": "14b63752.13b4e1",
     "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": 5796,
-    "y": 333,
-    "z": "b60623c5.e2d9e8",
+    "x": 6020.333312988281,
+    "y": 393.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "aadf27e6.e781b8",
+    "id": "c6702adf.a8a4e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5780.38232421875,
-    "y": 272.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 6004.715637207031,
+    "y": 332.65567779541016,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "cdb54fc1.4aeb5"
+        "d92f12f8.15c348"
       ]
     ]
   },
   {
-    "id": "cdb54fc1.4aeb5",
+    "id": "d92f12f8.15c348",
     "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": 5995,
-    "y": 269,
-    "z": "b60623c5.e2d9e8",
+    "x": 6219.333312988281,
+    "y": 329.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "33053457.2cf334",
+    "id": "60926b96.be818c",
     "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": 3562,
-    "y": 1609,
-    "z": "b60623c5.e2d9e8",
+    "x": 3786.3333129882812,
+    "y": 1669.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "4445f35f.408fdc",
+    "id": "c947459e.872f3",
     "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": 3625,
-    "y": 1938,
-    "z": "b60623c5.e2d9e8",
+    "x": 3849.3333129882812,
+    "y": 1998.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "862258db.691038",
-        "af408a0a.92301"
+        "a1124e38.08b2b8",
+        "626f4392.b77cf4"
       ]
     ]
   },
   {
-    "id": "862258db.691038",
+    "id": "a1124e38.08b2b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3920.5,
-    "y": 1905,
-    "z": "b60623c5.e2d9e8",
+    "x": 4144.833312988281,
+    "y": 1965.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "95d8110a.825b98"
+        "9662ab69.840d68"
       ]
     ]
   },
   {
-    "id": "af408a0a.92301",
+    "id": "626f4392.b77cf4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3925.5,
-    "y": 1970,
-    "z": "b60623c5.e2d9e8",
+    "x": 4149.833312988281,
+    "y": 2030.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "ef7aa326.5032b8"
+        "dc33d36b.4bb068"
       ]
     ]
   },
   {
-    "id": "95d8110a.825b98",
+    "id": "9662ab69.840d68",
     "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": 4088.5,
-    "y": 1905,
-    "z": "b60623c5.e2d9e8",
+    "x": 4312.833312988281,
+    "y": 1965.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ef7aa326.5032b8",
+    "id": "dc33d36b.4bb068",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4099,
-    "y": 1970,
-    "z": "b60623c5.e2d9e8",
+    "x": 4323.333312988281,
+    "y": 2030.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "f246db35.fbb0b8",
+    "id": "785f8bef.d4b92c",
     "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": 3501,
-    "y": 1666,
-    "z": "b60623c5.e2d9e8",
+    "x": 3725.3333129882812,
+    "y": 1726.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2f733fde.bfa8d8",
+    "id": "d7561682.896a3",
     "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": 3521,
-    "y": 1763,
-    "z": "b60623c5.e2d9e8",
+    "x": 3745.3333129882812,
+    "y": 1823.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d82ed114.d26fe",
-        "9b6a74e2.82fcf",
-        "105e680c.d4fe88"
+        "585f4a29.5a089c",
+        "beb39570.8572c",
+        "251a4de6.33c8aa"
       ]
     ]
   },
   {
-    "id": "d82ed114.d26fe",
+    "id": "585f4a29.5a089c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3723.5001220703125,
-    "y": 1716,
-    "z": "b60623c5.e2d9e8",
+    "x": 3947.8334350585938,
+    "y": 1776.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "3d1669ca.d8e9be"
+        "52dfa280.06ea3c"
       ]
     ]
   },
   {
-    "id": "9b6a74e2.82fcf",
+    "id": "beb39570.8572c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3715.5001220703125,
-    "y": 1771,
-    "z": "b60623c5.e2d9e8",
+    "x": 3939.8334350585938,
+    "y": 1831.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "28df2cef.da0a5c"
+        "d9bfad39.7bd668"
       ]
     ]
   },
   {
-    "id": "3d1669ca.d8e9be",
+    "id": "52dfa280.06ea3c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3867.8824462890625,
-    "y": 1713.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 4092.2157592773438,
+    "y": 1773.6556777954102,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "b0c477a0.14b6b8"
+        "3ad5a325.5b1584"
       ]
     ]
   },
   {
-    "id": "b0c477a0.14b6b8",
+    "id": "3ad5a325.5b1584",
     "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": 4052,
-    "y": 1728,
-    "z": "b60623c5.e2d9e8",
+    "x": 4276.333312988281,
+    "y": 1788.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "e68df009.7524f"
+        "66e3a12c.e2e618"
       ]
     ]
   },
   {
-    "id": "105e680c.d4fe88",
+    "id": "251a4de6.33c8aa",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3720.5001220703125,
-    "y": 1828,
-    "z": "b60623c5.e2d9e8",
+    "x": 3944.8334350585938,
+    "y": 1888.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "3376d063.6334f8"
+        "56e3abe.0b3e154"
       ]
     ]
   },
   {
-    "id": "3376d063.6334f8",
+    "id": "56e3abe.0b3e154",
     "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": 3872.5001220703125,
-    "y": 1829,
-    "z": "b60623c5.e2d9e8",
+    "x": 4096.833435058594,
+    "y": 1889.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "28df2cef.da0a5c",
+    "id": "d9bfad39.7bd668",
     "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": 3883.5001220703125,
-    "y": 1774,
-    "z": "b60623c5.e2d9e8",
+    "x": 4107.833435058594,
+    "y": 1834.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "86c78b55.020ad8",
+    "id": "b422b9dc.94e76",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4450,
-    "y": 1732,
-    "z": "b60623c5.e2d9e8",
+    "x": 4674.333312988281,
+    "y": 1792.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "de4526ed.169098"
+        "79873b94.5791e4"
       ]
     ]
   },
   {
-    "id": "e68df009.7524f",
+    "id": "66e3a12c.e2e618",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4247,
-    "y": 1728,
-    "z": "b60623c5.e2d9e8",
+    "x": 4471.333312988281,
+    "y": 1788.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "86c78b55.020ad8"
+        "b422b9dc.94e76"
       ]
     ]
   },
   {
-    "id": "bd56a946.09bfc8",
+    "id": "8c738542.45973",
     "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": 4835,
-    "y": 1731,
-    "z": "b60623c5.e2d9e8",
+    "x": 5059.333312988281,
+    "y": 1791.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "e62cd9e9.79901",
-        "3835956c.352dfa",
-        "ef4cce16.af464"
+        "bed842bc.70d158",
+        "9fccfde7.5bd058",
+        "42496faf.cc3318"
       ]
     ]
   },
   {
-    "id": "de4526ed.169098",
+    "id": "79873b94.5791e4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4627,
-    "y": 1724,
-    "z": "b60623c5.e2d9e8",
+    "x": 4851.333312988281,
+    "y": 1784.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "84662003.28e938",
-        "bd56a946.09bfc8"
+        "4d8f65c6.26fcac",
+        "8c738542.45973"
       ]
     ]
   },
   {
-    "id": "84662003.28e938",
+    "id": "4d8f65c6.26fcac",
     "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": 4865,
-    "y": 1679,
-    "z": "b60623c5.e2d9e8",
+    "x": 5089.333312988281,
+    "y": 1739.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2e3a7484.41bcbc",
+    "id": "8a854ad6.1d148",
     "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": 5194,
-    "y": 1835,
-    "z": "b60623c5.e2d9e8",
+    "x": 5418.333312988281,
+    "y": 1895.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "acb63215.67cbc8",
+    "id": "9b1912ba.26a3f8",
     "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": 5205,
-    "y": 1780,
-    "z": "b60623c5.e2d9e8",
+    "x": 5429.333312988281,
+    "y": 1840.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "bb7e5ab5.c4089",
+    "id": "e79aefeb.ae2d8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5189.38232421875,
-    "y": 1719.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 5413.715637207031,
+    "y": 1779.6556777954102,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7c187be.7c53484"
+        "9fa1b8fd.2344f"
       ]
     ]
   },
   {
-    "id": "7c187be.7c53484",
+    "id": "9fa1b8fd.2344f",
     "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": 5404,
-    "y": 1716,
-    "z": "b60623c5.e2d9e8",
+    "x": 5628.333312988281,
+    "y": 1776.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "e62cd9e9.79901",
+    "id": "bed842bc.70d158",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5045,
-    "y": 1722,
-    "z": "b60623c5.e2d9e8",
+    "x": 5269.333312988281,
+    "y": 1782.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "bb7e5ab5.c4089"
+        "e79aefeb.ae2d8"
       ]
     ]
   },
   {
-    "id": "3835956c.352dfa",
+    "id": "9fccfde7.5bd058",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5037,
-    "y": 1777,
-    "z": "b60623c5.e2d9e8",
+    "x": 5261.333312988281,
+    "y": 1837.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "acb63215.67cbc8"
+        "9b1912ba.26a3f8"
       ]
     ]
   },
   {
-    "id": "ef4cce16.af464",
+    "id": "42496faf.cc3318",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5042,
-    "y": 1834,
-    "z": "b60623c5.e2d9e8",
+    "x": 5266.333312988281,
+    "y": 1894.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2e3a7484.41bcbc"
+        "8a854ad6.1d148"
       ]
     ]
   },
   {
-    "id": "1dc25027.0c33f8",
+    "id": "afc78578.3291",
     "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": 3076,
-    "y": 680,
-    "z": "b60623c5.e2d9e8",
+    "x": 3300.3333129882812,
+    "y": 740.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "22e86b98.d5cd94",
-        "18519633.e9ee92"
+        "44cf1bd6.cdf99c",
+        "619a5ca0.cdbc04"
       ]
     ]
   },
   {
-    "id": "22e86b98.d5cd94",
+    "id": "44cf1bd6.cdf99c",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3290,
-    "y": 717,
-    "z": "b60623c5.e2d9e8",
+    "x": 3514.3333129882812,
+    "y": 777.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d8801466.520d4"
+        "357cc1f0.bc9fae"
       ]
     ]
   },
   {
-    "id": "18519633.e9ee92",
+    "id": "619a5ca0.cdbc04",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3292,
-    "y": 655,
-    "z": "b60623c5.e2d9e8",
+    "x": 3516.3333129882812,
+    "y": 715.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6bc727fb.e5e2c8"
+        "582aaedf.79cf78"
       ]
     ]
   },
   {
-    "id": "d8801466.520d4",
+    "id": "357cc1f0.bc9fae",
     "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": 2870,
-    "y": 1960,
-    "z": "b60623c5.e2d9e8",
+    "x": 3094.3333129882812,
+    "y": 2020.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "57adf29e.03275c",
-        "3c463d1c.a1e9ca"
+        "234b26f6.c2476a",
+        "5654d12.c509b3"
       ]
     ]
   },
   {
-    "id": "57adf29e.03275c",
+    "id": "234b26f6.c2476a",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3123,
-    "y": 1994,
-    "z": "b60623c5.e2d9e8",
+    "x": 3347.3333129882812,
+    "y": 2054.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "163451dc.e800ce"
+        "77779b01.5bda2c"
       ]
     ]
   },
   {
-    "id": "3c463d1c.a1e9ca",
+    "id": "5654d12.c509b3",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3123,
-    "y": 1938,
-    "z": "b60623c5.e2d9e8",
+    "x": 3347.3333129882812,
+    "y": 1998.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "72b99bc1.9d63c4"
+        "49e07205.df1904"
       ]
     ]
   },
   {
-    "id": "163451dc.e800ce",
+    "id": "77779b01.5bda2c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3274,
-    "y": 1994,
-    "z": "b60623c5.e2d9e8",
+    "x": 3498.3333129882812,
+    "y": 2054.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2a6d840b.d2c9ec",
+    "id": "fc88d512.b039f8",
     "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": 4150,
-    "y": 92,
-    "z": "b60623c5.e2d9e8",
+    "x": 4374.333312988281,
+    "y": 152.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "24792ed6.12e172",
+    "id": "6082a62.95d37d8",
     "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": 3558,
-    "y": 1551,
-    "z": "b60623c5.e2d9e8",
+    "x": 3782.3333129882812,
+    "y": 1611.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "fe0662dd.a80948",
+    "id": "7f468ae0.55d61c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3841,
-    "y": 349,
-    "z": "b60623c5.e2d9e8",
+    "x": 4065.3333129882812,
+    "y": 409.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2a6d840b.d2c9ec",
-        "e1c41eb3.6dc5b8",
-        "be8a4aef.c70ad",
-        "c13323e9.9191e8",
-        "7981558d.d1f29c",
-        "1721d523.151643",
-        "9094f518.043e98",
-        "f54721e.ec69de"
+        "fc88d512.b039f8",
+        "e5ef1dc.853e7e",
+        "d18efeb6.7196c8",
+        "3a9d4ff0.831a9",
+        "28eb1f3b.b8157",
+        "20794036.3e0d98",
+        "5a5b3fd3.939fa",
+        "eb39e6d9.695df8"
       ]
     ]
   },
   {
-    "id": "72b99bc1.9d63c4",
+    "id": "49e07205.df1904",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3274,
-    "y": 1937,
-    "z": "b60623c5.e2d9e8",
+    "x": 3498.3333129882812,
+    "y": 1997.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "24792ed6.12e172",
-        "33053457.2cf334",
-        "f246db35.fbb0b8",
-        "2f733fde.bfa8d8",
-        "4445f35f.408fdc",
-        "7c2a5c1b.45951c",
-        "db1559a9.21dcb8",
-        "64935ddb.b635b4"
+        "6082a62.95d37d8",
+        "60926b96.be818c",
+        "785f8bef.d4b92c",
+        "d7561682.896a3",
+        "c947459e.872f3",
+        "33be6bd8.7ec864",
+        "7832f278.b4880c",
+        "cc8c0809.c4ad6"
       ]
     ]
   },
   {
-    "id": "1ddc6cc6.41baa3",
+    "id": "3bec7c9e.0c31a4",
     "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": 3512,
-    "y": 2236,
-    "z": "b60623c5.e2d9e8",
+    "x": 3736.3333129882812,
+    "y": 2296.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "88e2026c.753db8",
+    "id": "66e73857.3d0e78",
     "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": 3666,
-    "y": 2284,
-    "z": "b60623c5.e2d9e8",
+    "x": 3890.3333129882812,
+    "y": 2344.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "e41adb3.0072828",
-        "6a4db145.9abb38"
+        "9ba2be1f.f4daf",
+        "1b19ccdb.027f4b"
       ]
     ]
   },
   {
-    "id": "e41adb3.0072828",
+    "id": "9ba2be1f.f4daf",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4011.5,
-    "y": 2265,
-    "z": "b60623c5.e2d9e8",
+    "x": 4235.833312988281,
+    "y": 2325.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "b46428d7.0cf41"
+        "9032db4e.fba99"
       ]
     ]
   },
   {
-    "id": "6a4db145.9abb38",
+    "id": "1b19ccdb.027f4b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4015.5,
-    "y": 2305,
-    "z": "b60623c5.e2d9e8",
+    "x": 4239.833312988281,
+    "y": 2365.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1616e093.24d98f"
+        "2bcc0072.d2bc6"
       ]
     ]
   },
   {
-    "id": "b46428d7.0cf41",
+    "id": "9032db4e.fba99",
     "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": 4169.5,
-    "y": 2265,
-    "z": "b60623c5.e2d9e8",
+    "x": 4393.833312988281,
+    "y": 2325.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1616e093.24d98f",
+    "id": "2bcc0072.d2bc6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4173,
-    "y": 2305,
-    "z": "b60623c5.e2d9e8",
+    "x": 4397.333312988281,
+    "y": 2365.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f5ad5aa7.4c2ca",
-        "f30a934b.4a146"
+        "45d30eee.bf1db8",
+        "a53e3184.87caf8"
       ]
     ]
   },
   {
-    "id": "f5ad5aa7.4c2ca",
+    "id": "45d30eee.bf1db8",
     "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": 4513,
-    "y": 2304,
-    "z": "b60623c5.e2d9e8",
+    "x": 4737.333312988281,
+    "y": 2364.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "14882444.425ec4",
+    "id": "63d5aebc.7e418",
     "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": 4371,
-    "y": 2262,
-    "z": "b60623c5.e2d9e8",
+    "x": 4595.333312988281,
+    "y": 2322.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "f30a934b.4a146",
+    "id": "a53e3184.87caf8",
     "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": 4442,
-    "y": 2353,
-    "z": "b60623c5.e2d9e8",
+    "x": 4666.333312988281,
+    "y": 2413.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "35b5f42.3d7048c",
+    "id": "27db8b21.23f75c",
     "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": 3067,
-    "y": 620,
-    "z": "b60623c5.e2d9e8",
+    "x": 3291.3333129882812,
+    "y": 680.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "672937f1.5c86c",
+    "id": "c22368e1.6b1058",
     "type": "comment",
     "name": "only dst ttp exists. No src",
     "info": "",
     "comments": "",
-    "x": 3662,
-    "y": 306,
-    "z": "b60623c5.e2d9e8",
+    "x": 3886.3333129882812,
+    "y": 366.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "cf6d8000.914ec",
+    "id": "87e2c89e.c92dc",
     "type": "comment",
     "name": "only src ttp exists. No dst",
     "info": "",
     "comments": "",
-    "x": 3219,
-    "y": 1884,
-    "z": "b60623c5.e2d9e8",
+    "x": 3443.3333129882812,
+    "y": 1944.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "6bc727fb.e5e2c8",
+    "id": "582aaedf.79cf78",
     "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": 3398,
-    "y": 468,
-    "z": "b60623c5.e2d9e8",
+    "x": 3622.3333129882812,
+    "y": 528.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "16d04d16.35cc13",
-        "81d801a9.0be79"
+        "16dc47d9.553a58",
+        "e13eb694.152348"
       ]
     ]
   },
   {
-    "id": "81d801a9.0be79",
+    "id": "e13eb694.152348",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3640,
-    "y": 1057,
-    "z": "b60623c5.e2d9e8",
+    "x": 3864.3333129882812,
+    "y": 1117.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "87bd1b21.78447"
+        "7db46487.9eca7c"
       ]
     ]
   },
   {
-    "id": "16d04d16.35cc13",
+    "id": "16dc47d9.553a58",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3634,
-    "y": 348,
-    "z": "b60623c5.e2d9e8",
+    "x": 3858.3333129882812,
+    "y": 408.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fe0662dd.a80948"
+        "7f468ae0.55d61c"
       ]
     ]
   },
   {
-    "id": "87bd1b21.78447",
+    "id": "7db46487.9eca7c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3798,
-    "y": 1056,
-    "z": "b60623c5.e2d9e8",
+    "x": 4022.3333129882812,
+    "y": 1116.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6a4fd43b.29d0a4",
-        "bb732000.b077a",
-        "14bb373f.07c761",
-        "ee3130b2.515378",
-        "25e58429.ad4ee4",
-        "13fd978.b0ce7e9"
+        "27bc6cfd.f882bc",
+        "798042fa.f28ecc",
+        "44029581.1e0294",
+        "2e2e336b.2a2684",
+        "c0302985.1bc5d8",
+        "3bfb4fd1.bca51"
       ]
     ]
   },
   {
-    "id": "bb732000.b077a",
+    "id": "798042fa.f28ecc",
     "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": 4062,
-    "y": 939,
-    "z": "b60623c5.e2d9e8",
+    "x": 4286.333312988281,
+    "y": 999.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "25e58429.ad4ee4",
+    "id": "c0302985.1bc5d8",
     "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": 4143,
-    "y": 1254,
-    "z": "b60623c5.e2d9e8",
+    "x": 4367.333312988281,
+    "y": 1314.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "69f73464.0e3e8c",
-        "5f37ff67.4bb2f"
+        "cb1eb04b.0a8a5",
+        "c9a4895f.79f59"
       ]
     ]
   },
   {
-    "id": "69f73464.0e3e8c",
+    "id": "cb1eb04b.0a8a5",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4452.5,
-    "y": 1223,
-    "z": "b60623c5.e2d9e8",
+    "x": 4676.833312988281,
+    "y": 1283.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "43cec921.9d623"
+        "5c0ad877.d4666"
       ]
     ]
   },
   {
-    "id": "5f37ff67.4bb2f",
+    "id": "c9a4895f.79f59",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4457.5,
-    "y": 1288,
-    "z": "b60623c5.e2d9e8",
+    "x": 4681.833312988281,
+    "y": 1348.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "a900d0fc.b4f8e"
+        "647a8c60.745274"
       ]
     ]
   },
   {
-    "id": "43cec921.9d623",
+    "id": "5c0ad877.d4666",
     "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": 4628.5,
-    "y": 1223,
-    "z": "b60623c5.e2d9e8",
+    "x": 4852.833312988281,
+    "y": 1283.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "a900d0fc.b4f8e",
+    "id": "647a8c60.745274",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4624,
-    "y": 1288,
-    "z": "b60623c5.e2d9e8",
+    "x": 4848.333312988281,
+    "y": 1348.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "14bb373f.07c761",
+    "id": "44029581.1e0294",
     "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": 4000,
-    "y": 987,
-    "z": "b60623c5.e2d9e8",
+    "x": 4224.333312988281,
+    "y": 1047.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ee3130b2.515378",
+    "id": "2e2e336b.2a2684",
     "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": 4026,
-    "y": 1104,
-    "z": "b60623c5.e2d9e8",
+    "x": 4250.333312988281,
+    "y": 1164.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7994d48a.ca38a4",
-        "46376621.e31dd8",
-        "662f2070.bc1d4"
+        "aa3dc68a.e420e",
+        "2fd5a39c.e4d124",
+        "be0fb969.9df28"
       ]
     ]
   },
   {
-    "id": "7994d48a.ca38a4",
+    "id": "aa3dc68a.e420e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4221.5001220703125,
-    "y": 1056,
-    "z": "b60623c5.e2d9e8",
+    "x": 4445.833435058594,
+    "y": 1116.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "28f98c5.d17c774"
+        "bee191ec.52168"
       ]
     ]
   },
   {
-    "id": "46376621.e31dd8",
+    "id": "2fd5a39c.e4d124",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4213.5001220703125,
-    "y": 1111,
-    "z": "b60623c5.e2d9e8",
+    "x": 4437.833435058594,
+    "y": 1171.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "b6666e55.258c4"
+        "53b0c593.b44354"
       ]
     ]
   },
   {
-    "id": "28f98c5.d17c774",
+    "id": "bee191ec.52168",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4365.8824462890625,
-    "y": 1055.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 4590.215759277344,
+    "y": 1115.6556777954102,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "abee57b5.2a2df"
+        "41b89aec.8f3b84"
       ]
     ]
   },
   {
-    "id": "abee57b5.2a2df",
+    "id": "41b89aec.8f3b84",
     "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": 4550,
-    "y": 1054,
-    "z": "b60623c5.e2d9e8",
+    "x": 4774.333312988281,
+    "y": 1114.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "4e7ce11e.d4486"
+        "860e8326.494828"
       ]
     ]
   },
   {
-    "id": "4e7ce11e.d4486",
+    "id": "860e8326.494828",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4745,
-    "y": 1054,
-    "z": "b60623c5.e2d9e8",
+    "x": 4969.333312988281,
+    "y": 1114.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "cd73aa8e.57927"
+        "95d294a2.519858"
       ]
     ]
   },
   {
-    "id": "662f2070.bc1d4",
+    "id": "be0fb969.9df28",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4218.5001220703125,
-    "y": 1168,
-    "z": "b60623c5.e2d9e8",
+    "x": 4442.833435058594,
+    "y": 1228.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "65647ec7.0c6e5"
+        "a6d3daf4.4de778"
       ]
     ]
   },
   {
-    "id": "65647ec7.0c6e5",
+    "id": "a6d3daf4.4de778",
     "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": 4370.5001220703125,
-    "y": 1169,
-    "z": "b60623c5.e2d9e8",
+    "x": 4594.833435058594,
+    "y": 1229.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "b6666e55.258c4",
+    "id": "53b0c593.b44354",
     "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": 4381.5001220703125,
-    "y": 1112,
-    "z": "b60623c5.e2d9e8",
+    "x": 4605.833435058594,
+    "y": 1172.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "6a4fd43b.29d0a4",
+    "id": "27bc6cfd.f882bc",
     "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": 4057,
-    "y": 879,
-    "z": "b60623c5.e2d9e8",
+    "x": 4281.333312988281,
+    "y": 939.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "cd73aa8e.57927",
+    "id": "95d294a2.519858",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4948,
-    "y": 1058,
-    "z": "b60623c5.e2d9e8",
+    "x": 5172.333312988281,
+    "y": 1118.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d2b1d416.053a58"
+        "280af449.de2e3c"
       ]
     ]
   },
   {
-    "id": "66918eb9.ab92e8",
+    "id": "ef3f04cf.8bb518",
     "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": 5333,
-    "y": 1071,
-    "z": "b60623c5.e2d9e8",
+    "x": 5557.333312988281,
+    "y": 1131.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f8b9a196.010a1",
-        "fd17d420.f985",
-        "40d42743.f42fd8"
+        "31456949.0bd6c6",
+        "ae6ce682.b30c68",
+        "e0e5a782.5ecb88"
       ]
     ]
   },
   {
-    "id": "d2b1d416.053a58",
+    "id": "280af449.de2e3c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5127,
-    "y": 1058,
-    "z": "b60623c5.e2d9e8",
+    "x": 5351.333312988281,
+    "y": 1118.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c71b3067.5066e8",
-        "66918eb9.ab92e8"
+        "7f6c4201.ca3284",
+        "ef3f04cf.8bb518"
       ]
     ]
   },
   {
-    "id": "c71b3067.5066e8",
+    "id": "7f6c4201.ca3284",
     "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": 5363,
-    "y": 1019,
-    "z": "b60623c5.e2d9e8",
+    "x": 5587.333312988281,
+    "y": 1079.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "f8b9a196.010a1",
+    "id": "31456949.0bd6c6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5543,
-    "y": 1062,
-    "z": "b60623c5.e2d9e8",
+    "x": 5767.333312988281,
+    "y": 1122.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "27038b3e.3bcfc4"
+        "37e04a2.a327336"
       ]
     ]
   },
   {
-    "id": "fd17d420.f985",
+    "id": "ae6ce682.b30c68",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5535,
-    "y": 1117,
-    "z": "b60623c5.e2d9e8",
+    "x": 5759.333312988281,
+    "y": 1177.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "967c6c86.0bbb78"
+        "536ede72.dab3b"
       ]
     ]
   },
   {
-    "id": "40d42743.f42fd8",
+    "id": "e0e5a782.5ecb88",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5540,
-    "y": 1174,
-    "z": "b60623c5.e2d9e8",
+    "x": 5764.333312988281,
+    "y": 1234.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "35455e8c.6afe9a"
+        "f46537ce.c9aaa8"
       ]
     ]
   },
   {
-    "id": "35455e8c.6afe9a",
+    "id": "f46537ce.c9aaa8",
     "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": 5692,
-    "y": 1175,
-    "z": "b60623c5.e2d9e8",
+    "x": 5916.333312988281,
+    "y": 1235.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "967c6c86.0bbb78",
+    "id": "536ede72.dab3b",
     "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": 5703,
-    "y": 1120,
-    "z": "b60623c5.e2d9e8",
+    "x": 5927.333312988281,
+    "y": 1180.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "27038b3e.3bcfc4",
+    "id": "37e04a2.a327336",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5687.38232421875,
-    "y": 1059.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 5911.715637207031,
+    "y": 1119.6556777954102,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "501ec52c.0a5be4"
+        "77189bba.da3f4c"
       ]
     ]
   },
   {
-    "id": "501ec52c.0a5be4",
+    "id": "77189bba.da3f4c",
     "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": 5902,
-    "y": 1056,
-    "z": "b60623c5.e2d9e8",
+    "x": 6126.333312988281,
+    "y": 1116.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ce5771d5.1db118",
+    "id": "217a8eaf.b5afda",
     "type": "comment",
     "name": "both src and dst exist",
     "info": "",
     "comments": "",
-    "x": 3676,
-    "y": 997,
-    "z": "b60623c5.e2d9e8",
+    "x": 3900.3333129882812,
+    "y": 1057.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2ade390a.34dac6",
+    "id": "877d8b16.d3994",
     "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": 2238,
-    "y": 724,
-    "z": "b60623c5.e2d9e8",
+    "x": 2462.3333129882812,
+    "y": 784.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "faa20144.28683",
-        "a3241eaf.e05748"
+        "df6e125e.14274",
+        "fd236e9d.746de"
       ]
     ]
   },
   {
-    "id": "a3241eaf.e05748",
+    "id": "fd236e9d.746de",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2645,
-    "y": 742,
-    "z": "b60623c5.e2d9e8",
+    "x": 2869.3333129882812,
+    "y": 802.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "73c18a9e.ba438c"
+        "a1b579c2.6ca69"
       ]
     ]
   },
   {
-    "id": "faa20144.28683",
+    "id": "df6e125e.14274",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2645,
-    "y": 687,
-    "z": "b60623c5.e2d9e8",
+    "x": 2869.3333129882812,
+    "y": 747.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d5f3133.6f4a0f"
+        "51a6a8ff.40f098"
       ]
     ]
   },
   {
-    "id": "d5f3133.6f4a0f",
+    "id": "51a6a8ff.40f098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2801,
-    "y": 685,
-    "z": "b60623c5.e2d9e8",
+    "x": 3025.3333129882812,
+    "y": 745.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "35b5f42.3d7048c",
-        "1dc25027.0c33f8"
+        "27db8b21.23f75c",
+        "afc78578.3291"
       ]
     ]
   },
   {
-    "id": "73c18a9e.ba438c",
+    "id": "a1b579c2.6ca69",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2778,
-    "y": 743,
-    "z": "b60623c5.e2d9e8",
+    "x": 3002.3333129882812,
+    "y": 803.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "fda13949.60eb78",
+    "id": "cef7b9ce.1b3ba8",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
     "comments": "",
-    "x": 955,
-    "y": 159,
-    "z": "b60623c5.e2d9e8",
+    "x": 1179.3333129882812,
+    "y": 219.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "38085312.8a965c",
+    "id": "bdafe4d.0bce798",
     "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": 4072,
-    "y": 577,
-    "z": "b60623c5.e2d9e8",
+    "x": 4296.333312988281,
+    "y": 637.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1721d523.151643",
+    "id": "20794036.3e0d98",
     "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": 4132,
-    "y": 616,
-    "z": "b60623c5.e2d9e8",
+    "x": 4356.333312988281,
+    "y": 676.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "47d2cfff.4a0e4",
+    "id": "306cc859.5059d",
     "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": 948,
-    "y": 67,
-    "z": "b60623c5.e2d9e8",
+    "x": 1172.3333129882812,
+    "y": 127.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "be7a05aa.4b83b",
+    "id": "3258d8ff.e890f",
     "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": 3484,
-    "y": 2093,
-    "z": "b60623c5.e2d9e8",
+    "x": 3708.3333129882812,
+    "y": 2153.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "7c2a5c1b.45951c",
+    "id": "33be6bd8.7ec864",
     "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": 3540,
-    "y": 2142,
-    "z": "b60623c5.e2d9e8",
+    "x": 3764.3333129882812,
+    "y": 2202.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "f179b432.4e819",
+    "id": "7f9af85d.c9b1a",
     "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": 948,
-    "y": 106,
-    "z": "b60623c5.e2d9e8",
+    "x": 1172.3333129882812,
+    "y": 166.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "8845442c.1d5de8",
+    "id": "5f84eccb.714dcc",
     "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": 979,
-    "y": 207,
-    "z": "b60623c5.e2d9e8",
+    "x": 1203.3333129882812,
+    "y": 267.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "72564454.b964f4",
+    "id": "3014f91f.87a3fe",
     "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": 189,
-    "y": 682,
-    "z": "b60623c5.e2d9e8",
+    "x": 413.33331298828125,
+    "y": 742.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "130c8849.c68768",
-        "9607da93.a7cfb8",
-        "675a11bf.37e84"
+        "ad3a20d5.f6589",
+        "e51813a.1cc197",
+        "ca637d1.24786"
       ]
     ]
   },
   {
-    "id": "130c8849.c68768",
+    "id": "ad3a20d5.f6589",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 408,
-    "y": 620,
-    "z": "b60623c5.e2d9e8",
+    "x": 632.3333129882812,
+    "y": 680.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "19b84d16.53d643"
+        "5ade52fc.bbf09c"
       ]
     ]
   },
   {
-    "id": "9607da93.a7cfb8",
+    "id": "e51813a.1cc197",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 417.490966796875,
-    "y": 662.5740356445312,
-    "z": "b60623c5.e2d9e8",
+    "x": 641.8242797851562,
+    "y": 722.5740432739258,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "675a11bf.37e84",
+    "id": "ca637d1.24786",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 406,
-    "y": 709,
-    "z": "b60623c5.e2d9e8",
+    "x": 630.3333129882812,
+    "y": 769.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "13e02ffd.705ef8"
+        "67b4863e.f31f1"
       ]
     ]
   },
   {
-    "id": "19b84d16.53d643",
+    "id": "5ade52fc.bbf09c",
     "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": 605,
-    "y": 616,
-    "z": "b60623c5.e2d9e8",
+    "x": 829.3333129882812,
+    "y": 676.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "95aa58da.ce0078"
+        "805608ab.1113d"
       ]
     ]
   },
   {
-    "id": "13e02ffd.705ef8",
+    "id": "67b4863e.f31f1",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 575,
-    "y": 710,
-    "z": "b60623c5.e2d9e8",
+    "x": 799.3333129882812,
+    "y": 770.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "95aa58da.ce0078",
+    "id": "805608ab.1113d",
     "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": 828.33349609375,
-    "y": 615.9999389648438,
-    "z": "b60623c5.e2d9e8",
+    "x": 1052.6668090820312,
+    "y": 675.9999465942383,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "82937c17.5a3278"
+        "fce88b79.ad9ea"
       ]
     ]
   },
   {
-    "id": "82937c17.5a3278",
+    "id": "fce88b79.ad9ea",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1029.0001335144043,
-    "y": 617.000020980835,
-    "z": "b60623c5.e2d9e8",
+    "x": 1253.3334465026855,
+    "y": 677.0000286102295,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7d4de732.7e236"
+        "324a4f4a.beb9"
       ]
     ]
   },
   {
-    "id": "7d4de732.7e236",
+    "id": "324a4f4a.beb9",
     "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": 159,
-    "y": 879,
-    "z": "b60623c5.e2d9e8",
+    "x": 383.33331298828125,
+    "y": 939.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f6447d51.51534",
-        "d2723085.ef21f",
-        "14bf719a.197f76"
+        "5a7cd799.dd504",
+        "c46ba437.0993",
+        "3526445b.eeea9c"
       ]
     ]
   },
   {
-    "id": "f6447d51.51534",
+    "id": "5a7cd799.dd504",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 367,
-    "y": 843,
-    "z": "b60623c5.e2d9e8",
+    "x": 591.3333129882812,
+    "y": 903.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "93da3cfa.70c248"
+        "63b8bbd2.15c994"
       ]
     ]
   },
   {
-    "id": "d2723085.ef21f",
+    "id": "c46ba437.0993",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 367.490966796875,
-    "y": 888.5740356445312,
-    "z": "b60623c5.e2d9e8",
+    "x": 591.8242797851562,
+    "y": 948.5740432739258,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "14bf719a.197f76",
+    "id": "3526445b.eeea9c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 365,
-    "y": 932,
-    "z": "b60623c5.e2d9e8",
+    "x": 589.3333129882812,
+    "y": 992.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "836041f9.6829f8"
+        "c4b232cc.80b998"
       ]
     ]
   },
   {
-    "id": "836041f9.6829f8",
+    "id": "c4b232cc.80b998",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 534,
-    "y": 933,
-    "z": "b60623c5.e2d9e8",
+    "x": 758.3333129882812,
+    "y": 993.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "a94aa53a.b107d8",
+    "id": "bd0ad7c2.1f4f3",
     "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": 506,
-    "y": 1427,
-    "z": "b60623c5.e2d9e8",
+    "x": 730.3333129882812,
+    "y": 1487.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "21c47827.df1568"
+        "fb10f5a.4414808"
       ]
     ]
   },
   {
-    "id": "21c47827.df1568",
+    "id": "fb10f5a.4414808",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 709,
-    "y": 1439,
-    "z": "b60623c5.e2d9e8",
+    "x": 933.3333129882812,
+    "y": 1499.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "18be783b.f07278"
+        "31b4d2c5.66c72e"
       ]
     ]
   },
   {
-    "id": "18be783b.f07278",
+    "id": "31b4d2c5.66c72e",
     "type": "outcome",
     "name": "UNI",
     "xml": "<outcome value='uni'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 875,
-    "y": 1436,
-    "z": "b60623c5.e2d9e8",
+    "x": 1099.3333129882812,
+    "y": 1496.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "11fb7f76.b02469"
+        "d62a4bb8.975ae8"
       ]
     ]
   },
   {
-    "id": "11fb7f76.b02469",
+    "id": "d62a4bb8.975ae8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1036,
-    "y": 1433,
-    "z": "b60623c5.e2d9e8",
+    "x": 1260.3333129882812,
+    "y": 1493.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "47d6d37a.9fb43c",
-        "1c027792.461348",
-        "ea05bf35.5069",
-        "9d31ed5b.d2c91",
-        "23eb7cf4.f6cfdc",
-        "99b18acf.7ec528"
+        "46f537c9.1c8be8",
+        "f8fe77e2.d43ff8",
+        "6a183fad.35ec3",
+        "f7155528.92cd7",
+        "65c7779e.8d1a88",
+        "cccd2695.c600b"
       ]
     ]
   },
   {
-    "id": "1c027792.461348",
+    "id": "f8fe77e2.d43ff8",
     "type": "set",
     "name": "unset tmp.aai.uni",
     "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
     "comments": "",
-    "x": 1242,
-    "y": 1032.9999389648438,
-    "z": "b60623c5.e2d9e8",
+    "x": 1466.3333129882812,
+    "y": 1092.9999465942383,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "47d6d37a.9fb43c",
+    "id": "46f537c9.1c8be8",
     "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": 1239,
-    "y": 1077.9999389648438,
-    "z": "b60623c5.e2d9e8",
+    "x": 1463.3333129882812,
+    "y": 1137.9999465942383,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2a120b9c.2b340c",
-        "41aafa7d.002584",
-        "b80f04fd.7f4018"
+        "4e769c0f.1938ec",
+        "3dc6fc35.d186bc",
+        "90b11589.d4f84"
       ]
     ]
   },
   {
-    "id": "41aafa7d.002584",
+    "id": "3dc6fc35.d186bc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1434.490966796875,
-    "y": 1051.5739135742188,
-    "z": "b60623c5.e2d9e8",
+    "x": 1658.8242797851562,
+    "y": 1111.5739212036133,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "b752ad58.1bdf1"
+        "6d117931.940098"
       ]
     ]
   },
   {
-    "id": "b80f04fd.7f4018",
+    "id": "90b11589.d4f84",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1430,
-    "y": 1095.9998779296875,
-    "z": "b60623c5.e2d9e8",
+    "x": 1654.3333129882812,
+    "y": 1155.999885559082,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "81604b65.13211"
+        "f48b55b8.ea1ca8"
       ]
     ]
   },
   {
-    "id": "b752ad58.1bdf1",
+    "id": "6d117931.940098",
     "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": 1597.0625,
-    "y": 1050.859619140625,
-    "z": "b60623c5.e2d9e8",
+    "x": 1821.3958129882812,
+    "y": 1110.8596267700195,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "81604b65.13211",
+    "id": "f48b55b8.ea1ca8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1598,
-    "y": 1095.9998779296875,
-    "z": "b60623c5.e2d9e8",
+    "x": 1822.3333129882812,
+    "y": 1155.999885559082,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1b5d0889.20238f",
+    "id": "e35ee523.d065b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1600,
-    "y": 1142.9998779296875,
-    "z": "b60623c5.e2d9e8",
+    "x": 1824.3333129882812,
+    "y": 1202.999885559082,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "2a120b9c.2b340c",
+    "id": "4e769c0f.1938ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1431,
-    "y": 1142.9998779296875,
-    "z": "b60623c5.e2d9e8",
+    "x": 1655.3333129882812,
+    "y": 1202.999885559082,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1b5d0889.20238f"
+        "e35ee523.d065b8"
       ]
     ]
   },
   {
-    "id": "450a13df.b4e0a4",
+    "id": "bf815f65.ee4c28",
     "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": 1213,
-    "y": 1664,
-    "z": "b60623c5.e2d9e8",
+    "x": 1437.3333129882812,
+    "y": 1724.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ea05bf35.5069",
+    "id": "6a183fad.35ec3",
     "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": 1304,
-    "y": 1718,
-    "z": "b60623c5.e2d9e8",
+    "x": 1528.3333129882812,
+    "y": 1778.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "93a880c5.cd0b3",
+    "id": "1ef1fe95.45b2b9",
     "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": 1980.5,
-    "y": 1131,
-    "z": "b60623c5.e2d9e8",
+    "x": 2204.8333129882812,
+    "y": 1191.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "481f95ef.87ef1c",
+    "id": "dbeb188c.810cc",
     "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": 1985.5,
-    "y": 1233,
-    "z": "b60623c5.e2d9e8",
+    "x": 2209.8333129882812,
+    "y": 1293.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "c1ad05eb.c84b48",
+    "id": "f8c77435.00d858",
     "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": 469,
-    "y": 1683,
-    "z": "b60623c5.e2d9e8",
+    "x": 693.3333129882812,
+    "y": 1743.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7f234491.70b134"
+        "e5d4675a.166ce"
       ]
     ]
   },
   {
-    "id": "7f234491.70b134",
+    "id": "e5d4675a.166ce",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 701,
-    "y": 1682,
-    "z": "b60623c5.e2d9e8",
+    "x": 925.3333129882812,
+    "y": 1742.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c6ba5a66.793238"
+        "a4b4e62.0b9bb18"
       ]
     ]
   },
   {
-    "id": "c6ba5a66.793238",
+    "id": "a4b4e62.0b9bb18",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 913,
-    "y": 1683,
-    "z": "b60623c5.e2d9e8",
+    "x": 1137.3333129882812,
+    "y": 1743.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6ed8d899.fdc1a"
+        "79b56211.8303fc"
       ]
     ]
   },
   {
-    "id": "6ed8d899.fdc1a",
+    "id": "79b56211.8303fc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 169,
-    "y": 1839,
-    "z": "b60623c5.e2d9e8",
+    "x": 393.33331298828125,
+    "y": 1899.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d9421c0f.7a0898",
-        "953702c4.2d79b"
+        "5e413ae2.fc139c",
+        "a0eb6cf6.129b98"
       ]
     ]
   },
   {
-    "id": "953702c4.2d79b",
+    "id": "a0eb6cf6.129b98",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 404,
-    "y": 1826,
-    "z": "b60623c5.e2d9e8",
+    "x": 628.3333129882812,
+    "y": 1886.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "d9421c0f.7a0898",
+    "id": "5e413ae2.fc139c",
     "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": 394,
-    "y": 1887,
-    "z": "b60623c5.e2d9e8",
+    "x": 618.3333129882812,
+    "y": 1947.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "329ab1cc.22fb9e",
-        "864547d3.a6077",
-        "b2aa6219.f09508"
+        "5d519b04.edc364",
+        "44e78fc4.a8de9",
+        "77b9ca42.e1131c"
       ]
     ]
   },
   {
-    "id": "864547d3.a6077",
+    "id": "44e78fc4.a8de9",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 607.490966796875,
-    "y": 1871.5740356445312,
-    "z": "b60623c5.e2d9e8",
+    "x": 831.8242797851562,
+    "y": 1931.5740432739258,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6b83b223.ee9d94"
+        "93fe98b.5489068"
       ]
     ]
   },
   {
-    "id": "b2aa6219.f09508",
+    "id": "77b9ca42.e1131c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 603,
-    "y": 1916,
-    "z": "b60623c5.e2d9e8",
+    "x": 827.3333129882812,
+    "y": 1976.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "4ac70bf0.89675c"
+        "376a9d2f.bd1f52"
       ]
     ]
   },
   {
-    "id": "329ab1cc.22fb9e",
+    "id": "5d519b04.edc364",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 605,
-    "y": 1976,
-    "z": "b60623c5.e2d9e8",
+    "x": 829.3333129882812,
+    "y": 2036.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f02a177d.26c7"
+        "fa4146f3.54f198"
       ]
     ]
   },
   {
-    "id": "6b83b223.ee9d94",
+    "id": "93fe98b.5489068",
     "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": 770.0625,
-    "y": 1870.8597412109375,
-    "z": "b60623c5.e2d9e8",
+    "x": 994.3958129882812,
+    "y": 1930.859748840332,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "4ac70bf0.89675c",
+    "id": "376a9d2f.bd1f52",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 771,
-    "y": 1916,
-    "z": "b60623c5.e2d9e8",
+    "x": 995.3333129882812,
+    "y": 1976.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "f02a177d.26c7",
+    "id": "fa4146f3.54f198",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 774,
-    "y": 1975,
-    "z": "b60623c5.e2d9e8",
+    "x": 998.3333129882812,
+    "y": 2035.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fc6eb753.cc314",
-        "6f8a0144.f9e8e8"
+        "ef75e4e3.1f8138",
+        "e2966b29.fc5b38"
       ]
     ]
   },
   {
-    "id": "ace8d395.16f8f8",
+    "id": "572a8f36.0443a",
     "type": "set",
     "name": "set sotn_value",
     "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
     "comments": "",
-    "x": 173,
-    "y": 2474,
-    "z": "b60623c5.e2d9e8",
+    "x": 397.33331298828125,
+    "y": 2534.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "fa159141.96876",
+    "id": "944da194.59bcd",
     "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-protection.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": 316,
-    "y": 2534,
-    "z": "b60623c5.e2d9e8",
+    "x": 540.3333129882812,
+    "y": 2594.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "192fb1d6.9d578e",
-        "7d0ee5a8.eae4dc"
+        "d840ad4b.1282a",
+        "89a7b87.1e553c8"
       ]
     ]
   },
   {
-    "id": "192fb1d6.9d578e",
+    "id": "d840ad4b.1282a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 628.5,
-    "y": 2511,
-    "z": "b60623c5.e2d9e8",
+    "x": 852.8333129882812,
+    "y": 2571.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "7d0ee5a8.eae4dc",
+    "id": "89a7b87.1e553c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 632.5,
-    "y": 2551,
-    "z": "b60623c5.e2d9e8",
+    "x": 856.8333129882812,
+    "y": 2611.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "31d10b34.3ac65c"
+        "5d5378bf.137d"
       ]
     ]
   },
   {
-    "id": "7a578c61.6716c4",
+    "id": "9a01795a.7ab4e",
     "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": 808.5,
-    "y": 2515,
-    "z": "b60623c5.e2d9e8",
+    "x": 1032.8333129882812,
+    "y": 2575.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "31d10b34.3ac65c",
+    "id": "5d5378bf.137d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 824,
-    "y": 2569,
-    "z": "b60623c5.e2d9e8",
+    "x": 1048.3333129882812,
+    "y": 2629.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "34d0fee.5345782"
+        "6dbe844a.8a9554",
+        "63370d02.a0670c",
+        "1ca90fe2.261db8",
+        "2ecfa879.64974"
       ]
     ]
   },
   {
-    "id": "e5aa9a1b.90043",
+    "id": "ef77bece.8a7928",
     "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": 1119.5,
-    "y": 2538,
-    "z": "b60623c5.e2d9e8",
+    "x": 1343.8333129882812,
+    "y": 2598.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "dceb8020.64dda",
+    "id": "33e96132.6ee886",
     "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": 2586.5,
-    "y": 1889,
-    "z": "b60623c5.e2d9e8",
+    "x": 2810.8333129882812,
+    "y": 1949.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "34d0fee.5345782",
+    "id": "6dbe844a.8a9554",
     "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": 1081.5,
-    "y": 2580,
-    "z": "b60623c5.e2d9e8",
+    "x": 1305.8333129882812,
+    "y": 2640.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "1840e683.b61c39",
+    "id": "c08ad06c.488d4",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
     "comments": "",
-    "x": 1946.5,
-    "y": 1169,
-    "z": "b60623c5.e2d9e8",
+    "x": 2170.8333129882812,
+    "y": 1229.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ebd04ab8.6f009",
+    "id": "2ee2b867.995c6",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
     "comments": "",
-    "x": 1947.5,
-    "y": 1273,
-    "z": "b60623c5.e2d9e8",
+    "x": 2171.8333129882812,
+    "y": 1333.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "9094f518.043e98",
+    "id": "5a5b3fd3.939fa",
     "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": 4241,
-    "y": 530,
-    "z": "b60623c5.e2d9e8",
+    "x": 4465.333312988281,
+    "y": 590.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "13fd978.b0ce7e9",
+    "id": "3bfb4fd1.bca51",
     "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": 4144,
-    "y": 1349,
-    "z": "b60623c5.e2d9e8",
+    "x": 4368.333312988281,
+    "y": 1409.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "db1559a9.21dcb8",
+    "id": "7832f278.b4880c",
     "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": 3638,
-    "y": 2021,
-    "z": "b60623c5.e2d9e8",
+    "x": 3862.3333129882812,
+    "y": 2081.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "93da3cfa.70c248",
+    "id": "63b8bbd2.15c994",
     "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": 739,
-    "y": 829,
-    "z": "b60623c5.e2d9e8",
+    "x": 963.3333129882812,
+    "y": 889.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2c44355c.6d9982",
-        "16b41754.18b639"
+        "a66053fc.e972e8",
+        "286bc10d.0b75fe"
       ]
     ]
   },
   {
-    "id": "2c44355c.6d9982",
+    "id": "a66053fc.e972e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1102,
-    "y": 852,
-    "z": "b60623c5.e2d9e8",
+    "x": 1326.3333129882812,
+    "y": 912.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "58ecddbb.063a6c"
+        "6f304f3b.74dcb"
       ]
     ]
   },
   {
-    "id": "16b41754.18b639",
+    "id": "286bc10d.0b75fe",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1102,
-    "y": 801,
-    "z": "b60623c5.e2d9e8",
+    "x": 1326.3333129882812,
+    "y": 861.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "255e639c.d2ebb4"
+        "bf68aa32.2da6d"
       ]
     ]
   },
   {
-    "id": "58ecddbb.063a6c",
+    "id": "6f304f3b.74dcb",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1258,
-    "y": 850,
-    "z": "b60623c5.e2d9e8",
+    "x": 1482.3333129882812,
+    "y": 910.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "9a61b358.c738d8"
+        "9b8bc380.4fea78"
       ]
     ]
   },
   {
-    "id": "255e639c.d2ebb4",
+    "id": "bf68aa32.2da6d",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1235,
-    "y": 802,
-    "z": "b60623c5.e2d9e8",
+    "x": 1459.3333129882812,
+    "y": 862.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "c0e6872b.6bc578",
+    "id": "b3333886.2341",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 1995,
-    "y": 200,
-    "z": "b60623c5.e2d9e8",
+    "x": 2219.3333129882812,
+    "y": 260.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "64935ddb.b635b4",
+    "id": "cc8c0809.c4ad6",
     "type": "set",
     "name": "set root-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
     "comments": "",
-    "x": 3537,
-    "y": 2181,
-    "z": "b60623c5.e2d9e8",
+    "x": 3761.3333129882812,
+    "y": 2241.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "f54721e.ec69de",
+    "id": "eb39e6d9.695df8",
     "type": "set",
     "name": "set leaf-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
     "comments": "",
-    "x": 4127,
-    "y": 654,
-    "z": "b60623c5.e2d9e8",
+    "x": 4351.333312988281,
+    "y": 714.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "9d31ed5b.d2c91",
+    "id": "f7155528.92cd7",
     "type": "set",
     "name": "set ethernet-srv-end-points-list array",
     "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
     "comments": "",
-    "x": 1301,
-    "y": 1760,
-    "z": "b60623c5.e2d9e8",
+    "x": 1525.3333129882812,
+    "y": 1820.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "7af36070.5c1af",
+    "id": "7ad9431e.95fd94",
     "type": "set",
     "name": "set filename",
     "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
     "comments": "",
-    "x": 480,
-    "y": 1494,
-    "z": "b60623c5.e2d9e8",
+    "x": 704.3333129882812,
+    "y": 1554.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2d8e3cc1.bb010c",
+    "id": "da906021.6570a8",
     "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": 511,
-    "y": 1534,
-    "z": "b60623c5.e2d9e8",
+    "x": 735.3333129882812,
+    "y": 1594.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "fc6eb753.cc314",
+    "id": "ef75e4e3.1f8138",
     "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": 1059,
-    "y": 1942,
-    "z": "b60623c5.e2d9e8",
+    "x": 1283.3333129882812,
+    "y": 2002.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "6f8a0144.f9e8e8",
+    "id": "e2966b29.fc5b38",
     "type": "set",
     "name": "set otn-tunnels-name-list array",
     "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
     "comments": "",
-    "x": 1062,
-    "y": 1984,
-    "z": "b60623c5.e2d9e8",
+    "x": 1286.3333129882812,
+    "y": 2044.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1e5bd700.d21b81",
+    "id": "64010c53.9fe67c",
     "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": 505,
-    "y": 1624,
-    "z": "b60623c5.e2d9e8",
+    "x": 729.3333129882812,
+    "y": 1684.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "144b407f.200e78",
+    "id": "d5a25879.5481b8",
     "type": "set",
     "name": "set filename",
     "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
     "comments": "",
-    "x": 260,
-    "y": 2003,
-    "z": "b60623c5.e2d9e8",
+    "x": 484.33331298828125,
+    "y": 2063.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "76785af4.e022ac",
+    "id": "7aac81ec.ba7cc8",
     "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": 268,
-    "y": 2060,
-    "z": "b60623c5.e2d9e8",
+    "x": 492.33331298828125,
+    "y": 2120.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "23eb7cf4.f6cfdc",
+    "id": "65c7779e.8d1a88",
     "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": 1279,
-    "y": 1609,
-    "z": "b60623c5.e2d9e8",
+    "x": 1503.3333129882812,
+    "y": 1669.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "779a259e.64832c",
-        "277a0a61.75069e"
+        "2c5e4010.43e508",
+        "e3644437.55d698"
       ]
     ]
   },
   {
-    "id": "277a0a61.75069e",
+    "id": "e3644437.55d698",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1502,
-    "y": 1564,
-    "z": "b60623c5.e2d9e8",
+    "x": 1726.3333129882812,
+    "y": 1624.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "21f0cc68.0dd77c"
+        "63f336a7.fff6b"
       ]
     ]
   },
   {
-    "id": "779a259e.64832c",
+    "id": "2c5e4010.43e508",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1504,
-    "y": 1628,
-    "z": "b60623c5.e2d9e8",
+    "x": 1728.3333129882812,
+    "y": 1688.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "db13af98.99768"
+        "2fd3ce09.17bf12"
       ]
     ]
   },
   {
-    "id": "21f0cc68.0dd77c",
+    "id": "63f336a7.fff6b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1667,
-    "y": 1561,
-    "z": "b60623c5.e2d9e8",
+    "x": 1891.3333129882812,
+    "y": 1621.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "ec997076.0ceb28"
+        "185277bc.64228"
       ]
     ]
   },
   {
-    "id": "db13af98.99768",
+    "id": "2fd3ce09.17bf12",
     "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": 1666,
-    "y": 1624,
-    "z": "b60623c5.e2d9e8",
+    "x": 1890.3333129882812,
+    "y": 1684.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ec997076.0ceb28",
+    "id": "185277bc.64228",
     "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": 1887,
-    "y": 1575,
-    "z": "b60623c5.e2d9e8",
+    "x": 2111.3333129882812,
+    "y": 1635.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2341ba90.ed99d6",
+    "id": "f4fd995d.61939",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1432,
-    "y": 2300,
-    "z": "b60623c5.e2d9e8",
+    "x": 1656.3333129882812,
+    "y": 2360.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "35e4a68.098365a"
+        "3bd70d03.1cae1a"
       ]
     ]
   },
   {
-    "id": "701770f6.4dd0f8",
+    "id": "fea4d7d8.17bf48",
     "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": 1817,
-    "y": 2313,
-    "z": "b60623c5.e2d9e8",
+    "x": 2041.3333129882812,
+    "y": 2373.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d75e7467.a58a4",
-        "74ab773b.95bd78",
-        "df0b8ca4.cd7bb8"
+        "753e6379.2f2664",
+        "3a690bb3.5501f4",
+        "105362f3.9957cd"
       ]
     ]
   },
   {
-    "id": "35e4a68.098365a",
+    "id": "3bd70d03.1cae1a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1611,
-    "y": 2300,
-    "z": "b60623c5.e2d9e8",
+    "x": 1835.3333129882812,
+    "y": 2360.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fa1aec8.0f5319",
-        "701770f6.4dd0f8"
+        "3086e43a.76dc2c",
+        "fea4d7d8.17bf48"
       ]
     ]
   },
   {
-    "id": "fa1aec8.0f5319",
+    "id": "3086e43a.76dc2c",
     "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": 1847,
-    "y": 2261,
-    "z": "b60623c5.e2d9e8",
+    "x": 2071.3333129882812,
+    "y": 2321.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "d75e7467.a58a4",
+    "id": "753e6379.2f2664",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2027,
-    "y": 2304,
-    "z": "b60623c5.e2d9e8",
+    "x": 2251.3333129882812,
+    "y": 2364.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1ccfad18.1b3fa3"
+        "57e3082b.ec85c"
       ]
     ]
   },
   {
-    "id": "74ab773b.95bd78",
+    "id": "3a690bb3.5501f4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2019,
-    "y": 2359,
-    "z": "b60623c5.e2d9e8",
+    "x": 2243.3333129882812,
+    "y": 2419.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2692af0.8253f52"
+        "e1967348.adb6a"
       ]
     ]
   },
   {
-    "id": "df0b8ca4.cd7bb8",
+    "id": "105362f3.9957cd",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2024,
-    "y": 2416,
-    "z": "b60623c5.e2d9e8",
+    "x": 2248.3333129882812,
+    "y": 2476.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f048da7.b1469a8"
+        "9b464363.d7abc"
       ]
     ]
   },
   {
-    "id": "f048da7.b1469a8",
+    "id": "9b464363.d7abc",
     "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": 2176,
-    "y": 2417,
-    "z": "b60623c5.e2d9e8",
+    "x": 2400.3333129882812,
+    "y": 2477.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2692af0.8253f52",
+    "id": "e1967348.adb6a",
     "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": 2187,
-    "y": 2362,
-    "z": "b60623c5.e2d9e8",
+    "x": 2411.3333129882812,
+    "y": 2422.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1ccfad18.1b3fa3",
+    "id": "57e3082b.ec85c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2171.38232421875,
-    "y": 2301.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 2395.7156372070312,
+    "y": 2361.65567779541,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "64610343.e61854"
+        "a2d4cc4c.5835f"
       ]
     ]
   },
   {
-    "id": "64610343.e61854",
+    "id": "a2d4cc4c.5835f",
     "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": 2386,
-    "y": 2298,
-    "z": "b60623c5.e2d9e8",
+    "x": 2610.3333129882812,
+    "y": 2358.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "d3c52589.f54e9",
+    "id": "77651854.67a228",
     "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": 510,
-    "y": 2346,
-    "z": "b60623c5.e2d9e8",
+    "x": 734.3333129882812,
+    "y": 2406.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f189c3f1.d69a28",
-        "4452e7a9.eaf9c8",
-        "77af657c.107d34"
+        "8b371429.94e21",
+        "ddb97aef.ff9618",
+        "6bdf8533.ac0744"
       ]
     ]
   },
   {
-    "id": "f189c3f1.d69a28",
+    "id": "8b371429.94e21",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 705.5001220703125,
-    "y": 2298,
-    "z": "b60623c5.e2d9e8",
+    "x": 929.8334350585938,
+    "y": 2358.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "47b3661c.a1e7d8"
+        "86408567.50b5f8"
       ]
     ]
   },
   {
-    "id": "4452e7a9.eaf9c8",
+    "id": "ddb97aef.ff9618",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 697.5001220703125,
-    "y": 2353,
-    "z": "b60623c5.e2d9e8",
+    "x": 921.8334350585938,
+    "y": 2413.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "34198ba3.49ea3c"
+        "83d0fe92.92a8c"
       ]
     ]
   },
   {
-    "id": "47b3661c.a1e7d8",
+    "id": "86408567.50b5f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 849.8824462890625,
-    "y": 2297.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 1074.2157592773438,
+    "y": 2357.65567779541,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "cd5c4879.eeeaf"
+        "206c1f26.03baa8"
       ]
     ]
   },
   {
-    "id": "cd5c4879.eeeaf",
+    "id": "206c1f26.03baa8",
     "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": 1034,
-    "y": 2296,
-    "z": "b60623c5.e2d9e8",
+    "x": 1258.3333129882812,
+    "y": 2356.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7bf74b1f.d5837c"
+        "604358eb.cf3bc"
       ]
     ]
   },
   {
-    "id": "7bf74b1f.d5837c",
+    "id": "604358eb.cf3bc",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1229,
-    "y": 2296,
-    "z": "b60623c5.e2d9e8",
+    "x": 1453.3333129882812,
+    "y": 2356.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2341ba90.ed99d6"
+        "f4fd995d.61939"
       ]
     ]
   },
   {
-    "id": "77af657c.107d34",
+    "id": "6bdf8533.ac0744",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 702.5001220703125,
-    "y": 2410,
-    "z": "b60623c5.e2d9e8",
+    "x": 926.8334350585938,
+    "y": 2470.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6c7ae4ee.17c334"
+        "843f6d1c.7ee9c"
       ]
     ]
   },
   {
-    "id": "6c7ae4ee.17c334",
+    "id": "843f6d1c.7ee9c",
     "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": 854.5001220703125,
-    "y": 2411,
-    "z": "b60623c5.e2d9e8",
+    "x": 1078.8334350585938,
+    "y": 2471.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "34198ba3.49ea3c",
+    "id": "83d0fe92.92a8c",
     "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": 865.5001220703125,
-    "y": 2354,
-    "z": "b60623c5.e2d9e8",
+    "x": 1089.8334350585938,
+    "y": 2414.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "303a4e11.243e7a",
+    "id": "7e37f686.4b31c8",
     "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": 500,
-    "y": 2258,
-    "z": "b60623c5.e2d9e8",
+    "x": 724.3333129882812,
+    "y": 2318.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "c718737.8cca71",
+    "id": "c0f06a3d.8ad7f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 245,
-    "y": 2389,
-    "z": "b60623c5.e2d9e8",
+    "x": 469.33331298828125,
+    "y": 2449.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "303a4e11.243e7a",
-        "d3c52589.f54e9"
+        "7e37f686.4b31c8",
+        "77651854.67a228"
       ]
     ]
   },
   {
-    "id": "72622933.417d18",
+    "id": "7e8f5942.82fe9",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 1459.9666748046875,
-    "y": 206.88333129882812,
-    "z": "b60623c5.e2d9e8",
+    "x": 1684.2999877929688,
+    "y": 266.88333892822266,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "c3fd03f5.ced1a",
+    "id": "9f7438aa.cfa3f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 662,
-    "y": 429,
-    "z": "b60623c5.e2d9e8",
+    "x": 886.3333129882812,
+    "y": 489.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "c72dabdd.dd1b58",
+    "id": "4162fe05.2b911",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 221.5,
-    "y": 1398,
-    "z": "b60623c5.e2d9e8",
+    "x": 445.83331298828125,
+    "y": 1458.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "a94aa53a.b107d8",
-        "c1ad05eb.c84b48",
-        "7af36070.5c1af",
-        "2d8e3cc1.bb010c",
-        "ace8d395.16f8f8",
-        "fa159141.96876",
-        "1e5bd700.d21b81",
-        "144b407f.200e78",
-        "76785af4.e022ac",
-        "c718737.8cca71",
-        "eca312ef.b3f488"
+        "bd0ad7c2.1f4f3",
+        "f8c77435.00d858",
+        "7ad9431e.95fd94",
+        "da906021.6570a8",
+        "572a8f36.0443a",
+        "944da194.59bcd",
+        "64010c53.9fe67c",
+        "d5a25879.5481b8",
+        "7aac81ec.ba7cc8",
+        "c0f06a3d.8ad7f8",
+        "ad8e54c3.d3fe18"
       ]
     ]
   },
   {
-    "id": "99b18acf.7ec528",
+    "id": "cccd2695.c600b",
     "type": "switchNode",
     "name": "switch uni type",
     "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1252,
-    "y": 1236,
-    "z": "b60623c5.e2d9e8",
+    "x": 1476.3333129882812,
+    "y": 1296.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "bfa56f6a.14e168",
-        "3c1ef869.c0abd8",
-        "3b2dd259.d313d6",
-        "42d627cc.4d9d98"
+        "8f7bce65.961b18",
+        "17cc18e5.7d037f",
+        "302ecb9b.5a47dc",
+        "c6b9b74d.1c7d78"
       ]
     ]
   },
   {
-    "id": "bfa56f6a.14e168",
+    "id": "8f7bce65.961b18",
     "type": "outcome",
     "name": "leaf",
     "xml": "<outcome value='leaf'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1417,
-    "y": 1218,
-    "z": "b60623c5.e2d9e8",
+    "x": 1641.3333129882812,
+    "y": 1278.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "327e25a1.149b82"
+        "3943aa6e.c88a36"
       ]
     ]
   },
   {
-    "id": "3c1ef869.c0abd8",
+    "id": "17cc18e5.7d037f",
     "type": "outcome",
     "name": "root",
     "xml": "<outcome value='root'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1420,
-    "y": 1257,
-    "z": "b60623c5.e2d9e8",
+    "x": 1644.3333129882812,
+    "y": 1317.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "bb94632d.8744e"
+        "47637f28.c69c6"
       ]
     ]
   },
   {
-    "id": "42d627cc.4d9d98",
+    "id": "c6b9b74d.1c7d78",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1414,
-    "y": 1335,
-    "z": "b60623c5.e2d9e8",
+    "x": 1638.3333129882812,
+    "y": 1395.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "aa99ff1e.001ee"
+        "656a466a.445c98"
       ]
     ]
   },
   {
-    "id": "3b2dd259.d313d6",
+    "id": "302ecb9b.5a47dc",
     "type": "outcome",
     "name": "secondary-root",
     "xml": "<outcome value='secondary-root'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1437,
-    "y": 1298,
-    "z": "b60623c5.e2d9e8",
+    "x": 1661.3333129882812,
+    "y": 1358.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "3c1ff952.ce0566"
+        "6a61eaa3.28143c"
       ]
     ]
   },
   {
-    "id": "8b34828e.2e2fe8",
+    "id": "a2fb1650.227e28",
     "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": 1983,
-    "y": 1331,
-    "z": "b60623c5.e2d9e8",
+    "x": 2207.3333129882812,
+    "y": 1391.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "7c827d8b.b5207c",
+    "id": "e35c4fb2.169e68",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-backup' />\n",
     "comments": "",
-    "x": 1945,
-    "y": 1371,
-    "z": "b60623c5.e2d9e8",
+    "x": 2169.3333129882812,
+    "y": 1431.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "aa99ff1e.001ee",
+    "id": "656a466a.445c98",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1582,
-    "y": 1335,
-    "z": "b60623c5.e2d9e8",
+    "x": 1806.3333129882812,
+    "y": 1395.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "327e25a1.149b82",
+    "id": "3943aa6e.c88a36",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1578,
-    "y": 1214,
-    "z": "b60623c5.e2d9e8",
+    "x": 1802.3333129882812,
+    "y": 1274.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1840e683.b61c39"
+        "c08ad06c.488d4"
       ]
     ]
   },
   {
-    "id": "bb94632d.8744e",
+    "id": "47637f28.c69c6",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1585,
-    "y": 1259,
-    "z": "b60623c5.e2d9e8",
+    "x": 1809.3333129882812,
+    "y": 1319.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "ebd04ab8.6f009"
+        "2ee2b867.995c6"
       ]
     ]
   },
   {
-    "id": "3c1ff952.ce0566",
+    "id": "6a61eaa3.28143c",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1584,
-    "y": 1299,
-    "z": "b60623c5.e2d9e8",
+    "x": 1808.3333129882812,
+    "y": 1359.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7c827d8b.b5207c"
+        "e35c4fb2.169e68"
       ]
     ]
   },
   {
-    "id": "9a61b358.c738d8",
+    "id": "9b8bc380.4fea78",
     "type": "switchNode",
     "name": "switch conn type != mdsc",
     "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type != 'mdsc' `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 218.56666564941406,
-    "y": 1158.933349609375,
-    "z": "b60623c5.e2d9e8",
+    "x": 442.8999786376953,
+    "y": 1218.9333572387695,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "4c9cf74b.527528"
+        "77dc380.c063d48"
       ]
     ]
   },
   {
-    "id": "4c9cf74b.527528",
+    "id": "77dc380.c063d48",
     "type": "outcome",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 400.566650390625,
-    "y": 1159.933349609375,
-    "z": "b60623c5.e2d9e8",
+    "x": 624.8999633789062,
+    "y": 1219.9333572387695,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c72dabdd.dd1b58"
+        "4162fe05.2b911"
       ]
     ]
   },
   {
-    "id": "eca312ef.b3f488",
+    "id": "ad8e54c3.d3fe18",
     "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": 536.566650390625,
-    "y": 1336.9666748046875,
-    "z": "b60623c5.e2d9e8",
+    "x": 760.8999633789062,
+    "y": 1396.966682434082,
+    "z": "88b99be5.091bf8",
     "wires": []
+  },
+  {
+    "id": "63370d02.a0670c",
+    "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'`\" />\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=\"post\"/>\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": 1386.3333740234375,
+    "y": 2738.33349609375,
+    "z": "88b99be5.091bf8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1ca90fe2.261db8",
+    "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=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1354.3333740234375,
+    "y": 2810.3333740234375,
+    "z": "88b99be5.091bf8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2ecfa879.64974",
+    "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=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1384.3333740234375,
+    "y": 2872.3333740234375,
+    "z": "88b99be5.091bf8",
+    "wires": [
+      []
+    ]
   }
 ]
\ No newline at end of file