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=c96583a12019fed1182e1aa475ba9ed4c5a09157;hb=645b21298c9a4aff5f3f625eabb586fff40db732;hp=42f3ac6368648eb46cd4d78d1cc2c45c35ce0a81;hpb=c14f920415db0de169e0826e0d746cf80757b1f4;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 42f3ac63..c96583a1 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": "2c2eaaa6.595c6e",
+    "id": "10a422cf.1eeed5",
     "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": 533.3333129882812,
-    "y": 388.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 676,
+    "y": 287,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "b93bc255.06d818",
-        "e7d58f90.50f7a",
-        "d44dcc0c.074358"
+        "b0a990da.c03088",
+        "b7ea05a6.0fe86",
+        "2c56ab13.0959e4"
       ]
     ]
   },
   {
-    "id": "b93bc255.06d818",
+    "id": "b0a990da.c03088",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 721.3333129882812,
-    "y": 401.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 864,
+    "y": 300,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "351735cd.d4c382"
+        "455891ac.f0409"
       ]
     ]
   },
   {
-    "id": "e7d58f90.50f7a",
+    "id": "b7ea05a6.0fe86",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 728.8242492675781,
-    "y": 443.5740432739258,
-    "z": "88b99be5.091bf8",
+    "x": 871.4909362792969,
+    "y": 342.57403564453125,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "d44dcc0c.074358",
+    "id": "2c56ab13.0959e4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 719.3333129882812,
-    "y": 490.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 862,
+    "y": 389,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9f7438aa.cfa3f8"
+        "630bfd04.7da00c"
       ]
     ]
   },
   {
-    "id": "351735cd.d4c382",
+    "id": "455891ac.f0409",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 894.3333129882812,
-    "y": 399.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1037,
+    "y": 298,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6797a33f.6e9ecc"
+        "7e5b0143.2c92a8"
       ]
     ]
   },
   {
-    "id": "6797a33f.6e9ecc",
+    "id": "7e5b0143.2c92a8",
     "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": 1123.3333129882812,
-    "y": 400.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1266,
+    "y": 299,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "181a770b.23d341"
+        "62dd4d08.7a116c"
       ]
     ]
   },
   {
-    "id": "181a770b.23d341",
+    "id": "62dd4d08.7a116c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1338.3333129882812,
-    "y": 401.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1481,
+    "y": 300,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "96414042.e1f2c8"
+        "7caf5b45.f9ab04"
       ]
     ]
   },
   {
-    "id": "e5c5abf.467ec58",
+    "id": "76f6230c.40e14c",
     "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": 1592.3333129882812,
-    "y": 323.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1735,
+    "y": 222,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "71905208.3f5ca4",
-        "3be6bf3.b82124"
+        "a035fb12.104f38",
+        "a471cecf.79d2"
       ]
     ]
   },
   {
-    "id": "71905208.3f5ca4",
+    "id": "a035fb12.104f38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1809.3333129882812,
-    "y": 302.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1952,
+    "y": 201,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "96414042.e1f2c8"
+        "7caf5b45.f9ab04"
       ]
     ]
   },
   {
-    "id": "3be6bf3.b82124",
+    "id": "a471cecf.79d2",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1809.3333129882812,
-    "y": 351.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1952,
+    "y": 250,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "96414042.e1f2c8",
+    "id": "7caf5b45.f9ab04",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1993.3333129882812,
-    "y": 388.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 2136,
+    "y": 287,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "95dd5e61.027198",
-        "877d8b16.d3994",
-        "b3333886.2341"
+        "9e3d4f1.ef044b",
+        "1812ba90.3bec25",
+        "cefb7e41.dee868"
       ]
     ]
   },
   {
-    "id": "884050d1.040518",
+    "id": "82ff7ac2.5ab12",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 352.33331298828125,
-    "y": 129.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 495,
+    "y": 28,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d4acd14e.d29f88"
+        "60b5aea2.21792"
       ]
     ]
   },
   {
-    "id": "d4acd14e.d29f88",
+    "id": "60b5aea2.21792",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -201,3693 +201,3693 @@
     "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": 636.6190032958984,
-    "y": 190.23811626434326,
-    "z": "88b99be5.091bf8",
+    "x": 779.2856903076172,
+    "y": 89.23810863494873,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "659111a0.43dcc"
+        "414f5c44.935264"
       ]
     ]
   },
   {
-    "id": "659111a0.43dcc",
+    "id": "414f5c44.935264",
     "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": 642.7619171142578,
-    "y": 275.00003814697266,
-    "z": "88b99be5.091bf8",
+    "x": 785.4286041259766,
+    "y": 174.00003051757812,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "27f31a3d.0f29d6"
+        "90230fbe.1f78e8"
       ]
     ]
   },
   {
-    "id": "27f31a3d.0f29d6",
+    "id": "90230fbe.1f78e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 952.5713500976562,
-    "y": 266.6666946411133,
-    "z": "88b99be5.091bf8",
+    "x": 1095.238037109375,
+    "y": 165.66668701171875,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "2c2eaaa6.595c6e",
-        "cef7b9ce.1b3ba8",
-        "306cc859.5059d",
-        "5f84eccb.714dcc",
-        "3014f91f.87a3fe"
+        "10a422cf.1eeed5",
+        "c82b1b5b.8e5c4",
+        "476ddcd6.ba7404",
+        "cf6ce2f3.f820a",
+        "a8ba69c5.3110b8"
       ]
     ]
   },
   {
-    "id": "95dd5e61.027198",
+    "id": "9e3d4f1.ef044b",
     "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": 2210.3333129882812,
-    "y": 326.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 2353,
+    "y": 225,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e5ef1dc.853e7e",
+    "id": "9b274b59.c02fc",
     "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": 4379.333312988281,
-    "y": 212.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4522,
+    "y": 111,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "28eb1f3b.b8157",
+    "id": "73b1b71.91a29c8",
     "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": 4460.333312988281,
-    "y": 527.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4603,
+    "y": 426,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "1f9f84d9.8d553b",
-        "99de3b6c.89af8"
+        "bf94869d.abe8c",
+        "7e872687.f361d8"
       ]
     ]
   },
   {
-    "id": "1f9f84d9.8d553b",
+    "id": "bf94869d.abe8c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4769.833312988281,
-    "y": 496.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4912.5,
+    "y": 395,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d7492135.ad5fc8"
+        "70666b8b.cebd9c"
       ]
     ]
   },
   {
-    "id": "99de3b6c.89af8",
+    "id": "7e872687.f361d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4774.833312988281,
-    "y": 561.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4917.5,
+    "y": 460,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "76880ad0.6601a4"
+        "2f157928.a7cc26"
       ]
     ]
   },
   {
-    "id": "d7492135.ad5fc8",
+    "id": "70666b8b.cebd9c",
     "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": 4945.833312988281,
-    "y": 496.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5088.5,
+    "y": 395,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "76880ad0.6601a4",
+    "id": "2f157928.a7cc26",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4941.333312988281,
-    "y": 561.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5084,
+    "y": 460,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "faa33d4e.9e9608",
+    "id": "2c68de8.698fe22",
     "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": 4324.833312988281,
-    "y": 781.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4467.5,
+    "y": 680,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "2bce125e.cf653e",
+    "id": "432e6fef.6bc3f",
     "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": 4478.833312988281,
-    "y": 829.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4621.5,
+    "y": 728,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "ca07acfa.a5fa68",
-        "90e419cc.31d64"
+        "4c8de07f.a04f7",
+        "1618ec6.a46fa94"
       ]
     ]
   },
   {
-    "id": "ca07acfa.a5fa68",
+    "id": "4c8de07f.a04f7",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4824.333312988281,
-    "y": 810.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4967,
+    "y": 709,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "4bb3503a.663a88"
+        "74c74a6e.6269c4"
       ]
     ]
   },
   {
-    "id": "90e419cc.31d64",
+    "id": "1618ec6.a46fa94",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4828.333312988281,
-    "y": 850.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4971,
+    "y": 749,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d3e50925.f867c"
+        "1da4485d.51ad6"
       ]
     ]
   },
   {
-    "id": "4bb3503a.663a88",
+    "id": "74c74a6e.6269c4",
     "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": 4982.333312988281,
-    "y": 810.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5125,
+    "y": 709,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "d3e50925.f867c",
+    "id": "1da4485d.51ad6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4985.833312988281,
-    "y": 850.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5128.5,
+    "y": 749,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a6019d0e.791c3",
-        "1200fd09.b183c3"
+        "ee6915f8.624f38",
+        "90214377.544788"
       ]
     ]
   },
   {
-    "id": "a6019d0e.791c3",
+    "id": "ee6915f8.624f38",
     "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": 5316.333312988281,
-    "y": 815.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5459,
+    "y": 714,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "409f8a00.232b48",
+    "id": "838cdc3e.4f58e",
     "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": 5180.333312988281,
-    "y": 774.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5323,
+    "y": 673,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "1200fd09.b183c3",
+    "id": "90214377.544788",
     "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": 5243.333312988281,
-    "y": 861.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5386,
+    "y": 760,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "d18efeb6.7196c8",
+    "id": "aa46b84e.3356a",
     "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": 4317.333312988281,
-    "y": 260.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4460,
+    "y": 159,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "3a9d4ff0.831a9",
+    "id": "d57f31e9.bb9eb",
     "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": 4343.333312988281,
-    "y": 377.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4486,
+    "y": 276,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9519eb20.e7bb98",
-        "5232e91a.5e69a",
-        "d4898e73.a749e8"
+        "33a92b4f.9380e4",
+        "f049b484.8a771",
+        "3592f024.f5a328"
       ]
     ]
   },
   {
-    "id": "9519eb20.e7bb98",
+    "id": "33a92b4f.9380e4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4538.833435058594,
-    "y": 329.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4681.5001220703125,
+    "y": 228,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "4b08f17b.aadf2"
+        "14379d7c.41191b"
       ]
     ]
   },
   {
-    "id": "5232e91a.5e69a",
+    "id": "f049b484.8a771",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4530.833435058594,
-    "y": 384.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4673.5001220703125,
+    "y": 283,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "b87b6903.ae28e"
+        "53127e40.7f1108"
       ]
     ]
   },
   {
-    "id": "4b08f17b.aadf2",
+    "id": "14379d7c.41191b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4683.215759277344,
-    "y": 328.65567779541016,
-    "z": "88b99be5.091bf8",
+    "x": 4825.8824462890625,
+    "y": 227.65567016601562,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "797a34c3.7e821c"
+        "88ec362d.bac6c"
       ]
     ]
   },
   {
-    "id": "85c5906d.e6a79",
+    "id": "5831eff3.ba3a08",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5265.333312988281,
-    "y": 331.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5408,
+    "y": 230,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "937745a8.a82728"
+        "ea688f7c.199be"
       ]
     ]
   },
   {
-    "id": "797a34c3.7e821c",
+    "id": "88ec362d.bac6c",
     "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": 4867.333312988281,
-    "y": 327.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5010,
+    "y": 226,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bb125276.4bcb68"
+        "280d7047.234eb8"
       ]
     ]
   },
   {
-    "id": "bb125276.4bcb68",
+    "id": "280d7047.234eb8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5062.333312988281,
-    "y": 327.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5205,
+    "y": 226,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "85c5906d.e6a79"
+        "5831eff3.ba3a08"
       ]
     ]
   },
   {
-    "id": "d4898e73.a749e8",
+    "id": "3592f024.f5a328",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4535.833435058594,
-    "y": 441.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4678.5001220703125,
+    "y": 340,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "54ed711f.a7d8c8"
+        "5b037f74.b971e"
       ]
     ]
   },
   {
-    "id": "54ed711f.a7d8c8",
+    "id": "5b037f74.b971e",
     "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": 4687.833435058594,
-    "y": 442.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4830.5001220703125,
+    "y": 341,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "b87b6903.ae28e",
+    "id": "53127e40.7f1108",
     "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": 4698.833435058594,
-    "y": 385.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4841.5001220703125,
+    "y": 284,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "d6320d33.cae9b",
+    "id": "9d5c763c.8825a8",
     "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": 5650.333312988281,
-    "y": 344.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5793,
+    "y": 243,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bdc01a41.5b11d",
-        "19bd6ca2.3b24bb",
-        "3d79a005.c3b89"
+        "14eb5ad.a3dc725",
+        "4c145e69.4439a8",
+        "6146c55d.b50c7c"
       ]
     ]
   },
   {
-    "id": "937745a8.a82728",
+    "id": "ea688f7c.199be",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5444.333312988281,
-    "y": 331.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5587,
+    "y": 230,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "624c597d.18779",
-        "d6320d33.cae9b"
+        "2ce20510.f1ea8a",
+        "9d5c763c.8825a8"
       ]
     ]
   },
   {
-    "id": "624c597d.18779",
+    "id": "2ce20510.f1ea8a",
     "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": 5680.333312988281,
-    "y": 292.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5823,
+    "y": 191,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "bdc01a41.5b11d",
+    "id": "14eb5ad.a3dc725",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5860.333312988281,
-    "y": 335.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 6003,
+    "y": 234,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "c6702adf.a8a4e8"
+        "95245b22.847e1"
       ]
     ]
   },
   {
-    "id": "19bd6ca2.3b24bb",
+    "id": "4c145e69.4439a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5852.333312988281,
-    "y": 390.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 5995,
+    "y": 289,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "14b63752.13b4e1"
+        "8e4747a4.d218e8"
       ]
     ]
   },
   {
-    "id": "3d79a005.c3b89",
+    "id": "6146c55d.b50c7c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5857.333312988281,
-    "y": 447.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 6000,
+    "y": 346,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "52bfc859.8923c8"
+        "6067fdf7.24ee8c"
       ]
     ]
   },
   {
-    "id": "52bfc859.8923c8",
+    "id": "6067fdf7.24ee8c",
     "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": 6009.333312988281,
-    "y": 448.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 6152,
+    "y": 347,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "14b63752.13b4e1",
+    "id": "8e4747a4.d218e8",
     "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": 6020.333312988281,
-    "y": 393.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 6163,
+    "y": 292,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "c6702adf.a8a4e8",
+    "id": "95245b22.847e1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6004.715637207031,
-    "y": 332.65567779541016,
-    "z": "88b99be5.091bf8",
+    "x": 6147.38232421875,
+    "y": 231.65567016601562,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d92f12f8.15c348"
+        "37f78c4b.9778a4"
       ]
     ]
   },
   {
-    "id": "d92f12f8.15c348",
+    "id": "37f78c4b.9778a4",
     "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": 6219.333312988281,
-    "y": 329.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 6362,
+    "y": 228,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "60926b96.be818c",
+    "id": "105d488e.a9be97",
     "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": 3786.3333129882812,
-    "y": 1669.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3929,
+    "y": 1568,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "c947459e.872f3",
+    "id": "f1912cb6.f277c8",
     "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": 3849.3333129882812,
-    "y": 1998.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3992,
+    "y": 1897,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a1124e38.08b2b8",
-        "626f4392.b77cf4"
+        "97bce09c.8125c",
+        "5d55eda4.32d174"
       ]
     ]
   },
   {
-    "id": "a1124e38.08b2b8",
+    "id": "97bce09c.8125c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4144.833312988281,
-    "y": 1965.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4287.5,
+    "y": 1864,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9662ab69.840d68"
+        "f47c0fd1.452808"
       ]
     ]
   },
   {
-    "id": "626f4392.b77cf4",
+    "id": "5d55eda4.32d174",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4149.833312988281,
-    "y": 2030.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4292.5,
+    "y": 1929,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "dc33d36b.4bb068"
+        "acffe827.dd3a1"
       ]
     ]
   },
   {
-    "id": "9662ab69.840d68",
+    "id": "f47c0fd1.452808",
     "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": 4312.833312988281,
-    "y": 1965.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4455.5,
+    "y": 1864,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "dc33d36b.4bb068",
+    "id": "acffe827.dd3a1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4323.333312988281,
-    "y": 2030.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4466,
+    "y": 1929,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "785f8bef.d4b92c",
+    "id": "b25ffa4f.8d40a",
     "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": 3725.3333129882812,
-    "y": 1726.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3868,
+    "y": 1625,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "d7561682.896a3",
+    "id": "cf848b89.db6cc",
     "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": 3745.3333129882812,
-    "y": 1823.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3888,
+    "y": 1722,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "585f4a29.5a089c",
-        "beb39570.8572c",
-        "251a4de6.33c8aa"
+        "3599c19a.ddebee",
+        "34a9c77d.fd737",
+        "5dbb4cb9.edac8c"
       ]
     ]
   },
   {
-    "id": "585f4a29.5a089c",
+    "id": "3599c19a.ddebee",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3947.8334350585938,
-    "y": 1776.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4090.5001220703125,
+    "y": 1675,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "52dfa280.06ea3c"
+        "cbdb928e.2f6908"
       ]
     ]
   },
   {
-    "id": "beb39570.8572c",
+    "id": "34a9c77d.fd737",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3939.8334350585938,
-    "y": 1831.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4082.5001220703125,
+    "y": 1730,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d9bfad39.7bd668"
+        "aab7df57.177ae"
       ]
     ]
   },
   {
-    "id": "52dfa280.06ea3c",
+    "id": "cbdb928e.2f6908",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4092.2157592773438,
-    "y": 1773.6556777954102,
-    "z": "88b99be5.091bf8",
+    "x": 4234.8824462890625,
+    "y": 1672.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "3ad5a325.5b1584"
+        "5b70bc96.d9f024"
       ]
     ]
   },
   {
-    "id": "3ad5a325.5b1584",
+    "id": "5b70bc96.d9f024",
     "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": 4276.333312988281,
-    "y": 1788.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4419,
+    "y": 1687,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "66e3a12c.e2e618"
+        "4020371.e4e7d48"
       ]
     ]
   },
   {
-    "id": "251a4de6.33c8aa",
+    "id": "5dbb4cb9.edac8c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3944.8334350585938,
-    "y": 1888.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4087.5001220703125,
+    "y": 1787,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "56e3abe.0b3e154"
+        "cb2099e3.7f1de"
       ]
     ]
   },
   {
-    "id": "56e3abe.0b3e154",
+    "id": "cb2099e3.7f1de",
     "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": 4096.833435058594,
-    "y": 1889.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4239.5001220703125,
+    "y": 1788,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "d9bfad39.7bd668",
+    "id": "aab7df57.177ae",
     "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": 4107.833435058594,
-    "y": 1834.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4250.5001220703125,
+    "y": 1733,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "b422b9dc.94e76",
+    "id": "b4cfde0a.4da658",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4674.333312988281,
-    "y": 1792.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4817,
+    "y": 1691,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "79873b94.5791e4"
+        "f4ed5c16.5bfe98"
       ]
     ]
   },
   {
-    "id": "66e3a12c.e2e618",
+    "id": "4020371.e4e7d48",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4471.333312988281,
-    "y": 1788.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4614,
+    "y": 1687,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "b422b9dc.94e76"
+        "b4cfde0a.4da658"
       ]
     ]
   },
   {
-    "id": "8c738542.45973",
+    "id": "5139fea9.434dc8",
     "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": 5059.333312988281,
-    "y": 1791.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5202,
+    "y": 1690,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bed842bc.70d158",
-        "9fccfde7.5bd058",
-        "42496faf.cc3318"
+        "d7e660a5.61d688",
+        "5cb5ba76.7f8a6c",
+        "f188d950.fea538"
       ]
     ]
   },
   {
-    "id": "79873b94.5791e4",
+    "id": "f4ed5c16.5bfe98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4851.333312988281,
-    "y": 1784.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4994,
+    "y": 1683,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "4d8f65c6.26fcac",
-        "8c738542.45973"
+        "5d010c90.067a14",
+        "5139fea9.434dc8"
       ]
     ]
   },
   {
-    "id": "4d8f65c6.26fcac",
+    "id": "5d010c90.067a14",
     "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": 5089.333312988281,
-    "y": 1739.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5232,
+    "y": 1638,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "8a854ad6.1d148",
+    "id": "9b19cdfe.3fc3d8",
     "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": 5418.333312988281,
-    "y": 1895.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5561,
+    "y": 1794,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "9b1912ba.26a3f8",
+    "id": "c60dd4d0.e8d36",
     "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": 5429.333312988281,
-    "y": 1840.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5572,
+    "y": 1739,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e79aefeb.ae2d8",
+    "id": "285fdf09.377c58",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5413.715637207031,
-    "y": 1779.6556777954102,
-    "z": "88b99be5.091bf8",
+    "x": 5556.38232421875,
+    "y": 1678.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9fa1b8fd.2344f"
+        "98960d3c.5507d"
       ]
     ]
   },
   {
-    "id": "9fa1b8fd.2344f",
+    "id": "98960d3c.5507d",
     "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": 5628.333312988281,
-    "y": 1776.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5771,
+    "y": 1675,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "bed842bc.70d158",
+    "id": "d7e660a5.61d688",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5269.333312988281,
-    "y": 1782.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5412,
+    "y": 1681,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "e79aefeb.ae2d8"
+        "285fdf09.377c58"
       ]
     ]
   },
   {
-    "id": "9fccfde7.5bd058",
+    "id": "5cb5ba76.7f8a6c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5261.333312988281,
-    "y": 1837.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5404,
+    "y": 1736,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9b1912ba.26a3f8"
+        "c60dd4d0.e8d36"
       ]
     ]
   },
   {
-    "id": "42496faf.cc3318",
+    "id": "f188d950.fea538",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5266.333312988281,
-    "y": 1894.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5409,
+    "y": 1793,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "8a854ad6.1d148"
+        "9b19cdfe.3fc3d8"
       ]
     ]
   },
   {
-    "id": "afc78578.3291",
+    "id": "4f2225d8.9c49ec",
     "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": 3300.3333129882812,
-    "y": 740.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3443,
+    "y": 639,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "44cf1bd6.cdf99c",
-        "619a5ca0.cdbc04"
+        "d58501ac.39534",
+        "2fb4f475.808574"
       ]
     ]
   },
   {
-    "id": "44cf1bd6.cdf99c",
+    "id": "d58501ac.39534",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3514.3333129882812,
-    "y": 777.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3657,
+    "y": 676,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "357cc1f0.bc9fae"
+        "41d82fae.a5867"
       ]
     ]
   },
   {
-    "id": "619a5ca0.cdbc04",
+    "id": "2fb4f475.808574",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3516.3333129882812,
-    "y": 715.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3659,
+    "y": 614,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "582aaedf.79cf78"
+        "918c203c.df9608"
       ]
     ]
   },
   {
-    "id": "357cc1f0.bc9fae",
+    "id": "41d82fae.a5867",
     "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": 3094.3333129882812,
-    "y": 2020.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3237,
+    "y": 1919,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "234b26f6.c2476a",
-        "5654d12.c509b3"
+        "5075f0ba.d591f8",
+        "d426d492.2d277"
       ]
     ]
   },
   {
-    "id": "234b26f6.c2476a",
+    "id": "5075f0ba.d591f8",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3347.3333129882812,
-    "y": 2054.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3490,
+    "y": 1953,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "77779b01.5bda2c"
+        "e38a9aed.8397b"
       ]
     ]
   },
   {
-    "id": "5654d12.c509b3",
+    "id": "d426d492.2d277",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3347.3333129882812,
-    "y": 1998.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3490,
+    "y": 1897,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "49e07205.df1904"
+        "16742fe3.bdb1e8"
       ]
     ]
   },
   {
-    "id": "77779b01.5bda2c",
+    "id": "e38a9aed.8397b",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3498.3333129882812,
-    "y": 2054.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3641,
+    "y": 1953,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "fc88d512.b039f8",
+    "id": "5d106c04.0c1bfc",
     "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": 4374.333312988281,
-    "y": 152.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4517,
+    "y": 51,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "6082a62.95d37d8",
+    "id": "ff76ad24.0c9b6",
     "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": 3782.3333129882812,
-    "y": 1611.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3925,
+    "y": 1510,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "7f468ae0.55d61c",
+    "id": "a35804af.f7d858",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4065.3333129882812,
-    "y": 409.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4208,
+    "y": 308,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "fc88d512.b039f8",
-        "e5ef1dc.853e7e",
-        "d18efeb6.7196c8",
-        "3a9d4ff0.831a9",
-        "28eb1f3b.b8157",
-        "20794036.3e0d98",
-        "5a5b3fd3.939fa",
-        "eb39e6d9.695df8"
+        "5d106c04.0c1bfc",
+        "9b274b59.c02fc",
+        "aa46b84e.3356a",
+        "d57f31e9.bb9eb",
+        "73b1b71.91a29c8",
+        "8951fa6a.a6da3",
+        "46bfac70.a8d9fc",
+        "d22b47c.48051b8"
       ]
     ]
   },
   {
-    "id": "49e07205.df1904",
+    "id": "16742fe3.bdb1e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3498.3333129882812,
-    "y": 1997.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3641,
+    "y": 1896,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6082a62.95d37d8",
-        "60926b96.be818c",
-        "785f8bef.d4b92c",
-        "d7561682.896a3",
-        "c947459e.872f3",
-        "33be6bd8.7ec864",
-        "7832f278.b4880c",
-        "cc8c0809.c4ad6"
+        "ff76ad24.0c9b6",
+        "105d488e.a9be97",
+        "b25ffa4f.8d40a",
+        "cf848b89.db6cc",
+        "f1912cb6.f277c8",
+        "7bb669b7.d54818",
+        "bfef7878.c9996",
+        "fc2523d9.c5b768"
       ]
     ]
   },
   {
-    "id": "3bec7c9e.0c31a4",
+    "id": "b91faaf4.9b239",
     "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": 3736.3333129882812,
-    "y": 2296.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3879,
+    "y": 2195,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "66e73857.3d0e78",
+    "id": "332b3c8d.6566fc",
     "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": 3890.3333129882812,
-    "y": 2344.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4033,
+    "y": 2243,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9ba2be1f.f4daf",
-        "1b19ccdb.027f4b"
+        "f1ea3ac9.246e38",
+        "629d98b3.63b55"
       ]
     ]
   },
   {
-    "id": "9ba2be1f.f4daf",
+    "id": "f1ea3ac9.246e38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4235.833312988281,
-    "y": 2325.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4378.5,
+    "y": 2224,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9032db4e.fba99"
+        "d4e7ca44.3afb58"
       ]
     ]
   },
   {
-    "id": "1b19ccdb.027f4b",
+    "id": "629d98b3.63b55",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4239.833312988281,
-    "y": 2365.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4382.5,
+    "y": 2264,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "2bcc0072.d2bc6"
+        "cda78bf5.1aa53"
       ]
     ]
   },
   {
-    "id": "9032db4e.fba99",
+    "id": "d4e7ca44.3afb58",
     "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": 4393.833312988281,
-    "y": 2325.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4536.5,
+    "y": 2224,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "2bcc0072.d2bc6",
+    "id": "cda78bf5.1aa53",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4397.333312988281,
-    "y": 2365.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4540,
+    "y": 2264,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "45d30eee.bf1db8",
-        "a53e3184.87caf8"
+        "d94da46.8513a58",
+        "80579be4.10d908"
       ]
     ]
   },
   {
-    "id": "45d30eee.bf1db8",
+    "id": "d94da46.8513a58",
     "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": 4737.333312988281,
-    "y": 2364.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4880,
+    "y": 2263,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "63d5aebc.7e418",
+    "id": "3ac4cfaa.a33bf8",
     "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": 4595.333312988281,
-    "y": 2322.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4738,
+    "y": 2221,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "a53e3184.87caf8",
+    "id": "80579be4.10d908",
     "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": 4666.333312988281,
-    "y": 2413.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4809,
+    "y": 2312,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "27db8b21.23f75c",
+    "id": "59ca2fb3.db456",
     "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": 3291.3333129882812,
-    "y": 680.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3434,
+    "y": 579,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "c22368e1.6b1058",
+    "id": "e8c1824d.c7b678",
     "type": "comment",
     "name": "only dst ttp exists. No src",
     "info": "",
     "comments": "",
-    "x": 3886.3333129882812,
-    "y": 366.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4029,
+    "y": 265,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "87e2c89e.c92dc",
+    "id": "6594c17a.b17458",
     "type": "comment",
     "name": "only src ttp exists. No dst",
     "info": "",
     "comments": "",
-    "x": 3443.3333129882812,
-    "y": 1944.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3586,
+    "y": 1843,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "582aaedf.79cf78",
+    "id": "918c203c.df9608",
     "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": 3622.3333129882812,
-    "y": 528.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3765,
+    "y": 427,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "16dc47d9.553a58",
-        "e13eb694.152348"
+        "bfcf03d4.3ffba",
+        "71ba846a.64e1d4"
       ]
     ]
   },
   {
-    "id": "e13eb694.152348",
+    "id": "71ba846a.64e1d4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3864.3333129882812,
-    "y": 1117.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4007,
+    "y": 1016,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "7db46487.9eca7c"
+        "98c2d638.1715f8"
       ]
     ]
   },
   {
-    "id": "16dc47d9.553a58",
+    "id": "bfcf03d4.3ffba",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3858.3333129882812,
-    "y": 408.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 4001,
+    "y": 307,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "7f468ae0.55d61c"
+        "a35804af.f7d858"
       ]
     ]
   },
   {
-    "id": "7db46487.9eca7c",
+    "id": "98c2d638.1715f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4022.3333129882812,
-    "y": 1116.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4165,
+    "y": 1015,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "27bc6cfd.f882bc",
-        "798042fa.f28ecc",
-        "44029581.1e0294",
-        "2e2e336b.2a2684",
-        "c0302985.1bc5d8",
-        "3bfb4fd1.bca51"
+        "d3cd38dd.2ebd58",
+        "ad06e711.5b1538",
+        "8a91f9fb.3806c",
+        "162c1530.673073",
+        "7140d593.b05bc4",
+        "baf6ec9f.d24be"
       ]
     ]
   },
   {
-    "id": "798042fa.f28ecc",
+    "id": "ad06e711.5b1538",
     "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": 4286.333312988281,
-    "y": 999.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4429,
+    "y": 898,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "c0302985.1bc5d8",
+    "id": "7140d593.b05bc4",
     "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": 4367.333312988281,
-    "y": 1314.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4510,
+    "y": 1213,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "cb1eb04b.0a8a5",
-        "c9a4895f.79f59"
+        "3f3f2221.846d2e",
+        "8610f4b1.bab488"
       ]
     ]
   },
   {
-    "id": "cb1eb04b.0a8a5",
+    "id": "3f3f2221.846d2e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4676.833312988281,
-    "y": 1283.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4819.5,
+    "y": 1182,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5c0ad877.d4666"
+        "1759fa75.7439f6"
       ]
     ]
   },
   {
-    "id": "c9a4895f.79f59",
+    "id": "8610f4b1.bab488",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4681.833312988281,
-    "y": 1348.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4824.5,
+    "y": 1247,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "647a8c60.745274"
+        "ea3b42ee.d3dc2"
       ]
     ]
   },
   {
-    "id": "5c0ad877.d4666",
+    "id": "1759fa75.7439f6",
     "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": 4852.833312988281,
-    "y": 1283.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4995.5,
+    "y": 1182,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "647a8c60.745274",
+    "id": "ea3b42ee.d3dc2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4848.333312988281,
-    "y": 1348.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4991,
+    "y": 1247,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "44029581.1e0294",
+    "id": "8a91f9fb.3806c",
     "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": 4224.333312988281,
-    "y": 1047.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4367,
+    "y": 946,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "2e2e336b.2a2684",
+    "id": "162c1530.673073",
     "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": 4250.333312988281,
-    "y": 1164.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4393,
+    "y": 1063,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "aa3dc68a.e420e",
-        "2fd5a39c.e4d124",
-        "be0fb969.9df28"
+        "8b8f3e33.0b8288",
+        "bbf641fc.079918",
+        "aed8a0af.bcb0e8"
       ]
     ]
   },
   {
-    "id": "aa3dc68a.e420e",
+    "id": "8b8f3e33.0b8288",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4445.833435058594,
-    "y": 1116.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4588.5001220703125,
+    "y": 1015,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bee191ec.52168"
+        "175bae6d.5d0f5a"
       ]
     ]
   },
   {
-    "id": "2fd5a39c.e4d124",
+    "id": "bbf641fc.079918",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4437.833435058594,
-    "y": 1171.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4580.5001220703125,
+    "y": 1070,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "53b0c593.b44354"
+        "fdde9a8e.52abd"
       ]
     ]
   },
   {
-    "id": "bee191ec.52168",
+    "id": "175bae6d.5d0f5a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4590.215759277344,
-    "y": 1115.6556777954102,
-    "z": "88b99be5.091bf8",
+    "x": 4732.8824462890625,
+    "y": 1014.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "41b89aec.8f3b84"
+        "719f0fb2.9b4ea"
       ]
     ]
   },
   {
-    "id": "41b89aec.8f3b84",
+    "id": "719f0fb2.9b4ea",
     "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": 4774.333312988281,
-    "y": 1114.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4917,
+    "y": 1013,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "860e8326.494828"
+        "776708d.aaadf78"
       ]
     ]
   },
   {
-    "id": "860e8326.494828",
+    "id": "776708d.aaadf78",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4969.333312988281,
-    "y": 1114.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5112,
+    "y": 1013,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "95d294a2.519858"
+        "2f8639e1.f5b81e"
       ]
     ]
   },
   {
-    "id": "be0fb969.9df28",
+    "id": "aed8a0af.bcb0e8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4442.833435058594,
-    "y": 1228.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4585.5001220703125,
+    "y": 1127,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a6d3daf4.4de778"
+        "16ba7b0.a295705"
       ]
     ]
   },
   {
-    "id": "a6d3daf4.4de778",
+    "id": "16ba7b0.a295705",
     "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": 4594.833435058594,
-    "y": 1229.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4737.5001220703125,
+    "y": 1128,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "53b0c593.b44354",
+    "id": "fdde9a8e.52abd",
     "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": 4605.833435058594,
-    "y": 1172.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4748.5001220703125,
+    "y": 1071,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "27bc6cfd.f882bc",
+    "id": "d3cd38dd.2ebd58",
     "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": 4281.333312988281,
-    "y": 939.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4424,
+    "y": 838,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "95d294a2.519858",
+    "id": "2f8639e1.f5b81e",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5172.333312988281,
-    "y": 1118.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5315,
+    "y": 1017,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "280af449.de2e3c"
+        "4e6eba09.52f61c"
       ]
     ]
   },
   {
-    "id": "ef3f04cf.8bb518",
+    "id": "d0ebf00f.416c5",
     "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": 5557.333312988281,
-    "y": 1131.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5700,
+    "y": 1030,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "31456949.0bd6c6",
-        "ae6ce682.b30c68",
-        "e0e5a782.5ecb88"
+        "504e55c8.8a8984",
+        "eddcd7ad.fdc98",
+        "17833a87.15b8f5"
       ]
     ]
   },
   {
-    "id": "280af449.de2e3c",
+    "id": "4e6eba09.52f61c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5351.333312988281,
-    "y": 1118.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5494,
+    "y": 1017,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "7f6c4201.ca3284",
-        "ef3f04cf.8bb518"
+        "951ffcc3.fc60c8",
+        "d0ebf00f.416c5"
       ]
     ]
   },
   {
-    "id": "7f6c4201.ca3284",
+    "id": "951ffcc3.fc60c8",
     "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": 5587.333312988281,
-    "y": 1079.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5730,
+    "y": 978,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "31456949.0bd6c6",
+    "id": "504e55c8.8a8984",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5767.333312988281,
-    "y": 1122.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5910,
+    "y": 1021,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "37e04a2.a327336"
+        "8e64943.8a64ae8"
       ]
     ]
   },
   {
-    "id": "ae6ce682.b30c68",
+    "id": "eddcd7ad.fdc98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5759.333312988281,
-    "y": 1177.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5902,
+    "y": 1076,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "536ede72.dab3b"
+        "6bb74cc0.02d7dc"
       ]
     ]
   },
   {
-    "id": "e0e5a782.5ecb88",
+    "id": "17833a87.15b8f5",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5764.333312988281,
-    "y": 1234.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 5907,
+    "y": 1133,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "f46537ce.c9aaa8"
+        "43c2b842.215f48"
       ]
     ]
   },
   {
-    "id": "f46537ce.c9aaa8",
+    "id": "43c2b842.215f48",
     "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": 5916.333312988281,
-    "y": 1235.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 6059,
+    "y": 1134,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "536ede72.dab3b",
+    "id": "6bb74cc0.02d7dc",
     "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": 5927.333312988281,
-    "y": 1180.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 6070,
+    "y": 1079,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "37e04a2.a327336",
+    "id": "8e64943.8a64ae8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5911.715637207031,
-    "y": 1119.6556777954102,
-    "z": "88b99be5.091bf8",
+    "x": 6054.38232421875,
+    "y": 1018.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "77189bba.da3f4c"
+        "fb3f7d81.a9fad8"
       ]
     ]
   },
   {
-    "id": "77189bba.da3f4c",
+    "id": "fb3f7d81.a9fad8",
     "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": 6126.333312988281,
-    "y": 1116.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 6269,
+    "y": 1015,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "217a8eaf.b5afda",
+    "id": "534dacd3.c0ac9c",
     "type": "comment",
     "name": "both src and dst exist",
     "info": "",
     "comments": "",
-    "x": 3900.3333129882812,
-    "y": 1057.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4043,
+    "y": 956,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "877d8b16.d3994",
+    "id": "1812ba90.3bec25",
     "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": 2462.3333129882812,
-    "y": 784.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2605,
+    "y": 683,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "df6e125e.14274",
-        "fd236e9d.746de"
+        "1c061163.c474df",
+        "695afc2e.f3ca34"
       ]
     ]
   },
   {
-    "id": "fd236e9d.746de",
+    "id": "695afc2e.f3ca34",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2869.3333129882812,
-    "y": 802.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3012,
+    "y": 701,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a1b579c2.6ca69"
+        "fdf83271.37011"
       ]
     ]
   },
   {
-    "id": "df6e125e.14274",
+    "id": "1c061163.c474df",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2869.3333129882812,
-    "y": 747.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3012,
+    "y": 646,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "51a6a8ff.40f098"
+        "ca8832e9.e2e2f8"
       ]
     ]
   },
   {
-    "id": "51a6a8ff.40f098",
+    "id": "ca8832e9.e2e2f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3025.3333129882812,
-    "y": 745.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3168,
+    "y": 644,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "27db8b21.23f75c",
-        "afc78578.3291"
+        "59ca2fb3.db456",
+        "4f2225d8.9c49ec"
       ]
     ]
   },
   {
-    "id": "a1b579c2.6ca69",
+    "id": "fdf83271.37011",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3002.3333129882812,
-    "y": 803.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3145,
+    "y": 702,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "cef7b9ce.1b3ba8",
+    "id": "c82b1b5b.8e5c4",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
     "comments": "",
-    "x": 1179.3333129882812,
-    "y": 219.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1322,
+    "y": 118,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "bdafe4d.0bce798",
+    "id": "411de79.b4b0f18",
     "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": 4296.333312988281,
-    "y": 637.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4439,
+    "y": 536,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "20794036.3e0d98",
+    "id": "8951fa6a.a6da3",
     "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": 4356.333312988281,
-    "y": 676.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4499,
+    "y": 575,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "306cc859.5059d",
+    "id": "476ddcd6.ba7404",
     "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": 1172.3333129882812,
-    "y": 127.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1315,
+    "y": 26,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "3258d8ff.e890f",
+    "id": "1bf6340f.f5f2ec",
     "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": 3708.3333129882812,
-    "y": 2153.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3851,
+    "y": 2052,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "33be6bd8.7ec864",
+    "id": "7bb669b7.d54818",
     "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": 3764.3333129882812,
-    "y": 2202.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3907,
+    "y": 2101,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "7f9af85d.c9b1a",
+    "id": "6657df85.d2b128",
     "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": 1172.3333129882812,
-    "y": 166.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1315,
+    "y": 65,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "5f84eccb.714dcc",
+    "id": "cf6ce2f3.f820a",
     "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": 1203.3333129882812,
-    "y": 267.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1346,
+    "y": 166,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "3014f91f.87a3fe",
+    "id": "a8ba69c5.3110b8",
     "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": 413.33331298828125,
-    "y": 742.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 556,
+    "y": 641,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "ad3a20d5.f6589",
-        "e51813a.1cc197",
-        "ca637d1.24786"
+        "502e9c54.45eb3c",
+        "889f52ba.eeef7",
+        "28d7625.1c6aa1e"
       ]
     ]
   },
   {
-    "id": "ad3a20d5.f6589",
+    "id": "502e9c54.45eb3c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 632.3333129882812,
-    "y": 680.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 775,
+    "y": 579,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5ade52fc.bbf09c"
+        "1f16072d.60be49"
       ]
     ]
   },
   {
-    "id": "e51813a.1cc197",
+    "id": "889f52ba.eeef7",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 641.8242797851562,
-    "y": 722.5740432739258,
-    "z": "88b99be5.091bf8",
+    "x": 784.490966796875,
+    "y": 621.5740356445312,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "ca637d1.24786",
+    "id": "28d7625.1c6aa1e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 630.3333129882812,
-    "y": 769.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 773,
+    "y": 668,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "67b4863e.f31f1"
+        "ccd7626e.e5286"
       ]
     ]
   },
   {
-    "id": "5ade52fc.bbf09c",
+    "id": "1f16072d.60be49",
     "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": 829.3333129882812,
-    "y": 676.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 972,
+    "y": 575,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "805608ab.1113d"
+        "839ea221.6a3238"
       ]
     ]
   },
   {
-    "id": "67b4863e.f31f1",
+    "id": "ccd7626e.e5286",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 799.3333129882812,
-    "y": 770.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 942,
+    "y": 669,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "805608ab.1113d",
+    "id": "839ea221.6a3238",
     "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": 1052.6668090820312,
-    "y": 675.9999465942383,
-    "z": "88b99be5.091bf8",
+    "x": 1195.33349609375,
+    "y": 574.9999389648438,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "fce88b79.ad9ea"
+        "8ba544cb.07a21"
       ]
     ]
   },
   {
-    "id": "fce88b79.ad9ea",
+    "id": "8ba544cb.07a21",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1253.3334465026855,
-    "y": 677.0000286102295,
-    "z": "88b99be5.091bf8",
+    "x": 1396.0001335144043,
+    "y": 576.000020980835,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "324a4f4a.beb9"
+        "f797d924.6d542"
       ]
     ]
   },
   {
-    "id": "324a4f4a.beb9",
+    "id": "f797d924.6d542",
     "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": 383.33331298828125,
-    "y": 939.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 526,
+    "y": 838,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5a7cd799.dd504",
-        "c46ba437.0993",
-        "3526445b.eeea9c"
+        "55f1b492.85099c",
+        "efb1ebef.255b68",
+        "f3e73178.97a2a"
       ]
     ]
   },
   {
-    "id": "5a7cd799.dd504",
+    "id": "55f1b492.85099c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 591.3333129882812,
-    "y": 903.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 734,
+    "y": 802,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "63b8bbd2.15c994"
+        "b45da909.27452"
       ]
     ]
   },
   {
-    "id": "c46ba437.0993",
+    "id": "efb1ebef.255b68",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 591.8242797851562,
-    "y": 948.5740432739258,
-    "z": "88b99be5.091bf8",
+    "x": 734.490966796875,
+    "y": 847.5740356445312,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "3526445b.eeea9c",
+    "id": "f3e73178.97a2a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 589.3333129882812,
-    "y": 992.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 732,
+    "y": 891,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "c4b232cc.80b998"
+        "e06cb3b.90f78d"
       ]
     ]
   },
   {
-    "id": "c4b232cc.80b998",
+    "id": "e06cb3b.90f78d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 758.3333129882812,
-    "y": 993.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 901,
+    "y": 892,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "bd0ad7c2.1f4f3",
+    "id": "58a3e896.b9ca7",
     "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": 730.3333129882812,
-    "y": 1487.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 873,
+    "y": 1386,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "fb10f5a.4414808"
+        "ed8e0c4d.c624f8"
       ]
     ]
   },
   {
-    "id": "fb10f5a.4414808",
+    "id": "ed8e0c4d.c624f8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 933.3333129882812,
-    "y": 1499.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1076,
+    "y": 1398,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "31b4d2c5.66c72e"
+        "31bb3da4.3ce832"
       ]
     ]
   },
   {
-    "id": "31b4d2c5.66c72e",
+    "id": "31bb3da4.3ce832",
     "type": "outcome",
     "name": "UNI",
     "xml": "<outcome value='uni'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1099.3333129882812,
-    "y": 1496.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1242,
+    "y": 1395,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d62a4bb8.975ae8"
+        "7ad884e0.ebf21c"
       ]
     ]
   },
   {
-    "id": "d62a4bb8.975ae8",
+    "id": "7ad884e0.ebf21c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1260.3333129882812,
-    "y": 1493.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1403,
+    "y": 1392,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "46f537c9.1c8be8",
-        "f8fe77e2.d43ff8",
-        "6a183fad.35ec3",
-        "f7155528.92cd7",
-        "65c7779e.8d1a88",
-        "cccd2695.c600b"
+        "319b90ba.5fa548",
+        "5d60f478.58b2dc",
+        "478f42b4.faa2d4",
+        "573af6c.7f50588",
+        "1b5d7c99.3bb563",
+        "a7cc4e14.f32b08"
       ]
     ]
   },
   {
-    "id": "f8fe77e2.d43ff8",
+    "id": "5d60f478.58b2dc",
     "type": "set",
     "name": "unset tmp.aai.uni",
     "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
     "comments": "",
-    "x": 1466.3333129882812,
-    "y": 1092.9999465942383,
-    "z": "88b99be5.091bf8",
+    "x": 1609,
+    "y": 991.9999389648438,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "46f537c9.1c8be8",
+    "id": "319b90ba.5fa548",
     "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": 1463.3333129882812,
-    "y": 1137.9999465942383,
-    "z": "88b99be5.091bf8",
+    "x": 1606,
+    "y": 1036.9999389648438,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "4e769c0f.1938ec",
-        "3dc6fc35.d186bc",
-        "90b11589.d4f84"
+        "be8d977b.6062b8",
+        "2f61d10e.8f5e3e",
+        "9e1188e1.cf8b3"
       ]
     ]
   },
   {
-    "id": "3dc6fc35.d186bc",
+    "id": "2f61d10e.8f5e3e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1658.8242797851562,
-    "y": 1111.5739212036133,
-    "z": "88b99be5.091bf8",
+    "x": 1801.490966796875,
+    "y": 1010.5739135742188,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6d117931.940098"
+        "771eefb0.aeb88"
       ]
     ]
   },
   {
-    "id": "90b11589.d4f84",
+    "id": "9e1188e1.cf8b3",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1654.3333129882812,
-    "y": 1155.999885559082,
-    "z": "88b99be5.091bf8",
+    "x": 1797,
+    "y": 1054.9998779296875,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "f48b55b8.ea1ca8"
+        "47c4b052.107038"
       ]
     ]
   },
   {
-    "id": "6d117931.940098",
+    "id": "771eefb0.aeb88",
     "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": 1821.3958129882812,
-    "y": 1110.8596267700195,
-    "z": "88b99be5.091bf8",
+    "x": 1964.0625,
+    "y": 1009.859619140625,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "f48b55b8.ea1ca8",
+    "id": "47c4b052.107038",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1822.3333129882812,
-    "y": 1155.999885559082,
-    "z": "88b99be5.091bf8",
+    "x": 1965,
+    "y": 1054.9998779296875,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e35ee523.d065b8",
+    "id": "2be34ba3.ed43bc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1824.3333129882812,
-    "y": 1202.999885559082,
-    "z": "88b99be5.091bf8",
+    "x": 1967,
+    "y": 1101.9998779296875,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "4e769c0f.1938ec",
+    "id": "be8d977b.6062b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1655.3333129882812,
-    "y": 1202.999885559082,
-    "z": "88b99be5.091bf8",
+    "x": 1798,
+    "y": 1101.9998779296875,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "e35ee523.d065b8"
+        "2be34ba3.ed43bc"
       ]
     ]
   },
   {
-    "id": "bf815f65.ee4c28",
+    "id": "41b34545.fd0234",
     "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": 1437.3333129882812,
-    "y": 1724.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1580,
+    "y": 1623,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "6a183fad.35ec3",
+    "id": "478f42b4.faa2d4",
     "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",
+    "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<!--<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.uni.data-owner`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
     "comments": "",
-    "x": 1528.3333129882812,
-    "y": 1778.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1671,
+    "y": 1677,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "1ef1fe95.45b2b9",
+    "id": "651de255.0b2e64",
     "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": 2204.8333129882812,
-    "y": 1191.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2347.5,
+    "y": 1090,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "dbeb188c.810cc",
+    "id": "d6d9ebdf.e9fb3",
     "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": 2209.8333129882812,
-    "y": 1293.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2352.5,
+    "y": 1192,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "f8c77435.00d858",
+    "id": "19b7b815.a2da88",
     "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": 693.3333129882812,
-    "y": 1743.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 836,
+    "y": 1642,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "e5d4675a.166ce"
+        "326b550a.9db58a"
       ]
     ]
   },
   {
-    "id": "e5d4675a.166ce",
+    "id": "326b550a.9db58a",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 925.3333129882812,
-    "y": 1742.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1068,
+    "y": 1641,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a4b4e62.0b9bb18"
+        "ee715cec.70103"
       ]
     ]
   },
   {
-    "id": "a4b4e62.0b9bb18",
+    "id": "ee715cec.70103",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1137.3333129882812,
-    "y": 1743.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1280,
+    "y": 1642,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "79b56211.8303fc"
+        "43195eb9.e8bde"
       ]
     ]
   },
   {
-    "id": "79b56211.8303fc",
+    "id": "43195eb9.e8bde",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 393.33331298828125,
-    "y": 1899.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 536,
+    "y": 1798,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5e413ae2.fc139c",
-        "a0eb6cf6.129b98"
+        "1e409cd.23bb4e3",
+        "e0ab136c.d8395"
       ]
     ]
   },
   {
-    "id": "a0eb6cf6.129b98",
+    "id": "e0ab136c.d8395",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 628.3333129882812,
-    "y": 1886.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 771,
+    "y": 1785,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "5e413ae2.fc139c",
+    "id": "1e409cd.23bb4e3",
     "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": 618.3333129882812,
-    "y": 1947.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 761,
+    "y": 1846,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5d519b04.edc364",
-        "44e78fc4.a8de9",
-        "77b9ca42.e1131c"
+        "1385ba51.9ab07e",
+        "5c95ef7e.18572",
+        "b238e66d.1cae98"
       ]
     ]
   },
   {
-    "id": "44e78fc4.a8de9",
+    "id": "5c95ef7e.18572",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 831.8242797851562,
-    "y": 1931.5740432739258,
-    "z": "88b99be5.091bf8",
+    "x": 974.490966796875,
+    "y": 1830.5740356445312,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "93fe98b.5489068"
+        "a28f4f7.3d20fb"
       ]
     ]
   },
   {
-    "id": "77b9ca42.e1131c",
+    "id": "b238e66d.1cae98",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 827.3333129882812,
-    "y": 1976.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 970,
+    "y": 1875,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "376a9d2f.bd1f52"
+        "20e3dbdd.0ffc3c"
       ]
     ]
   },
   {
-    "id": "5d519b04.edc364",
+    "id": "1385ba51.9ab07e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 829.3333129882812,
-    "y": 2036.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 972,
+    "y": 1935,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "fa4146f3.54f198"
+        "dcbbe04b.ec00a"
       ]
     ]
   },
   {
-    "id": "93fe98b.5489068",
+    "id": "a28f4f7.3d20fb",
     "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": 994.3958129882812,
-    "y": 1930.859748840332,
-    "z": "88b99be5.091bf8",
+    "x": 1137.0625,
+    "y": 1829.8597412109375,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "376a9d2f.bd1f52",
+    "id": "20e3dbdd.0ffc3c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 995.3333129882812,
-    "y": 1976.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1138,
+    "y": 1875,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "fa4146f3.54f198",
+    "id": "dcbbe04b.ec00a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 998.3333129882812,
-    "y": 2035.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1141,
+    "y": 1934,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "ef75e4e3.1f8138",
-        "e2966b29.fc5b38"
+        "5f788739.44bc78",
+        "7a2f8c3.df4e4f4"
       ]
     ]
   },
   {
-    "id": "572a8f36.0443a",
+    "id": "968f8b65.0f9e28",
     "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",
+    "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<!--<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": 397.33331298828125,
-    "y": 2534.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 540,
+    "y": 2433,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "944da194.59bcd",
+    "id": "d784554f.a0db1",
     "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": 540.3333129882812,
-    "y": 2594.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 683,
+    "y": 2493,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "d840ad4b.1282a",
-        "89a7b87.1e553c8"
+        "d0e8b7bc.b13c",
+        "92d47971.6e56"
       ]
     ]
   },
   {
-    "id": "d840ad4b.1282a",
+    "id": "d0e8b7bc.b13c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 852.8333129882812,
-    "y": 2571.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 995.5,
+    "y": 2470,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "89a7b87.1e553c8",
+    "id": "92d47971.6e56",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 856.8333129882812,
-    "y": 2611.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 999.5,
+    "y": 2510,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "5d5378bf.137d"
+        "d5b32099.fe43f"
       ]
     ]
   },
   {
-    "id": "9a01795a.7ab4e",
+    "id": "1ff5a710.b4bb29",
     "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": 1032.8333129882812,
-    "y": 2575.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1175.5,
+    "y": 2474,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "5d5378bf.137d",
+    "id": "d5b32099.fe43f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1048.3333129882812,
-    "y": 2629.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1191,
+    "y": 2528,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6dbe844a.8a9554",
-        "63370d02.a0670c",
-        "1ca90fe2.261db8",
-        "2ecfa879.64974"
+        "ca571afb.4a46e8",
+        "1210758a.a607e2",
+        "9f2557cf.e0f36",
+        "c6235f90.04d29"
       ]
     ]
   },
   {
-    "id": "ef77bece.8a7928",
+    "id": "7f59e1a7.53806",
     "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": 1343.8333129882812,
-    "y": 2598.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1486.5,
+    "y": 2497,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "33e96132.6ee886",
+    "id": "5a3937e0.a5f138",
     "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": 2810.8333129882812,
-    "y": 1949.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2953.5,
+    "y": 1848,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "6dbe844a.8a9554",
+    "id": "ca571afb.4a46e8",
     "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": 1305.8333129882812,
-    "y": 2640.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1448.5,
+    "y": 2539,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "c08ad06c.488d4",
+    "id": "5eba1f1e.c5c1c",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
     "comments": "",
-    "x": 2170.8333129882812,
-    "y": 1229.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2313.5,
+    "y": 1128,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "2ee2b867.995c6",
+    "id": "14e15bd9.f573a4",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
     "comments": "",
-    "x": 2171.8333129882812,
-    "y": 1333.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2314.5,
+    "y": 1232,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "5a5b3fd3.939fa",
+    "id": "46bfac70.a8d9fc",
     "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": 4465.333312988281,
-    "y": 590.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4608,
+    "y": 489,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "3bfb4fd1.bca51",
+    "id": "baf6ec9f.d24be",
     "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": 4368.333312988281,
-    "y": 1409.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4511,
+    "y": 1308,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "7832f278.b4880c",
+    "id": "bfef7878.c9996",
     "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": 3862.3333129882812,
-    "y": 2081.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4005,
+    "y": 1980,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "63b8bbd2.15c994",
+    "id": "b45da909.27452",
     "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": 963.3333129882812,
-    "y": 889.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1106,
+    "y": 788,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a66053fc.e972e8",
-        "286bc10d.0b75fe"
+        "b0133784.5a4a",
+        "99418662.5bc768"
       ]
     ]
   },
   {
-    "id": "a66053fc.e972e8",
+    "id": "b0133784.5a4a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1326.3333129882812,
-    "y": 912.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1469,
+    "y": 811,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6f304f3b.74dcb"
+        "288f63da.bd0d24"
       ]
     ]
   },
   {
-    "id": "286bc10d.0b75fe",
+    "id": "99418662.5bc768",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1326.3333129882812,
-    "y": 861.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1469,
+    "y": 760,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bf68aa32.2da6d"
+        "e20160a5.497008"
       ]
     ]
   },
   {
-    "id": "6f304f3b.74dcb",
+    "id": "288f63da.bd0d24",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1482.3333129882812,
-    "y": 910.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1625,
+    "y": 809,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9b8bc380.4fea78"
+        "45fa8d37.dd8774"
       ]
     ]
   },
   {
-    "id": "bf68aa32.2da6d",
+    "id": "e20160a5.497008",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1459.3333129882812,
-    "y": 862.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1602,
+    "y": 761,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "b3333886.2341",
+    "id": "cefb7e41.dee868",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 2219.3333129882812,
-    "y": 260.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 2362,
+    "y": 159,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "cc8c0809.c4ad6",
+    "id": "fc2523d9.c5b768",
     "type": "set",
     "name": "set root-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
     "comments": "",
-    "x": 3761.3333129882812,
-    "y": 2241.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 3904,
+    "y": 2140,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "eb39e6d9.695df8",
+    "id": "d22b47c.48051b8",
     "type": "set",
     "name": "set leaf-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
     "comments": "",
-    "x": 4351.333312988281,
-    "y": 714.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 4494,
+    "y": 613,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "f7155528.92cd7",
+    "id": "573af6c.7f50588",
     "type": "set",
     "name": "set ethernet-srv-end-points-list array",
     "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
     "comments": "",
-    "x": 1525.3333129882812,
-    "y": 1820.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1668,
+    "y": 1719,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "7ad9431e.95fd94",
+    "id": "b8cd961f.31b1e",
     "type": "set",
     "name": "set filename",
     "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
     "comments": "",
-    "x": 704.3333129882812,
-    "y": 1554.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 847,
+    "y": 1453,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "da906021.6570a8",
+    "id": "e61f86e7.4b844",
     "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": 735.3333129882812,
-    "y": 1594.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 878,
+    "y": 1493,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "ef75e4e3.1f8138",
+    "id": "5f788739.44bc78",
     "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": 1283.3333129882812,
-    "y": 2002.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1426,
+    "y": 1901,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e2966b29.fc5b38",
+    "id": "7a2f8c3.df4e4f4",
     "type": "set",
     "name": "set otn-tunnels-name-list array",
     "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
     "comments": "",
-    "x": 1286.3333129882812,
-    "y": 2044.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1429,
+    "y": 1943,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "64010c53.9fe67c",
+    "id": "faabf01d.19b578",
     "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": 729.3333129882812,
-    "y": 1684.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 872,
+    "y": 1583,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "d5a25879.5481b8",
+    "id": "9608fe0d.afb518",
     "type": "set",
     "name": "set filename",
     "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
     "comments": "",
-    "x": 484.33331298828125,
-    "y": 2063.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 627,
+    "y": 1962,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "7aac81ec.ba7cc8",
+    "id": "a9b8ee61.6ebf68",
     "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": 492.33331298828125,
-    "y": 2120.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 635,
+    "y": 2019,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "65c7779e.8d1a88",
+    "id": "1b5d7c99.3bb563",
     "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": 1503.3333129882812,
-    "y": 1669.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1646,
+    "y": 1568,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "2c5e4010.43e508",
-        "e3644437.55d698"
+        "7979c8cd.b373d",
+        "23095b34.b6c794"
       ]
     ]
   },
   {
-    "id": "e3644437.55d698",
+    "id": "23095b34.b6c794",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1726.3333129882812,
-    "y": 1624.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1869,
+    "y": 1523,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "63f336a7.fff6b"
+        "b9f88a30.b1b1"
       ]
     ]
   },
   {
-    "id": "2c5e4010.43e508",
+    "id": "7979c8cd.b373d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1728.3333129882812,
-    "y": 1688.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1871,
+    "y": 1587,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "2fd3ce09.17bf12"
+        "4c2d0979.5cdfa"
       ]
     ]
   },
   {
-    "id": "63f336a7.fff6b",
+    "id": "b9f88a30.b1b1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1891.3333129882812,
-    "y": 1621.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2034,
+    "y": 1520,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "185277bc.64228"
+        "a93541e2.34e668"
       ]
     ]
   },
   {
-    "id": "2fd3ce09.17bf12",
+    "id": "4c2d0979.5cdfa",
     "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": 1890.3333129882812,
-    "y": 1684.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2033,
+    "y": 1583,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "185277bc.64228",
+    "id": "a93541e2.34e668",
     "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": 2111.3333129882812,
-    "y": 1635.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2254,
+    "y": 1534,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "f4fd995d.61939",
+    "id": "2126128b.9ba956",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1656.3333129882812,
-    "y": 2360.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1799,
+    "y": 2259,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "3bd70d03.1cae1a"
+        "62735f15.7b8b4"
       ]
     ]
   },
   {
-    "id": "fea4d7d8.17bf48",
+    "id": "47d236a4.c5327",
     "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": 2041.3333129882812,
-    "y": 2373.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2184,
+    "y": 2272,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "753e6379.2f2664",
-        "3a690bb3.5501f4",
-        "105362f3.9957cd"
+        "fd91a13a.7b2ed",
+        "dc7a52c4.792ff8",
+        "81cf7ce4.5be808"
       ]
     ]
   },
   {
-    "id": "3bd70d03.1cae1a",
+    "id": "62735f15.7b8b4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1835.3333129882812,
-    "y": 2360.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1978,
+    "y": 2259,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "3086e43a.76dc2c",
-        "fea4d7d8.17bf48"
+        "fb54c20.839104",
+        "47d236a4.c5327"
       ]
     ]
   },
   {
-    "id": "3086e43a.76dc2c",
+    "id": "fb54c20.839104",
     "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": 2071.3333129882812,
-    "y": 2321.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2214,
+    "y": 2220,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "753e6379.2f2664",
+    "id": "fd91a13a.7b2ed",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2251.3333129882812,
-    "y": 2364.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2394,
+    "y": 2263,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "57e3082b.ec85c"
+        "66b9462d.a94c6"
       ]
     ]
   },
   {
-    "id": "3a690bb3.5501f4",
+    "id": "dc7a52c4.792ff8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2243.3333129882812,
-    "y": 2419.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2386,
+    "y": 2318,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "e1967348.adb6a"
+        "4ff23f6c.d7f718"
       ]
     ]
   },
   {
-    "id": "105362f3.9957cd",
+    "id": "81cf7ce4.5be808",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2248.3333129882812,
-    "y": 2476.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2391,
+    "y": 2375,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "9b464363.d7abc"
+        "45252a0c.1579ec"
       ]
     ]
   },
   {
-    "id": "9b464363.d7abc",
+    "id": "45252a0c.1579ec",
     "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": 2400.3333129882812,
-    "y": 2477.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2543,
+    "y": 2376,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e1967348.adb6a",
+    "id": "4ff23f6c.d7f718",
     "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": 2411.3333129882812,
-    "y": 2422.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2554,
+    "y": 2321,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "57e3082b.ec85c",
+    "id": "66b9462d.a94c6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2395.7156372070312,
-    "y": 2361.65567779541,
-    "z": "88b99be5.091bf8",
+    "x": 2538.38232421875,
+    "y": 2260.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "a2d4cc4c.5835f"
+        "d426c7f3.a4f758"
       ]
     ]
   },
   {
-    "id": "a2d4cc4c.5835f",
+    "id": "d426c7f3.a4f758",
     "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": 2610.3333129882812,
-    "y": 2358.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2753,
+    "y": 2257,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "77651854.67a228",
+    "id": "9097bb51.35f598",
     "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": 734.3333129882812,
-    "y": 2406.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 877,
+    "y": 2305,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "8b371429.94e21",
-        "ddb97aef.ff9618",
-        "6bdf8533.ac0744"
+        "c5c9c64c.e5b6a",
+        "fbc95d65.751dd8",
+        "a12f5414.7f7f38"
       ]
     ]
   },
   {
-    "id": "8b371429.94e21",
+    "id": "c5c9c64c.e5b6a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 929.8334350585938,
-    "y": 2358.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1072.5001220703125,
+    "y": 2257,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "86408567.50b5f8"
+        "cd1789e.857e878"
       ]
     ]
   },
   {
-    "id": "ddb97aef.ff9618",
+    "id": "fbc95d65.751dd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 921.8334350585938,
-    "y": 2413.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1064.5001220703125,
+    "y": 2312,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "83d0fe92.92a8c"
+        "641a2f60.3e56f"
       ]
     ]
   },
   {
-    "id": "86408567.50b5f8",
+    "id": "cd1789e.857e878",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1074.2157592773438,
-    "y": 2357.65567779541,
-    "z": "88b99be5.091bf8",
+    "x": 1216.8824462890625,
+    "y": 2256.6556701660156,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "206c1f26.03baa8"
+        "40024900.22ab5"
       ]
     ]
   },
   {
-    "id": "206c1f26.03baa8",
+    "id": "40024900.22ab5",
     "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": 1258.3333129882812,
-    "y": 2356.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1401,
+    "y": 2255,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "604358eb.cf3bc"
+        "61575a21.5f4624"
       ]
     ]
   },
   {
-    "id": "604358eb.cf3bc",
+    "id": "61575a21.5f4624",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1453.3333129882812,
-    "y": 2356.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1596,
+    "y": 2255,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "f4fd995d.61939"
+        "2126128b.9ba956"
       ]
     ]
   },
   {
-    "id": "6bdf8533.ac0744",
+    "id": "a12f5414.7f7f38",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 926.8334350585938,
-    "y": 2470.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1069.5001220703125,
+    "y": 2369,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "843f6d1c.7ee9c"
+        "73357d18.309cec"
       ]
     ]
   },
   {
-    "id": "843f6d1c.7ee9c",
+    "id": "73357d18.309cec",
     "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": 1078.8334350585938,
-    "y": 2471.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1221.5001220703125,
+    "y": 2370,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "83d0fe92.92a8c",
+    "id": "641a2f60.3e56f",
     "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": 1089.8334350585938,
-    "y": 2414.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1232.5001220703125,
+    "y": 2313,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "7e37f686.4b31c8",
+    "id": "1f9570cc.1dec3f",
     "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": 724.3333129882812,
-    "y": 2318.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 867,
+    "y": 2217,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "c0f06a3d.8ad7f8",
+    "id": "8c27b84f.305088",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 469.33331298828125,
-    "y": 2449.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 612,
+    "y": 2348,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "7e37f686.4b31c8",
-        "77651854.67a228"
+        "1f9570cc.1dec3f",
+        "9097bb51.35f598"
       ]
     ]
   },
   {
-    "id": "7e8f5942.82fe9",
+    "id": "518c62b.9bc109c",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 1684.2999877929688,
-    "y": 266.88333892822266,
-    "z": "88b99be5.091bf8",
+    "x": 1826.9666748046875,
+    "y": 165.88333129882812,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "9f7438aa.cfa3f8",
+    "id": "630bfd04.7da00c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 886.3333129882812,
-    "y": 489.00000762939453,
-    "z": "88b99be5.091bf8",
+    "x": 1029,
+    "y": 388,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "4162fe05.2b911",
+    "id": "87edee65.85ae28",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 445.83331298828125,
-    "y": 1458.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 588.5,
+    "y": 1357,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "bd0ad7c2.1f4f3",
-        "f8c77435.00d858",
-        "7ad9431e.95fd94",
-        "da906021.6570a8",
-        "572a8f36.0443a",
-        "944da194.59bcd",
-        "64010c53.9fe67c",
-        "d5a25879.5481b8",
-        "7aac81ec.ba7cc8",
-        "c0f06a3d.8ad7f8",
-        "ad8e54c3.d3fe18"
+        "58a3e896.b9ca7",
+        "19b7b815.a2da88",
+        "b8cd961f.31b1e",
+        "e61f86e7.4b844",
+        "968f8b65.0f9e28",
+        "d784554f.a0db1",
+        "faabf01d.19b578",
+        "9608fe0d.afb518",
+        "a9b8ee61.6ebf68",
+        "8c27b84f.305088",
+        "d6d125c6.7c1ef"
       ]
     ]
   },
   {
-    "id": "cccd2695.c600b",
+    "id": "a7cc4e14.f32b08",
     "type": "switchNode",
     "name": "switch uni type",
     "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1476.3333129882812,
-    "y": 1296.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1619,
+    "y": 1195,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "8f7bce65.961b18",
-        "17cc18e5.7d037f",
-        "302ecb9b.5a47dc",
-        "c6b9b74d.1c7d78"
+        "b16fe4e0.6f4fa8",
+        "2186f280.8edb0e",
+        "ddeb0896.cc0458",
+        "c02b45cf.aa9298"
       ]
     ]
   },
   {
-    "id": "8f7bce65.961b18",
+    "id": "b16fe4e0.6f4fa8",
     "type": "outcome",
     "name": "leaf",
     "xml": "<outcome value='leaf'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1641.3333129882812,
-    "y": 1278.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1784,
+    "y": 1177,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "3943aa6e.c88a36"
+        "58f42d60.f5c1ac"
       ]
     ]
   },
   {
-    "id": "17cc18e5.7d037f",
+    "id": "2186f280.8edb0e",
     "type": "outcome",
     "name": "root",
     "xml": "<outcome value='root'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1644.3333129882812,
-    "y": 1317.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1787,
+    "y": 1216,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "47637f28.c69c6"
+        "2233c963.7160de"
       ]
     ]
   },
   {
-    "id": "c6b9b74d.1c7d78",
+    "id": "c02b45cf.aa9298",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1638.3333129882812,
-    "y": 1395.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1781,
+    "y": 1294,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "656a466a.445c98"
+        "7ed44e10.cd8f4"
       ]
     ]
   },
   {
-    "id": "302ecb9b.5a47dc",
+    "id": "ddeb0896.cc0458",
     "type": "outcome",
     "name": "secondary-root",
     "xml": "<outcome value='secondary-root'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1661.3333129882812,
-    "y": 1358.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1804,
+    "y": 1257,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "6a61eaa3.28143c"
+        "17bdedbb.6d9ba2"
       ]
     ]
   },
   {
-    "id": "a2fb1650.227e28",
+    "id": "35f2d4d7.ba6b9c",
     "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": 2207.3333129882812,
-    "y": 1391.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2350,
+    "y": 1290,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "e35c4fb2.169e68",
+    "id": "1bdb940e.a70dfc",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-backup' />\n",
     "comments": "",
-    "x": 2169.3333129882812,
-    "y": 1431.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 2312,
+    "y": 1330,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "656a466a.445c98",
+    "id": "7ed44e10.cd8f4",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1806.3333129882812,
-    "y": 1395.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1949,
+    "y": 1294,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "3943aa6e.c88a36",
+    "id": "58f42d60.f5c1ac",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1802.3333129882812,
-    "y": 1274.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1945,
+    "y": 1173,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "c08ad06c.488d4"
+        "5eba1f1e.c5c1c"
       ]
     ]
   },
   {
-    "id": "47637f28.c69c6",
+    "id": "2233c963.7160de",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1809.3333129882812,
-    "y": 1319.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1952,
+    "y": 1218,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "2ee2b867.995c6"
+        "14e15bd9.f573a4"
       ]
     ]
   },
   {
-    "id": "6a61eaa3.28143c",
+    "id": "17bdedbb.6d9ba2",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1808.3333129882812,
-    "y": 1359.0000076293945,
-    "z": "88b99be5.091bf8",
+    "x": 1951,
+    "y": 1258,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "e35c4fb2.169e68"
+        "1bdb940e.a70dfc"
       ]
     ]
   },
   {
-    "id": "9b8bc380.4fea78",
+    "id": "45fa8d37.dd8774",
     "type": "switchNode",
     "name": "switch conn type != mdsc",
     "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type != 'mdsc' `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 442.8999786376953,
-    "y": 1218.9333572387695,
-    "z": "88b99be5.091bf8",
+    "x": 585.5666656494141,
+    "y": 1117.933349609375,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "77dc380.c063d48"
+        "4985dcd9.148044"
       ]
     ]
   },
   {
-    "id": "77dc380.c063d48",
+    "id": "4985dcd9.148044",
     "type": "outcome",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 624.8999633789062,
-    "y": 1219.9333572387695,
-    "z": "88b99be5.091bf8",
+    "x": 767.566650390625,
+    "y": 1118.933349609375,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       [
-        "4162fe05.2b911"
+        "87edee65.85ae28"
       ]
     ]
   },
   {
-    "id": "ad8e54c3.d3fe18",
+    "id": "d6d125c6.7c1ef",
     "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": 760.8999633789062,
-    "y": 1396.966682434082,
-    "z": "88b99be5.091bf8",
+    "x": 903.566650390625,
+    "y": 1295.9666748046875,
+    "z": "fbffbb46.f6ea5",
     "wires": []
   },
   {
-    "id": "63370d02.a0670c",
+    "id": "1210758a.a607e2",
     "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",
+    "x": 1529.0000610351562,
+    "y": 2637.3334884643555,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ca90fe2.261db8",
+    "id": "9f2557cf.e0f36",
     "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",
+    "x": 1497.0000610351562,
+    "y": 2709.333366394043,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]
   },
   {
-    "id": "2ecfa879.64974",
+    "id": "c6235f90.04d29",
     "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",
+    "x": 1527.0000610351562,
+    "y": 2771.333366394043,
+    "z": "fbffbb46.f6ea5",
     "wires": [
       []
     ]