Support for 1+1 protection path for a cloud leased-line (CLL) service.
[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..d58ad7b 100644 (file)
 [\r
     {\r
-        "id": "ee012476.423b98",\r
+        "id": "d35e2da9.70a7e",\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": 372,\r
+        "y": 306,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "2b361ed4.488d22",\r
-                "8a293b14.096a28",\r
-                "e711b658.aa0458"\r
+                "88d19ab1.10b18",\r
+                "8fd12759.af6e18",\r
+                "50405d21.7eae84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b361ed4.488d22",\r
+        "id": "88d19ab1.10b18",\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": 560,\r
+        "y": 319,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "d45a4635.eb8678"\r
+                "d472199a.beff9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a293b14.096a28",\r
+        "id": "8fd12759.af6e18",\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": 567.4909362792969,\r
+        "y": 361.57403564453125,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
-            [\r
-                "abb54833.f0129"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "e711b658.aa0458",\r
+        "id": "50405d21.7eae84",\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": 558,\r
+        "y": 408,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "f29b4663.f669b"\r
+                "6b1a691d.f6617"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d45a4635.eb8678",\r
+        "id": "d472199a.beff9",\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": 733,\r
+        "y": 317,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "f31c0d53.86d7f8"\r
+                "f306805a.38d6f8"\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": "f306805a.38d6f8",\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": 962,\r
+        "y": 318,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "b49d17ad.574c7"\r
+                "4a920666.d84d68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b49d17ad.574c7",\r
+        "id": "4a920666.d84d68",\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": 1177,\r
+        "y": 319,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "59104900.730b5"\r
+                "fc848cba.fc33d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59104900.730b5",\r
+        "id": "841ae1dd.49d178",\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": 1431,\r
+        "y": 241,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "a081cc3f.ed90c8",\r
-                "c86127b7.79d09"\r
+                "98ef6cc.4725e9",\r
+                "ab42fe03.c49e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a081cc3f.ed90c8",\r
+        "id": "98ef6cc.4725e9",\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": 1648,\r
+        "y": 220,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "99d2c91.f0beeb8"\r
+                "fc848cba.fc33d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c86127b7.79d09",\r
+        "id": "ab42fe03.c49e3",\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": 1648,\r
+        "y": 269,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "99d2c91.f0beeb8",\r
+        "id": "fc848cba.fc33d8",\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": 1832,\r
+        "y": 306,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "1cc75cf0.e01a9b",\r
-                "171d3657.f2327a",\r
-                "e9e324cf.d34fa8"\r
+                "53692e4a.48cde",\r
+                "957d0d12.f7d338",\r
+                "1f9b767f.d670b2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63d9b9e3.c39a3",\r
+        "id": "524dbe59.8ef8f",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 158,\r
-        "y": 104,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 191,\r
+        "y": 47,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "13826703.6fe8f9"\r
+                "320667fa.12a2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13826703.6fe8f9",\r
+        "id": "320667fa.12a2c",\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": 475.2856903076172,\r
+        "y": 108.23810863494873,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "a18ada65.df1b6"\r
+                "aa006c98.f12b58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a18ada65.df1b6",\r
+        "id": "aa006c98.f12b58",\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": 481.42860412597656,\r
+        "y": 193.00003051757812,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "e68623b.1ed71e"\r
+                "72fe4a66.39584c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e68623b.1ed71e",\r
+        "id": "72fe4a66.39584c",\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": 791.238037109375,\r
+        "y": 184.66668701171875,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "ee012476.423b98",\r
-                "1d423866.3abba8",\r
-                "63268214.354d14",\r
-                "2b86835c.8d9024",\r
-                "5a6a7d0e.a2f89c"\r
+                "d35e2da9.70a7e",\r
+                "cce8745e.b515b8",\r
+                "706cb78c.da92b",\r
+                "88772a4.9b58658",\r
+                "4ace150.4554dec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cc75cf0.e01a9b",\r
+        "id": "53692e4a.48cde",\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": 2049,\r
+        "y": 244,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "acb2a33f.d7ec9",\r
+        "id": "123fcc82.b79ae3",\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": 4218,\r
+        "y": 130,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1a2b69e5.bdb2ae",\r
+        "id": "e308a3a2.af826",\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": 4299,\r
+        "y": 445,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "c13bac2.6ce225",\r
-                "54c65da.56603a4"\r
+                "fedd6b9.d7f3318",\r
+                "39581c20.edb614"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c13bac2.6ce225",\r
+        "id": "fedd6b9.d7f3318",\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": 4608.5,\r
+        "y": 414,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "9c791a1e.520a28"\r
+                "c49081cf.377c78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54c65da.56603a4",\r
+        "id": "39581c20.edb614",\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": 4613.5,\r
+        "y": 479,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "b016fce4.beba"\r
+                "9c0572a4.3a997"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c791a1e.520a28",\r
+        "id": "c49081cf.377c78",\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": 4784.5,\r
+        "y": 414,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b016fce4.beba",\r
+        "id": "9c0572a4.3a997",\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": 4780,\r
+        "y": 479,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2227e8a2.0665b8",\r
+        "id": "2d297001.689a7",\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": 4163.5,\r
+        "y": 699,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f70fce2d.7485",\r
+        "id": "54d9bbcc.0d0bac",\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": 4317.5,\r
+        "y": 747,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "8ffe5287.d9d0e8",\r
-                "5f6b3e31.55961"\r
+                "2ade786d.c09b28",\r
+                "f17ad5b3.0ef818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ffe5287.d9d0e8",\r
+        "id": "2ade786d.c09b28",\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": 4663,\r
+        "y": 728,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "8c837eb9.336b9"\r
+                "72718fb4.e15e78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f6b3e31.55961",\r
+        "id": "f17ad5b3.0ef818",\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": 4667,\r
+        "y": 768,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "575c5f0f.3503d8"\r
+                "98b1fdb0.a42648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c837eb9.336b9",\r
+        "id": "72718fb4.e15e78",\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": 4821,\r
+        "y": 728,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "575c5f0f.3503d8",\r
+        "id": "98b1fdb0.a42648",\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": 4824.5,\r
+        "y": 768,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "25e6aa4e.9a9cde",\r
-                "1cebed54.09e3f3"\r
+                "fe12ce9.6a53ab",\r
+                "4eba4c2.fda54b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25e6aa4e.9a9cde",\r
+        "id": "fe12ce9.6a53ab",\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": 5155,\r
+        "y": 733,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "57cb404e.88a3a8",\r
+        "id": "9e233ee4.5c90e",\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": 5019,\r
+        "y": 692,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1cebed54.09e3f3",\r
+        "id": "4eba4c2.fda54b4",\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": 5082,\r
+        "y": 779,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "adcc0fc7.59b628",\r
+        "id": "fbd17573.b91cd8",\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": 4156,\r
+        "y": 178,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "36f9f62e.004372",\r
+        "id": "985dbb20.1c3b78",\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": 4182,\r
+        "y": 295,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "37680b24.ccfd7c",\r
-                "da1cdd66.16c98",\r
-                "923405db.542c"\r
+                "544c4f89.eba52",\r
+                "eb873b5e.d10b8",\r
+                "d8377d86.76164"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37680b24.ccfd7c",\r
+        "id": "544c4f89.eba52",\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": 4377.5001220703125,\r
+        "y": 247,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "3021ee1b.904b12"\r
+                "cd232c91.ed7d5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da1cdd66.16c98",\r
+        "id": "eb873b5e.d10b8",\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": 4369.5001220703125,\r
+        "y": 302,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "12605fae.863058"\r
+                "7e7e18a4.ea2a98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3021ee1b.904b12",\r
+        "id": "cd232c91.ed7d5",\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": 4521.8824462890625,\r
+        "y": 246.65567016601562,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "dd5c14b5.d1837"\r
+                "d5d46c3b.524dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67c4003.ef8f28",\r
+        "id": "4c85ec99.26bac4",\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": 5104,\r
+        "y": 249,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "108d04fa.bf4053"\r
+                "490c8cc0.c71134"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd5c14b5.d1837",\r
+        "id": "d5d46c3b.524dc8",\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": 4706,\r
+        "y": 245,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "d5f86c5d.16c4"\r
+                "cc43f2ea.19847"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5f86c5d.16c4",\r
+        "id": "cc43f2ea.19847",\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": 4901,\r
+        "y": 245,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "67c4003.ef8f28"\r
+                "4c85ec99.26bac4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "923405db.542c",\r
+        "id": "d8377d86.76164",\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": 4374.5001220703125,\r
+        "y": 359,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "b180d8b0.c43f88"\r
+                "9cf617d3.aee3a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b180d8b0.c43f88",\r
+        "id": "9cf617d3.aee3a8",\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": 4526.5001220703125,\r
+        "y": 360,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "12605fae.863058",\r
+        "id": "7e7e18a4.ea2a98",\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": 4537.5001220703125,\r
+        "y": 303,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f9899c24.7b705",\r
+        "id": "f42e9c90.ae58f",\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": 5489,\r
+        "y": 262,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "d378bd87.63a5c8",\r
-                "5261c81e.fbb5b8",\r
-                "634ff531.a525f4"\r
+                "f404a9ca.fbce2",\r
+                "3fd1ebaf.c62a54",\r
+                "66a3972e.71bfa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "108d04fa.bf4053",\r
+        "id": "490c8cc0.c71134",\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": 5283,\r
+        "y": 249,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "20f95b42.b2257c",\r
-                "f9899c24.7b705"\r
+                "9ce5b4b0.4bb188",\r
+                "f42e9c90.ae58f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20f95b42.b2257c",\r
+        "id": "9ce5b4b0.4bb188",\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": 5519,\r
+        "y": 210,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d378bd87.63a5c8",\r
+        "id": "f404a9ca.fbce2",\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": 5699,\r
+        "y": 253,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "1cbdaba0.674dd4"\r
+                "3597c274.50637e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5261c81e.fbb5b8",\r
+        "id": "3fd1ebaf.c62a54",\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": 5691,\r
+        "y": 308,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "66b4dbad.a4949c"\r
+                "ff90e84e.43d4b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "634ff531.a525f4",\r
+        "id": "66a3972e.71bfa8",\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": 5696,\r
+        "y": 365,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "21f2fdd8.0e601a"\r
+                "ff823793.36814"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21f2fdd8.0e601a",\r
+        "id": "ff823793.36814",\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": 5848,\r
+        "y": 366,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66b4dbad.a4949c",\r
+        "id": "ff90e84e.43d4b8",\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": 5859,\r
+        "y": 311,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1cbdaba0.674dd4",\r
+        "id": "3597c274.50637e",\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": 5843.38232421875,\r
+        "y": 250.65567016601562,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "ebf10644.3cf328"\r
+                "d39e28b5.1aec5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ebf10644.3cf328",\r
+        "id": "d39e28b5.1aec5",\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": 6058,\r
+        "y": 247,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "204badf8.a5ba12",\r
+        "id": "139f2f1e.8fa159",\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": 3625,\r
+        "y": 1587,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d3bca29.9af50c",\r
+        "id": "18d2c2bc.05fd85",\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": 3688,\r
+        "y": 1916,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "30186c33.4929f4",\r
-                "868e39af.adebc8"\r
+                "8895fa29.bf8e3",\r
+                "23c7c635.fd4722"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30186c33.4929f4",\r
+        "id": "8895fa29.bf8e3",\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": 3983.5,\r
+        "y": 1883,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "2aae4501.2c69e2"\r
+                "500b5538.e88684"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "868e39af.adebc8",\r
+        "id": "23c7c635.fd4722",\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": 3988.5,\r
+        "y": 1948,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "7501d4e8.c8d944"\r
+                "909dfd67.2300d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2aae4501.2c69e2",\r
+        "id": "500b5538.e88684",\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": 4151.5,\r
+        "y": 1883,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7501d4e8.c8d944",\r
+        "id": "909dfd67.2300d8",\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": 4162,\r
+        "y": 1948,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cc294dbc.f351c",\r
+        "id": "a49aeabe.b5ff8",\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": 3564,\r
+        "y": 1644,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c8227bea.321b5",\r
+        "id": "642d00da.b53c68",\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": 3584,\r
+        "y": 1741,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "9f19ba3f.539ea8",\r
-                "e4125ed0.f068f8",\r
-                "de95537a.826588"\r
+                "1e5d6803.78b7d8",\r
+                "84307ec5.09a8d",\r
+                "b468d4fc.bc9c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f19ba3f.539ea8",\r
+        "id": "1e5d6803.78b7d8",\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": 3786.5001220703125,\r
+        "y": 1694,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "e35cf2ca.728ed8"\r
+                "683b34d0.c1df64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e4125ed0.f068f8",\r
+        "id": "84307ec5.09a8d",\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": 3778.5001220703125,\r
+        "y": 1749,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "c80b6676.b0f198"\r
+                "72cad52e.cb1d74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e35cf2ca.728ed8",\r
+        "id": "683b34d0.c1df64",\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": 3930.8824462890625,\r
+        "y": 1691.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "57d9c9b8.81d7a8"\r
+                "8511cae6.cbf588"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57d9c9b8.81d7a8",\r
+        "id": "8511cae6.cbf588",\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": 4115,\r
+        "y": 1706,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "2837eada.0816e6"\r
+                "82496ff9.234ee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de95537a.826588",\r
+        "id": "b468d4fc.bc9c8",\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": 3783.5001220703125,\r
+        "y": 1806,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "6ac21b2f.35237c"\r
+                "a6137ce1.b3b5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ac21b2f.35237c",\r
+        "id": "a6137ce1.b3b5c",\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": 3935.5001220703125,\r
+        "y": 1807,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c80b6676.b0f198",\r
+        "id": "72cad52e.cb1d74",\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": 3946.5001220703125,\r
+        "y": 1752,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b2f2b82b.20ac9",\r
+        "id": "7b4a137a.364fcc",\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": 4513,\r
+        "y": 1710,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "e8c4648e.2f16b8"\r
+                "37fe69a9.07064e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2837eada.0816e6",\r
+        "id": "82496ff9.234ee",\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": 4310,\r
+        "y": 1706,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "b2f2b82b.20ac9"\r
+                "7b4a137a.364fcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fa6120f.8bbc34",\r
+        "id": "4bdd9e57.a5e13",\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": 4898,\r
+        "y": 1709,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "2004b12.ed9d54e",\r
-                "ffd8f42d.6ff66",\r
-                "7412d147.be04a8"\r
+                "8afff046.26af98",\r
+                "5118b1e.53f805",\r
+                "5a800db8.063d6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8c4648e.2f16b8",\r
+        "id": "37fe69a9.07064e",\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": 4690,\r
+        "y": 1702,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "619505d8.279204",\r
-                "7fa6120f.8bbc34"\r
+                "d299743b.8f6b68",\r
+                "4bdd9e57.a5e13"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "619505d8.279204",\r
+        "id": "d299743b.8f6b68",\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": 4928,\r
+        "y": 1657,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "407265d3.d9387c",\r
+        "id": "2523ddf0.8e1c8a",\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": 5257,\r
+        "y": 1813,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "70bb8ce1.2b5a7c",\r
+        "id": "6f850c0f.e212ac",\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": 5268,\r
+        "y": 1758,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "474b0f12.6a5378",\r
+        "id": "546ca846.269108",\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": 5252.38232421875,\r
+        "y": 1697.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "4664ee87.d9fd18"\r
+                "fac7ab27.77dda8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4664ee87.d9fd18",\r
+        "id": "fac7ab27.77dda8",\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": 5467,\r
+        "y": 1694,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2004b12.ed9d54e",\r
+        "id": "8afff046.26af98",\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": 5108,\r
+        "y": 1700,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "474b0f12.6a5378"\r
+                "546ca846.269108"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd8f42d.6ff66",\r
+        "id": "5118b1e.53f805",\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": 5100,\r
+        "y": 1755,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "70bb8ce1.2b5a7c"\r
+                "6f850c0f.e212ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7412d147.be04a8",\r
+        "id": "5a800db8.063d6c",\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": 5105,\r
+        "y": 1812,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "407265d3.d9387c"\r
+                "2523ddf0.8e1c8a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79f7771a.baa2f",\r
+        "id": "a1edca3.1a62bb8",\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": 3139,\r
+        "y": 658,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "6b315a67.2be854",\r
-                "7ca64a28.96fff4"\r
+                "d4bdeded.3ef248",\r
+                "eead64c.0115918"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b315a67.2be854",\r
+        "id": "d4bdeded.3ef248",\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": 3353,\r
+        "y": 695,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "e26333e1.9f2a38"\r
+                "614a0644.b0e3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ca64a28.96fff4",\r
+        "id": "eead64c.0115918",\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": 3355,\r
+        "y": 633,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "89cb81b5.af1468"\r
+                "295e16ce.878c6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e26333e1.9f2a38",\r
+        "id": "614a0644.b0e3e",\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": 2933,\r
+        "y": 1938,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "5c3b586f.467af",\r
-                "6b4dbd17.81909c"\r
+                "75bfd38b.356f64",\r
+                "f4c4b096.a3ce2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c3b586f.467af",\r
+        "id": "75bfd38b.356f64",\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": 3186,\r
+        "y": 1972,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "a3ab9951.4bdf08"\r
+                "b0597a28.514d3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b4dbd17.81909c",\r
+        "id": "f4c4b096.a3ce2",\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": 3186,\r
+        "y": 1916,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "29d8f363.c99594"\r
+                "64045150.224658"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3ab9951.4bdf08",\r
+        "id": "b0597a28.514d3",\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": 3337,\r
+        "y": 1972,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c7f2aefb.cead08",\r
+        "id": "cf5b963d.2b5a08",\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": 4213,\r
+        "y": 70,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8d65460e.504db8",\r
+        "id": "4badfb31.b82c1c",\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": 3621,\r
+        "y": 1529,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3e2a76dd.233f7a",\r
+        "id": "552020c2.f01db",\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": 3904,\r
+        "y": 327,\r
+        "z": "5a4cb919.dfff38",\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
+                "cf5b963d.2b5a08",\r
+                "123fcc82.b79ae3",\r
+                "fbd17573.b91cd8",\r
+                "985dbb20.1c3b78",\r
+                "e308a3a2.af826",\r
+                "ec3b4a19.7f5ee",\r
+                "881b2d7a.c4e888",\r
+                "1a392cd7.238923"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29d8f363.c99594",\r
+        "id": "64045150.224658",\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": 3337,\r
+        "y": 1915,\r
+        "z": "5a4cb919.dfff38",\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
+                "4badfb31.b82c1c",\r
+                "139f2f1e.8fa159",\r
+                "a49aeabe.b5ff8",\r
+                "642d00da.b53c68",\r
+                "18d2c2bc.05fd85",\r
+                "724930a5.f44628",\r
+                "98331ea2.d141f",\r
+                "f84de17e.e8ea08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "59dac694.235a08",\r
+        "id": "ed40d4d6.135678",\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": 3575,\r
+        "y": 2214,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "704c6.41b9333ac",\r
+        "id": "b71c97.3dad8368",\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": 3729,\r
+        "y": 2262,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "5cc2fc76.782a54",\r
-                "be48f3e2.0fbf"\r
+                "aa1d9a65.d56ee",\r
+                "ce785491.f82258"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5cc2fc76.782a54",\r
+        "id": "aa1d9a65.d56ee",\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": 4074.5,\r
+        "y": 2243,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "a76d95f1.d45e1"\r
+                "d8df230a.b47018"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be48f3e2.0fbf",\r
+        "id": "ce785491.f82258",\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": 4078.5,\r
+        "y": 2283,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "1991eff2.b8a15"\r
+                "d2d57048.de12f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a76d95f1.d45e1",\r
+        "id": "d8df230a.b47018",\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": 4232.5,\r
+        "y": 2243,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1991eff2.b8a15",\r
+        "id": "d2d57048.de12f",\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": 4236,\r
+        "y": 2283,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "69ca6e83.833b58",\r
-                "1ce7897f.5077ef"\r
+                "703675c3.1d187c",\r
+                "6a8e2764.0748e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "69ca6e83.833b58",\r
+        "id": "703675c3.1d187c",\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": 4576,\r
+        "y": 2282,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "47268bd4.d29394",\r
+        "id": "b9adfc7b.f1d908",\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": 4434,\r
+        "y": 2240,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1ce7897f.5077ef",\r
+        "id": "6a8e2764.0748e8",\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": 4505,\r
+        "y": 2331,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "adf25f68.f6874",\r
+        "id": "641093d5.a73774",\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": 3130,\r
+        "y": 598,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5011571a.f2ffc8",\r
+        "id": "29b91b19.d2edf4",\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": 3725,\r
+        "y": 284,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "69454f54.a632a",\r
+        "id": "df88a98e.3b797",\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": 3282,\r
+        "y": 1862,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "89cb81b5.af1468",\r
+        "id": "295e16ce.878c6a",\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": 3461,\r
+        "y": 446,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "89a2367.f810e48",\r
-                "76abc6c6.50ef4"\r
+                "fdfbdf68.ace01",\r
+                "8f7ef737.3d4208"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76abc6c6.50ef4",\r
+        "id": "8f7ef737.3d4208",\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": 3703,\r
+        "y": 1035,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "fdc63597.3712e"\r
+                "d545d977.39f008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89a2367.f810e48",\r
+        "id": "fdfbdf68.ace01",\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": 3697,\r
+        "y": 326,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "3e2a76dd.233f7a"\r
+                "552020c2.f01db"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fdc63597.3712e",\r
+        "id": "d545d977.39f008",\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": 3861,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "1793312b.927ef7",\r
-                "41401fda.2be158",\r
-                "9005ec38.4e5e88",\r
-                "dd0899e7.f82f08",\r
-                "ecd7f356.de7408",\r
-                "b3054d0f.9c60c"\r
+                "127c7c35.f5600c",\r
+                "aa22b9fb.8c00d",\r
+                "7a8bb8ff.a3807",\r
+                "b6e4b7cd.3aab58",\r
+                "9befe6d.bfbfb18",\r
+                "61ff745d.2cf8b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41401fda.2be158",\r
+        "id": "aa22b9fb.8c00d",\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": 4125,\r
+        "y": 917,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ecd7f356.de7408",\r
+        "id": "9befe6d.bfbfb18",\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": 4206,\r
+        "y": 1232,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "e0518882.6fa588",\r
-                "87218147.0fa418"\r
+                "602f32f4.cac7b4",\r
+                "1d093526.32224b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0518882.6fa588",\r
+        "id": "602f32f4.cac7b4",\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": 4515.5,\r
+        "y": 1201,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "57c63933.072c5"\r
+                "4513cd6b.369634"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "87218147.0fa418",\r
+        "id": "1d093526.32224b",\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": 4520.5,\r
+        "y": 1266,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "7dd1782c.b2154"\r
+                "7640c8ac.188fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57c63933.072c5",\r
+        "id": "4513cd6b.369634",\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": 4691.5,\r
+        "y": 1201,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7dd1782c.b2154",\r
+        "id": "7640c8ac.188fc8",\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": 4687,\r
+        "y": 1266,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9005ec38.4e5e88",\r
+        "id": "7a8bb8ff.a3807",\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": 4063,\r
+        "y": 965,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dd0899e7.f82f08",\r
+        "id": "b6e4b7cd.3aab58",\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": 4089,\r
+        "y": 1082,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "7a284ffa.3cc17",\r
-                "aa72c818.28213",\r
-                "f0ca75e3.4407d"\r
+                "bc604696.f19bf",\r
+                "6b2ab2eb.e94cac",\r
+                "158e3d74.81687b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a284ffa.3cc17",\r
+        "id": "bc604696.f19bf",\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": 4284.5001220703125,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "25701aeb.93625e"\r
+                "fbbae41a.6bb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa72c818.28213",\r
+        "id": "6b2ab2eb.e94cac",\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": 4276.5001220703125,\r
+        "y": 1089,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "f502d128.6eafe8"\r
+                "5e10560f.7f2a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25701aeb.93625e",\r
+        "id": "fbbae41a.6bb8",\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": 4428.8824462890625,\r
+        "y": 1033.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "86d32773.3465f8"\r
+                "4ab90ec7.0f8a1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86d32773.3465f8",\r
+        "id": "4ab90ec7.0f8a1",\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": 4613,\r
+        "y": 1032,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "e526c1c.efff3c"\r
+                "3bb025b6.92298a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e526c1c.efff3c",\r
+        "id": "3bb025b6.92298a",\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": 4808,\r
+        "y": 1032,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "b3ad7614.48799"\r
+                "ce204654.d589e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0ca75e3.4407d",\r
+        "id": "158e3d74.81687b",\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": 4281.5001220703125,\r
+        "y": 1146,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "f3b0b426.0ebd8"\r
+                "cfe04507.17faa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3b0b426.0ebd8",\r
+        "id": "cfe04507.17faa",\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": 4433.5001220703125,\r
+        "y": 1147,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f502d128.6eafe8",\r
+        "id": "5e10560f.7f2a6",\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": 4444.5001220703125,\r
+        "y": 1090,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1793312b.927ef7",\r
+        "id": "127c7c35.f5600c",\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": 4120,\r
+        "y": 857,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b3ad7614.48799",\r
+        "id": "ce204654.d589e8",\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": 5011,\r
+        "y": 1036,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "96db10e5.ea83"\r
+                "fea8f5c8.b664d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "306d874d.b412d8",\r
+        "id": "17936311.45c0f5",\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": 5396,\r
+        "y": 1049,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "c6eb6256.83f998",\r
-                "45038891.4f4538",\r
-                "daa4d789.597db8"\r
+                "bda3b861.07af08",\r
+                "8ce8739f.28fc08",\r
+                "8098fa71.4cbf3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96db10e5.ea83",\r
+        "id": "fea8f5c8.b664d8",\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": 5190,\r
+        "y": 1036,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "d230885e.9519f8",\r
-                "306d874d.b412d8"\r
+                "619520a0.18d9e",\r
+                "17936311.45c0f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d230885e.9519f8",\r
+        "id": "619520a0.18d9e",\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": 5426,\r
+        "y": 997,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c6eb6256.83f998",\r
+        "id": "bda3b861.07af08",\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": 5606,\r
+        "y": 1040,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "a3266db3.e5e668"\r
+                "3c9ad3f5.e5e4a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45038891.4f4538",\r
+        "id": "8ce8739f.28fc08",\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": 5598,\r
+        "y": 1095,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "c1656fec.754d9"\r
+                "ec86cd9f.a15968"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "daa4d789.597db8",\r
+        "id": "8098fa71.4cbf3",\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": 5603,\r
+        "y": 1152,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "e2730778.5b349"\r
+                "244270ad.8dfe1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e2730778.5b349",\r
+        "id": "244270ad.8dfe1",\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": 5755,\r
+        "y": 1153,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1656fec.754d9",\r
+        "id": "ec86cd9f.a15968",\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": 5766,\r
+        "y": 1098,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3266db3.e5e668",\r
+        "id": "3c9ad3f5.e5e4a4",\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": 5750.38232421875,\r
+        "y": 1037.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "eeffd7c6.a525f"\r
+                "2068f2a1.5ec866"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eeffd7c6.a525f",\r
+        "id": "2068f2a1.5ec866",\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": 5965,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24ea3ba5.00c9cc",\r
+        "id": "e69cbe2a.82be58",\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": 3739,\r
+        "y": 975,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "171d3657.f2327a",\r
+        "id": "957d0d12.f7d338",\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": 2301,\r
+        "y": 702,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "76b248ab.29f1f8",\r
-                "a2a1c5ad.da7c28"\r
+                "7969493f.6a54d",\r
+                "9a6050c4.300548"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2a1c5ad.da7c28",\r
+        "id": "9a6050c4.300548",\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": 2708,\r
+        "y": 720,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "4b53f5cd.6e4a64"\r
+                "66cd0943.de62f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76b248ab.29f1f8",\r
+        "id": "7969493f.6a54d",\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": 2708,\r
+        "y": 665,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "ed700187.4c0438"\r
+                "7c5fc999.6b62c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed700187.4c0438",\r
+        "id": "7c5fc999.6b62c",\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": 2864,\r
+        "y": 663,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "adf25f68.f6874",\r
-                "79f7771a.baa2f"\r
+                "641093d5.a73774",\r
+                "a1edca3.1a62bb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b53f5cd.6e4a64",\r
+        "id": "66cd0943.de62f",\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": 2841,\r
+        "y": 721,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1d423866.3abba8",\r
+        "id": "cce8745e.b515b8",\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": 1018,\r
+        "y": 137,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b7ea63f5.b58c8",\r
+        "id": "48ad099a.c16688",\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": 4135,\r
+        "y": 555,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7d01ae3.e59e8d",\r
+        "id": "ec3b4a19.7f5ee",\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": 4195,\r
+        "y": 594,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63268214.354d14",\r
+        "id": "706cb78c.da92b",\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": 1011,\r
+        "y": 45,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad2fff57.f164d",\r
+        "id": "9a38eb9e.71f4d8",\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": 3547,\r
+        "y": 2071,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "605c7758.9853c8",\r
+        "id": "724930a5.f44628",\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": 3603,\r
+        "y": 2120,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "45ce7d67.6029dc",\r
+        "id": "2a414bdc.2311dc",\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": 1011,\r
+        "y": 84,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b86835c.8d9024",\r
+        "id": "88772a4.9b58658",\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": 1042,\r
+        "y": 185,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5a6a7d0e.a2f89c",\r
+        "id": "4ace150.4554dec",\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": 252,\r
+        "y": 660,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "bd2f8dbe.e61408",\r
-                "cacc237e.394a4",\r
-                "f05100c1.a77fd8"\r
+                "ce4ab0d3.b836a",\r
+                "9dbee6c6.1a60a",\r
+                "290803ec.65c94c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd2f8dbe.e61408",\r
+        "id": "ce4ab0d3.b836a",\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": 471,\r
+        "y": 598,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "64d16331.36ee54"\r
+                "280015e3.c315e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cacc237e.394a4",\r
+        "id": "9dbee6c6.1a60a",\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": 480.490966796875,\r
+        "y": 640.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
-            [\r
-                "537fe800.387e68"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "f05100c1.a77fd8",\r
+        "id": "290803ec.65c94c",\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": 469,\r
+        "y": 687,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "4626cafb.2ab55c"\r
+                "f842cdf9.29a79"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64d16331.36ee54",\r
+        "id": "280015e3.c315e2",\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": 668,\r
+        "y": 594,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "f0f139f4.8e2a48"\r
+                "cd508bdd.302a88"\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": "f842cdf9.29a79",\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": 638,\r
+        "y": 688,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f0f139f4.8e2a48",\r
+        "id": "cd508bdd.302a88",\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": 891.33349609375,\r
+        "y": 593.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "2762e6c2.94358a"\r
+                "d4df8e14.56fc08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2762e6c2.94358a",\r
+        "id": "d4df8e14.56fc08",\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": 1092.0001335144043,\r
+        "y": 595.000020980835,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "37a60584.767442"\r
+                "b67eb6e5.58b31"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37a60584.767442",\r
+        "id": "b67eb6e5.58b31",\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": 222,\r
+        "y": 857,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "99239678.d76be8",\r
-                "87a24056.0cfc9",\r
-                "b29ec635.8a7db"\r
+                "eb910f68.8a5408",\r
+                "a6536ba8.c4e148",\r
+                "6d1288a7.3722b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99239678.d76be8",\r
+        "id": "eb910f68.8a5408",\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": 430,\r
+        "y": 821,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "bb3094ff.e3cd78"\r
+                "6687da8.fb06ca4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "87a24056.0cfc9",\r
+        "id": "a6536ba8.c4e148",\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": 430.490966796875,\r
+        "y": 866.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
-            [\r
-                "816ef02e.772828"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "b29ec635.8a7db",\r
+        "id": "6d1288a7.3722b8",\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": 428,\r
+        "y": 910,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "b9990c7b.83fc7"\r
+                "a3e6b31.4b2495"\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": "a3e6b31.4b2495",\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": 597,\r
+        "y": 911,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30524cd6.9ca834",\r
+        "id": "64de189c.ea0ca",\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": 569,\r
+        "y": 1405,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "b7324e21.fe4538"\r
+                "f09d5f3a.90b09"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7324e21.fe4538",\r
+        "id": "f09d5f3a.90b09",\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": 772,\r
+        "y": 1417,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "fd6dca36.4f2ef"\r
+                "be069a3d.2f258"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd6dca36.4f2ef",\r
+        "id": "be069a3d.2f258",\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": 938,\r
+        "y": 1414,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "14e5640a.2c60e4"\r
+                "b33327bf.cf44b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14e5640a.2c60e4",\r
+        "id": "b33327bf.cf44b8",\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": 1099,\r
+        "y": 1411,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "a961c0c2.954588",\r
-                "bfc93479.bb02c8",\r
-                "ea108501.b7cec8",\r
-                "9c9a6caf.c302e",\r
-                "520b6d65.f95b0c"\r
+                "9b6250ff.75cf18",\r
+                "6e8e9c3e.00f634",\r
+                "db16830a.f6a5",\r
+                "611e4d54.277574",\r
+                "c0f4e533.035be8",\r
+                "ee82569c.a25768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfc93479.bb02c8",\r
+        "id": "6e8e9c3e.00f634",\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": 1305,\r
+        "y": 1010.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a961c0c2.954588",\r
+        "id": "9b6250ff.75cf18",\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": 1302,\r
+        "y": 1055.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "ae34427.3665d4",\r
-                "2e0f53f9.af66fc",\r
-                "e67056c5.33255"\r
+                "1b290eb5.e974c9",\r
+                "b84573d.a8be19",\r
+                "ef2334eb.3c1b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e0f53f9.af66fc",\r
+        "id": "b84573d.a8be19",\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": 1497.490966796875,\r
+        "y": 1029.5739135742188,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "c471a2c5.a52548"\r
+                "45bb14a8.1a7924"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e67056c5.33255",\r
+        "id": "ef2334eb.3c1b68",\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": 1493,\r
+        "y": 1073.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "ff2d9a38.ef94a"\r
+                "cd1f6950.fef1f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c471a2c5.a52548",\r
+        "id": "45bb14a8.1a7924",\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": 1660.0625,\r
+        "y": 1028.859619140625,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff2d9a38.ef94a",\r
+        "id": "cd1f6950.fef1f",\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": 1661,\r
+        "y": 1073.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "de28fbd6.aeb6d8",\r
+        "id": "cd4af41f.be1a78",\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": 1663,\r
+        "y": 1120.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ae34427.3665d4",\r
+        "id": "1b290eb5.e974c9",\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": 1494,\r
+        "y": 1120.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "3438a7d7.53b84"\r
+                "cd4af41f.be1a78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5287808.34bdc8",\r
+        "id": "60f7024f.a382fc",\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": 1276,\r
+        "y": 1642,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea108501.b7cec8",\r
+        "id": "db16830a.f6a5",\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\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": 1367,\r
+        "y": 1696,\r
+        "z": "5a4cb919.dfff38",\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": "1989ebd9.8b76bc",\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": 2043.5,\r
+        "y": 1109,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5ac679b.0c3448",\r
+        "id": "9da50ff.0241af",\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": 2048.5,\r
+        "y": 1211,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1ca24e2.0ded08",\r
+        "id": "eda2f0f7.d8fb38",\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": 532,\r
+        "y": 1661,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "835a7483.88e81"\r
+                "62852429.1f30ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "835a7483.88e81",\r
+        "id": "62852429.1f30ac",\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": 764,\r
+        "y": 1660,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "51c29716.e56f9"\r
+                "ede4a749.9f1af8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51c29716.e56f9",\r
+        "id": "ede4a749.9f1af8",\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": 976,\r
+        "y": 1661,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "ed212632.132b88"\r
+                "b699a292.eb6f88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed212632.132b88",\r
+        "id": "b699a292.eb6f88",\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": 232,\r
+        "y": 1817,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "56f85a0e.adc1bc",\r
-                "4a52a34d.b3a154"\r
+                "13d7e483.3188fb",\r
+                "74bc3a8f.9628d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a52a34d.b3a154",\r
+        "id": "74bc3a8f.9628d4",\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": 467,\r
+        "y": 1804,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "56f85a0e.adc1bc",\r
+        "id": "13d7e483.3188fb",\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": 457,\r
+        "y": 1865,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "29bd05cb.6887aa",\r
-                "769c56b6.046928",\r
-                "2ae22544.9de39a"\r
+                "bcef8cd9.e20998",\r
+                "764e27eb.b5496",\r
+                "21958602.3fa0ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "769c56b6.046928",\r
+        "id": "764e27eb.b5496",\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": 670.490966796875,\r
+        "y": 1849.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "9a05194a.a2cf9"\r
+                "9c812de2.87639"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ae22544.9de39a",\r
+        "id": "21958602.3fa0ea",\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": 666,\r
+        "y": 1894,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "55ecc37f.47d76c"\r
+                "2915d3a6.63730c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29bd05cb.6887aa",\r
+        "id": "bcef8cd9.e20998",\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": 668,\r
+        "y": 1954,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "d6336d05.5f3c98"\r
+                "bb26f0d0.bc6288"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a05194a.a2cf9",\r
+        "id": "9c812de2.87639",\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": 833.0625,\r
+        "y": 1848.8597412109375,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "55ecc37f.47d76c",\r
+        "id": "2915d3a6.63730c",\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": 834,\r
+        "y": 1894,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d6336d05.5f3c98",\r
+        "id": "bb26f0d0.bc6288",\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": 837,\r
+        "y": 1953,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "84a52064.39d0f",\r
-                "fd245192.c0f68"\r
+                "e8fb0469.22a408",\r
+                "b503b0ba.b1ff6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62e9a9e6.6ea9a8",\r
+        "id": "445d8bb1.6c470c",\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
         "comments": "",\r
-        "x": 213,\r
-        "y": 2153,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 236,\r
+        "y": 2452,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "94499eb7.5f7bf8",\r
+        "id": "925823e9.1c4a4",\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": 379,\r
+        "y": 2512,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "a73a5a95.120de",\r
-                "bca2a5aa.f6cc3"\r
+                "345842a4.88ef2e",\r
+                "a4dc32a8.6620d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a73a5a95.120de",\r
+        "id": "345842a4.88ef2e",\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": 691.5,\r
+        "y": 2489,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bca2a5aa.f6cc3",\r
+        "id": "a4dc32a8.6620d8",\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": 695.5,\r
+        "y": 2529,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "10f6c019.f86f7"\r
+                "d1fda3bb.92b0e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60ee3bcb.03ac64",\r
+        "id": "cde1b667.7c4d6",\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": 871.5,\r
+        "y": 2493,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "10f6c019.f86f7",\r
+        "id": "d1fda3bb.92b0e",\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": 887,\r
+        "y": 2547,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "67f0aa7d.43690c"\r
+                "a9ee92c3.93f6e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca5ee847.cad2",\r
+        "id": "459839ba.ae33c",\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": 1182.5,\r
+        "y": 2516,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c6e95b64.3418d8",\r
+        "id": "120147ed.79206",\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": 2649.5,\r
+        "y": 1867,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67f0aa7d.43690c",\r
+        "id": "a9ee92c3.93f6e8",\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": 1144.5,\r
+        "y": 2558,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4f3ecf27.4c11b",\r
+        "id": "9d25e547.75567",\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": 2009.5,\r
+        "y": 1147,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4bb59d5e.d5f6bc",\r
+        "id": "52a255e0.e77dec",\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": 2010.5,\r
+        "y": 1251,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "91a8f363.33b6d",\r
+        "id": "881b2d7a.c4e888",\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": 4304,\r
+        "y": 508,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b3054d0f.9c60c",\r
+        "id": "61ff745d.2cf8b4",\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": 4207,\r
+        "y": 1327,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d3fdc974.92df9",\r
+        "id": "98331ea2.d141f",\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": 3701,\r
+        "y": 1999,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bb3094ff.e3cd78",\r
+        "id": "6687da8.fb06ca4",\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": 802,\r
+        "y": 807,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "282392e2.d6f746",\r
-                "f0518341.6afb1"\r
+                "11a4a5f5.385f32",\r
+                "192499d2.667f1e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "282392e2.d6f746",\r
+        "id": "11a4a5f5.385f32",\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": 1165,\r
+        "y": 830,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "77c0bd36.331cac"\r
+                "1fc9c5be.8fac2a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0518341.6afb1",\r
+        "id": "192499d2.667f1e",\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": 1165,\r
+        "y": 779,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "e54c87c8.43eeb8"\r
+                "5fe8520c.50e664"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77c0bd36.331cac",\r
+        "id": "1fc9c5be.8fac2a",\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": 1321,\r
+        "y": 828,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "30e36623.144df2"\r
+                "a46faf22.6dbda8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e54c87c8.43eeb8",\r
+        "id": "5fe8520c.50e664",\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": 1298,\r
+        "y": 780,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e9e324cf.d34fa8",\r
+        "id": "1f9b767f.d670b2",\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": 2058,\r
+        "y": 178,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "52902dc6.5c041c",\r
+        "id": "f84de17e.e8ea08",\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": 3600,\r
+        "y": 2159,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c296a00.ae82e8",\r
+        "id": "1a392cd7.238923",\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": 4190,\r
+        "y": 632,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9c9a6caf.c302e",\r
+        "id": "611e4d54.277574",\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": 1364,\r
+        "y": 1738,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1761a56.ef5438",\r
+        "id": "dc7d7df9.afb81",\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": 543,\r
+        "y": 1472,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a3c09b5.9a3f5",\r
+        "id": "c70f6326.e297a",\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": 574,\r
+        "y": 1512,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "84a52064.39d0f",\r
+        "id": "e8fb0469.22a408",\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": 1122,\r
+        "y": 1920,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fd245192.c0f68",\r
+        "id": "b503b0ba.b1ff6",\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": 1125,\r
+        "y": 1962,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24306e49.ece4e2",\r
+        "id": "f7d70d92.8a17d",\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": 568,\r
+        "y": 1602,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "527621da.e42f6",\r
+        "id": "93ecab9f.5bb27",\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": 323,\r
+        "y": 1981,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1193850.b7d1f",\r
+        "id": "e1bf516d.80132",\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": 331,\r
+        "y": 2038,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "520b6d65.f95b0c",\r
+        "id": "c0f4e533.035be8",\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": 1342,\r
+        "y": 1587,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "19e13e29.006812",\r
-                "9d0e6726.e149c8"\r
+                "ff9a5641.69fda",\r
+                "a44c9ce4.5d2008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d0e6726.e149c8",\r
+        "id": "a44c9ce4.5d2008",\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": 1565,\r
+        "y": 1542,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "2d20dd4b.751b72"\r
+                "eaca171f.944a48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19e13e29.006812",\r
+        "id": "ff9a5641.69fda",\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": 1567,\r
+        "y": 1606,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "1dc48abe.a6b4ad"\r
+                "93d69fa.52d496"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d20dd4b.751b72",\r
+        "id": "eaca171f.944a48",\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": 1730,\r
+        "y": 1539,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": [\r
             [\r
-                "c6b49f04.8bee18"\r
+                "b0447236.92d3b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1dc48abe.a6b4ad",\r
+        "id": "93d69fa.52d496",\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": 1729,\r
+        "y": 1602,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c6b49f04.8bee18",\r
+        "id": "b0447236.92d3b",\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": 1950,\r
+        "y": 1553,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ab15b7a9.bc6bc8",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1495,\r
+        "y": 2278,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "be2440af.c20c98"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1405448e.40f263",\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": 1880,\r
+        "y": 2291,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "facba133.b01618",\r
+                "36457cd.f85a104",\r
+                "a0c24437.cf174"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "be2440af.c20c98",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1674,\r
+        "y": 2278,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "eec40e11.9fdab",\r
+                "1405448e.40f263"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eec40e11.9fdab",\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": 1917,\r
-        "y": 1610,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1910,\r
+        "y": 2239,\r
+        "z": "5a4cb919.dfff38",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "facba133.b01618",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2090,\r
+        "y": 2282,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "926a046d.eed228"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "36457cd.f85a104",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2082,\r
+        "y": 2337,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "6ca22053.c9fba8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a0c24437.cf174",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2087,\r
+        "y": 2394,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "f91dd017.676d7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f91dd017.676d7",\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": 2239,\r
+        "y": 2395,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6ca22053.c9fba8",\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": 2250,\r
+        "y": 2340,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "926a046d.eed228",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2234.38232421875,\r
+        "y": 2279.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "1e25e04f.ee7df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1e25e04f.ee7df",\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": 2449,\r
+        "y": 2276,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "46842cb8.91c5bc",\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": 573,\r
+        "y": 2324,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "80e94eed.70f82",\r
+                "e1101309.b00428",\r
+                "6cefa506.12a2dc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "80e94eed.70f82",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 768.5001220703125,\r
+        "y": 2276,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "a961cabf.5d77d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e1101309.b00428",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 760.5001220703125,\r
+        "y": 2331,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "cfce6a08.8d1818"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a961cabf.5d77d8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 912.8824462890625,\r
+        "y": 2275.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "41f5578e.096c08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "41f5578e.096c08",\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": 1097,\r
+        "y": 2274,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "78702bad.3695f4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "78702bad.3695f4",\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": 1292,\r
+        "y": 2274,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "ab15b7a9.bc6bc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6cefa506.12a2dc",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 765.5001220703125,\r
+        "y": 2388,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "bbb236e9.1d475"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bbb236e9.1d475",\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": 917.5001220703125,\r
+        "y": 2389,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cfce6a08.8d1818",\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": 928.5001220703125,\r
+        "y": 2332,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "fd11a034.71ffe8",\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": 563,\r
+        "y": 2236,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2ab715a0.ab46a2",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 308,\r
+        "y": 2367,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "fd11a034.71ffe8",\r
+                "46842cb8.91c5bc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c68339b5.636678",\r
+        "type": "comment",\r
+        "name": "Temporary skipping this check - to support multiple instances in one slice",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1522.9666748046875,\r
+        "y": 184.88333129882812,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6b1a691d.f6617",\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": 725,\r
+        "y": 407,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a46faf22.6dbda8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 284.5,\r
+        "y": 1376,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "64de189c.ea0ca",\r
+                "eda2f0f7.d8fb38",\r
+                "dc7d7df9.afb81",\r
+                "c70f6326.e297a",\r
+                "445d8bb1.6c470c",\r
+                "925823e9.1c4a4",\r
+                "f7d70d92.8a17d",\r
+                "93ecab9f.5bb27",\r
+                "e1bf516d.80132",\r
+                "2ab715a0.ab46a2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ee82569c.a25768",\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": 1315,\r
+        "y": 1214,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "ef11d348.e67b18",\r
+                "db4eac49.9ee78",\r
+                "ccd7386e.438c4",\r
+                "8a1e26c1.925918"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ef11d348.e67b18",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1480,\r
+        "y": 1196,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "1989ebd9.8b76bc",\r
+                "9d25e547.75567"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "db4eac49.9ee78",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1483,\r
+        "y": 1235,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "9da50ff.0241af",\r
+                "52a255e0.e77dec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8a1e26c1.925918",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1477,\r
+        "y": 1313,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "af3eb285.34bda8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ccd7386e.438c4",\r
+        "type": "outcome",\r
+        "name": "root-secondary",\r
+        "xml": "<outcome value='root-secondary'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1500,\r
+        "y": 1276,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "8dd3ee03.704618",\r
+                "3acf3b0f.3b0184"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8dd3ee03.704618",\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": 2046,\r
+        "y": 1309,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3acf3b0f.3b0184",\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": 2008,\r
+        "y": 1349,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "af3eb285.34bda8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1629,\r
+        "y": 1334,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            []\r
+        ]\r
     }\r
 ]
\ No newline at end of file