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=02a760d5b0c76a93e08e196a695f0c5c57306c42;hb=2b6f24fe23ac60d0d9cf885687bf9786bc521ec1;hp=669eca8d1dbc3f74298f6991f6e563b3cff66b21;hpb=67331673496db788f450b8a3acfc8f268ded354f;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 669eca8d..02a760d5 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": "c95751e3.8ae788",
+        "id": "acf9e544.d632d8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 133,
-        "y": 58,
-        "z": "978d88fe.49f858",
+        "x": 130,
+        "y": 80,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "a120d0c2.d16848"
+                "ca913714.8e299"
             ]
         ]
     },
     {
-        "id": "a120d0c2.d16848",
+        "id": "ca913714.8e299",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1663 +22,2326 @@
         "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": 264.2856903076172,
-        "y": 107.23810863494873,
-        "z": "978d88fe.49f858",
+        "x": 261.2856903076172,
+        "y": 129.23810863494873,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "e3f08946.3b4f3"
+                "fb417168.600308"
             ]
         ]
     },
     {
-        "id": "e3f08946.3b4f3",
+        "id": "fb417168.600308",
         "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": 267.4286193847656,
-        "y": 192.00003242492676,
-        "z": "978d88fe.49f858",
+        "x": 264.4286193847656,
+        "y": 214.00003242492676,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "da15bb94.f35d78"
+                "b8f0421e.565ff8"
             ]
         ]
     },
     {
-        "id": "da15bb94.f35d78",
+        "id": "b8f0421e.565ff8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 417.238037109375,
-        "y": 321.6666564941406,
-        "z": "978d88fe.49f858",
+        "x": 414.238037109375,
+        "y": 343.6666564941406,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "a0613c64.0d3d18",
-                "bec74808.bd7fc8",
-                "6e589ca9.47c63c",
-                "a8ba9960.6cb65",
-                "d40da373.f15598",
-                "358d1f62.e4f2c8",
-                "a739ea85.93c65",
-                "19a0d774.67fb01"
+                "77ab8d82.d7040c",
+                "161b3712.e40a99",
+                "441438f3.47d108"
             ]
         ]
     },
     {
-        "id": "a0613c64.0d3d18",
-        "type": "set",
-        "name": "set vnf-level-oper-status to Active",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",
+        "id": "77ab8d82.d7040c",
+        "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": 760.3849563598633,
-        "y": 558.6705458434299,
-        "z": "978d88fe.49f858",
+        "x": 682.5716552734375,
+        "y": 730.59716796875,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "bec74808.bd7fc8",
-        "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",
+        "id": "cd3b0e66.721858",
+        "type": "comment",
+        "name": "new for TransportSlicing",
+        "info": "",
         "comments": "",
-        "x": 687.5716552734375,
-        "y": 1430.59716796875,
-        "z": "978d88fe.49f858",
+        "x": 714,
+        "y": 405,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "6e589ca9.47c63c",
-        "type": "set",
-        "name": "set vnf-index and vnf-object-path",
-        "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",
+        "id": "161b3712.e40a99",
+        "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": "",
-        "x": 766.5716018676758,
-        "y": 506.5968001158908,
-        "z": "978d88fe.49f858",
+        "outputs": 1,
+        "x": 734,
+        "y": 501,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "a50bfd24.6ac44",
+                "3bd3a68e.896b3a",
+                "320764b6.9fa15c"
+            ]
+        ]
+    },
+    {
+        "id": "a50bfd24.6ac44",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 953,
+        "y": 439,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "b122e042.5ab94"
+            ]
+        ]
+    },
+    {
+        "id": "3bd3a68e.896b3a",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 962.490966796875,
+        "y": 481.57403564453125,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "4e666373.42b6cc"
+            ]
+        ]
+    },
+    {
+        "id": "320764b6.9fa15c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 951,
+        "y": 528,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "422b64b3.e06004"
+            ]
+        ]
+    },
+    {
+        "id": "4e666373.42b6cc",
+        "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": 1116.0623779296875,
+        "y": 484.8597717285156,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "422b64b3.e06004",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 1120,
+        "y": 529,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "a8ba9960.6cb65",
+        "id": "b122e042.5ab94",
+        "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": 1150,
+        "y": 435,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "111942fe.354315"
+            ]
+        ]
+    },
+    {
+        "id": "111942fe.354315",
         "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 775,
-        "y": 261,
-        "z": "978d88fe.49f858",
+        "x": 1373.33349609375,
+        "y": 434.99993896484375,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "752da5f3.b4cc4c",
-                "b945aefb.e762f",
-                "8cef6bde.bc7818"
+                "ff15f851.7a7528"
             ]
         ]
     },
     {
-        "id": "8cef6bde.bc7818",
+        "id": "ff15f851.7a7528",
         "type": "outcome",
-        "name": "0",
-        "xml": "<outcome value='0'>\n",
+        "name": "connectivity",
+        "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1167.968994140625,
-        "y": 226.96875,
-        "z": "978d88fe.49f858",
+        "x": 1574.0001335144043,
+        "y": 436.00002098083496,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "5417fb2d.edce0c"
+                "cf901b65.835fc8"
             ]
         ]
     },
     {
-        "id": "5417fb2d.edce0c",
+        "id": "72376cd1.cdcaec",
+        "type": "set",
+        "name": "set attachment_param for OTN A",
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
+        "comments": "",
+        "x": 4393,
+        "y": 152,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "2a89aa53.8890b6",
+        "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": 4474,
+        "y": 467,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "40316706.17eb48",
+                "6c473f1b.946a08"
+            ]
+        ]
+    },
+    {
+        "id": "40316706.17eb48",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4783.5,
+        "y": 436,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "aea69973.33e85"
+            ]
+        ]
+    },
+    {
+        "id": "6c473f1b.946a08",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4788.5,
+        "y": 501,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "d21a082d.2cad68"
+            ]
+        ]
+    },
+    {
+        "id": "aea69973.33e85",
         "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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
+        "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": 1322.7778816223145,
-        "y": 245.889018535614,
-        "z": "978d88fe.49f858",
+        "x": 4959.5,
+        "y": 436,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "752da5f3.b4cc4c",
-        "type": "other",
-        "name": "Null",
-        "xml": "<outcome value=''>\n",
+        "id": "d21a082d.2cad68",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4955,
+        "y": 501,
+        "z": "4996e636.3ea08",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "de94f6d4.eda0e",
+        "type": "set",
+        "name": "set sotn_value",
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
+        "comments": "",
+        "x": 4340.5,
+        "y": 655,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "342bfbf3.ee642c",
+        "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": 1161.0001335144043,
-        "y": 266.00007152557373,
-        "z": "978d88fe.49f858",
+        "x": 4494.5,
+        "y": 703,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "5417fb2d.edce0c"
+                "8236b8ec.5fd17",
+                "51c5e2c3.871744"
             ]
         ]
     },
     {
-        "id": "b945aefb.e762f",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "8236b8ec.5fd17",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4840,
+        "y": 684,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "b89e8953.c6ac88"
+            ]
+        ]
+    },
+    {
+        "id": "51c5e2c3.871744",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1154.0005416870117,
-        "y": 299.000075340271,
-        "z": "978d88fe.49f858",
+        "x": 4844,
+        "y": 724,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "39deabe9.dfa46c"
+                "933ba47e.14e65"
             ]
         ]
     },
     {
-        "id": "39deabe9.dfa46c",
+        "id": "b89e8953.c6ac88",
+        "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": 4998,
+        "y": 684,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "933ba47e.14e65",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
+        "comments": "",
         "outputs": 1,
-        "x": 1301.2700843811035,
-        "y": 299.5547204017639,
-        "z": "978d88fe.49f858",
+        "x": 5001.5,
+        "y": 724,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "ffe0cb12.24663"
+                "363131ab.be28b6",
+                "fcee3485.dea4a"
             ]
         ]
     },
     {
-        "id": "ffe0cb12.24663",
-        "type": "for",
-        "name": "for vidx..service-data.vnfs.vnf_length[]",
-        "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+        "id": "776cbd7.844f0c4",
+        "type": "comment",
+        "name": "TODO: FIXME:",
+        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "comments": "",
+        "x": 4338,
+        "y": 611,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "363131ab.be28b6",
+        "type": "save",
+        "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5332,
+        "y": 689,
+        "z": "4996e636.3ea08",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d8ba5ee6.a5736",
+        "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": 5196,
+        "y": 648,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "fcee3485.dea4a",
+        "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": 5259,
+        "y": 735,
+        "z": "4996e636.3ea08",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9b9c3cba.716c78",
+        "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": 4331,
+        "y": 200,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "5f8cf8c6.3002c8",
+        "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": 4357,
+        "y": 317,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "33823e1a.9269c2",
+                "b38b9e38.f8c8a8",
+                "9f21383a.68cb9"
+            ]
+        ]
+    },
+    {
+        "id": "33823e1a.9269c2",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4552.5001220703125,
+        "y": 269,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "755b5bf3.347744"
+            ]
+        ]
+    },
+    {
+        "id": "b38b9e38.f8c8a8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1547.2862014770508,
-        "y": 306.42864084243774,
-        "z": "978d88fe.49f858",
+        "x": 4544.5001220703125,
+        "y": 324,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d581e614.41ca28"
+                "5d1291bc.3b9d5"
             ]
         ]
     },
     {
-        "id": "d581e614.41ca28",
+        "id": "755b5bf3.347744",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1766.6358337402344,
-        "y": 305.96872091293335,
-        "z": "978d88fe.49f858",
+        "x": 4696.8824462890625,
+        "y": 268.6556701660156,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "5007d6bb.a571d"
+            ]
+        ]
+    },
+    {
+        "id": "c0da9575.eb2c6",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5279,
+        "y": 271,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "1053f3a3.2846c4"
+            ]
+        ]
+    },
+    {
+        "id": "5007d6bb.a571d",
+        "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": 4881,
+        "y": 267,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "6cb341ea.d215b"
+                "33b94d0d.c61ee2"
             ]
         ]
     },
     {
-        "id": "6cb341ea.d215b",
+        "id": "33b94d0d.c61ee2",
         "type": "switchNode",
-        "name": "switch vnfid found",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1920.715431213379,
-        "y": 305.67880296707153,
-        "z": "978d88fe.49f858",
+        "x": 5076,
+        "y": 267,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "7e8f8e16.82297"
+                "c0da9575.eb2c6"
             ]
         ]
     },
     {
-        "id": "7e8f8e16.82297",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "9f21383a.68cb9",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4549.5001220703125,
+        "y": 381,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "e621d08a.7d07a8"
+            ]
+        ]
+    },
+    {
+        "id": "e621d08a.7d07a8",
+        "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": 4701.5001220703125,
+        "y": 382,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "5d1291bc.3b9d5",
+        "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": 4712.5001220703125,
+        "y": 325,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "bace4f35.dcb4f",
+        "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": 5664,
+        "y": 284,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "41428f.b99c7d7",
+                "92b16ebc.198be8",
+                "47593c0a.609b2c"
+            ]
+        ]
+    },
+    {
+        "id": "1053f3a3.2846c4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5458,
+        "y": 271,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "db2fdd1f.f44e1",
+                "bace4f35.dcb4f"
+            ]
+        ]
+    },
+    {
+        "id": "db2fdd1f.f44e1",
+        "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": 5694,
+        "y": 232,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "41428f.b99c7d7",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5874,
+        "y": 275,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "d8c57966.bba2b8"
+            ]
+        ]
+    },
+    {
+        "id": "92b16ebc.198be8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5866,
+        "y": 330,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "bbecf65b.0991f"
+            ]
+        ]
+    },
+    {
+        "id": "47593c0a.609b2c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5871,
+        "y": 387,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "17aa566c.ce27ba"
+            ]
+        ]
+    },
+    {
+        "id": "17aa566c.ce27ba",
+        "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": 6023,
+        "y": 388,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "bbecf65b.0991f",
+        "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": 6034,
+        "y": 333,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "d8c57966.bba2b8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2131.6675758361816,
-        "y": 308.571494102478,
-        "z": "978d88fe.49f858",
+        "x": 6018.38232421875,
+        "y": 272.6556701660156,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "1efc1703.0b69f1"
+                "eeaaed9f.46288"
             ]
         ]
     },
     {
-        "id": "1efc1703.0b69f1",
+        "id": "eeaaed9f.46288",
         "type": "set",
-        "name": "set tmp.vidx and ctx.vnf-data",
-        "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",
+        "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": 2341.199951171875,
-        "y": 310.32159423828125,
-        "z": "978d88fe.49f858",
+        "x": 6233,
+        "y": 269,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "d40da373.f15598",
-        "type": "save",
-        "name": "update AnAI - vnf-instance.orchestration-status",
-        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"Active\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",
+        "id": "441438f3.47d108",
+        "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": 785.9999618530273,
-        "y": 625.0103714736179,
-        "z": "978d88fe.49f858",
+        "x": 700,
+        "y": 449,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "358d1f62.e4f2c8",
+        "id": "48e88b1.fd2c9f4",
         "type": "set",
-        "name": "copy input data to service data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",
+        "name": "set attachment_param for OTN B",
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
-        "x": 765.0000762939453,
-        "y": 456.01033284980804,
-        "z": "978d88fe.49f858",
+        "x": 3800,
+        "y": 1609,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "a739ea85.93c65",
-        "type": "switchNode",
-        "name": "switch vnf-level-oper-status",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
+        "id": "46863424.f49acc",
+        "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": 751.7499389648438,
-        "y": 361.00390270072967,
-        "z": "978d88fe.49f858",
+        "x": 3863,
+        "y": 1938,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "c40ac9fb.21106",
-                "625ef5e9.0fa304"
+                "dcc57379.86dfe8",
+                "c898077c.fa069"
             ]
         ]
     },
     {
-        "id": "c40ac9fb.21106",
-        "type": "outcome",
-        "name": "outcome Created",
-        "xml": "<outcome value='Created'>\n",
+        "id": "dcc57379.86dfe8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1131.5833320617676,
-        "y": 366.1149909766391,
-        "z": "978d88fe.49f858",
+        "x": 4158.5,
+        "y": 1905,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "50da061e.3d2a4"
+                "abcd166d.ac4418"
             ]
         ]
     },
     {
-        "id": "625ef5e9.0fa304",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "c898077c.fa069",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1109.583351135254,
-        "y": 416.1150024207309,
-        "z": "978d88fe.49f858",
+        "x": 4163.5,
+        "y": 1970,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "9d9a6d0b.f63a18"
+                "a337c775.425078"
             ]
         ]
     },
     {
-        "id": "9d9a6d0b.f63a18",
+        "id": "abcd166d.ac4418",
         "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=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
+        "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": 1269.0831184387207,
-        "y": 419.1150014670566,
-        "z": "978d88fe.49f858",
+        "x": 4326.5,
+        "y": 1905,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "50da061e.3d2a4",
+        "id": "a337c775.425078",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
+        "comments": "",
         "outputs": 1,
-        "x": 1341.889705657959,
-        "y": 377.44016626197845,
-        "z": "978d88fe.49f858",
+        "x": 4337,
+        "y": 1970,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a49c1a1.74cca",
-        "type": "comment",
-        "name": "new for TransportSlicing",
-        "info": "",
+        "id": "402d5da7.084ecc",
+        "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": 726,
-        "y": 699,
-        "z": "978d88fe.49f858",
+        "x": 3739,
+        "y": 1666,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "19a0d774.67fb01",
-        "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.service-information.service-instance-id\n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">",
+        "id": "600572d7.37f4f4",
+        "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": 737,
-        "y": 749,
-        "z": "978d88fe.49f858",
+        "x": 3759,
+        "y": 1763,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "ef923a7d.6928a8",
-                "981c314b.31ecb8",
-                "65818037.104038"
+                "a75ca9d.3439f58",
+                "399b40eb.8cb2c",
+                "c23ae6cb.c49a18"
             ]
         ]
     },
     {
-        "id": "ef923a7d.6928a8",
+        "id": "a75ca9d.3439f58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 953,
-        "y": 714,
-        "z": "978d88fe.49f858",
+        "x": 3961.5001220703125,
+        "y": 1716,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "c4da4ce2.e86fd"
+                "7c251cdc.702f24"
             ]
         ]
     },
     {
-        "id": "981c314b.31ecb8",
+        "id": "399b40eb.8cb2c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 962.490966796875,
-        "y": 756.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 3953.5001220703125,
+        "y": 1771,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "2c51a746.8529b8"
+                "9ad884c8.666098"
             ]
         ]
     },
     {
-        "id": "65818037.104038",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "7c251cdc.702f24",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 951,
-        "y": 803,
-        "z": "978d88fe.49f858",
+        "x": 4105.8824462890625,
+        "y": 1713.6556701660156,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "cb9eeb5b.e8a49"
+            ]
+        ]
+    },
+    {
+        "id": "cb9eeb5b.e8a49",
+        "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": 4290,
+        "y": 1728,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "3d062c6c.6ff5d4"
+            ]
+        ]
+    },
+    {
+        "id": "c23ae6cb.c49a18",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3958.5001220703125,
+        "y": 1828,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "11f3085c.6c3b58"
+                "c325aab2.4755e"
             ]
         ]
     },
     {
-        "id": "2c51a746.8529b8",
+        "id": "c325aab2.4755e",
         "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",
+        "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": 1116.0623779296875,
-        "y": 759.8597717285156,
-        "z": "978d88fe.49f858",
+        "x": 4110.5001220703125,
+        "y": 1829,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "11f3085c.6c3b58",
+        "id": "9ad884c8.666098",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "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": 1120,
-        "y": 804,
-        "z": "978d88fe.49f858",
+        "x": 4121.5001220703125,
+        "y": 1774,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "c4da4ce2.e86fd",
-        "type": "for",
-        "name": "for each relationship",
-        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
+        "id": "34bca75e.e09988",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1150,
-        "y": 710,
-        "z": "978d88fe.49f858",
+        "x": 4688,
+        "y": 1732,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "eb26c03f.cde3a"
+                "edc0cd69.586d38"
             ]
         ]
     },
     {
-        "id": "eb26c03f.cde3a",
+        "id": "3d062c6c.6ff5d4",
         "type": "switchNode",
         "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
+        "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1373.33349609375,
-        "y": 709.9999389648438,
-        "z": "978d88fe.49f858",
+        "x": 4485,
+        "y": 1728,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "b65d7d38.16fc68"
+                "34bca75e.e09988"
             ]
         ]
     },
     {
-        "id": "b65d7d38.16fc68",
-        "type": "outcome",
-        "name": "connectivity",
-        "xml": "<outcome value='connectivity'>\n",
+        "id": "f5373d88.e0f4c",
+        "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": 1574.0001335144043,
-        "y": 711.000020980835,
-        "z": "978d88fe.49f858",
+        "x": 5073,
+        "y": 1731,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "fda5561b.cca698"
+                "efe05c93.e4bd48",
+                "c004c915.8de7",
+                "8875f4b.bcb6f88"
             ]
         ]
     },
     {
-        "id": "edc6ee23.1891a",
-        "type": "save",
-        "name": "get connectivityA 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[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityA\" >\n",
+        "id": "edc0cd69.586d38",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4865,
+        "y": 1724,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "bd388c7d.2a51e",
+                "f5373d88.e0f4c"
+            ]
+        ]
+    },
+    {
+        "id": "bd388c7d.2a51e",
+        "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": 5103,
+        "y": 1679,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "c54d67f1.3a38c8",
+        "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": 5432,
+        "y": 1835,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "56448bab.caa82c",
+        "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": 5443,
+        "y": 1780,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "97f3ba34.f2dc7",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2179,
-        "y": 599,
-        "z": "978d88fe.49f858",
+        "x": 5427.38232421875,
+        "y": 1719.6556701660156,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "81d6e319.abfd8",
-                "313c36d7.969d3a",
-                "3d5cf6f2.953e9a"
+                "5b487de9.7c9484"
             ]
         ]
     },
     {
-        "id": "fda5561b.cca698",
-        "type": "switchNode",
-        "name": "switch $rel-index == 0",
-        "xml": "<switch test=\"`$rel-index == 0`\">\n\n",
+        "id": "5b487de9.7c9484",
+        "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": 5642,
+        "y": 1716,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "efe05c93.e4bd48",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1762,
-        "y": 709,
-        "z": "978d88fe.49f858",
+        "x": 5283,
+        "y": 1722,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "44bd1b.3cc782e4",
-                "f85fb605.a76398"
+                "97f3ba34.f2dc7"
             ]
         ]
     },
     {
-        "id": "44bd1b.3cc782e4",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "c004c915.8de7",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1985,
-        "y": 599,
-        "z": "978d88fe.49f858",
+        "x": 5275,
+        "y": 1777,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "edc6ee23.1891a"
+                "56448bab.caa82c"
             ]
         ]
     },
     {
-        "id": "f85fb605.a76398",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "8875f4b.bcb6f88",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1971,
-        "y": 1156,
-        "z": "978d88fe.49f858",
+        "x": 5280,
+        "y": 1834,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "7b60b790.bc4c4"
+                "c54d67f1.3a38c8"
             ]
         ]
     },
     {
-        "id": "7b60b790.bc4c4",
+        "id": "cf901b65.835fc8",
         "type": "save",
-        "name": "get connectivityB 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[1].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityB\" >\n",
+        "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": 2167,
-        "y": 1156,
-        "z": "978d88fe.49f858",
+        "x": 1812,
+        "y": 438,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "8b96b70e.2f635",
-                "20f5c9d8.832b4e",
-                "f513c25.b78554"
+                "a3e158df.aec638",
+                "28bc0271.0f9e9e",
+                "12a8a0b5.4084c7"
             ]
         ]
     },
     {
-        "id": "81d6e319.abfd8",
+        "id": "a3e158df.aec638",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2385,
-        "y": 559,
-        "z": "978d88fe.49f858",
+        "x": 2020,
+        "y": 402,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "98b1c0b9.f7f4b"
+                "8651df9.9efa52"
             ]
         ]
     },
     {
-        "id": "313c36d7.969d3a",
+        "id": "28bc0271.0f9e9e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2385.490966796875,
-        "y": 604.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 2020.490966796875,
+        "y": 447.57403564453125,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d4d990d4.f7b0a8"
+                "b3859ee9.a63778"
             ]
         ]
     },
     {
-        "id": "3d5cf6f2.953e9a",
+        "id": "12a8a0b5.4084c7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2383,
-        "y": 648,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "97be5e5a.798428"
-            ]
-        ]
-    },
-    {
-        "id": "98b1c0b9.f7f4b",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2557.66650390625,
-        "y": 558,
-        "z": "978d88fe.49f858",
+        "x": 2018,
+        "y": 491,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "2d415746.a7be9",
-                "96d25665.97a75",
-                "2f11d14a.7d5856",
-                "d0c66bee.225358"
+                "b1a3023.979458"
             ]
         ]
     },
     {
-        "id": "d4d990d4.f7b0a8",
+        "id": "b3859ee9.a63778",
         "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": 2548.0623779296875,
-        "y": 604.8597717285156,
-        "z": "978d88fe.49f858",
+        "x": 2183.0623779296875,
+        "y": 447.8597717285156,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "97be5e5a.798428",
+        "id": "b1a3023.979458",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2552,
-        "y": 649,
-        "z": "978d88fe.49f858",
+        "x": 2187,
+        "y": 492,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "8b96b70e.2f635",
+        "id": "e921a3d6.75f8b8",
+        "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": 2493,
+        "y": 491,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "19de242e.79b56c",
+                "e1533c2.9fadc4",
+                "da41548.4c59da8"
+            ]
+        ]
+    },
+    {
+        "id": "108df7f5.f0405",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2873,
+        "y": 579,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "19520422.b45d4c"
+            ]
+        ]
+    },
+    {
+        "id": "19de242e.79b56c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2387,
-        "y": 1127,
-        "z": "978d88fe.49f858",
+        "x": 2704,
+        "y": 580,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "aff8819.10cbe8"
+                "108df7f5.f0405"
             ]
         ]
     },
     {
-        "id": "20f5c9d8.832b4e",
+        "id": "e1533c2.9fadc4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2388.490966796875,
-        "y": 1172.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 2706.490966796875,
+        "y": 475.57403564453125,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "cb55df0.f8980a"
+                "efbdd7a3.5958d8"
             ]
         ]
     },
     {
-        "id": "f513c25.b78554",
+        "id": "da41548.4c59da8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2385,
-        "y": 1218,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "fd8e37a.cf27348"
-            ]
-        ]
-    },
-    {
-        "id": "aff8819.10cbe8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2559.66650390625,
-        "y": 1128,
-        "z": "978d88fe.49f858",
+        "x": 2702,
+        "y": 520,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "490cf25b.6f8bbc",
-                "7192c89b.9fa8a",
-                "83e10369.9e2a48",
-                "8632824a.a7d1a"
+                "e03f3a11.4be118"
             ]
         ]
     },
     {
-        "id": "cb55df0.f8980a",
+        "id": "e03f3a11.4be118",
         "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",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2550.0623779296875,
-        "y": 1174.8597717285156,
-        "z": "978d88fe.49f858",
+        "x": 2870,
+        "y": 520,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "fd8e37a.cf27348",
+        "id": "efbdd7a3.5958d8",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "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": 2554,
-        "y": 1219,
-        "z": "978d88fe.49f858",
+        "x": 2869.0625,
+        "y": 474.8597412109375,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "2d415746.a7be9",
-        "type": "save",
-        "name": "get vpn-binding-A 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.connectivityA.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-bindingA\" >\n",
+        "id": "8651df9.9efa52",
+        "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": 2782,
-        "y": 556,
-        "z": "978d88fe.49f858",
+        "x": 2221,
+        "y": 397,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "2054e000.51325",
-                "24cb3e35.5919ba",
-                "49ca8d9.cac6774"
+                "6856373e.df8d5"
             ]
         ]
     },
     {
-        "id": "490cf25b.6f8bbc",
-        "type": "save",
-        "name": "get vpn-binding-B 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.connectivityB.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-bindingB\" >\n",
+        "id": "6856373e.df8d5",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2426,
+        "y": 397,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "61b4f44b.e9282c"
+            ]
+        ]
+    },
+    {
+        "id": "61b4f44b.e9282c",
+        "type": "outcome",
+        "name": "vpn-binding",
+        "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2786,
-        "y": 1126,
-        "z": "978d88fe.49f858",
+        "x": 2592,
+        "y": 397,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "9697ed36.e16ad8",
-                "1b825f20.68c389",
-                "214845f.325e5ba"
+                "9aa1bdef.a85148"
             ]
         ]
     },
     {
-        "id": "8505e692.6e58e8",
+        "id": "9aa1bdef.a85148",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3166,
-        "y": 556,
-        "z": "978d88fe.49f858",
+        "x": 2755,
+        "y": 397,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "1e245d3c.a778db",
-                "f09e2868.9a86c8"
+                "e921a3d6.75f8b8",
+                "8b7a547c.5a78f8"
             ]
         ]
     },
     {
-        "id": "1e245d3c.a778db",
-        "type": "set",
-        "name": "set attachment_param for OTN A",
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n\n",
-        "comments": "",
-        "x": 3402,
-        "y": 555,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "2054e000.51325",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "61cd75bc.541bfc",
+        "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": 2993,
-        "y": 558,
-        "z": "978d88fe.49f858",
+        "x": 3314,
+        "y": 680,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "8505e692.6e58e8"
+                "ce7e100e.65e8d8",
+                "978d0324.53a218"
             ]
         ]
     },
     {
-        "id": "24cb3e35.5919ba",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "ce7e100e.65e8d8",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2993.490966796875,
-        "y": 603.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 3528,
+        "y": 717,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "7b7e2f47.0a22b"
+                "d3a9cf8b.6d8898"
             ]
         ]
     },
     {
-        "id": "49ca8d9.cac6774",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "978d0324.53a218",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2991,
-        "y": 647,
-        "z": "978d88fe.49f858",
+        "x": 3530,
+        "y": 655,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "f869989c.799108"
+                "eacef09.695731"
             ]
         ]
     },
     {
-        "id": "f869989c.799108",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 3158,
-        "y": 646,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "7b7e2f47.0a22b",
-        "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": 3156.0623779296875,
-        "y": 603.8597717285156,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "9697ed36.e16ad8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "d3a9cf8b.6d8898",
+        "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": 2993,
-        "y": 1129,
-        "z": "978d88fe.49f858",
+        "x": 3108,
+        "y": 1960,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "d0988988.8d0a18"
+                "a298a9c0.8f44e8",
+                "ca55eca6.1cb808"
             ]
         ]
     },
     {
-        "id": "1b825f20.68c389",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "a298a9c0.8f44e8",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2993.490966796875,
-        "y": 1174.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 3361,
+        "y": 1994,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "875a2548.0cfdc8"
+                "c785caf0.121d"
             ]
         ]
     },
     {
-        "id": "214845f.325e5ba",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "ca55eca6.1cb808",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2991,
-        "y": 1218,
-        "z": "978d88fe.49f858",
+        "x": 3361,
+        "y": 1938,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "5743b059.d8fee"
+                "6d0b6c95.2359f4"
             ]
         ]
     },
     {
-        "id": "5743b059.d8fee",
+        "id": "c785caf0.121d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3160,
-        "y": 1219,
-        "z": "978d88fe.49f858",
+        "x": 3512,
+        "y": 1994,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "875a2548.0cfdc8",
-        "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",
+        "id": "2abfc3f7.2295e4",
+        "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": 4388,
+        "y": 92,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "ebb770b7.bb1a4",
+        "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": 3156.0623779296875,
-        "y": 1174.8597717285156,
-        "z": "978d88fe.49f858",
+        "x": 3796,
+        "y": 1551,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "d0988988.8d0a18",
+        "id": "bcb6d938.081b58",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4079,
+        "y": 349,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "2abfc3f7.2295e4",
+                "72376cd1.cdcaec",
+                "9b9c3cba.716c78",
+                "5f8cf8c6.3002c8",
+                "de94f6d4.eda0e",
+                "342bfbf3.ee642c",
+                "2a89aa53.8890b6"
+            ]
+        ]
+    },
+    {
+        "id": "6d0b6c95.2359f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3162,
-        "y": 1129,
-        "z": "978d88fe.49f858",
+        "x": 3512,
+        "y": 1937,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "7dda745d.4071a4",
-                "6468b39.c45bd4c"
+                "ebb770b7.bb1a4",
+                "48e88b1.fd2c9f4",
+                "402d5da7.084ecc",
+                "600572d7.37f4f4",
+                "46863424.f49acc",
+                "4aa8bc15.43053c",
+                "295ad948.4ab50e"
             ]
         ]
     },
     {
-        "id": "7dda745d.4071a4",
+        "id": "4aa8bc15.43053c",
         "type": "set",
-        "name": "set attachment_param for OTN B",
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingB.dst-access-ltp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n\n",
+        "name": "set sotn_value",
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
-        "x": 3398,
-        "y": 1128,
-        "z": "978d88fe.49f858",
+        "x": 3741,
+        "y": 2080,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "f09e2868.9a86c8",
+        "id": "295ad948.4ab50e",
         "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 + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "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": 3480,
-        "y": 601,
-        "z": "978d88fe.49f858",
+        "x": 3895,
+        "y": 2128,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "a8d618e8.7c53c8",
-                "84fddcaa.8b02a"
+                "ec9bb97a.fa7b4",
+                "d7a86063.21272"
             ]
         ]
     },
     {
-        "id": "a8d618e8.7c53c8",
+        "id": "ec9bb97a.fa7b4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3790.5,
-        "y": 568,
-        "z": "978d88fe.49f858",
+        "x": 4240.5,
+        "y": 2109,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "6eacb8a7.7aa3d"
+                "23e4ab97.fe6f5c"
             ]
         ]
     },
     {
-        "id": "84fddcaa.8b02a",
+        "id": "d7a86063.21272",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3805.5,
-        "y": 633,
-        "z": "978d88fe.49f858",
+        "x": 4244.5,
+        "y": 2149,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "b82bd962.cbba2"
+                "3d3a171d.cfa4"
             ]
         ]
     },
     {
-        "id": "6eacb8a7.7aa3d",
+        "id": "23e4ab97.fe6f5c",
         "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 vpn rest api\" />\n",
+        "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": 3974.5,
-        "y": 564,
-        "z": "978d88fe.49f858",
+        "x": 4398.5,
+        "y": 2109,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "b82bd962.cbba2",
+        "id": "3d3a171d.cfa4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4000,
-        "y": 626,
-        "z": "978d88fe.49f858",
+        "x": 4402,
+        "y": 2149,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "5d084d8a.b2f23c",
+                "44dbf2a2.960644"
+            ]
+        ]
+    },
+    {
+        "id": "ce171a50.073f6",
+        "type": "comment",
+        "name": "TODO: FIXME:",
+        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "comments": "",
+        "x": 3738.5,
+        "y": 2036,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "5d084d8a.b2f23c",
+        "type": "save",
+        "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4742,
+        "y": 2148,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]
     },
     {
-        "id": "74c1bd3a.398664",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "e7b454fe.3b5cb",
+        "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": 4600,
+        "y": 2106,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "44dbf2a2.960644",
+        "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": 3775,
-        "y": 1150,
-        "z": "978d88fe.49f858",
+        "x": 4671,
+        "y": 2197,
+        "z": "4996e636.3ea08",
         "wires": [
-            [
-                "fc791248.fc4648"
-            ]
+            []
         ]
     },
     {
-        "id": "fdc0c54.10c51b8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "dcf1d309.aad128",
+        "type": "set",
+        "name": "set attachment_param (gfp-n) for OTN",
+        "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
+        "comments": "",
+        "x": 3305,
+        "y": 620,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "8b7a547c.5a78f8",
+        "type": "set",
+        "name": "unset tmp.aai.vpn-binding",
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
+        "comments": "",
+        "x": 2939,
+        "y": 268,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "29539dcf.178a92",
+        "type": "comment",
+        "name": "only dst ttp exists. No src",
+        "info": "",
+        "comments": "",
+        "x": 3900,
+        "y": 306,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "5f3074d9.b389cc",
+        "type": "comment",
+        "name": "only src ttp exists. No dst",
+        "info": "",
+        "comments": "",
+        "x": 3457,
+        "y": 1884,
+        "z": "4996e636.3ea08",
+        "wires": []
+    },
+    {
+        "id": "eacef09.695731",
+        "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": 3790,
-        "y": 1215,
-        "z": "978d88fe.49f858",
+        "x": 3636,
+        "y": 468,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "16f26dc2.3147e2"
+                "f62c1164.a0b8",
+                "81b54f08.97d86"
             ]
         ]
     },
     {
-        "id": "fc791248.fc4648",
-        "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 vpn rest api\" />\n",
+        "id": "81b54f08.97d86",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
-        "x": 3959,
-        "y": 1146,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 3878,
+        "y": 1057,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "efc62266.57c198"
+            ]
+        ]
     },
     {
-        "id": "16f26dc2.3147e2",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "f62c1164.a0b8",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3984.5,
-        "y": 1208,
-        "z": "978d88fe.49f858",
+        "x": 3872,
+        "y": 348,
+        "z": "4996e636.3ea08",
         "wires": [
-            []
+            [
+                "bcb6d938.081b58"
+            ]
         ]
     },
     {
-        "id": "6468b39.c45bd4c",
-        "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 + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
-        "comments": "",
+        "id": "efc62266.57c198",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 3464.5,
-        "y": 1183,
-        "z": "978d88fe.49f858",
+        "x": 4036,
+        "y": 1056,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "74c1bd3a.398664",
-                "fdc0c54.10c51b8"
+                "cb6a953c.fa71e8",
+                "263d4572.ce34fa",
+                "2e78dd82.d5612a",
+                "c61e9a44.c762a8",
+                "8ae64ab7.a00a7"
             ]
         ]
     },
     {
-        "id": "2f11d14a.7d5856",
+        "id": "263d4572.ce34fa",
         "type": "set",
-        "name": "set sotn_value",
-        "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n\n<parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />",
+        "name": "set attachment_param for OTN G",
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
         "comments": "",
-        "x": 2766.5,
-        "y": 898,
-        "z": "978d88fe.49f858",
+        "x": 4300,
+        "y": 939,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "d0c66bee.225358",
+        "id": "8ae64ab7.a00a7",
         "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=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\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=\"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\"/>",
+        "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-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2920.5,
-        "y": 946,
-        "z": "978d88fe.49f858",
+        "x": 4381,
+        "y": 1254,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "3db41fa8.f38878",
-                "fbb2729e.49853"
+                "bd008f9d.f02308",
+                "91d1e4e0.3cbb38"
             ]
         ]
     },
     {
-        "id": "3db41fa8.f38878",
+        "id": "bd008f9d.f02308",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3266,
-        "y": 927,
-        "z": "978d88fe.49f858",
+        "x": 4690.5,
+        "y": 1223,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "f346270d.843368"
+                "270fab9f.26c71c"
             ]
         ]
     },
     {
-        "id": "fbb2729e.49853",
+        "id": "91d1e4e0.3cbb38",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3270,
-        "y": 967,
-        "z": "978d88fe.49f858",
+        "x": 4695.5,
+        "y": 1288,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "c716fb9b.f3ffc"
+                "49e9447.128b63c"
             ]
         ]
     },
     {
-        "id": "f346270d.843368",
+        "id": "270fab9f.26c71c",
         "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 vpn rest api\" />\n",
+        "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": 3424,
-        "y": 927,
-        "z": "978d88fe.49f858",
+        "x": 4866.5,
+        "y": 1223,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "c716fb9b.f3ffc",
+        "id": "49e9447.128b63c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3427.5,
-        "y": 967,
-        "z": "978d88fe.49f858",
+        "x": 4862,
+        "y": 1288,
+        "z": "4996e636.3ea08",
         "wires": [
-            [
-                "3124f6f9.b8bd1a",
-                "856ae03f.786118"
-            ]
+            []
         ]
     },
     {
-        "id": "4c34ee00.d0d39",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "id": "2e78dd82.d5612a",
+        "type": "set",
+        "name": "set pnf-name",
+        "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 2764,
-        "y": 854,
-        "z": "978d88fe.49f858",
+        "x": 4238,
+        "y": 987,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "96d25665.97a75",
+        "id": "c61e9a44.c762a8",
         "type": "get-resource",
-        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+        "name": "get-resource src pnf",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 2816,
-        "y": 780,
-        "z": "978d88fe.49f858",
+        "x": 4264,
+        "y": 1104,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "4a3c4a39.62e724",
-                "e52cd6a7.6aeb28",
-                "bb40af56.1cbe7"
+                "58640478.1eeefc",
+                "b15b9e00.631398",
+                "c5141964.109468"
             ]
         ]
     },
     {
-        "id": "4a3c4a39.62e724",
+        "id": "58640478.1eeefc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3062,
-        "y": 740,
-        "z": "978d88fe.49f858",
+        "x": 4459.5001220703125,
+        "y": 1056,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "9e28f8d9.f64138"
+                "9ec63af5.4a1a88"
             ]
         ]
     },
     {
-        "id": "e52cd6a7.6aeb28",
+        "id": "b15b9e00.631398",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3066,
-        "y": 780,
-        "z": "978d88fe.49f858",
+        "x": 4451.5001220703125,
+        "y": 1111,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "916c7538.648ed"
+                "a4b9d6d5.39a2c8"
             ]
         ]
     },
     {
-        "id": "bb40af56.1cbe7",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "9ec63af5.4a1a88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3058,
-        "y": 820,
-        "z": "978d88fe.49f858",
+        "x": 4603.8824462890625,
+        "y": 1055.6556701660156,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "a678576a.20b77"
+                "f086ebfd.c8405"
             ]
         ]
     },
     {
-        "id": "a678576a.20b77",
-        "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+        "id": "f086ebfd.c8405",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
-        "x": 3216,
-        "y": 820,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 4788,
+        "y": 1054,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "b709cf8e.43e148"
+            ]
+        ]
     },
     {
-        "id": "916c7538.648ed",
-        "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+        "id": "b709cf8e.43e148",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
-        "x": 3216,
-        "y": 780,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 4983,
+        "y": 1054,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "ad439d36.0ced9"
+            ]
+        ]
     },
     {
-        "id": "9e28f8d9.f64138",
-        "type": "set",
-        "name": "set controller data",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.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",
+        "id": "c5141964.109468",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
-        "x": 3232,
-        "y": 740,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 4456.5001220703125,
+        "y": 1168,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "56d134ff.8e34ec"
+            ]
+        ]
     },
     {
-        "id": "b0af8ca6.269818",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
+        "id": "56d134ff.8e34ec",
+        "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": 2824,
-        "y": 740,
-        "z": "978d88fe.49f858",
+        "x": 4608.5001220703125,
+        "y": 1169,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "83e10369.9e2a48",
-        "type": "set",
-        "name": "set sotn_value",
-        "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n\n<parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />",
+        "id": "a4b9d6d5.39a2c8",
+        "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": 2752,
-        "y": 1454,
-        "z": "978d88fe.49f858",
+        "x": 4619.5001220703125,
+        "y": 1112,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "8632824a.a7d1a",
-        "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=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\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=\"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\"/>",
+        "id": "cb6a953c.fa71e8",
+        "type": "set",
+        "name": "set vpn-bindingG and connectivityG",
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "outputs": 1,
-        "x": 2906,
-        "y": 1502,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "51ac9234.46b414",
-                "a5f17af5.5d803"
-            ]
-        ]
+        "x": 4295,
+        "y": 879,
+        "z": "4996e636.3ea08",
+        "wires": []
     },
     {
-        "id": "51ac9234.46b414",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "ad439d36.0ced9",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3251.5,
-        "y": 1483,
-        "z": "978d88fe.49f858",
+        "x": 5186,
+        "y": 1058,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "6f72d542.94964c"
+                "cb537ad7.8928d8"
             ]
         ]
     },
     {
-        "id": "a5f17af5.5d803",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "e839cea.58e4f3",
+        "type": "execute",
+        "name": "get esr-thirdparty-sdnc",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 3255.5,
-        "y": 1523,
-        "z": "978d88fe.49f858",
+        "x": 5571,
+        "y": 1071,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "2dab9f7d.db59d8"
+                "9673ee8e.826088",
+                "87202e49.7cf198",
+                "ad5371c2.88c47"
             ]
         ]
     },
     {
-        "id": "6f72d542.94964c",
-        "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 vpn rest api\" />\n",
-        "comments": "",
-        "x": 3409.5,
-        "y": 1483,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "2dab9f7d.db59d8",
+        "id": "cb537ad7.8928d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
-        "comments": "",
         "outputs": 1,
-        "x": 3413,
-        "y": 1523,
-        "z": "978d88fe.49f858",
+        "x": 5365,
+        "y": 1058,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "a1391891.c310f",
-                "ccc1b1df.33721"
+                "2fa33243.987c8e",
+                "e839cea.58e4f3"
             ]
         ]
     },
     {
-        "id": "5d06869f.f8bcb8",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "id": "2fa33243.987c8e",
+        "type": "set",
+        "name": "set esr-thirdparty-sdnc domainG id",
+        "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2749.5,
-        "y": 1410,
-        "z": "978d88fe.49f858",
+        "x": 5601,
+        "y": 1019,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "7192c89b.9fa8a",
-        "type": "get-resource",
-        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2801.5,
-        "y": 1336,
-        "z": "978d88fe.49f858",
-        "wires": [
-            [
-                "e2e5c437.a11d5",
-                "9dfaf98b.e80c9",
-                "dcca7d62.830ee8"
-            ]
-        ]
-    },
-    {
-        "id": "e2e5c437.a11d5",
+        "id": "9673ee8e.826088",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3047.5,
-        "y": 1296,
-        "z": "978d88fe.49f858",
+        "x": 5781,
+        "y": 1062,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "427eefc5.61bc"
+                "3788c181.11c43e"
             ]
         ]
     },
     {
-        "id": "9dfaf98b.e80c9",
+        "id": "87202e49.7cf198",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3051.5,
-        "y": 1336,
-        "z": "978d88fe.49f858",
+        "x": 5773,
+        "y": 1117,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "8ac5fa96.75d4b"
+                "3691dbb8.1b2bf4"
             ]
         ]
     },
     {
-        "id": "dcca7d62.830ee8",
+        "id": "ad5371c2.88c47",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3043.5,
-        "y": 1376,
-        "z": "978d88fe.49f858",
+        "x": 5778,
+        "y": 1174,
+        "z": "4996e636.3ea08",
         "wires": [
             [
-                "39cf0825.d43ae"
+                "c7f3058f.182658"
             ]
         ]
     },
     {
-        "id": "39cf0825.d43ae",
+        "id": "c7f3058f.182658",
         "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
+        "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": 3201.5,
-        "y": 1376,
-        "z": "978d88fe.49f858",
+        "x": 5930,
+        "y": 1175,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "8ac5fa96.75d4b",
+        "id": "3691dbb8.1b2bf4",
         "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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
-        "comments": "",
-        "x": 3201.5,
-        "y": 1336,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "427eefc5.61bc",
-        "type": "set",
-        "name": "set controller data",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.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",
+        "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": 3217.5,
-        "y": 1296,
-        "z": "978d88fe.49f858",
+        "x": 5941,
+        "y": 1120,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "74572637.f29d7",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
+        "id": "3788c181.11c43e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
-        "x": 2809.5,
-        "y": 1296,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 5925.38232421875,
+        "y": 1059.6556701660156,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "a3c8eb2b.95af8"
+            ]
+        ]
     },
     {
-        "id": "135b0ed7.2faa91",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
+        "id": "a3c8eb2b.95af8",
+        "type": "set",
+        "name": "set controller domainG data",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 2744,
-        "y": 1256,
-        "z": "978d88fe.49f858",
+        "x": 6140,
+        "y": 1056,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "a58ac83b.b037d",
+        "id": "2ac9f039.bfa9a8",
         "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
+        "name": "both src and dst exist",
+        "info": "",
         "comments": "",
-        "x": 2756,
-        "y": 700,
-        "z": "978d88fe.49f858",
+        "x": 3914,
+        "y": 997,
+        "z": "4996e636.3ea08",
         "wires": []
     },
     {
-        "id": "3124f6f9.b8bd1a",
-        "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.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n\n<parameter name='operational-status' value='Activated' />\n",
+        "id": "19520422.b45d4c",
+        "type": "switchNode",
+        "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
+        "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 3756,
-        "y": 967,
-        "z": "978d88fe.49f858",
+        "x": 2476,
+        "y": 724,
+        "z": "4996e636.3ea08",
         "wires": [
-            []
+            [
+                "fc6dfa43.dee44",
+                "90381d7.56caa6"
+            ]
         ]
     },
     {
-        "id": "554a4766.c457a",
-        "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": 3620,
-        "y": 926,
-        "z": "978d88fe.49f858",
-        "wires": []
-    },
-    {
-        "id": "a1391891.c310f",
-        "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.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n\n<parameter name='operational-status' value='Activated' />\n",
+        "id": "90381d7.56caa6",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3753,
-        "y": 1522,
-        "z": "978d88fe.49f858",
+        "x": 2883,
+        "y": 742,
+        "z": "4996e636.3ea08",
         "wires": [
-            []
+            [
+                "d486bdc8.981f98"
+            ]
         ]
     },
     {
-        "id": "90d3682d.e54348",
-        "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?",
+        "id": "fc6dfa43.dee44",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
-        "x": 3611,
-        "y": 1480,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 2883,
+        "y": 687,
+        "z": "4996e636.3ea08",
+        "wires": [
+            [
+                "7563c99.56d39b8"
+            ]
+        ]
     },
     {
-        "id": "856ae03f.786118",
-        "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 = $prop.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Activated' />\n",
-        "comments": "",
+        "id": "7563c99.56d39b8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 3683,
-        "y": 1013,
-        "z": "978d88fe.49f858",
+        "x": 3039,
+        "y": 685,
+        "z": "4996e636.3ea08",
         "wires": [
-            []
+            [
+                "dcf1d309.aad128",
+                "61cd75bc.541bfc"
+            ]
         ]
     },
     {
-        "id": "ccc1b1df.33721",
-        "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 = $prop.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Activated' />\n",
+        "id": "d486bdc8.981f98",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3682,
-        "y": 1571,
-        "z": "978d88fe.49f858",
+        "x": 3016,
+        "y": 743,
+        "z": "4996e636.3ea08",
         "wires": [
             []
         ]