X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Ftrans_slicing%2FGENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json;h=5d150f6ba4370e8b40922df60bfba239bab0e6c2;hb=9c49bf5a112d96f17cfff475bb61c5e99046a242;hp=a1b68a691a5e24c42e822c8749302ce9de5a98fd;hpb=e07cb63566934236cc1574bc3ae8ae165b664107;p=sdnc%2Foam.git

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