Use same name for OTN Tunnels and Ethernet Services in both domains.
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
index a1b68a6..5d150f6 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "d5615e24.a00ab8",\r
+        "id": "d9508d21.fa5b3",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 156,\r
-        "y": 95,\r
+        "x": 144,\r
+        "y": 116,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "90741178.637a68"\r
+                "cae32381.bce9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90741178.637a68",\r
+        "id": "cae32381.bce9d",\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": 287.2856903076172,\r
-        "y": 144.23810863494873,\r
+        "x": 275.2856903076172,\r
+        "y": 165.23810863494873,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "e9aee376.235818"\r
+                "82cfa8a0.a91dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9aee376.235818",\r
+        "id": "82cfa8a0.a91dc",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-activate",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 290.4286193847656,\r
-        "y": 229.00003242492676,\r
+        "x": 278.4286193847656,\r
+        "y": 250.00003242492676,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "9c8b5d20.5b6ef8"\r
+                "f6fef19d.8fc9f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c8b5d20.5b6ef8",\r
+        "id": "f6fef19d.8fc9f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 440.238037109375,\r
-        "y": 358.6666564941406,\r
+        "x": 428.238037109375,\r
+        "y": 379.6666564941406,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "f1c1dc9b.59851",\r
-                "40fee6aa.417918",\r
-                "a3f28ac6.d30ed8"\r
+                "c70167ce.7f9118",\r
+                "6aca196e.a4377",\r
+                "e86e6571.913898"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1c1dc9b.59851",\r
+        "id": "c70167ce.7f9118",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 708.5716552734375,\r
-        "y": 745.59716796875,\r
+        "x": 696.5716552734375,\r
+        "y": 766.59716796875,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e4fd4d94.2b8ec8",\r
+        "id": "d841551.d686928",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 740,\r
-        "y": 420,\r
+        "x": 728,\r
+        "y": 441,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "40fee6aa.417918",\r
+        "id": "6aca196e.a4377",\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": 760,\r
-        "y": 516,\r
+        "x": 748,\r
+        "y": 537,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "15f2cda7.88709a",\r
-                "187b249d.3c85cb",\r
-                "c12e657e.e2c7f8"\r
+                "8dfdefd.d3d4d9",\r
+                "f6a9e3a5.f26778",\r
+                "6cad2633.e5f528"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15f2cda7.88709a",\r
+        "id": "8dfdefd.d3d4d9",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 979,\r
-        "y": 454,\r
+        "x": 967,\r
+        "y": 475,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "56c6117d.ed7bc"\r
+                "f2dd8538.5d3378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "187b249d.3c85cb",\r
+        "id": "f6a9e3a5.f26778",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 988.490966796875,\r
-        "y": 496.57403564453125,\r
+        "x": 976.490966796875,\r
+        "y": 517.5740356445312,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "dd3e3cac.482ca8"\r
+                "59b21b6f.e70b7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c12e657e.e2c7f8",\r
+        "id": "6cad2633.e5f528",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 977,\r
-        "y": 543,\r
+        "x": 965,\r
+        "y": 564,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "d7bbbdd4.b85c7"\r
+                "95c7d05e.93c3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd3e3cac.482ca8",\r
+        "id": "59b21b6f.e70b7c",\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": 1142.0623779296875,\r
-        "y": 499.8597717285156,\r
+        "x": 1130.0623779296875,\r
+        "y": 520.8597717285156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d7bbbdd4.b85c7",\r
+        "id": "95c7d05e.93c3e",\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": 1146,\r
-        "y": 544,\r
+        "x": 1134,\r
+        "y": 565,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "56c6117d.ed7bc",\r
+        "id": "f2dd8538.5d3378",\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": 1176,\r
-        "y": 450,\r
+        "x": 1164,\r
+        "y": 471,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "68f0da0a.13a494"\r
+                "94e5618.e7d282"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "68f0da0a.13a494",\r
+        "id": "94e5618.e7d282",\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": 1399.33349609375,\r
-        "y": 449.99993896484375,\r
+        "x": 1387.33349609375,\r
+        "y": 470.99993896484375,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "a37a9810.801788"\r
+                "32140056.199ae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a37a9810.801788",\r
+        "id": "32140056.199ae",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1600.0001335144043,\r
-        "y": 451.00002098083496,\r
+        "x": 1588.0001335144043,\r
+        "y": 472.00002098083496,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "2d3714db.b7aad4"\r
+                "9174febc.b8b998"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d56fd4f.8da4ea",\r
+        "id": "25e7d332.a761fc",\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-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": 3861,\r
-        "y": 170,\r
+        "x": 3849,\r
+        "y": 191,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "119d7057.187e9",\r
+        "id": "fee47d9.4382e",\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.ts-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": 3942,\r
-        "y": 485,\r
+        "x": 3930,\r
+        "y": 506,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "a078109.a1f9bf",\r
-                "c205f5c4.0bdb88"\r
+                "445402d7.16a9f4",\r
+                "d34714f7.10a51"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a078109.a1f9bf",\r
+        "id": "445402d7.16a9f4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4251.5,\r
-        "y": 454,\r
+        "x": 4239.5,\r
+        "y": 475,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "3b38ca16.a7fb4e"\r
+                "69fb5a0d.27a12c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c205f5c4.0bdb88",\r
+        "id": "d34714f7.10a51",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4256.5,\r
-        "y": 519,\r
+        "x": 4244.5,\r
+        "y": 540,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "176e9242.258856"\r
+                "f0eccde.2c0533"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b38ca16.a7fb4e",\r
+        "id": "69fb5a0d.27a12c",\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": 4427.5,\r
-        "y": 454,\r
+        "x": 4415.5,\r
+        "y": 475,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "176e9242.258856",\r
+        "id": "f0eccde.2c0533",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4423,\r
-        "y": 519,\r
+        "x": 4411,\r
+        "y": 540,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ab834e.f483fcb",\r
+        "id": "a96cdedb.06ef48",\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='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",\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",\r
         "comments": "",\r
