Making sure not to use the same CLL instance name for all endpoints' description...
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / cloud_leased_line / GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
index 81e0415..a522c41 100644 (file)
 [\r
     {\r
-        "id": "ee012476.423b98",\r
+        "id": "9ee6a3c1.bedb",\r
         "type": "save",\r
         "name": "get all-vpn-bindings from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 339,\r
-        "y": 363,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 450.33331298828125,\r
+        "y": 350.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "2b361ed4.488d22",\r
-                "8a293b14.096a28",\r
-                "e711b658.aa0458"\r
+                "3d418b0.8302bf6",\r
+                "48d7e3bc.f2883c",\r
+                "8ec621b1.80ebc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b361ed4.488d22",\r
+        "id": "3d418b0.8302bf6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 527,\r
-        "y": 376,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 638.3333129882812,\r
+        "y": 363.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "d45a4635.eb8678"\r
+                "9c98306.e2cffd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a293b14.096a28",\r
+        "id": "48d7e3bc.f2883c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 527.490966796875,\r
-        "y": 421.57403564453125,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 645.8242492675781,\r
+        "y": 405.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
-            [\r
-                "abb54833.f0129"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "e711b658.aa0458",\r
+        "id": "8ec621b1.80ebc8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 525,\r
-        "y": 465,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 636.3333129882812,\r
+        "y": 452.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "f29b4663.f669b"\r
+                "57052eb0.583298"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d45a4635.eb8678",\r
+        "id": "9c98306.e2cffd",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 700,\r
-        "y": 374,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 811.3333129882812,\r
+        "y": 361.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "f31c0d53.86d7f8"\r
+                "53767e53.94959"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abb54833.f0129",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "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",\r
-        "comments": "",\r
-        "x": 690.0623779296875,\r
-        "y": 421.8597717285156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "f29b4663.f669b",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
-        "comments": "",\r
-        "x": 692,\r
-        "y": 464,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "f31c0d53.86d7f8",\r
+        "id": "53767e53.94959",\r
         "type": "for",\r
         "name": "for vpnidx in all-vpn-bindings",\r
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 929,\r
-        "y": 375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1040.3333129882812,\r
+        "y": 362.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "b49d17ad.574c7"\r
+                "c415e278.f5611"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b49d17ad.574c7",\r
+        "id": "c415e278.f5611",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1144,\r
-        "y": 376,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1255.3333129882812,\r
+        "y": 363.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "59104900.730b5"\r
+                "c71ad5b.64b44a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59104900.730b5",\r
+        "id": "3d675d8e.b88daa",\r
         "type": "switchNode",\r
         "name": "switch vpnuuid is for this slice",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1388,\r
-        "y": 375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1509.3333129882812,\r
+        "y": 285.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "a081cc3f.ed90c8",\r
-                "c86127b7.79d09"\r
+                "bbedabe9.bd4b",\r
+                "34793819.776c6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a081cc3f.ed90c8",\r
+        "id": "bbedabe9.bd4b",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1605,\r
-        "y": 354,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1726.3333129882812,\r
+        "y": 264.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "99d2c91.f0beeb8"\r
+                "c71ad5b.64b44a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c86127b7.79d09",\r
+        "id": "34793819.776c6",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1605,\r
-        "y": 403,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1726.3333129882812,\r
+        "y": 313.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "99d2c91.f0beeb8",\r
+        "id": "c71ad5b.64b44a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1799,\r
-        "y": 363,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1910.3333129882812,\r
+        "y": 350.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "1cc75cf0.e01a9b",\r
-                "171d3657.f2327a",\r
-                "e9e324cf.d34fa8"\r
+                "3dd08dae.27e4a2",\r
+                "52a060f7.3567c8",\r
+                "a8591f2d.71e23"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63d9b9e3.c39a3",\r
+        "id": "e6629469.2dd4b8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 158,\r
-        "y": 104,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 269.33331298828125,\r
+        "y": 91.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "13826703.6fe8f9"\r
+                "e4a2a292.f645d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13826703.6fe8f9",\r
+        "id": "e4a2a292.f645d8",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 442.2856903076172,\r
-        "y": 165.23810863494873,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 553.6190032958984,\r
+        "y": 152.23811626434326,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "a18ada65.df1b6"\r
+                "94591033.455c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a18ada65.df1b6",\r
+        "id": "94591033.455c8",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-F1-Activate",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 448.42860412597656,\r
-        "y": 250.00003051757812,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 559.7619171142578,\r
+        "y": 237.00003814697266,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "e68623b.1ed71e"\r
+                "fa712947.37c038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e68623b.1ed71e",\r
+        "id": "fa712947.37c038",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 758.238037109375,\r
-        "y": 241.66668701171875,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 869.5713500976562,\r
+        "y": 228.66669464111328,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "ee012476.423b98",\r
-                "1d423866.3abba8",\r
-                "63268214.354d14",\r
-                "2b86835c.8d9024",\r
-                "5a6a7d0e.a2f89c"\r
+                "9ee6a3c1.bedb",\r
+                "b5b4ab5e.850cd8",\r
+                "8297c516.b14308",\r
+                "e7860d61.a71378",\r
+                "a8115aec.3c3d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cc75cf0.e01a9b",\r
+        "id": "3dd08dae.27e4a2",\r
         "type": "set",\r
         "name": "set tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
         "comments": "",\r
-        "x": 2016,\r
-        "y": 301,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2127.3333129882812,\r
+        "y": 288.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "acb2a33f.d7ec9",\r
+        "id": "a8b9f4f8.1eb4e8",\r
         "type": "set",\r
         "name": "set attachment_param for OTN A",\r
         "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",\r
         "comments": "",\r
-        "x": 4185,\r
-        "y": 187,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4296.333312988281,\r
+        "y": 174.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1a2b69e5.bdb2ae",\r
+        "id": "24ae2ddb.2d91ca",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4266,\r
-        "y": 502,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4377.333312988281,\r
+        "y": 489.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "c13bac2.6ce225",\r
-                "54c65da.56603a4"\r
+                "d90569fe.c301e",\r
+                "9a0fd68f.7364"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c13bac2.6ce225",\r
+        "id": "d90569fe.c301e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4575.5,\r
-        "y": 471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4686.833312988281,\r
+        "y": 458.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "9c791a1e.520a28"\r
+                "bfcc154c.9d015"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54c65da.56603a4",\r
+        "id": "9a0fd68f.7364",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4580.5,\r
-        "y": 536,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4691.833312988281,\r
+        "y": 523.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "b016fce4.beba"\r
+                "5fe18426.281bd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c791a1e.520a28",\r
+        "id": "bfcc154c.9d015",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4751.5,\r
-        "y": 471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4862.833312988281,\r
+        "y": 458.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b016fce4.beba",\r
+        "id": "5fe18426.281bd4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4747,\r
-        "y": 536,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4858.333312988281,\r
+        "y": 523.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2227e8a2.0665b8",\r
+        "id": "3e254ec8.8f602a",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "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",\r
         "comments": "",\r
-        "x": 4130.5,\r
-        "y": 756,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4241.833312988281,\r
+        "y": 743.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f70fce2d.7485",\r
+        "id": "4a6469cd.4f0b98",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4284.5,\r
-        "y": 804,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4395.833312988281,\r
+        "y": 791.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "8ffe5287.d9d0e8",\r
-                "5f6b3e31.55961"\r
+                "826c2f73.5d5e88",\r
+                "403359b0.843728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ffe5287.d9d0e8",\r
+        "id": "826c2f73.5d5e88",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4630,\r
-        "y": 785,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4741.333312988281,\r
+        "y": 772.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "8c837eb9.336b9"\r
+                "80c327f3.9b168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f6b3e31.55961",\r
+        "id": "403359b0.843728",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4634,\r
-        "y": 825,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4745.333312988281,\r
+        "y": 812.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "575c5f0f.3503d8"\r
+                "6ab9c98a.fce4d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c837eb9.336b9",\r
+        "id": "80c327f3.9b168",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4788,\r
-        "y": 785,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4899.333312988281,\r
+        "y": 772.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "575c5f0f.3503d8",\r
+        "id": "6ab9c98a.fce4d8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4791.5,\r
-        "y": 825,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4902.833312988281,\r
+        "y": 812.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "25e6aa4e.9a9cde",\r
-                "1cebed54.09e3f3"\r
+                "e1c867b8.192bd",\r
+                "913acec9.956098"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25e6aa4e.9a9cde",\r
+        "id": "e1c867b8.192bd",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5122,\r
-        "y": 790,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5233.333312988281,\r
+        "y": 777.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "57cb404e.88a3a8",\r
+        "id": "b428e7f5.22dd58",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 4986,\r
-        "y": 749,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5097.333312988281,\r
+        "y": 736.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1cebed54.09e3f3",\r
+        "id": "913acec9.956098",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5049,\r
-        "y": 836,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5160.333312988281,\r
+        "y": 823.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "adcc0fc7.59b628",\r
+        "id": "c0a903ed.d424f",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 4123,\r
-        "y": 235,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4234.333312988281,\r
+        "y": 222.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "36f9f62e.004372",\r
+        "id": "c9a2a428.5985e8",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4149,\r
-        "y": 352,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4260.333312988281,\r
+        "y": 339.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "37680b24.ccfd7c",\r
-                "da1cdd66.16c98",\r
-                "923405db.542c"\r
+                "fe7b0b4f.4f25b8",\r
+                "1f23a1db.9239d6",\r
+                "80067a1b.7e8398"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37680b24.ccfd7c",\r
+        "id": "fe7b0b4f.4f25b8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4344.5001220703125,\r
-        "y": 304,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4455.833435058594,\r
+        "y": 291.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "3021ee1b.904b12"\r
+                "b7ec9659.601c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da1cdd66.16c98",\r
+        "id": "1f23a1db.9239d6",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4336.5001220703125,\r
-        "y": 359,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4447.833435058594,\r
+        "y": 346.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "12605fae.863058"\r
+                "fe1da93b.8b0db8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3021ee1b.904b12",\r
+        "id": "b7ec9659.601c4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4488.8824462890625,\r
-        "y": 303.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4600.215759277344,\r
+        "y": 290.65567779541016,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "dd5c14b5.d1837"\r
+                "5d87f5d0.3bfe2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67c4003.ef8f28",\r
+        "id": "4b9cdc3a.96a434",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5071,\r
-        "y": 306,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5182.333312988281,\r
+        "y": 293.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "108d04fa.bf4053"\r
+                "c5c0e693.b5a978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd5c14b5.d1837",\r
+        "id": "5d87f5d0.3bfe2c",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4673,\r
-        "y": 302,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4784.333312988281,\r
+        "y": 289.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "d5f86c5d.16c4"\r
+                "3668fdab.2d6312"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5f86c5d.16c4",\r
+        "id": "3668fdab.2d6312",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4868,\r
-        "y": 302,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4979.333312988281,\r
+        "y": 289.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "67c4003.ef8f28"\r
+                "4b9cdc3a.96a434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "923405db.542c",\r
+        "id": "80067a1b.7e8398",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4341.5001220703125,\r
-        "y": 416,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4452.833435058594,\r
+        "y": 403.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "b180d8b0.c43f88"\r
+                "72f714cc.b21364"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b180d8b0.c43f88",\r
+        "id": "72f714cc.b21364",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4493.5001220703125,\r
-        "y": 417,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4604.833435058594,\r
+        "y": 404.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "12605fae.863058",\r
+        "id": "fe1da93b.8b0db8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4504.5001220703125,\r
-        "y": 360,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4615.833435058594,\r
+        "y": 347.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f9899c24.7b705",\r
+        "id": "247e40ac.03f008",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5456,\r
-        "y": 319,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5567.333312988281,\r
+        "y": 306.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "d378bd87.63a5c8",\r
-                "5261c81e.fbb5b8",\r
-                "634ff531.a525f4"\r
+                "2769fc5a.203d24",\r
+                "510b4bec.e64154",\r
+                "dc91b912.6316b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "108d04fa.bf4053",\r
+        "id": "c5c0e693.b5a978",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5250,\r
-        "y": 306,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5361.333312988281,\r
+        "y": 293.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "20f95b42.b2257c",\r
-                "f9899c24.7b705"\r
+                "d3a253e8.52c87",\r
+                "247e40ac.03f008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20f95b42.b2257c",\r
+        "id": "d3a253e8.52c87",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainA id",\r
         "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",\r
         "comments": "",\r
-        "x": 5486,\r
-        "y": 267,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5597.333312988281,\r
+        "y": 254.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d378bd87.63a5c8",\r
+        "id": "2769fc5a.203d24",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5666,\r
-        "y": 310,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5777.333312988281,\r
+        "y": 297.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "1cbdaba0.674dd4"\r
+                "373ad72a.24ed2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5261c81e.fbb5b8",\r
+        "id": "510b4bec.e64154",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5658,\r
-        "y": 365,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5769.333312988281,\r
+        "y": 352.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "66b4dbad.a4949c"\r
+                "fed052ea.46fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "634ff531.a525f4",\r
+        "id": "dc91b912.6316b8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5663,\r
-        "y": 422,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5774.333312988281,\r
+        "y": 409.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "21f2fdd8.0e601a"\r
+                "62129ad3.e59fd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21f2fdd8.0e601a",\r
+        "id": "62129ad3.e59fd4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5815,\r
-        "y": 423,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5926.333312988281,\r
+        "y": 410.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66b4dbad.a4949c",\r
+        "id": "fed052ea.46fa",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5826,\r
-        "y": 368,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5937.333312988281,\r
+        "y": 355.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1cbdaba0.674dd4",\r
+        "id": "373ad72a.24ed2",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5810.38232421875,\r
-        "y": 307.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5921.715637207031,\r
+        "y": 294.65567779541016,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "ebf10644.3cf328"\r
+                "53739ad0.387d34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebf10644.3cf328",\r
+        "id": "53739ad0.387d34",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "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",\r
         "comments": "",\r
-        "x": 6025,\r
-        "y": 304,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 6136.333312988281,\r
+        "y": 291.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "204badf8.a5ba12",\r
+        "id": "a04b7e22.2aeb18",\r
         "type": "set",\r
         "name": "set attachment_param for OTN B",\r
         "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",\r
         "comments": "",\r
-        "x": 3592,\r
-        "y": 1644,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3703.3333129882812,\r
+        "y": 1631.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d3bca29.9af50c",\r
+        "id": "a747fd61.4d43f8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3655,\r
-        "y": 1973,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3766.3333129882812,\r
+        "y": 1960.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "30186c33.4929f4",\r
-                "868e39af.adebc8"\r
+                "1746de51.5350e2",\r
+                "3d545b09.cac1fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30186c33.4929f4",\r
+        "id": "1746de51.5350e2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3950.5,\r
-        "y": 1940,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4061.8333129882812,\r
+        "y": 1927.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "2aae4501.2c69e2"\r
+                "fee57d61.96dd7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "868e39af.adebc8",\r
+        "id": "3d545b09.cac1fc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3955.5,\r
-        "y": 2005,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4066.8333129882812,\r
+        "y": 1992.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "7501d4e8.c8d944"\r
+                "3e571aef.d1d9c6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2aae4501.2c69e2",\r
+        "id": "fee57d61.96dd7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4118.5,\r
-        "y": 1940,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4229.833312988281,\r
+        "y": 1927.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7501d4e8.c8d944",\r
+        "id": "3e571aef.d1d9c6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4129,\r
-        "y": 2005,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4240.333312988281,\r
+        "y": 1992.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cc294dbc.f351c",\r
+        "id": "c298ee7.360a71",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 3531,\r
-        "y": 1701,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3642.3333129882812,\r
+        "y": 1688.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c8227bea.321b5",\r
+        "id": "374df09c.221b4",\r
         "type": "get-resource",\r
         "name": "get-resource dst pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3551,\r
-        "y": 1798,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3662.3333129882812,\r
+        "y": 1785.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "9f19ba3f.539ea8",\r
-                "e4125ed0.f068f8",\r
-                "de95537a.826588"\r
+                "b8613e52.06e248",\r
+                "b100c849.f8697",\r
+                "9726d82.0cb02a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f19ba3f.539ea8",\r
+        "id": "b8613e52.06e248",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3753.5001220703125,\r
-        "y": 1751,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3864.8334350585938,\r
+        "y": 1738.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "e35cf2ca.728ed8"\r
+                "fe5dc3f.664f44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4125ed0.f068f8",\r
+        "id": "b100c849.f8697",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3745.5001220703125,\r
-        "y": 1806,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3856.8334350585938,\r
+        "y": 1793.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "c80b6676.b0f198"\r
+                "45b746dd.1fc3c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e35cf2ca.728ed8",\r
+        "id": "fe5dc3f.664f44",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3897.8824462890625,\r
-        "y": 1748.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4009.2157592773438,\r
+        "y": 1735.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "57d9c9b8.81d7a8"\r
+                "38c123a7.87ff54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57d9c9b8.81d7a8",\r
+        "id": "38c123a7.87ff54",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4082,\r
-        "y": 1763,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4193.333312988281,\r
+        "y": 1750.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "2837eada.0816e6"\r
+                "8269be24.8785c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de95537a.826588",\r
+        "id": "9726d82.0cb02a8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3750.5001220703125,\r
-        "y": 1863,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3861.8334350585938,\r
+        "y": 1850.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "6ac21b2f.35237c"\r
+                "920b3194.25369"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ac21b2f.35237c",\r
+        "id": "920b3194.25369",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3902.5001220703125,\r
-        "y": 1864,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4013.8334350585938,\r
+        "y": 1851.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c80b6676.b0f198",\r
+        "id": "45b746dd.1fc3c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3913.5001220703125,\r
-        "y": 1809,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4024.8334350585938,\r
+        "y": 1796.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b2f2b82b.20ac9",\r
+        "id": "3be7fe46.7bed5a",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4480,\r
-        "y": 1767,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4591.333312988281,\r
+        "y": 1754.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "e8c4648e.2f16b8"\r
+                "9242c93c.f02488"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2837eada.0816e6",\r
+        "id": "8269be24.8785c8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4277,\r
-        "y": 1763,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4388.333312988281,\r
+        "y": 1750.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "b2f2b82b.20ac9"\r
+                "3be7fe46.7bed5a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fa6120f.8bbc34",\r
+        "id": "24d5bcbc.e5fd54",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4865,\r
-        "y": 1766,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4976.333312988281,\r
+        "y": 1753.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "2004b12.ed9d54e",\r
-                "ffd8f42d.6ff66",\r
-                "7412d147.be04a8"\r
+                "7fafe45b.58f05c",\r
+                "c7d3d0e7.e6edb8",\r
+                "2bbce26d.997346"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8c4648e.2f16b8",\r
+        "id": "9242c93c.f02488",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4657,\r
-        "y": 1759,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4768.333312988281,\r
+        "y": 1746.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "619505d8.279204",\r
-                "7fa6120f.8bbc34"\r
+                "4aece362.c97204",\r
+                "24d5bcbc.e5fd54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "619505d8.279204",\r
+        "id": "4aece362.c97204",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainB id",\r
         "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",\r
         "comments": "",\r
-        "x": 4895,\r
-        "y": 1714,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5006.333312988281,\r
+        "y": 1701.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "407265d3.d9387c",\r
+        "id": "5653f279.fa187c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5224,\r
-        "y": 1870,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5335.333312988281,\r
+        "y": 1857.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "70bb8ce1.2b5a7c",\r
+        "id": "991ab386.c1ab2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5235,\r
-        "y": 1815,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5346.333312988281,\r
+        "y": 1802.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "474b0f12.6a5378",\r
+        "id": "f903abd6.bcb5e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5219.38232421875,\r
-        "y": 1754.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5330.715637207031,\r
+        "y": 1741.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "4664ee87.d9fd18"\r
+                "9d78b23c.6c7458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4664ee87.d9fd18",\r
+        "id": "9d78b23c.6c7458",\r
         "type": "set",\r
         "name": "set controller domainB data",\r
         "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",\r
         "comments": "",\r
-        "x": 5434,\r
-        "y": 1751,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5545.333312988281,\r
+        "y": 1738.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2004b12.ed9d54e",\r
+        "id": "7fafe45b.58f05c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5075,\r
-        "y": 1757,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5186.333312988281,\r
+        "y": 1744.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "474b0f12.6a5378"\r
+                "f903abd6.bcb5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd8f42d.6ff66",\r
+        "id": "c7d3d0e7.e6edb8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5067,\r
-        "y": 1812,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5178.333312988281,\r
+        "y": 1799.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "70bb8ce1.2b5a7c"\r
+                "991ab386.c1ab2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7412d147.be04a8",\r
+        "id": "2bbce26d.997346",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5072,\r
-        "y": 1869,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5183.333312988281,\r
+        "y": 1856.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "407265d3.d9387c"\r
+                "5653f279.fa187c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79f7771a.baa2f",\r
+        "id": "d6212bc2.789e7",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has dst-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3106,\r
-        "y": 715,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3217.3333129882812,\r
+        "y": 702.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "6b315a67.2be854",\r
-                "7ca64a28.96fff4"\r
+                "e3d89802.393a78",\r
+                "22a27baf.15e97c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b315a67.2be854",\r
+        "id": "e3d89802.393a78",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3320,\r
-        "y": 752,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3431.3333129882812,\r
+        "y": 739.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "e26333e1.9f2a38"\r
+                "793df4ee.f1df74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ca64a28.96fff4",\r
+        "id": "22a27baf.15e97c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3322,\r
-        "y": 690,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3433.3333129882812,\r
+        "y": 677.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "89cb81b5.af1468"\r
+                "7ecfd25a.90cdcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e26333e1.9f2a38",\r
+        "id": "793df4ee.f1df74",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2900,\r
-        "y": 1995,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3011.3333129882812,\r
+        "y": 1982.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "5c3b586f.467af",\r
-                "6b4dbd17.81909c"\r
+                "3123087e.cfd848",\r
+                "426b4898.f559d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c3b586f.467af",\r
+        "id": "3123087e.cfd848",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3153,\r
-        "y": 2029,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3264.3333129882812,\r
+        "y": 2016.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "a3ab9951.4bdf08"\r
+                "534033f3.f59e9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b4dbd17.81909c",\r
+        "id": "426b4898.f559d8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3153,\r
-        "y": 1973,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3264.3333129882812,\r
+        "y": 1960.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "29d8f363.c99594"\r
+                "d5f2676f.c2a88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3ab9951.4bdf08",\r
+        "id": "534033f3.f59e9c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3304,\r
-        "y": 2029,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3415.3333129882812,\r
+        "y": 2016.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c7f2aefb.cead08",\r
+        "id": "c77b264c.fe2528",\r
         "type": "set",\r
         "name": "set vpn-bindingA and connectivityA",\r
         "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",\r
         "comments": "",\r
-        "x": 4180,\r
-        "y": 127,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4291.333312988281,\r
+        "y": 114.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d65460e.504db8",\r
+        "id": "6ed23267.9185fc",\r
         "type": "set",\r
         "name": "set vpn-bindingB and connectivityB",\r
         "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",\r
         "comments": "",\r
-        "x": 3588,\r
-        "y": 1586,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3699.3333129882812,\r
+        "y": 1573.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e2a76dd.233f7a",\r
+        "id": "7d0cb107.7824a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3871,\r
-        "y": 384,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3982.3333129882812,\r
+        "y": 371.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "c7f2aefb.cead08",\r
-                "acb2a33f.d7ec9",\r
-                "adcc0fc7.59b628",\r
-                "36f9f62e.004372",\r
-                "1a2b69e5.bdb2ae",\r
-                "7d01ae3.e59e8d",\r
-                "91a8f363.33b6d",\r
-                "8c296a00.ae82e8"\r
+                "c77b264c.fe2528",\r
+                "a8b9f4f8.1eb4e8",\r
+                "c0a903ed.d424f",\r
+                "c9a2a428.5985e8",\r
+                "24ae2ddb.2d91ca",\r
+                "1656bf6f.d0ade1",\r
+                "d2ff3c56.4372d",\r
+                "9499a947.255148"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29d8f363.c99594",\r
+        "id": "d5f2676f.c2a88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3304,\r
-        "y": 1972,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3415.3333129882812,\r
+        "y": 1959.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "8d65460e.504db8",\r
-                "204badf8.a5ba12",\r
-                "cc294dbc.f351c",\r
-                "c8227bea.321b5",\r
-                "4d3bca29.9af50c",\r
-                "605c7758.9853c8",\r
-                "d3fdc974.92df9",\r
-                "52902dc6.5c041c"\r
+                "6ed23267.9185fc",\r
+                "a04b7e22.2aeb18",\r
+                "c298ee7.360a71",\r
+                "374df09c.221b4",\r
+                "a747fd61.4d43f8",\r
+                "ad599918.3fac7",\r
+                "cedd744c.d4173",\r
+                "c2c48b41.449c5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59dac694.235a08",\r
+        "id": "dd92322c.d6fdb",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "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",\r
         "comments": "",\r
-        "x": 3542,\r
-        "y": 2271,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3653.3333129882812,\r
+        "y": 2258.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "704c6.41b9333ac",\r
+        "id": "4e1fc9cd.44e65",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3696,\r
-        "y": 2319,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3807.3333129882812,\r
+        "y": 2306.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "5cc2fc76.782a54",\r
-                "be48f3e2.0fbf"\r
+                "3bc05be0.577364",\r
+                "9453988b.761fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5cc2fc76.782a54",\r
+        "id": "3bc05be0.577364",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4041.5,\r
-        "y": 2300,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4152.833312988281,\r
+        "y": 2287.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "a76d95f1.d45e1"\r
+                "48b1874d.6dc6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be48f3e2.0fbf",\r
+        "id": "9453988b.761fc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4045.5,\r
-        "y": 2340,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4156.833312988281,\r
+        "y": 2327.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "1991eff2.b8a15"\r
+                "e2a44822.8eb888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a76d95f1.d45e1",\r
+        "id": "48b1874d.6dc6a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4199.5,\r
-        "y": 2300,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4310.833312988281,\r
+        "y": 2287.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1991eff2.b8a15",\r
+        "id": "e2a44822.8eb888",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4203,\r
-        "y": 2340,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4314.333312988281,\r
+        "y": 2327.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "69ca6e83.833b58",\r
-                "1ce7897f.5077ef"\r
+                "3369ff99.af45f",\r
+                "6ce9279e.5956d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69ca6e83.833b58",\r
+        "id": "3369ff99.af45f",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4543,\r
-        "y": 2339,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4654.333312988281,\r
+        "y": 2326.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "47268bd4.d29394",\r
+        "id": "64323d0d.a53eec",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 4401,\r
-        "y": 2297,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4512.333312988281,\r
+        "y": 2284.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1ce7897f.5077ef",\r
+        "id": "6ce9279e.5956d",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4472,\r
-        "y": 2388,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4583.333312988281,\r
+        "y": 2375.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "adf25f68.f6874",\r
+        "id": "8b193137.7290b",\r
         "type": "set",\r
         "name": "set attachment_param (gfp-n) for OTN",\r
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
         "comments": "",\r
-        "x": 3097,\r
-        "y": 655,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3208.3333129882812,\r
+        "y": 642.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5011571a.f2ffc8",\r
+        "id": "6b6c5120.d697b",\r
         "type": "comment",\r
         "name": "only dst ttp exists. No src",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3692,\r
-        "y": 341,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3803.3333129882812,\r
+        "y": 328.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "69454f54.a632a",\r
+        "id": "7a49b0ec.1116e8",\r
         "type": "comment",\r
         "name": "only src ttp exists. No dst",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3249,\r
-        "y": 1919,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3360.3333129882812,\r
+        "y": 1906.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "89cb81b5.af1468",\r
+        "id": "7ecfd25a.90cdcc",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3428,\r
-        "y": 503,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3539.3333129882812,\r
+        "y": 490.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "89a2367.f810e48",\r
-                "76abc6c6.50ef4"\r
+                "c5975b58.7cfb78",\r
+                "8fa5c52a.f6d0f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76abc6c6.50ef4",\r
+        "id": "8fa5c52a.f6d0f",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3670,\r
-        "y": 1092,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3781.3333129882812,\r
+        "y": 1079.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "fdc63597.3712e"\r
+                "1a8ceecd.14cfa1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89a2367.f810e48",\r
+        "id": "c5975b58.7cfb78",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3664,\r
-        "y": 383,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3775.3333129882812,\r
+        "y": 370.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "3e2a76dd.233f7a"\r
+                "7d0cb107.7824a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fdc63597.3712e",\r
+        "id": "1a8ceecd.14cfa1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3828,\r
-        "y": 1091,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3939.3333129882812,\r
+        "y": 1078.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "1793312b.927ef7",\r
-                "41401fda.2be158",\r
-                "9005ec38.4e5e88",\r
-                "dd0899e7.f82f08",\r
-                "ecd7f356.de7408",\r
-                "b3054d0f.9c60c"\r
+                "cfc45fbc.625408",\r
+                "87ccca6a.f8f9b8",\r
+                "e86d624f.d5f408",\r
+                "3e480e6a.3eb6c2",\r
+                "178f13fb.65189c",\r
+                "8c5d7664.9247c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41401fda.2be158",\r
+        "id": "87ccca6a.f8f9b8",\r
         "type": "set",\r
         "name": "set attachment_param for OTN G",\r
         "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",\r
         "comments": "",\r
-        "x": 4092,\r
-        "y": 974,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4203.333312988281,\r
+        "y": 961.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ecd7f356.de7408",\r
+        "id": "178f13fb.65189c",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4173,\r
-        "y": 1289,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4284.333312988281,\r
+        "y": 1276.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "e0518882.6fa588",\r
-                "87218147.0fa418"\r
+                "47471e7d.1bf5e",\r
+                "2f64742a.d54c2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0518882.6fa588",\r
+        "id": "47471e7d.1bf5e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4482.5,\r
-        "y": 1258,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4593.833312988281,\r
+        "y": 1245.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "57c63933.072c5"\r
+                "27252576.feabca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "87218147.0fa418",\r
+        "id": "2f64742a.d54c2c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4487.5,\r
-        "y": 1323,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4598.833312988281,\r
+        "y": 1310.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "7dd1782c.b2154"\r
+                "d2def383.359ac8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57c63933.072c5",\r
+        "id": "27252576.feabca",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4658.5,\r
-        "y": 1258,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4769.833312988281,\r
+        "y": 1245.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7dd1782c.b2154",\r
+        "id": "d2def383.359ac8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4654,\r
-        "y": 1323,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4765.333312988281,\r
+        "y": 1310.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9005ec38.4e5e88",\r
+        "id": "e86d624f.d5f408",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 4030,\r
-        "y": 1022,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4141.333312988281,\r
+        "y": 1009.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd0899e7.f82f08",\r
+        "id": "3e480e6a.3eb6c2",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4056,\r
-        "y": 1139,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4167.333312988281,\r
+        "y": 1126.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "7a284ffa.3cc17",\r
-                "aa72c818.28213",\r
-                "f0ca75e3.4407d"\r
+                "2fe7a70f.325738",\r
+                "de56dd13.56cbc",\r
+                "da128a7e.2de4c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a284ffa.3cc17",\r
+        "id": "2fe7a70f.325738",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4251.5001220703125,\r
-        "y": 1091,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4362.833435058594,\r
+        "y": 1078.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "25701aeb.93625e"\r
+                "236585d1.bff802"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa72c818.28213",\r
+        "id": "de56dd13.56cbc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4243.5001220703125,\r
-        "y": 1146,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4354.833435058594,\r
+        "y": 1133.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "f502d128.6eafe8"\r
+                "7ab4252e.e507d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25701aeb.93625e",\r
+        "id": "236585d1.bff802",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4395.8824462890625,\r
-        "y": 1090.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4507.215759277344,\r
+        "y": 1077.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "86d32773.3465f8"\r
+                "d1f5d3f1.d937a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86d32773.3465f8",\r
+        "id": "d1f5d3f1.d937a8",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4580,\r
-        "y": 1089,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4691.333312988281,\r
+        "y": 1076.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "e526c1c.efff3c"\r
+                "b6dba6f2.6f5a68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e526c1c.efff3c",\r
+        "id": "b6dba6f2.6f5a68",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4775,\r
-        "y": 1089,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4886.333312988281,\r
+        "y": 1076.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "b3ad7614.48799"\r
+                "decb3043.cd12c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0ca75e3.4407d",\r
+        "id": "da128a7e.2de4c8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4248.5001220703125,\r
-        "y": 1203,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4359.833435058594,\r
+        "y": 1190.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "f3b0b426.0ebd8"\r
+                "98ee3a25.1ab9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3b0b426.0ebd8",\r
+        "id": "98ee3a25.1ab9e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4400.5001220703125,\r
-        "y": 1204,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4511.833435058594,\r
+        "y": 1191.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f502d128.6eafe8",\r
+        "id": "7ab4252e.e507d4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4411.5001220703125,\r
-        "y": 1147,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4522.833435058594,\r
+        "y": 1134.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1793312b.927ef7",\r
+        "id": "cfc45fbc.625408",\r
         "type": "set",\r
         "name": "set vpn-bindingG and connectivityG",\r
         "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",\r
         "comments": "",\r
-        "x": 4087,\r
-        "y": 914,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4198.333312988281,\r
+        "y": 901.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b3ad7614.48799",\r
+        "id": "decb3043.cd12c",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4978,\r
-        "y": 1093,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5089.333312988281,\r
+        "y": 1080.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "96db10e5.ea83"\r
+                "b6ba573a.60741"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "306d874d.b412d8",\r
+        "id": "f4847f5f.1d887",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5363,\r
-        "y": 1106,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5474.333312988281,\r
+        "y": 1093.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "c6eb6256.83f998",\r
-                "45038891.4f4538",\r
-                "daa4d789.597db8"\r
+                "e228c69c.360f98",\r
+                "9bce816d.2db348",\r
+                "41d83525.ce00b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96db10e5.ea83",\r
+        "id": "b6ba573a.60741",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5157,\r
-        "y": 1093,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5268.333312988281,\r
+        "y": 1080.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "d230885e.9519f8",\r
-                "306d874d.b412d8"\r
+                "5b50b3ea.1f8ef4",\r
+                "f4847f5f.1d887"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d230885e.9519f8",\r
+        "id": "5b50b3ea.1f8ef4",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainG id",\r
         "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",\r
         "comments": "",\r
-        "x": 5393,\r
-        "y": 1054,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5504.333312988281,\r
+        "y": 1041.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c6eb6256.83f998",\r
+        "id": "e228c69c.360f98",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5573,\r
-        "y": 1097,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5684.333312988281,\r
+        "y": 1084.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "a3266db3.e5e668"\r
+                "189e198c.62579e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45038891.4f4538",\r
+        "id": "9bce816d.2db348",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5565,\r
-        "y": 1152,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5676.333312988281,\r
+        "y": 1139.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "c1656fec.754d9"\r
+                "a893456b.716548"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "daa4d789.597db8",\r
+        "id": "41d83525.ce00b4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5570,\r
-        "y": 1209,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5681.333312988281,\r
+        "y": 1196.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "e2730778.5b349"\r
+                "7bd5c1c9.c0b778"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e2730778.5b349",\r
+        "id": "7bd5c1c9.c0b778",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5722,\r
-        "y": 1210,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5833.333312988281,\r
+        "y": 1197.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1656fec.754d9",\r
+        "id": "a893456b.716548",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5733,\r
-        "y": 1155,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5844.333312988281,\r
+        "y": 1142.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3266db3.e5e668",\r
+        "id": "189e198c.62579e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5717.38232421875,\r
-        "y": 1094.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5828.715637207031,\r
+        "y": 1081.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "eeffd7c6.a525f"\r
+                "ae6db88e.b087a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eeffd7c6.a525f",\r
+        "id": "ae6db88e.b087a",\r
         "type": "set",\r
         "name": "set controller domainG data",\r
         "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",\r
         "comments": "",\r
-        "x": 5932,\r
-        "y": 1091,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 6043.333312988281,\r
+        "y": 1078.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24ea3ba5.00c9cc",\r
+        "id": "56d817b5.d38a48",\r
         "type": "comment",\r
         "name": "both src and dst exist",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3706,\r
-        "y": 1032,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3817.3333129882812,\r
+        "y": 1019.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "171d3657.f2327a",\r
+        "id": "52a060f7.3567c8",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2268,\r
-        "y": 759,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2379.3333129882812,\r
+        "y": 746.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "76b248ab.29f1f8",\r
-                "a2a1c5ad.da7c28"\r
+                "f7d2b361.6e54e",\r
+                "d75a20a3.76dfd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2a1c5ad.da7c28",\r
+        "id": "d75a20a3.76dfd",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2675,\r
-        "y": 777,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2786.3333129882812,\r
+        "y": 764.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "4b53f5cd.6e4a64"\r
+                "87632a9d.0edf7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76b248ab.29f1f8",\r
+        "id": "f7d2b361.6e54e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2675,\r
-        "y": 722,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2786.3333129882812,\r
+        "y": 709.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "ed700187.4c0438"\r
+                "d139f1fa.1d1b08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed700187.4c0438",\r
+        "id": "d139f1fa.1d1b08",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2831,\r
-        "y": 720,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2942.3333129882812,\r
+        "y": 707.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "adf25f68.f6874",\r
-                "79f7771a.baa2f"\r
+                "8b193137.7290b",\r
+                "d6212bc2.789e7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b53f5cd.6e4a64",\r
+        "id": "87632a9d.0edf7",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2808,\r
-        "y": 778,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2919.3333129882812,\r
+        "y": 765.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1d423866.3abba8",\r
+        "id": "b5b4ab5e.850cd8",\r
         "type": "set",\r
         "name": "unset tmp.aai.all-vpn-bindings",\r
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 985,\r
-        "y": 194,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1096.3333129882812,\r
+        "y": 181.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b7ea63f5.b58c8",\r
+        "id": "7e254bc9.6368cc",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "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}",\r
         "comments": "",\r
-        "x": 4102,\r
-        "y": 612,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4213.333312988281,\r
+        "y": 599.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7d01ae3.e59e8d",\r
+        "id": "1656bf6f.d0ade1",\r
         "type": "set",\r
         "name": "set leaf-otn-tunnels-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 4162,\r
-        "y": 651,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4273.333312988281,\r
+        "y": 638.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63268214.354d14",\r
+        "id": "8297c516.b14308",\r
         "type": "set",\r
         "name": "unset leaf-otn-tunnels-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 978,\r
-        "y": 102,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1089.3333129882812,\r
+        "y": 89.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad2fff57.f164d",\r
+        "id": "b5552ed0.c09148",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "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}",\r
         "comments": "",\r
-        "x": 3514,\r
-        "y": 2128,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3625.3333129882812,\r
+        "y": 2115.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "605c7758.9853c8",\r
+        "id": "ad599918.3fac7",\r
         "type": "set",\r
         "name": "set root-otn-tunnels-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 3570,\r
-        "y": 2177,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3681.3333129882812,\r
+        "y": 2164.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "45ce7d67.6029dc",\r
+        "id": "1fbc8dc6.5c716a",\r
         "type": "set",\r
         "name": "unset root-otn-tunnels-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 978,\r
-        "y": 141,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1089.3333129882812,\r
+        "y": 128.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b86835c.8d9024",\r
+        "id": "e7860d61.a71378",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "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' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1009,\r
-        "y": 242,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1120.3333129882812,\r
+        "y": 229.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5a6a7d0e.a2f89c",\r
+        "id": "a8115aec.3c3d6",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "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-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 219,\r
-        "y": 717,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 330.33331298828125,\r
+        "y": 704.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "bd2f8dbe.e61408",\r
-                "cacc237e.394a4",\r
-                "f05100c1.a77fd8"\r
+                "9234c3d4.71d2d8",\r
+                "71dab0f1.557458",\r
+                "d5b7dbc9.87e818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd2f8dbe.e61408",\r
+        "id": "9234c3d4.71d2d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 438,\r
-        "y": 655,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 549.3333129882812,\r
+        "y": 642.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "64d16331.36ee54"\r
+                "deed2b95.51b008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cacc237e.394a4",\r
+        "id": "71dab0f1.557458",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 447.490966796875,\r
-        "y": 697.5740356445312,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 558.8242797851562,\r
+        "y": 684.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
-            [\r
-                "537fe800.387e68"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "f05100c1.a77fd8",\r
+        "id": "d5b7dbc9.87e818",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 436,\r
-        "y": 744,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 547.3333129882812,\r
+        "y": 731.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "4626cafb.2ab55c"\r
+                "1f43e158.ba10c7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64d16331.36ee54",\r
+        "id": "deed2b95.51b008",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 635,\r
-        "y": 651,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 746.3333129882812,\r
+        "y": 638.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "f0f139f4.8e2a48"\r
+                "2dc9974e.fd8eb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "537fe800.387e68",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "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",\r
-        "comments": "",\r
-        "x": 601.0623779296875,\r
-        "y": 700.8597717285156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "4626cafb.2ab55c",\r
+        "id": "1f43e158.ba10c7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 605,\r
-        "y": 745,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 716.3333129882812,\r
+        "y": 732.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f0f139f4.8e2a48",\r
+        "id": "2dc9974e.fd8eb",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 858.33349609375,\r
-        "y": 650.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 969.6668090820312,\r
+        "y": 637.9999465942383,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "2762e6c2.94358a"\r
+                "ba6829c9.a61c58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2762e6c2.94358a",\r
+        "id": "ba6829c9.a61c58",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1059.0001335144043,\r
-        "y": 652.000020980835,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1170.3334465026855,\r
+        "y": 639.0000286102295,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "37a60584.767442"\r
+                "64a3ee9a.60466"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37a60584.767442",\r
+        "id": "64a3ee9a.60466",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 189,\r
-        "y": 914,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 300.33331298828125,\r
+        "y": 901.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "99239678.d76be8",\r
-                "87a24056.0cfc9",\r
-                "b29ec635.8a7db"\r
+                "b06f4672.19b5b",\r
+                "1bbc50b7.a546f7",\r
+                "46ec206d.bba02"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99239678.d76be8",\r
+        "id": "b06f4672.19b5b",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 397,\r
-        "y": 878,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 508.33331298828125,\r
+        "y": 865.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "bb3094ff.e3cd78"\r
+                "71154b9b.41ff14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "87a24056.0cfc9",\r
+        "id": "1bbc50b7.a546f7",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 397.490966796875,\r
-        "y": 923.5740356445312,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 508.82427978515625,\r
+        "y": 910.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
-            [\r
-                "816ef02e.772828"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "b29ec635.8a7db",\r
+        "id": "46ec206d.bba02",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 395,\r
-        "y": 967,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 506.33331298828125,\r
+        "y": 954.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "b9990c7b.83fc7"\r
+                "d5a43e3e.bfb46"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "816ef02e.772828",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "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",\r
-        "comments": "",\r
-        "x": 560.0623779296875,\r
-        "y": 923.8597717285156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "b9990c7b.83fc7",\r
+        "id": "d5a43e3e.bfb46",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 564,\r
-        "y": 968,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 675.3333129882812,\r
+        "y": 955.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30524cd6.9ca834",\r
+        "id": "c36699ae.d9b4d8",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 534,\r
-        "y": 1474,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 647.3333129882812,\r
+        "y": 1449.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "b7324e21.fe4538"\r
+                "cf4994da.4e15f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7324e21.fe4538",\r
+        "id": "cf4994da.4e15f8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 739,\r
-        "y": 1474,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 850.3333129882812,\r
+        "y": 1461.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "fd6dca36.4f2ef"\r
+                "5493f71f.74de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd6dca36.4f2ef",\r
+        "id": "5493f71f.74de8",\r
         "type": "outcome",\r
         "name": "UNI",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 905,\r
-        "y": 1471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1016.3333129882812,\r
+        "y": 1458.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "14e5640a.2c60e4"\r
+                "ee9f0ecc.141c08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14e5640a.2c60e4",\r
+        "id": "ee9f0ecc.141c08",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1066,\r
-        "y": 1468,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1177.3333129882812,\r
+        "y": 1455.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "a961c0c2.954588",\r
-                "bfc93479.bb02c8",\r
-                "ea108501.b7cec8",\r
-                "9c9a6caf.c302e",\r
-                "520b6d65.f95b0c"\r
+                "4557d328.03c724",\r
+                "aa5d4b55.ae996",\r
+                "977d1c3.25b4f6",\r
+                "f4df7601.a8481",\r
+                "e57dfa3b.7a1478",\r
+                "7a26c91d.a51bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfc93479.bb02c8",\r
+        "id": "aa5d4b55.ae996",\r
         "type": "set",\r
         "name": "unset tmp.aai.uni",\r
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
         "comments": "",\r
-        "x": 1270,\r
-        "y": 1426,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1383.3333129882812,\r
+        "y": 1054.9999465942383,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a961c0c2.954588",\r
+        "id": "4557d328.03c724",\r
         "type": "save",\r
         "name": "get uni from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1267,\r
-        "y": 1471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1380.3333129882812,\r
+        "y": 1099.9999465942383,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "ae34427.3665d4",\r
-                "2e0f53f9.af66fc",\r
-                "e67056c5.33255"\r
+                "93fcd434.d90c9",\r
+                "74ecef95.a69828",\r
+                "c24f7a8a.a1ade"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e0f53f9.af66fc",\r
+        "id": "74ecef95.a69828",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1462.490966796875,\r
-        "y": 1444.573974609375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1575.8242797851562,\r
+        "y": 1073.5739212036133,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "c471a2c5.a52548"\r
+                "ae28b8c.fba5c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e67056c5.33255",\r
+        "id": "c24f7a8a.a1ade",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1458,\r
-        "y": 1488.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1571.3333129882812,\r
+        "y": 1117.999885559082,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "ff2d9a38.ef94a"\r
+                "90024c2d.8db9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c471a2c5.a52548",\r
+        "id": "ae28b8c.fba5c48",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1625.0625,\r
-        "y": 1443.8596801757812,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1738.3958129882812,\r
+        "y": 1072.8596267700195,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff2d9a38.ef94a",\r
+        "id": "90024c2d.8db9e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1626,\r
-        "y": 1488.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1739.3333129882812,\r
+        "y": 1117.999885559082,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "de28fbd6.aeb6d8",\r
+        "id": "3a69019e.e0465e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1628,\r
-        "y": 1535.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1741.3333129882812,\r
+        "y": 1164.999885559082,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ae34427.3665d4",\r
+        "id": "93fcd434.d90c9",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1459,\r
-        "y": 1535.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": [\r
-            [\r
-                "de28fbd6.aeb6d8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "30e36623.144df2",\r
-        "type": "switchNode",\r
-        "name": "switch conn type",\r
-        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 148.5,\r
-        "y": 1133,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": [\r
-            [\r
-                "f6f4ecca.51b1b8",\r
-                "c489f9fc.e5ffb8",\r
-                "a9b0c19e.2c84b8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3438a7d7.53b84",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 278.5,\r
-        "y": 1491,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "f6f4ecca.51b1b8",\r
-        "type": "outcome",\r
-        "name": "leaf",\r
-        "xml": "<outcome value='leaf'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 134.5,\r
-        "y": 1379,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": [\r
-            [\r
-                "96322198.44279"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "c489f9fc.e5ffb8",\r
-        "type": "outcome",\r
-        "name": "root",\r
-        "xml": "<outcome value='root'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 135.5,\r
-        "y": 1437,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": [\r
-            [\r
-                "398da5.544e025c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "a9b0c19e.2c84b8",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 137.5,\r
-        "y": 1491,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1572.3333129882812,\r
+        "y": 1164.999885559082,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "3438a7d7.53b84"\r
+                "3a69019e.e0465e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5287808.34bdc8",\r
+        "id": "87587932.9e7dd",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "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}",\r
         "comments": "",\r
-        "x": 1243,\r
-        "y": 1699,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1354.3333129882812,\r
+        "y": 1686.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea108501.b7cec8",\r
+        "id": "977d1c3.25b4f6",\r
         "type": "set",\r
         "name": "set ethernet-srv-end-points-list array",\r
-        "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].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.connectivity.cir`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.connectivity.eir`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
+        "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",\r
         "comments": "",\r
-        "x": 1334,\r
-        "y": 1753,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1445.3333129882812,\r
+        "y": 1740.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "398da5.544e025c",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 277.5,\r
-        "y": 1437,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": [\r
-            [\r
-                "f5ac679b.0c3448",\r
-                "30524cd6.9ca834",\r
-                "4bb59d5e.d5f6bc",\r
-                "c1ca24e2.0ded08",\r
-                "f1761a56.ef5438",\r
-                "6a3c09b5.9a3f5",\r
-                "62e9a9e6.6ea9a8",\r
-                "94499eb7.5f7bf8",\r
-                "24306e49.ece4e2",\r
-                "527621da.e42f6",\r
-                "f1193850.b7d1f"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "96322198.44279",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 276.5,\r
-        "y": 1379,\r
-        "z": "bbeb6c6b.9e8ac8",\r
-        "wires": [\r
-            [\r
-                "30524cd6.9ca834",\r
-                "4806b9e7.4221c",\r
-                "4f3ecf27.4c11b",\r
-                "c1ca24e2.0ded08",\r
-                "f1761a56.ef5438",\r
-                "6a3c09b5.9a3f5",\r
-                "62e9a9e6.6ea9a8",\r
-                "94499eb7.5f7bf8",\r
-                "24306e49.ece4e2",\r
-                "527621da.e42f6",\r
-                "f1193850.b7d1f"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "4806b9e7.4221c",\r
+        "id": "1a612904.ca3407",\r
         "type": "set",\r
         "name": "unset ethernet-srv-end-points-list",\r
         "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' />",\r
         "comments": "",\r
-        "x": 555.5,\r
-        "y": 1255,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2121.8333129882812,\r
+        "y": 1153.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5ac679b.0c3448",\r
+        "id": "70124697.bdc348",\r
         "type": "set",\r
         "name": "unset ethernet-srv-end-points-list",\r
         "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' />",\r
         "comments": "",\r
-        "x": 572.5,\r
-        "y": 1349,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2126.8333129882812,\r
+        "y": 1255.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1ca24e2.0ded08",\r
+        "id": "d56221fe.c2bbf",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 479,\r
-        "y": 1714,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 610.3333129882812,\r
+        "y": 1705.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "835a7483.88e81"\r
+                "aeacc57e.1c70e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "835a7483.88e81",\r
+        "id": "aeacc57e.1c70e",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 731,\r
-        "y": 1717,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 842.3333129882812,\r
+        "y": 1704.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "51c29716.e56f9"\r
+                "dab1af90.85d2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51c29716.e56f9",\r
+        "id": "dab1af90.85d2c",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 943,\r
-        "y": 1718,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1054.3333129882812,\r
+        "y": 1705.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "ed212632.132b88"\r
+                "6cc09a7e.3eecf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed212632.132b88",\r
+        "id": "6cc09a7e.3eecf4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 199,\r
-        "y": 1874,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 310.33331298828125,\r
+        "y": 1861.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "56f85a0e.adc1bc",\r
-                "4a52a34d.b3a154"\r
+                "acf145f8.65836",\r
+                "d6c02212.5df71"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a52a34d.b3a154",\r
+        "id": "d6c02212.5df71",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 434,\r
-        "y": 1861,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 545.3333129882812,\r
+        "y": 1848.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "56f85a0e.adc1bc",\r
+        "id": "acf145f8.65836",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 424,\r
-        "y": 1922,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 535.3333129882812,\r
+        "y": 1909.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "29bd05cb.6887aa",\r
-                "769c56b6.046928",\r
-                "2ae22544.9de39a"\r
+                "87fb6e74.97fee8",\r
+                "cc7c3629.07cd7",\r
+                "419399de.ad60b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "769c56b6.046928",\r
+        "id": "cc7c3629.07cd7",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 637.490966796875,\r
-        "y": 1906.5740356445312,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 748.8242797851562,\r
+        "y": 1893.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "9a05194a.a2cf9"\r
+                "739447c7.2df608"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ae22544.9de39a",\r
+        "id": "419399de.ad60b8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 633,\r
-        "y": 1951,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 744.3333129882812,\r
+        "y": 1938.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "55ecc37f.47d76c"\r
+                "a817deb7.6d09d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29bd05cb.6887aa",\r
+        "id": "87fb6e74.97fee8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 635,\r
-        "y": 2011,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 746.3333129882812,\r
+        "y": 1998.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "d6336d05.5f3c98"\r
+                "40dff6fa.ed3558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a05194a.a2cf9",\r
+        "id": "739447c7.2df608",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 800.0625,\r
-        "y": 1905.8597412109375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 911.3958129882812,\r
+        "y": 1892.859748840332,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "55ecc37f.47d76c",\r
+        "id": "a817deb7.6d09d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 801,\r
-        "y": 1951,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 912.3333129882812,\r
+        "y": 1938.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d6336d05.5f3c98",\r
+        "id": "40dff6fa.ed3558",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 804,\r
-        "y": 2010,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 915.3333129882812,\r
+        "y": 1997.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "84a52064.39d0f",\r
-                "fd245192.c0f68"\r
+                "e2deabd9.c69c8",\r
+                "574db0eb.1dd5f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62e9a9e6.6ea9a8",\r
+        "id": "bcc45625.ebbc48",\r
         "type": "set",\r
         "name": "set sotn_value",\r
-        "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",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
         "comments": "",\r
-        "x": 213,\r
-        "y": 2153,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 335.33331298828125,\r
+        "y": 2499.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "94499eb7.5f7bf8",\r
+        "id": "fa8a8b3f.f0a5f8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.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",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 369,\r
-        "y": 2201,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 457.33331298828125,\r
+        "y": 2556.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "a73a5a95.120de",\r
-                "bca2a5aa.f6cc3"\r
+                "2e9bd62d.c02afa",\r
+                "55c19c27.0b4a64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a73a5a95.120de",\r
+        "id": "2e9bd62d.c02afa",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 681.5,\r
-        "y": 2178,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 769.8333129882812,\r
+        "y": 2533.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bca2a5aa.f6cc3",\r
+        "id": "55c19c27.0b4a64",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 685.5,\r
-        "y": 2218,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 773.8333129882812,\r
+        "y": 2573.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "10f6c019.f86f7"\r
+                "19a8d296.6252e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60ee3bcb.03ac64",\r
+        "id": "81214b8b.cb073",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 861.5,\r
-        "y": 2182,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 949.8333129882812,\r
+        "y": 2537.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "10f6c019.f86f7",\r
+        "id": "19a8d296.6252e5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 877,\r
-        "y": 2236,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 965.3333129882812,\r
+        "y": 2591.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "67f0aa7d.43690c"\r
+                "89591cea.6097a8",\r
+                "e0a0a9f7.c3b968",\r
+                "39281a09.347b8e",\r
+                "8394d0d1.93103"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca5ee847.cad2",\r
+        "id": "d3d37efd.5c6f1",\r
         "type": "save",\r
         "name": "update vpn-binding resource (aka. OTN ) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1172.5,\r
-        "y": 2205,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1260.8333129882812,\r
+        "y": 2560.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c6e95b64.3418d8",\r
+        "id": "e1720f9a.264c28",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 2616.5,\r
-        "y": 1924,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2727.8333129882812,\r
+        "y": 1911.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67f0aa7d.43690c",\r
+        "id": "89591cea.6097a8",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1134.5,\r
-        "y": 2247,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1222.8333129882812,\r
+        "y": 2602.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4f3ecf27.4c11b",\r
+        "id": "7128141a.22afcc",\r
         "type": "set",\r
         "name": "set leafOrRootAccess",\r
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",\r
         "comments": "",\r
-        "x": 521.5,\r
-        "y": 1293,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2087.8333129882812,\r
+        "y": 1191.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4bb59d5e.d5f6bc",\r
+        "id": "59bf9e6a.8c5448",\r
         "type": "set",\r
         "name": "set leafOrRootAccess",\r
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",\r
         "comments": "",\r
-        "x": 534.5,\r
-        "y": 1389,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2088.8333129882812,\r
+        "y": 1295.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "91a8f363.33b6d",\r
+        "id": "d2ff3c56.4372d",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4271,\r
-        "y": 565,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4382.333312988281,\r
+        "y": 552.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b3054d0f.9c60c",\r
+        "id": "8c5d7664.9247c8",\r
         "type": "save",\r
         "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4174,\r
-        "y": 1384,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4285.333312988281,\r
+        "y": 1371.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d3fdc974.92df9",\r
+        "id": "cedd744c.d4173",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3668,\r
-        "y": 2056,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3779.3333129882812,\r
+        "y": 2043.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bb3094ff.e3cd78",\r
+        "id": "71154b9b.41ff14",\r
         "type": "switchNode",\r
         "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",\r
         "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 769,\r
-        "y": 864,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 880.3333129882812,\r
+        "y": 851.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "282392e2.d6f746",\r
-                "f0518341.6afb1"\r
+                "549c1dfb.8f3224",\r
+                "34cb7bd3.43733c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "282392e2.d6f746",\r
+        "id": "549c1dfb.8f3224",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1132,\r
-        "y": 887,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1243.3333129882812,\r
+        "y": 874.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "77c0bd36.331cac"\r
+                "e217a5f3.43edf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0518341.6afb1",\r
+        "id": "34cb7bd3.43733c",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1132,\r
-        "y": 836,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1243.3333129882812,\r
+        "y": 823.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "e54c87c8.43eeb8"\r
+                "845a9945.5ecef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77c0bd36.331cac",\r
+        "id": "e217a5f3.43edf8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1288,\r
-        "y": 885,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1399.3333129882812,\r
+        "y": 872.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "30e36623.144df2"\r
+                "462f3353.3aa76c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e54c87c8.43eeb8",\r
+        "id": "845a9945.5ecef8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1265,\r
-        "y": 837,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1376.3333129882812,\r
+        "y": 824.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e9e324cf.d34fa8",\r
+        "id": "a8591f2d.71e23",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 2025,\r
-        "y": 235,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2136.3333129882812,\r
+        "y": 222.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "52902dc6.5c041c",\r
+        "id": "c2c48b41.449c5",\r
         "type": "set",\r
         "name": "set root-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 3567,\r
-        "y": 2216,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3678.3333129882812,\r
+        "y": 2203.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c296a00.ae82e8",\r
+        "id": "9499a947.255148",\r
         "type": "set",\r
         "name": "set leaf-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 4157,\r
-        "y": 689,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4268.333312988281,\r
+        "y": 676.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9c9a6caf.c302e",\r
+        "id": "f4df7601.a8481",\r
         "type": "set",\r
         "name": "set ethernet-srv-end-points-list array",\r
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1331,\r
-        "y": 1795,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1442.3333129882812,\r
+        "y": 1782.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1761a56.ef5438",\r
+        "id": "c236e813.0b75c",\r
         "type": "set",\r
         "name": "set filename",\r
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",\r
         "comments": "",\r
-        "x": 510,\r
-        "y": 1529,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 621.3333129882812,\r
+        "y": 1516.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a3c09b5.9a3f5",\r
+        "id": "ccf5136c.426918",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 541,\r
-        "y": 1569,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 652.3333129882812,\r
+        "y": 1556.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "84a52064.39d0f",\r
+        "id": "e2deabd9.c69c8",\r
         "type": "set",\r
         "name": "set otn-tunnels-name-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 1089,\r
-        "y": 1977,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1200.3333129882812,\r
+        "y": 1964.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fd245192.c0f68",\r
+        "id": "574db0eb.1dd5f",\r
         "type": "set",\r
         "name": "set otn-tunnels-name-list array",\r
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1092,\r
-        "y": 2019,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1203.3333129882812,\r
+        "y": 2006.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24306e49.ece4e2",\r
+        "id": "67d19d91.7e0464",\r
         "type": "set",\r
         "name": "unset otn-tunnels-name-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 516,\r
-        "y": 1663,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 646.3333129882812,\r
+        "y": 1646.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "527621da.e42f6",\r
+        "id": "6dec5e05.6defc8",\r
         "type": "set",\r
         "name": "set filename",\r
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
         "comments": "",\r
-        "x": 290,\r
-        "y": 2038,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 401.33331298828125,\r
+        "y": 2025.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1193850.b7d1f",\r
+        "id": "4d2f3635.de76f",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 298,\r
-        "y": 2095,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 409.33331298828125,\r
+        "y": 2082.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "520b6d65.f95b0c",\r
+        "id": "e57dfa3b.7a1478",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1309,\r
-        "y": 1644,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1420.3333129882812,\r
+        "y": 1631.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "19e13e29.006812",\r
-                "9d0e6726.e149c8"\r
+                "42d55673.4b259",\r
+                "c68b8996.7afed8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d0e6726.e149c8",\r
+        "id": "c68b8996.7afed8",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1532,\r
-        "y": 1599,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1643.3333129882812,\r
+        "y": 1586.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "2d20dd4b.751b72"\r
+                "30a6d609.f0af22"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19e13e29.006812",\r
+        "id": "42d55673.4b259",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1534,\r
-        "y": 1663,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1645.3333129882812,\r
+        "y": 1650.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "1dc48abe.a6b4ad"\r
+                "36f16c60.30df3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d20dd4b.751b72",\r
+        "id": "30a6d609.f0af22",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1697,\r
-        "y": 1596,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1808.3333129882812,\r
+        "y": 1583.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": [\r
             [\r
-                "c6b49f04.8bee18"\r
+                "33a6db5.6665724"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1dc48abe.a6b4ad",\r
+        "id": "36f16c60.30df3c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 1696,\r
-        "y": 1659,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1807.3333129882812,\r
+        "y": 1646.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c6b49f04.8bee18",\r
+        "id": "33a6db5.6665724",\r
         "type": "set",\r
         "name": "set tmp.uni-node-id-short",\r
-        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -3]`' />\n",\r
+        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
+        "comments": "",\r
+        "x": 2028.3333129882812,\r
+        "y": 1597.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9a45a6ac.6bb008",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1573.3333129882812,\r
+        "y": 2322.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "90552bad.c118e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "746f3218.6a2f4c",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "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' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1958.3333129882812,\r
+        "y": 2335.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "cc717bee.327628",\r
+                "4215d2eb.6b41b4",\r
+                "6de2353d.61ff6c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "90552bad.c118e",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1752.3333129882812,\r
+        "y": 2322.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "f2b28f1.371b57",\r
+                "746f3218.6a2f4c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f2b28f1.371b57",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domainConn id",\r
+        "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",\r
+        "comments": "",\r
+        "x": 1988.3333129882812,\r
+        "y": 2283.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cc717bee.327628",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2168.3333129882812,\r
+        "y": 2326.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "864e3f3b.37515"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4215d2eb.6b41b4",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2160.3333129882812,\r
+        "y": 2381.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "dbafb74f.d2c48"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6de2353d.61ff6c",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2165.3333129882812,\r
+        "y": 2438.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "d9191b0b.ddee58"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d9191b0b.ddee58",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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",\r
+        "comments": "",\r
+        "x": 2317.3333129882812,\r
+        "y": 2439.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "dbafb74f.d2c48",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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",\r
+        "comments": "",\r
+        "x": 2328.3333129882812,\r
+        "y": 2384.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "864e3f3b.37515",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
-        "x": 1917,\r
-        "y": 1610,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "outputs": 1,\r
+        "x": 2312.7156372070312,\r
+        "y": 2323.65567779541,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "f35ba5bd.48a6c8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f35ba5bd.48a6c8",\r
+        "type": "set",\r
+        "name": "set controller domainConn data",\r
+        "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",\r
+        "comments": "",\r
+        "x": 2527.3333129882812,\r
+        "y": 2320.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "8481025.43fb9",\r
+        "type": "get-resource",\r
+        "name": "get-resource src pnf",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 651.3333129882812,\r
+        "y": 2368.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "372d54fa.9f96f4",\r
+                "9dc1c4cc.c7a94",\r
+                "2d38b1b0.a69f26"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "372d54fa.9f96f4",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 846.8334350585938,\r
+        "y": 2320.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "eb66892d.1f2808"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9dc1c4cc.c7a94",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 838.8334350585938,\r
+        "y": 2375.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "79e4473c.6cea88"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eb66892d.1f2808",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 991.2157592773438,\r
+        "y": 2319.65567779541,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "a488eeff.b05b28"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a488eeff.b05b28",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1175.3333129882812,\r
+        "y": 2318.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "52486109.89e3d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "52486109.89e3d",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1370.3333129882812,\r
+        "y": 2318.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "9a45a6ac.6bb008"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2d38b1b0.a69f26",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 843.8334350585938,\r
+        "y": 2432.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "7ec62576.a9581c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7ec62576.a9581c",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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",\r
+        "comments": "",\r
+        "x": 995.8334350585938,\r
+        "y": 2433.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "79e4473c.6cea88",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "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",\r
+        "comments": "",\r
+        "x": 1006.8334350585938,\r
+        "y": 2376.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "46b10267.ea0e94",\r
+        "type": "set",\r
+        "name": "set tmp.pnf-name-forUrl",\r
+        "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",\r
+        "comments": "",\r
+        "x": 641.3333129882812,\r
+        "y": 2280.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9e415421.d3d5",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 386.33331298828125,\r
+        "y": 2411.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "46b10267.ea0e94",\r
+                "8481025.43fb9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e5923dd1.06f5c",\r
+        "type": "comment",\r
+        "name": "Temporary skipping this check - to support multiple instances in one slice",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1601.2999877929688,\r
+        "y": 228.88333892822266,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "57052eb0.583298",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 803.3333129882812,\r
+        "y": 451.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b87c2610.4dcfe8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 362.83331298828125,\r
+        "y": 1420.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "c36699ae.d9b4d8",\r
+                "d56221fe.c2bbf",\r
+                "c236e813.0b75c",\r
+                "ccf5136c.426918",\r
+                "bcc45625.ebbc48",\r
+                "fa8a8b3f.f0a5f8",\r
+                "67d19d91.7e0464",\r
+                "6dec5e05.6defc8",\r
+                "4d2f3635.de76f",\r
+                "9e415421.d3d5",\r
+                "4fcc44c7.7479d4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a26c91d.a51bf",\r
+        "type": "switchNode",\r
+        "name": "switch uni type",\r
+        "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1393.3333129882812,\r
+        "y": 1258.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "a9279133.62197",\r
+                "c4ef1cec.86081",\r
+                "5303ba0b.725dcc",\r
+                "84ee69ca.e736d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a9279133.62197",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1558.3333129882812,\r
+        "y": 1240.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "df04fed1.2e9e3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c4ef1cec.86081",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1561.3333129882812,\r
+        "y": 1279.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "1437703.dec509"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "84ee69ca.e736d8",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1555.3333129882812,\r
+        "y": 1357.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "c52f2275.ca0538"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5303ba0b.725dcc",\r
+        "type": "outcome",\r
+        "name": "root-secondary",\r
+        "xml": "<outcome value='root-secondary'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1578.3333129882812,\r
+        "y": 1320.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "bb188e14.1d1858"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f4fe23e8.e2bba",\r
+        "type": "set",\r
+        "name": "unset ethernet-srv-end-points-list",\r
+        "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' />",\r
+        "comments": "",\r
+        "x": 2124.3333129882812,\r
+        "y": 1353.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a68d577a.75b008",\r
+        "type": "set",\r
+        "name": "set leafOrRootAccess",\r
+        "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",\r
+        "comments": "",\r
+        "x": 2086.3333129882812,\r
+        "y": 1393.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c52f2275.ca0538",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1707.3333129882812,\r
+        "y": 1378.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e0a0a9f7.c3b968",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create Performance Monitoring Data",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1296.9166870117188,\r
+        "y": 2677.333625793457,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "df04fed1.2e9e3",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1693.2499389648438,\r
+        "y": 1236.3332595825195,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "7128141a.22afcc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1437703.dec509",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1695.2499389648438,\r
+        "y": 1274.3332595825195,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "59bf9e6a.8c5448"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bb188e14.1d1858",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1738.2499389648438,\r
+        "y": 1321.3332595825195,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "a68d577a.75b008"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "39281a09.347b8e",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishSubscription",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1264.9166870117188,\r
+        "y": 2749.3335037231445,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "8394d0d1.93103",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishPersistentConnection",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1294.9166870117188,\r
+        "y": 2811.3335037231445,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4fcc44c7.7479d4",\r
+        "type": "set",\r
+        "name": "unset ethernet-srv-end-points-list",\r
+        "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' />",\r
+        "comments": "",\r
+        "x": 688.3333129882812,\r
+        "y": 1358.1667556762695,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "462f3353.3aa76c",\r
+        "type": "switchNode",\r
+        "name": "switch conn type",\r
+        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 229.3333282470703,\r
+        "y": 1069.166633605957,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "66788e31.cd8e5",\r
+                "15c226b1.2f2f21"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "15c226b1.2f2f21",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 414.33331298828125,\r
+        "y": 1243.166633605957,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "b87c2610.4dcfe8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "66788e31.cd8e5",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 417.33331298828125,\r
+        "y": 1198.166633605957,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "b87c2610.4dcfe8"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file