-        "x": 3808.5,\r
-        "y": 673,\r
+        "x": 3796.5,\r
+        "y": 694,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9d60073.e2df48",\r
+        "id": "616c98c7.f82ea8",\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": 3962.5,\r
-        "y": 721,\r
+        "x": 3950.5,\r
+        "y": 742,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "1e624148.f51b17",\r
-                "9b38443d.36a338"\r
+                "eef8ae3.fdd1a5",\r
+                "8f2e62b6.e98788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e624148.f51b17",\r
+        "id": "eef8ae3.fdd1a5",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4308,\r
-        "y": 702,\r
+        "x": 4296,\r
+        "y": 723,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "20712318.8d32fc"\r
+                "f08a069b.6042c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b38443d.36a338",\r
+        "id": "8f2e62b6.e98788",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4312,\r
-        "y": 742,\r
+        "x": 4300,\r
+        "y": 763,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "a4fdbce9.b1c4"\r
+                "b227b2c.229c1d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20712318.8d32fc",\r
+        "id": "f08a069b.6042c8",\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": 4466,\r
-        "y": 702,\r
+        "x": 4454,\r
+        "y": 723,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4fdbce9.b1c4",\r
+        "id": "b227b2c.229c1d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4469.5,\r
-        "y": 742,\r
+        "x": 4457.5,\r
+        "y": 763,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "f9579fb7.928158",\r
-                "b5483433.ff3288"\r
+                "2af71c81.1e5aec",\r
+                "5fe9896d.3d8e98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "320ccbea.c02274",\r
+        "id": "c5970f4b.9679a8",\r
         "type": "comment",\r
         "name": "TODO: FIXME:",\r
         "info": "put proper values based on connectivity resource retrieved from AAI",\r
         "comments": "",\r
-        "x": 3806,\r
-        "y": 629,\r
+        "x": 3794,\r
+        "y": 650,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f9579fb7.928158",\r
+        "id": "2af71c81.1e5aec",\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-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4800,\r
-        "y": 707,\r
+        "x": 4788,\r
+        "y": 728,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d3281524.0d8478",\r
+        "id": "48dd1ec4.51cb4",\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": 4664,\r
-        "y": 666,\r
+        "x": 4652,\r
+        "y": 687,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b5483433.ff3288",\r
+        "id": "5fe9896d.3d8e98",\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": 4727,\r
-        "y": 753,\r
+        "x": 4715,\r
+        "y": 774,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "5074df67.2ba988",\r
+        "id": "75d6c996.11aeb",\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": 3799,\r
-        "y": 218,\r
+        "x": 3787,\r
+        "y": 239,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9fd13730.014208",\r
+        "id": "c824ab5b.360f6",\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": 3825,\r
-        "y": 335,\r
+        "x": 3813,\r
+        "y": 356,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "e11a5ea7.685f28",\r
-                "6cb0b7a8.80c24",\r
-                "a90c44f8.bdb148"\r
+                "19cd8085.d8fca7",\r
+                "ff1311fc.28b29",\r
+                "929f1027.4a5828"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e11a5ea7.685f28",\r
+        "id": "19cd8085.d8fca7",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4020.5001220703125,\r
-        "y": 287,\r
+        "x": 4008.5001220703125,\r
+        "y": 308,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "dfb8903c.c1b1d8"\r
+                "a2185ea8.7f403"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cb0b7a8.80c24",\r
+        "id": "ff1311fc.28b29",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4012.5001220703125,\r
-        "y": 342,\r
+        "x": 4000.5001220703125,\r
+        "y": 363,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "509847ff.264c58"\r
+                "c3cea897.f88808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dfb8903c.c1b1d8",\r
+        "id": "a2185ea8.7f403",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4164.8824462890625,\r
-        "y": 286.6556701660156,\r
+        "x": 4152.8824462890625,\r
+        "y": 307.6556701660156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "22c6d630.71326a"\r
+                "eb7f6fc2.5f3468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e775dc4.42bfbc",\r
+        "id": "a0fa7da8.75192",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4747,\r
-        "y": 289,\r
+        "x": 4735,\r
+        "y": 310,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "f76a815f.36c178"\r
+                "809287e6.83f07"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "22c6d630.71326a",\r
+        "id": "eb7f6fc2.5f3468",\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": 4349,\r
-        "y": 285,\r
+        "x": 4337,\r
+        "y": 306,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "a3e1c0eb.9f5f88"\r
+                "21971ee2.f88962"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3e1c0eb.9f5f88",\r
+        "id": "21971ee2.f88962",\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": 4544,\r
-        "y": 285,\r
+        "x": 4532,\r
+        "y": 306,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "5e775dc4.42bfbc"\r
+                "a0fa7da8.75192"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a90c44f8.bdb148",\r
+        "id": "929f1027.4a5828",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4017.5001220703125,\r
-        "y": 399,\r
+        "x": 4005.5001220703125,\r
+        "y": 420,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "7a5f3123.aad6e8"\r
+                "5ece63ab.72534c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a5f3123.aad6e8",\r
+        "id": "5ece63ab.72534c",\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": 4169.5001220703125,\r
-        "y": 400,\r
+        "x": 4157.5001220703125,\r
+        "y": 421,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "509847ff.264c58",\r
+        "id": "c3cea897.f88808",\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": 4180.5001220703125,\r
-        "y": 343,\r
+        "x": 4168.5001220703125,\r
+        "y": 364,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4ab5c9a1.06e3f",\r
+        "id": "fd9485b.71b4af8",\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": 5132,\r
-        "y": 302,\r
+        "x": 5120,\r
+        "y": 323,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "73f9ea02.2fb1e4",\r
-                "f8008145.65a48",\r
-                "81ec8b7a.5856d8"\r
+                "12fe3fd6.ccef78",\r
+                "5cf62e0d.6aa85",\r
+                "156d902b.c3731"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f76a815f.36c178",\r
+        "id": "809287e6.83f07",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4926,\r
-        "y": 289,\r
+        "x": 4914,\r
+        "y": 310,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ba856b81.43ed78",\r
-                "4ab5c9a1.06e3f"\r
+                "a1955015.d4546",\r
+                "fd9485b.71b4af8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba856b81.43ed78",\r
+        "id": "a1955015.d4546",\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": 5162,\r
-        "y": 250,\r
+        "x": 5150,\r
+        "y": 271,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "73f9ea02.2fb1e4",\r
+        "id": "12fe3fd6.ccef78",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5342,\r
-        "y": 293,\r
+        "x": 5330,\r
+        "y": 314,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "5955dc9c.10f754"\r
+                "cc3a75a4.21fc7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f8008145.65a48",\r
+        "id": "5cf62e0d.6aa85",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5334,\r
-        "y": 348,\r
+        "x": 5322,\r
+        "y": 369,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "e3286b6.68c7618"\r
+                "bff3bfa.5f55cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81ec8b7a.5856d8",\r
+        "id": "156d902b.c3731",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5339,\r
-        "y": 405,\r
+        "x": 5327,\r
+        "y": 426,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ecd34f94.c447e"\r
+                "be590afe.7cc5a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ecd34f94.c447e",\r
+        "id": "be590afe.7cc5a8",\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": 5491,\r
-        "y": 406,\r
+        "x": 5479,\r
+        "y": 427,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e3286b6.68c7618",\r
+        "id": "bff3bfa.5f55cc",\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": 5502,\r
-        "y": 351,\r
+        "x": 5490,\r
+        "y": 372,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5955dc9c.10f754",\r
+        "id": "cc3a75a4.21fc7",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5486.38232421875,\r
-        "y": 290.6556701660156,\r
+        "x": 5474.38232421875,\r
+        "y": 311.6556701660156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "adf5d068.f7cc"\r
+                "665ad654.79ee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "adf5d068.f7cc",\r
+        "id": "665ad654.79ee8",\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": 5701,\r
-        "y": 287,\r
+        "x": 5689,\r
+        "y": 308,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3f28ac6.d30ed8",\r
+        "id": "e86e6571.913898",\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": 726,\r
-        "y": 464,\r
+        "x": 714,\r
+        "y": 485,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b8f0eb5.a171218",\r
+        "id": "27bc86e9.1c4e52",\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-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": 3841,\r
-        "y": 974,\r
+        "x": 3829,\r
+        "y": 995,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d94b849.7fdac78",\r
+        "id": "f8350413.ea8398",\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.ts-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": 3904,\r
-        "y": 1303,\r
+        "x": 3892,\r
+        "y": 1324,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "bfb79ead.715e28",\r
-                "d50b4560.d85de8"\r
+                "4e841df5.4d2d34",\r
+                "5e6f0ddb.0967b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bfb79ead.715e28",\r
+        "id": "4e841df5.4d2d34",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4199.5,\r
-        "y": 1270,\r
+        "x": 4187.5,\r
+        "y": 1291,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "3d3c3af3.12a3b6"\r
+                "8fb2eae.74bbb98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d50b4560.d85de8",\r
+        "id": "5e6f0ddb.0967b4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4204.5,\r
-        "y": 1335,\r
+        "x": 4192.5,\r
+        "y": 1356,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "347f5539.8f6cd2"\r
+                "9fef13b3.660c58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d3c3af3.12a3b6",\r
+        "id": "8fb2eae.74bbb98",\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": 4367.5,\r
-        "y": 1270,\r
+        "x": 4355.5,\r
+        "y": 1291,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "347f5539.8f6cd2",\r
+        "id": "9fef13b3.660c58",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4378,\r
-        "y": 1335,\r
+        "x": 4366,\r
+        "y": 1356,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7af2004a.23f66",\r
+        "id": "2fd670.86d5219",\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": 3780,\r
-        "y": 1031,\r
+        "x": 3768,\r
+        "y": 1052,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9e8fb92f.dc9c38",\r
+        "id": "8581969f.3e9f8",\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": 3800,\r
-        "y": 1128,\r
+        "x": 3788,\r
+        "y": 1149,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "3defc723.7feba8",\r
-                "92e9e56.6323798",\r
-                "92430372.354f08"\r
+                "3c9a5980.f5df5e",\r
+                "6737c173.340e3",\r
+                "68a240da.0733"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3defc723.7feba8",\r
+        "id": "3c9a5980.f5df5e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4002.5001220703125,\r
-        "y": 1081,\r
+        "x": 3990.5001220703125,\r
+        "y": 1102,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "38216362.304eb4"\r
+                "ea38c477.b7b2f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92e9e56.6323798",\r
+        "id": "6737c173.340e3",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3994.5001220703125,\r
-        "y": 1136,\r
+        "x": 3982.5001220703125,\r
+        "y": 1157,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "48eafe9b.93564"\r
+                "8bbc992f.718ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38216362.304eb4",\r
+        "id": "ea38c477.b7b2f",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4146.8824462890625,\r
-        "y": 1078.6556701660156,\r
+        "x": 4134.8824462890625,\r
+        "y": 1099.6556701660156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "5738b986.eff058"\r
+                "18cecfe3.6de9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5738b986.eff058",\r
+        "id": "18cecfe3.6de9e",\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": 4331,\r
-        "y": 1093,\r
+        "x": 4319,\r
+        "y": 1114,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "424cd2de.fa894c"\r
+                "68f9f038.67b62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92430372.354f08",\r
+        "id": "68a240da.0733",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3999.5001220703125,\r
-        "y": 1193,\r
+        "x": 3987.5001220703125,\r
+        "y": 1214,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "93dd1d01.b545d"\r
+                "20686ade.8b231e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93dd1d01.b545d",\r
+        "id": "20686ade.8b231e",\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": 4151.5001220703125,\r
-        "y": 1194,\r
+        "x": 4139.5001220703125,\r
+        "y": 1215,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "48eafe9b.93564",\r
+        "id": "8bbc992f.718ea",\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": 4162.5001220703125,\r
-        "y": 1139,\r
+        "x": 4150.5001220703125,\r
+        "y": 1160,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "38af15c1.7d84ba",\r
+        "id": "597aa62c.50d3c",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4729,\r
-        "y": 1097,\r
+        "x": 4717,\r
+        "y": 1118,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "d8eb3cd4.227208"\r
+                "e04d6fa3.eba9f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "424cd2de.fa894c",\r
+        "id": "68f9f038.67b62",\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": 4526,\r
-        "y": 1093,\r
+        "x": 4514,\r
+        "y": 1114,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "38af15c1.7d84ba"\r
+                "597aa62c.50d3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9c07a83.518f98",\r
+        "id": "2f50548b.6d0f1c",\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": 5114,\r
-        "y": 1096,\r
+        "x": 5102,\r
+        "y": 1117,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ef0c3c57.987338",\r
-                "56343453.6f0ce4",\r
-                "3b68871e.15bfe"\r
+                "a769e440.df581",\r
+                "a7207c49.d2bbc",\r
+                "1e0583ed.3bab5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8eb3cd4.227208",\r
+        "id": "e04d6fa3.eba9f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4906,\r
-        "y": 1089,\r
+        "x": 4894,\r
+        "y": 1110,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "f04e0884.6fcbb8",\r
-                "a9c07a83.518f98"\r
+                "eacacb80.08d4c",\r
+                "2f50548b.6d0f1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f04e0884.6fcbb8",\r
+        "id": "eacacb80.08d4c",\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": 5144,\r
-        "y": 1044,\r
+        "x": 5132,\r
+        "y": 1065,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b02d57da.181518",\r
+        "id": "61827e75.b97ad8",\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": 5473,\r
-        "y": 1200,\r
+        "x": 5461,\r
+        "y": 1221,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fed20348.5bb418",\r
+        "id": "b6c7c29b.5ee08",\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": 5484,\r
-        "y": 1145,\r
+        "x": 5472,\r
+        "y": 1166,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63aaed6a.7bdac4",\r
+        "id": "7c1b7b20.2d7bbc",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5468.38232421875,\r
-        "y": 1084.6556701660156,\r
+        "x": 5456.38232421875,\r
+        "y": 1105.6556701660156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "75824df.2d8fab4"\r
+                "9190ad56.af3378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75824df.2d8fab4",\r
+        "id": "9190ad56.af3378",\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": 5683,\r
-        "y": 1081,\r
+        "x": 5671,\r
+        "y": 1102,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ef0c3c57.987338",\r
+        "id": "a769e440.df581",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5324,\r
-        "y": 1087,\r
+        "x": 5312,\r
+        "y": 1108,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "63aaed6a.7bdac4"\r
+                "7c1b7b20.2d7bbc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56343453.6f0ce4",\r
+        "id": "a7207c49.d2bbc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5316,\r
-        "y": 1142,\r
+        "x": 5304,\r
+        "y": 1163,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "fed20348.5bb418"\r
+                "b6c7c29b.5ee08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b68871e.15bfe",\r
+        "id": "1e0583ed.3bab5c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5321,\r
-        "y": 1199,\r
+        "x": 5309,\r
+        "y": 1220,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "b02d57da.181518"\r
+                "61827e75.b97ad8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d3714db.b7aad4",\r
+        "id": "9174febc.b8b998",\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": 1838,\r
-        "y": 453,\r
+        "x": 1826,\r
+        "y": 474,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ff6cd3bd.d426f",\r
-                "64ede831.c277d",\r
-                "c3e64c55.d790f8"\r
+                "c96ce0ff.9fbaf8",\r
+                "96dddcba.eaaec8",\r
+                "4ccaabcc.f5bb34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff6cd3bd.d426f",\r
+        "id": "c96ce0ff.9fbaf8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2046,\r
-        "y": 417,\r
+        "x": 2034,\r
+        "y": 438,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ab398477.a58648"\r
+                "5281d926.1c9dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64ede831.c277d",\r
+        "id": "96dddcba.eaaec8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2046.490966796875,\r
-        "y": 462.57403564453125,\r
+        "x": 2034.490966796875,\r
+        "y": 483.57403564453125,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "575d4e0a.5d761"\r
+                "50a19d40.768324"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3e64c55.d790f8",\r
+        "id": "4ccaabcc.f5bb34",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2044,\r
-        "y": 506,\r
+        "x": 2032,\r
+        "y": 527,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "b99b7bb3.94d958"\r
+                "ffedf4ef.62de2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "575d4e0a.5d761",\r
+        "id": "50a19d40.768324",\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": 2209.0623779296875,\r
-        "y": 462.8597717285156,\r
+        "x": 2197.0623779296875,\r
+        "y": 483.8597717285156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b99b7bb3.94d958",\r
+        "id": "ffedf4ef.62de2",\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": 2213,\r
-        "y": 507,\r
+        "x": 2201,\r
+        "y": 528,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "684f9a1f.f6246c",\r
+        "id": "113dd07d.86f868",\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": 2519,\r
-        "y": 506,\r
+        "x": 2507,\r
+        "y": 527,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "7a997c1a.ca4d0c",\r
-                "5d76d89f.d221e",\r
-                "d47edd7.a73b9a"\r
+                "2b6a4b71.479d3c",\r
+                "34c32e6f.a9d052",\r
+                "c2c66c33.7e24d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11f43428.ee3774",\r
+        "id": "7a40580d.1d5388",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2903,\r
-        "y": 506,\r
+        "x": 2891,\r
+        "y": 527,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "9d8c4947.e731c",\r
-                "a3bb6162.8aa1a8"\r
+                "eeee2acf.9c0ba8",\r
+                "57847c7b.2f3dbc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a997c1a.ca4d0c",\r
+        "id": "2b6a4b71.479d3c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2730,\r
-        "y": 508,\r
+        "x": 2718,\r
+        "y": 529,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "11f43428.ee3774"\r
+                "7a40580d.1d5388"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d76d89f.d221e",\r
+        "id": "34c32e6f.a9d052",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2730.490966796875,\r
-        "y": 553.5740356445312,\r
+        "x": 2718.490966796875,\r
+        "y": 574.5740356445312,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "38cca479.139cac"\r
+                "17c937f3.281d28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d47edd7.a73b9a",\r
+        "id": "c2c66c33.7e24d",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2728,\r
-        "y": 597,\r
+        "x": 2716,\r
+        "y": 618,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "3c7730a0.80743"\r
+                "45484d04.351e94"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3c7730a0.80743",\r
+        "id": "45484d04.351e94",\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": 2895,\r
-        "y": 596,\r
+        "x": 2883,\r
+        "y": 617,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "38cca479.139cac",\r
+        "id": "17c937f3.281d28",\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": 2893.0623779296875,\r
-        "y": 553.8597717285156,\r
+        "x": 2881.0623779296875,\r
+        "y": 574.8597717285156,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab398477.a58648",\r
+        "id": "5281d926.1c9dd",\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": 2247,\r
-        "y": 412,\r
+        "x": 2235,\r
+        "y": 433,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "32748804.ce58a"\r
+                "24c8cf8c.d35f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32748804.ce58a",\r
+        "id": "24c8cf8c.d35f5",\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": 2452,\r
-        "y": 412,\r
+        "x": 2440,\r
+        "y": 433,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "41c73b96.f41a84"\r
+                "ffd8562e.6c7ab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41c73b96.f41a84",\r
+        "id": "ffd8562e.6c7ab",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2618,\r
-        "y": 412,\r
+        "x": 2606,\r
+        "y": 433,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "cfeba90.49ffe58"\r
+                "1639e360.7db745"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cfeba90.49ffe58",\r
+        "id": "1639e360.7db745",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2781,\r
-        "y": 412,\r
+        "x": 2769,\r
+        "y": 433,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "684f9a1f.f6246c",\r
-                "b9f32cf4.c94178"\r
+                "113dd07d.86f868",\r
+                "b864657f.9c5a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d8c4947.e731c",\r
+        "id": "eeee2acf.9c0ba8",\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": 3157,\r
-        "y": 505,\r
+        "x": 3145,\r
+        "y": 526,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "c705e3fd.e27bf",\r
-                "74e33b9a.6a3ba4"\r
+                "888039c0.be2748",\r
+                "40c5843d.11f78c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c705e3fd.e27bf",\r
+        "id": "888039c0.be2748",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3410,\r
-        "y": 539,\r
+        "x": 3398,\r
+        "y": 560,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ab5b6203.69a998"\r
+                "d751d093.92a62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74e33b9a.6a3ba4",\r
+        "id": "40c5843d.11f78c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3410,\r
-        "y": 483,\r
+        "x": 3398,\r
+        "y": 504,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "7b04fd35.ba570c"\r
+                "ddefc1a3.6644c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab5b6203.69a998",\r
+        "id": "d751d093.92a62",\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": 3149,\r
-        "y": 1325,\r
+        "x": 3137,\r
+        "y": 1346,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "15797e4.5eae102",\r
-                "55009f8b.9fdc5"\r
+                "b9609f04.c7afe8",\r
+                "28e97c84.2c5ab4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15797e4.5eae102",\r
+        "id": "b9609f04.c7afe8",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3402,\r
-        "y": 1359,\r
+        "x": 3390,\r
+        "y": 1380,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "4151c132.8e3c28"\r
+                "ee3de09a.383318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55009f8b.9fdc5",\r
+        "id": "28e97c84.2c5ab4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3402,\r
-        "y": 1303,\r
+        "x": 3390,\r
+        "y": 1324,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "db74d7f2.74d0f8"\r
+                "b80c5827.1a79a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4151c132.8e3c28",\r
+        "id": "ee3de09a.383318",\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": 3553,\r
-        "y": 1359,\r
+        "x": 3541,\r
+        "y": 1380,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad6a538e.8b5998",\r
+        "id": "8527e1fa.cc6b4",\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": 3856,\r
-        "y": 110,\r
+        "x": 3844,\r
+        "y": 131,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "51807068.f4c68",\r
+        "id": "615fdc8e.20c4e4",\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": 3837,\r
-        "y": 916,\r
+        "x": 3825,\r
+        "y": 937,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7b04fd35.ba570c",\r
+        "id": "ddefc1a3.6644c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3578,\r
-        "y": 485,\r
+        "x": 3566,\r
+        "y": 506,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "ad6a538e.8b5998",\r
-                "3d56fd4f.8da4ea",\r
-                "5074df67.2ba988",\r
-                "9fd13730.014208",\r
-                "ab834e.f483fcb",\r
-                "c9d60073.e2df48",\r
-                "119d7057.187e9"\r
+                "8527e1fa.cc6b4",\r
+                "25e7d332.a761fc",\r
+                "75d6c996.11aeb",\r
+                "c824ab5b.360f6",\r
+                "a96cdedb.06ef48",\r
+                "616c98c7.f82ea8",\r
+                "fee47d9.4382e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db74d7f2.74d0f8",\r
+        "id": "b80c5827.1a79a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3553,\r
-        "y": 1302,\r
+        "x": 3541,\r
+        "y": 1323,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "51807068.f4c68",\r
-                "b8f0eb5.a171218",\r
-                "7af2004a.23f66",\r
-                "9e8fb92f.dc9c38",\r
-                "d94b849.7fdac78",\r
-                "f91c20c6.244a28",\r
-                "158d95b4.dbf02a"\r
+                "615fdc8e.20c4e4",\r
+                "27bc86e9.1c4e52",\r
+                "2fd670.86d5219",\r
+                "8581969f.3e9f8",\r
+                "f8350413.ea8398",\r
+                "96b5aedc.4196d",\r
+                "e2e659bb.42dea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f91c20c6.244a28",\r
+        "id": "96b5aedc.4196d",\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='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",\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",\r
         "comments": "",\r
-        "x": 3782,\r
-        "y": 1445,\r
+        "x": 3770,\r
+        "y": 1466,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "158d95b4.dbf02a",\r
+        "id": "e2e659bb.42dea",\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": 3936,\r
-        "y": 1493,\r
+        "x": 3924,\r
+        "y": 1514,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "7e8ddb70.effbcc",\r
-                "8eaa1ef7.3644e"\r
+                "a28581db.fa7cb",\r
+                "a3f78a52.db8928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e8ddb70.effbcc",\r
+        "id": "a28581db.fa7cb",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4281.5,\r
-        "y": 1474,\r
+        "x": 4269.5,\r
+        "y": 1495,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "596967d4.0f4de8"\r
+                "14523534.ce6de3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8eaa1ef7.3644e",\r
+        "id": "a3f78a52.db8928",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4285.5,\r
-        "y": 1514,\r
+        "x": 4273.5,\r
+        "y": 1535,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "4f294e9d.697c08"\r
+                "2e9384b8.e29014"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "596967d4.0f4de8",\r
+        "id": "14523534.ce6de3",\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": 4439.5,\r
-        "y": 1474,\r
+        "x": 4427.5,\r
+        "y": 1495,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4f294e9d.697c08",\r
+        "id": "2e9384b8.e29014",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4443,\r
-        "y": 1514,\r
+        "x": 4431,\r
+        "y": 1535,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             [\r
-                "637a80dd.df05",\r
-                "d2c33ee2.7a3708"\r
+                "b54e7482.e242c8",\r
+                "df1f167a.857918"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78a845.7bb187bc",\r
+        "id": "364ac531.cfcb5a",\r
         "type": "comment",\r
         "name": "TODO: FIXME:",\r
         "info": "put proper values based on connectivity resource retrieved from AAI",\r
         "comments": "",\r
-        "x": 3779.5,\r
-        "y": 1401,\r
+        "x": 3767.5,\r
+        "y": 1422,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "637a80dd.df05",\r
+        "id": "b54e7482.e242c8",\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-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4783,\r
-        "y": 1513,\r
+        "x": 4771,\r
+        "y": 1534,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "88ec2f6d.8d5da",\r
+        "id": "68be1db9.7e03ec",\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": 4641,\r
-        "y": 1471,\r
+        "x": 4629,\r
+        "y": 1492,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2c33ee2.7a3708",\r
+        "id": "df1f167a.857918",\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": 4712,\r
-        "y": 1562,\r
+        "x": 4700,\r
+        "y": 1583,\r
         "z": "8a9c455f.82beb8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a3bb6162.8aa1a8",\r
+        "id": "57847c7b.2f3dbc",\r
         "type": "set",\r
         "name": "set attachment_param for OTN",\r
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
         "comments": "",\r
-        "x": 3144,\r
-        "y": 411,\r
+        "x": 3132,\r
+        "y": 432,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b9f32cf4.c94178",\r
+        "id": "b864657f.9c5a",\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": 2965,\r
-        "y": 283,\r
+        "x": 2953,\r
+        "y": 304,\r
         "z": "8a9c455f.82beb8",\r
         "wires": []\r
     }\r