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=79f774627705f02d13f78c8248448b2d98663233;hb=2a546f93ac1c3686f099549fc88cd8bf2d39bd20;hp=669eca8d1dbc3f74298f6991f6e563b3cff66b21;hpb=30f66e285566bea2ec5597f917709d54c69ffd6f;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..79f77462 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": "8976bcf1.70ac48",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 133,
-        "y": 58,
-        "z": "978d88fe.49f858",
+        "x": 233.75,
+        "y": 126.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a120d0c2.d16848"
+                "b1b89c9d.983348"
             ]
         ]
     },
     {
-        "id": "a120d0c2.d16848",
+        "id": "b1b89c9d.983348",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1663 +22,2356 @@
         "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": 365.0356903076172,
+        "y": 175.98810863494873,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "e3f08946.3b4f3"
+                "b0c84a88.7eefc"
             ]
         ]
     },
     {
-        "id": "e3f08946.3b4f3",
+        "id": "b0c84a88.7eefc",
         "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": 368.1786193847656,
+        "y": 260.75003242492676,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "da15bb94.f35d78"
+                "d31d270a.ac188"
             ]
         ]
     },
     {
-        "id": "da15bb94.f35d78",
+        "id": "d31d270a.ac188",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 417.238037109375,
-        "y": 321.6666564941406,
-        "z": "978d88fe.49f858",
+        "x": 517.988037109375,
+        "y": 390.4166564941406,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a0613c64.0d3d18",
-                "bec74808.bd7fc8",
-                "6e589ca9.47c63c",
-                "a8ba9960.6cb65",
-                "d40da373.f15598",
-                "358d1f62.e4f2c8",
-                "a739ea85.93c65",
-                "19a0d774.67fb01"
+                "67b5a6fb.99f89",
+                "31666720.2f23b8",
+                "1b5adc13.083b6c"
             ]
         ]
     },
     {
-        "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": "67b5a6fb.99f89",
+        "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": 786.3216552734375,
+        "y": 777.34716796875,
+        "z": "21b8a150.843866",
         "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": "1bac3f01.eca921",
+        "type": "comment",
+        "name": "new for TransportSlicing",
+        "info": "",
         "comments": "",
-        "x": 687.5716552734375,
-        "y": 1430.59716796875,
-        "z": "978d88fe.49f858",
+        "x": 817.75,
+        "y": 451.75,
+        "z": "21b8a150.843866",
         "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": "31666720.2f23b8",
+        "type": "save",
+        "name": "get service-instance from aai",
+        "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
+        "comments": "",
+        "outputs": 1,
+        "x": 837.75,
+        "y": 547.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "963616f2.8f1aa8",
+                "d3eed549.904728",
+                "b7b5ac0a.4b96c"
+            ]
+        ]
+    },
+    {
+        "id": "963616f2.8f1aa8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1056.75,
+        "y": 485.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "85a98f1d.b180e"
+            ]
+        ]
+    },
+    {
+        "id": "d3eed549.904728",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1066.240966796875,
+        "y": 528.3240356445312,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "bfe60f89.4e364"
+            ]
+        ]
+    },
+    {
+        "id": "b7b5ac0a.4b96c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1054.75,
+        "y": 574.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "2df6c7e.346a038"
+            ]
+        ]
+    },
+    {
+        "id": "bfe60f89.4e364",
+        "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": 1219.8123779296875,
+        "y": 531.6097717285156,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "2df6c7e.346a038",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 766.5716018676758,
-        "y": 506.5968001158908,
-        "z": "978d88fe.49f858",
+        "x": 1223.75,
+        "y": 575.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "a8ba9960.6cb65",
+        "id": "85a98f1d.b180e",
+        "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": 1253.75,
+        "y": 481.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "58591981.123b78"
+            ]
+        ]
+    },
+    {
+        "id": "58591981.123b78",
         "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": 1477.08349609375,
+        "y": 481.74993896484375,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "752da5f3.b4cc4c",
-                "b945aefb.e762f",
-                "8cef6bde.bc7818"
+                "56e0d242.b4b17c"
             ]
         ]
     },
     {
-        "id": "8cef6bde.bc7818",
+        "id": "56e0d242.b4b17c",
         "type": "outcome",
-        "name": "0",
-        "xml": "<outcome value='0'>\n",
+        "name": "connectivity",
+        "xml": "<outcome value='connectivity'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1677.7501335144043,
+        "y": 482.75002098083496,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "463ca820.11cf78"
+            ]
+        ]
+    },
+    {
+        "id": "bda858bd.a9d128",
+        "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": 4496.75,
+        "y": 198.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "be3c5cce.b55c98",
+        "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": 4577.75,
+        "y": 513.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "a29e7e17.b5f91",
+                "3da90d10.f4de92"
+            ]
+        ]
+    },
+    {
+        "id": "a29e7e17.b5f91",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1167.968994140625,
-        "y": 226.96875,
-        "z": "978d88fe.49f858",
+        "x": 4887.25,
+        "y": 482.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "5417fb2d.edce0c"
+                "878c441e.87326"
             ]
         ]
     },
     {
-        "id": "5417fb2d.edce0c",
+        "id": "3da90d10.f4de92",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4892.25,
+        "y": 547.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "d4311e2b.569f08"
+            ]
+        ]
+    },
+    {
+        "id": "878c441e.87326",
         "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": 5063.25,
+        "y": 482.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "752da5f3.b4cc4c",
-        "type": "other",
-        "name": "Null",
-        "xml": "<outcome value=''>\n",
+        "id": "d4311e2b.569f08",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 5058.75,
+        "y": 547.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3e803655.1b101a",
+        "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": 4444.25,
+        "y": 701.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "4c6ccd14.a8a574",
+        "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": 4598.25,
+        "y": 749.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "5417fb2d.edce0c"
+                "276414cf.b4df2c",
+                "64503714.72c7f8"
             ]
         ]
     },
     {
-        "id": "b945aefb.e762f",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "276414cf.b4df2c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4943.75,
+        "y": 730.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "102e191c.056cc7"
+            ]
+        ]
+    },
+    {
+        "id": "64503714.72c7f8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1154.0005416870117,
-        "y": 299.000075340271,
-        "z": "978d88fe.49f858",
+        "x": 4947.75,
+        "y": 770.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "39deabe9.dfa46c"
+                "24862939.f8dc8e"
             ]
         ]
     },
     {
-        "id": "39deabe9.dfa46c",
+        "id": "102e191c.056cc7",
+        "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": 5101.75,
+        "y": 730.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "24862939.f8dc8e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
+        "comments": "",
         "outputs": 1,
-        "x": 1301.2700843811035,
-        "y": 299.5547204017639,
-        "z": "978d88fe.49f858",
+        "x": 5105.25,
+        "y": 770.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "ffe0cb12.24663"
+                "21b9b574.b5d392",
+                "9fb31567.2a4df8",
+                "88154427.646e5"
             ]
         ]
     },
     {
-        "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": "a1a69def.dde488",
+        "type": "comment",
+        "name": "TODO: FIXME:",
+        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "comments": "",
+        "x": 4441.75,
+        "y": 657.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "21b9b574.b5d392",
+        "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": 5435.75,
+        "y": 735.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "88c6cc39.d0a418",
+        "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": 5299.75,
+        "y": 694.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "9fb31567.2a4df8",
+        "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": 5362.75,
+        "y": 781.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3c21bf12.e3cf58",
+        "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": 4434.75,
+        "y": 246.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "70ce80db.d98e2",
+        "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": 4460.75,
+        "y": 363.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "cd855b12.4c7648",
+                "e908220c.f2eba8",
+                "9142c53.c51d0b8"
+            ]
+        ]
+    },
+    {
+        "id": "cd855b12.4c7648",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1547.2862014770508,
-        "y": 306.42864084243774,
-        "z": "978d88fe.49f858",
+        "x": 4656.2501220703125,
+        "y": 315.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "d581e614.41ca28"
+                "a4edf485.1b87b"
             ]
         ]
     },
     {
-        "id": "d581e614.41ca28",
+        "id": "e908220c.f2eba8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4648.2501220703125,
+        "y": 370.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "9b453a42.4c355"
+            ]
+        ]
+    },
+    {
+        "id": "a4edf485.1b87b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1766.6358337402344,
-        "y": 305.96872091293335,
-        "z": "978d88fe.49f858",
+        "x": 4800.6324462890625,
+        "y": 315.4056701660156,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "5c080425.067b9c"
+            ]
+        ]
+    },
+    {
+        "id": "c0826996.0b6fb8",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5382.75,
+        "y": 317.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "6cb341ea.d215b"
+                "2f8dc255.fe7e1e"
             ]
         ]
     },
     {
-        "id": "6cb341ea.d215b",
+        "id": "5c080425.067b9c",
+        "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": 4984.75,
+        "y": 313.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "495e68aa.ac002"
+            ]
+        ]
+    },
+    {
+        "id": "495e68aa.ac002",
         "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": 5179.75,
+        "y": 313.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "7e8f8e16.82297"
+                "c0826996.0b6fb8"
             ]
         ]
     },
     {
-        "id": "7e8f8e16.82297",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "9142c53.c51d0b8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4653.2501220703125,
+        "y": 427.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "9ce4b617.939088"
+            ]
+        ]
+    },
+    {
+        "id": "9ce4b617.939088",
+        "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": 4805.2501220703125,
+        "y": 428.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "9b453a42.4c355",
+        "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": 4816.2501220703125,
+        "y": 371.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "e93c75e1.80ec18",
+        "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": 5767.75,
+        "y": 330.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "31d08ad5.ae1df6",
+                "38f9754c.f69992",
+                "31e3f0ee.1be648"
+            ]
+        ]
+    },
+    {
+        "id": "2f8dc255.fe7e1e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5561.75,
+        "y": 317.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "35fe1089.09d838",
+                "e93c75e1.80ec18"
+            ]
+        ]
+    },
+    {
+        "id": "35fe1089.09d838",
+        "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": 5797.75,
+        "y": 278.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "31d08ad5.ae1df6",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5977.75,
+        "y": 321.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "dcbf70b.fe9e51"
+            ]
+        ]
+    },
+    {
+        "id": "38f9754c.f69992",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5969.75,
+        "y": 376.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "b70d6ea.910679"
+            ]
+        ]
+    },
+    {
+        "id": "31e3f0ee.1be648",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5974.75,
+        "y": 433.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "96cd1d2a.b041a"
+            ]
+        ]
+    },
+    {
+        "id": "96cd1d2a.b041a",
+        "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": 6126.75,
+        "y": 434.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "b70d6ea.910679",
+        "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": 6137.75,
+        "y": 379.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "dcbf70b.fe9e51",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2131.6675758361816,
-        "y": 308.571494102478,
-        "z": "978d88fe.49f858",
+        "x": 6122.13232421875,
+        "y": 319.4056701660156,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "1efc1703.0b69f1"
+                "b0be4e8c.83ee08"
             ]
         ]
     },
     {
-        "id": "1efc1703.0b69f1",
+        "id": "b0be4e8c.83ee08",
         "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": 6336.75,
+        "y": 315.75,
+        "z": "21b8a150.843866",
         "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": "1b5adc13.083b6c",
+        "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": 803.75,
+        "y": 495.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "358d1f62.e4f2c8",
+        "id": "321a405b.7459b8",
         "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": 3903.75,
+        "y": 1655.75,
+        "z": "21b8a150.843866",
         "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": "13cb6aa6.78d01d",
+        "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": 3966.75,
+        "y": 1984.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "c40ac9fb.21106",
-                "625ef5e9.0fa304"
+                "10d81799.8466e",
+                "67bbae69.f0649"
             ]
         ]
     },
     {
-        "id": "c40ac9fb.21106",
-        "type": "outcome",
-        "name": "outcome Created",
-        "xml": "<outcome value='Created'>\n",
+        "id": "10d81799.8466e",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1131.5833320617676,
-        "y": 366.1149909766391,
-        "z": "978d88fe.49f858",
+        "x": 4262.25,
+        "y": 1951.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "50da061e.3d2a4"
+                "892eb025.ee91a8"
             ]
         ]
     },
     {
-        "id": "625ef5e9.0fa304",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "67bbae69.f0649",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1109.583351135254,
-        "y": 416.1150024207309,
-        "z": "978d88fe.49f858",
+        "x": 4267.25,
+        "y": 2016.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "9d9a6d0b.f63a18"
+                "f603d29b.ff0438"
             ]
         ]
     },
     {
-        "id": "9d9a6d0b.f63a18",
+        "id": "892eb025.ee91a8",
         "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": 4430.25,
+        "y": 1951.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "50da061e.3d2a4",
+        "id": "f603d29b.ff0438",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
+        "comments": "",
         "outputs": 1,
-        "x": 1341.889705657959,
-        "y": 377.44016626197845,
-        "z": "978d88fe.49f858",
+        "x": 4440.75,
+        "y": 2016.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a49c1a1.74cca",
-        "type": "comment",
-        "name": "new for TransportSlicing",
-        "info": "",
+        "id": "88f53e94.6d0a1",
+        "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": 3842.75,
+        "y": 1712.75,
+        "z": "21b8a150.843866",
         "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": "3fa49f7e.accef8",
+        "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": 3862.75,
+        "y": 1809.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "ef923a7d.6928a8",
-                "981c314b.31ecb8",
-                "65818037.104038"
+                "ebf12595.10e938",
+                "efabfdfe.5ba96",
+                "205446da.fa0a6a"
             ]
         ]
     },
     {
-        "id": "ef923a7d.6928a8",
+        "id": "ebf12595.10e938",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 953,
-        "y": 714,
-        "z": "978d88fe.49f858",
+        "x": 4065.2501220703125,
+        "y": 1762.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "c4da4ce2.e86fd"
+                "3bb96014.a51678"
             ]
         ]
     },
     {
-        "id": "981c314b.31ecb8",
+        "id": "efabfdfe.5ba96",
         "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": 4057.2501220703125,
+        "y": 1817.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "2c51a746.8529b8"
+                "6194e30c.a75eac"
             ]
         ]
     },
     {
-        "id": "65818037.104038",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "3bb96014.a51678",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4209.6324462890625,
+        "y": 1760.4056701660156,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "60e39d5f.e73f74"
+            ]
+        ]
+    },
+    {
+        "id": "60e39d5f.e73f74",
+        "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": 4393.75,
+        "y": 1774.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "f8535a31.25ce18"
+            ]
+        ]
+    },
+    {
+        "id": "205446da.fa0a6a",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 951,
-        "y": 803,
-        "z": "978d88fe.49f858",
+        "x": 4062.2501220703125,
+        "y": 1874.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "11f3085c.6c3b58"
+                "126fd357.b0d735"
             ]
         ]
     },
     {
-        "id": "2c51a746.8529b8",
+        "id": "126fd357.b0d735",
         "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": 4214.2501220703125,
+        "y": 1875.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "11f3085c.6c3b58",
+        "id": "6194e30c.a75eac",
         "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": 4225.2501220703125,
+        "y": 1820.75,
+        "z": "21b8a150.843866",
         "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": "a4686eb2.3a15b8",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1150,
-        "y": 710,
-        "z": "978d88fe.49f858",
+        "x": 4791.75,
+        "y": 1778.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "eb26c03f.cde3a"
+                "dd82991b.5dd978"
             ]
         ]
     },
     {
-        "id": "eb26c03f.cde3a",
+        "id": "f8535a31.25ce18",
         "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": 4588.75,
+        "y": 1774.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "b65d7d38.16fc68"
+                "a4686eb2.3a15b8"
             ]
         ]
     },
     {
-        "id": "b65d7d38.16fc68",
-        "type": "outcome",
-        "name": "connectivity",
-        "xml": "<outcome value='connectivity'>\n",
+        "id": "ad6998e4.c7769",
+        "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": 5176.75,
+        "y": 1777.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "fda5561b.cca698"
+                "f50cc222.33dcd",
+                "8488316b.70cb5",
+                "804e8e55.127ce"
             ]
         ]
     },
     {
-        "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": "dd82991b.5dd978",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4968.75,
+        "y": 1770.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "c219345a.333ee8",
+                "ad6998e4.c7769"
+            ]
+        ]
+    },
+    {
+        "id": "c219345a.333ee8",
+        "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": 5206.75,
+        "y": 1725.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "5afc9335.91bec4",
+        "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": 5535.75,
+        "y": 1881.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "bba1d37e.3ac768",
+        "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": 5546.75,
+        "y": 1826.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "4872e24d.b18cd4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2179,
-        "y": 599,
-        "z": "978d88fe.49f858",
+        "x": 5531.13232421875,
+        "y": 1766.4056701660156,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "81d6e319.abfd8",
-                "313c36d7.969d3a",
-                "3d5cf6f2.953e9a"
+                "4b7568ba.14d37"
             ]
         ]
     },
     {
-        "id": "fda5561b.cca698",
-        "type": "switchNode",
-        "name": "switch $rel-index == 0",
-        "xml": "<switch test=\"`$rel-index == 0`\">\n\n",
+        "id": "4b7568ba.14d37",
+        "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": 5745.75,
+        "y": 1762.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "f50cc222.33dcd",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1762,
-        "y": 709,
-        "z": "978d88fe.49f858",
+        "x": 5386.75,
+        "y": 1768.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "44bd1b.3cc782e4",
-                "f85fb605.a76398"
+                "4872e24d.b18cd4"
             ]
         ]
     },
     {
-        "id": "44bd1b.3cc782e4",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
+        "id": "8488316b.70cb5",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1985,
-        "y": 599,
-        "z": "978d88fe.49f858",
+        "x": 5378.75,
+        "y": 1823.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "edc6ee23.1891a"
+                "bba1d37e.3ac768"
             ]
         ]
     },
     {
-        "id": "f85fb605.a76398",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
+        "id": "804e8e55.127ce",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1971,
-        "y": 1156,
-        "z": "978d88fe.49f858",
+        "x": 5383.75,
+        "y": 1880.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "7b60b790.bc4c4"
+                "5afc9335.91bec4"
             ]
         ]
     },
     {
-        "id": "7b60b790.bc4c4",
+        "id": "463ca820.11cf78",
         "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": 1915.75,
+        "y": 484.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "8b96b70e.2f635",
-                "20f5c9d8.832b4e",
-                "f513c25.b78554"
+                "2eb4dc08.7f1c34",
+                "fa210005.600e9",
+                "cf2c914d.6b904"
             ]
         ]
     },
     {
-        "id": "81d6e319.abfd8",
+        "id": "2eb4dc08.7f1c34",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2385,
-        "y": 559,
-        "z": "978d88fe.49f858",
+        "x": 2123.75,
+        "y": 448.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "98b1c0b9.f7f4b"
+                "fdf5ae6d.1a01"
             ]
         ]
     },
     {
-        "id": "313c36d7.969d3a",
+        "id": "fa210005.600e9",
         "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": 2124.240966796875,
+        "y": 494.32403564453125,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "d4d990d4.f7b0a8"
+                "f1f7e3b1.bd8ea8"
             ]
         ]
     },
     {
-        "id": "3d5cf6f2.953e9a",
+        "id": "cf2c914d.6b904",
         "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": 2121.75,
+        "y": 537.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "2d415746.a7be9",
-                "96d25665.97a75",
-                "2f11d14a.7d5856",
-                "d0c66bee.225358"
+                "da54cf61.ae1b78"
             ]
         ]
     },
     {
-        "id": "d4d990d4.f7b0a8",
+        "id": "f1f7e3b1.bd8ea8",
         "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": 2286.8123779296875,
+        "y": 494.6097717285156,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "97be5e5a.798428",
+        "id": "da54cf61.ae1b78",
         "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": 2290.75,
+        "y": 538.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "8b96b70e.2f635",
+        "id": "7cc4f06d.7fdaa",
+        "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": 2596.75,
+        "y": 537.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "48c45912.635ab8",
+                "a55b1245.6d5a98",
+                "5114317.7fef9d"
+            ]
+        ]
+    },
+    {
+        "id": "f222a91f.adc5a8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2976.75,
+        "y": 625.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "941633f0.a03e2"
+            ]
+        ]
+    },
+    {
+        "id": "48c45912.635ab8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2387,
-        "y": 1127,
-        "z": "978d88fe.49f858",
+        "x": 2807.75,
+        "y": 626.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "aff8819.10cbe8"
+                "f222a91f.adc5a8"
             ]
         ]
     },
     {
-        "id": "20f5c9d8.832b4e",
+        "id": "a55b1245.6d5a98",
         "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": 2810.240966796875,
+        "y": 522.3240356445312,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "cb55df0.f8980a"
+                "c2aa70b6.4baf8"
             ]
         ]
     },
     {
-        "id": "f513c25.b78554",
+        "id": "5114317.7fef9d",
         "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": 2805.75,
+        "y": 566.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "490cf25b.6f8bbc",
-                "7192c89b.9fa8a",
-                "83e10369.9e2a48",
-                "8632824a.a7d1a"
+                "3cb9370e.446c48"
             ]
         ]
     },
     {
-        "id": "cb55df0.f8980a",
+        "id": "3cb9370e.446c48",
         "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": 2973.75,
+        "y": 566.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "fd8e37a.cf27348",
+        "id": "c2aa70b6.4baf8",
         "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": 2972.8125,
+        "y": 521.6097412109375,
+        "z": "21b8a150.843866",
         "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": "fdf5ae6d.1a01",
+        "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": 2324.75,
+        "y": 443.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "2054e000.51325",
-                "24cb3e35.5919ba",
-                "49ca8d9.cac6774"
+                "de0f0110.005fa8"
             ]
         ]
     },
     {
-        "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": "de0f0110.005fa8",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2529.75,
+        "y": 443.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "a755493f.53e5c"
+            ]
+        ]
+    },
+    {
+        "id": "a755493f.53e5c",
+        "type": "outcome",
+        "name": "vpn-binding",
+        "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2786,
-        "y": 1126,
-        "z": "978d88fe.49f858",
+        "x": 2695.75,
+        "y": 443.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "9697ed36.e16ad8",
-                "1b825f20.68c389",
-                "214845f.325e5ba"
+                "30deb2e6.ddbdde"
             ]
         ]
     },
     {
-        "id": "8505e692.6e58e8",
+        "id": "30deb2e6.ddbdde",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3166,
-        "y": 556,
-        "z": "978d88fe.49f858",
+        "x": 2858.75,
+        "y": 443.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "1e245d3c.a778db",
-                "f09e2868.9a86c8"
+                "7cc4f06d.7fdaa",
+                "5a3b76e5.927ca8"
             ]
         ]
     },
     {
-        "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": "e892b304.06846",
+        "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": 3417.75,
+        "y": 726.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "8505e692.6e58e8"
+                "21602510.29ed62",
+                "bcc4ade6.f232"
             ]
         ]
     },
     {
-        "id": "24cb3e35.5919ba",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "21602510.29ed62",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2993.490966796875,
-        "y": 603.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 3631.75,
+        "y": 763.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "7b7e2f47.0a22b"
+                "134315e7.fd7042"
             ]
         ]
     },
     {
-        "id": "49ca8d9.cac6774",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "bcc4ade6.f232",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2991,
-        "y": 647,
-        "z": "978d88fe.49f858",
+        "x": 3633.75,
+        "y": 701.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "f869989c.799108"
+                "3ace6707.d27cb8"
             ]
         ]
     },
     {
-        "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": "134315e7.fd7042",
+        "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": 3211.75,
+        "y": 2006.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "d0988988.8d0a18"
+                "36f11901.c669fe",
+                "3d3a4221.98f866"
             ]
         ]
     },
     {
-        "id": "1b825f20.68c389",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "36f11901.c669fe",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2993.490966796875,
-        "y": 1174.5740356445312,
-        "z": "978d88fe.49f858",
+        "x": 3464.75,
+        "y": 2040.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "875a2548.0cfdc8"
+                "861f9ff3.a542f8"
             ]
         ]
     },
     {
-        "id": "214845f.325e5ba",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "3d3a4221.98f866",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2991,
-        "y": 1218,
-        "z": "978d88fe.49f858",
+        "x": 3464.75,
+        "y": 1984.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "5743b059.d8fee"
+                "cd34c51c.32ff6"
             ]
         ]
     },
     {
-        "id": "5743b059.d8fee",
+        "id": "861f9ff3.a542f8",
         "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": 3615.75,
+        "y": 2040.75,
+        "z": "21b8a150.843866",
         "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": "37ab634e.8eb82c",
+        "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": 4491.75,
+        "y": 138.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "e9288827.8d4e48",
+        "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": 3899.75,
+        "y": 1597.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "5833352c.36b4cc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "comments": "",
-        "x": 3156.0623779296875,
-        "y": 1174.8597717285156,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 4182.75,
+        "y": 395.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "37ab634e.8eb82c",
+                "bda858bd.a9d128",
+                "3c21bf12.e3cf58",
+                "70ce80db.d98e2",
+                "3e803655.1b101a",
+                "4c6ccd14.a8a574",
+                "be3c5cce.b55c98"
+            ]
+        ]
     },
     {
-        "id": "d0988988.8d0a18",
+        "id": "cd34c51c.32ff6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3162,
-        "y": 1129,
-        "z": "978d88fe.49f858",
+        "x": 3615.75,
+        "y": 1983.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "7dda745d.4071a4",
-                "6468b39.c45bd4c"
+                "e9288827.8d4e48",
+                "321a405b.7459b8",
+                "88f53e94.6d0a1",
+                "3fa49f7e.accef8",
+                "13cb6aa6.78d01d",
+                "6887177c.ca96",
+                "4e3c7c24.641514"
             ]
         ]
     },
     {
-        "id": "7dda745d.4071a4",
+        "id": "6887177c.ca96",
         "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": 3844.75,
+        "y": 2126.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "f09e2868.9a86c8",
+        "id": "4e3c7c24.641514",
         "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": 3998.75,
+        "y": 2174.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a8d618e8.7c53c8",
-                "84fddcaa.8b02a"
+                "a995cca0.79095",
+                "691eaa5b.460a8c"
             ]
         ]
     },
     {
-        "id": "a8d618e8.7c53c8",
+        "id": "a995cca0.79095",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3790.5,
-        "y": 568,
-        "z": "978d88fe.49f858",
+        "x": 4344.25,
+        "y": 2155.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "6eacb8a7.7aa3d"
+                "8dda8416.3500c"
             ]
         ]
     },
     {
-        "id": "84fddcaa.8b02a",
+        "id": "691eaa5b.460a8c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3805.5,
-        "y": 633,
-        "z": "978d88fe.49f858",
+        "x": 4348.25,
+        "y": 2195.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "b82bd962.cbba2"
+                "12034c01.7a6e24"
             ]
         ]
     },
     {
-        "id": "6eacb8a7.7aa3d",
+        "id": "8dda8416.3500c",
         "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": 4502.25,
+        "y": 2155.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "b82bd962.cbba2",
+        "id": "12034c01.7a6e24",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4000,
-        "y": 626,
-        "z": "978d88fe.49f858",
+        "x": 4505.75,
+        "y": 2195.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "7af02db5.1d648c",
+                "7e35a72c.c5049",
+                "ed48bc59.3a7d1"
+            ]
+        ]
+    },
+    {
+        "id": "8f84b99e.0eac8",
+        "type": "comment",
+        "name": "TODO: FIXME:",
+        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "comments": "",
+        "x": 3842.25,
+        "y": 2082.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "7af02db5.1d648c",
+        "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": 4845.75,
+        "y": 2194.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "74c1bd3a.398664",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "1abb03b6.c2733c",
+        "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": 4703.75,
+        "y": 2152.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "7e35a72c.c5049",
+        "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": 4774.75,
+        "y": 2243.75,
+        "z": "21b8a150.843866",
         "wires": [
-            [
-                "fc791248.fc4648"
-            ]
+            []
         ]
     },
     {
-        "id": "fdc0c54.10c51b8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "7f9728ff.5a56d",
+        "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": 3408.75,
+        "y": 666.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "5a3b76e5.927ca8",
+        "type": "set",
+        "name": "unset tmp.aai.vpn-binding",
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
+        "comments": "",
+        "x": 3042.75,
+        "y": 314.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "5dc7fe07.3de0e",
+        "type": "comment",
+        "name": "only dst ttp exists. No src",
+        "info": "",
+        "comments": "",
+        "x": 4003.75,
+        "y": 352.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "95f7053c.6e7e8",
+        "type": "comment",
+        "name": "only src ttp exists. No dst",
+        "info": "",
+        "comments": "",
+        "x": 3560.75,
+        "y": 1930.75,
+        "z": "21b8a150.843866",
+        "wires": []
+    },
+    {
+        "id": "3ace6707.d27cb8",
+        "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": 3739.75,
+        "y": 514.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "16f26dc2.3147e2"
+                "784800ed.f5bf68",
+                "38254c71.c979d4"
             ]
         ]
     },
     {
-        "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": "38254c71.c979d4",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
-        "x": 3959,
-        "y": 1146,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 3981.75,
+        "y": 1103.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "8cda2b7.f98f558"
+            ]
+        ]
     },
     {
-        "id": "16f26dc2.3147e2",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "id": "784800ed.f5bf68",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3984.5,
-        "y": 1208,
-        "z": "978d88fe.49f858",
+        "x": 3975.75,
+        "y": 394.75,
+        "z": "21b8a150.843866",
         "wires": [
-            []
+            [
+                "5833352c.36b4cc"
+            ]
         ]
     },
     {
-        "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": "8cda2b7.f98f558",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 3464.5,
-        "y": 1183,
-        "z": "978d88fe.49f858",
+        "x": 4139.75,
+        "y": 1102.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "74c1bd3a.398664",
-                "fdc0c54.10c51b8"
+                "b7c2373e.9cd388",
+                "147ed25c.bf0c96",
+                "9a1eac1c.da1de8",
+                "2922d6af.6c9642",
+                "6061bd4e.a66dac"
             ]
         ]
     },
     {
-        "id": "2f11d14a.7d5856",
+        "id": "147ed25c.bf0c96",
         "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": 4403.75,
+        "y": 985.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "d0c66bee.225358",
+        "id": "6061bd4e.a66dac",
         "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": 4484.75,
+        "y": 1300.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "3db41fa8.f38878",
-                "fbb2729e.49853"
+                "de634d2d.e7705",
+                "961ea997.f45bc"
             ]
         ]
     },
     {
-        "id": "3db41fa8.f38878",
+        "id": "de634d2d.e7705",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3266,
-        "y": 927,
-        "z": "978d88fe.49f858",
+        "x": 4794.25,
+        "y": 1269.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "f346270d.843368"
+                "4e3f5895.525ca8"
             ]
         ]
     },
     {
-        "id": "fbb2729e.49853",
+        "id": "961ea997.f45bc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3270,
-        "y": 967,
-        "z": "978d88fe.49f858",
+        "x": 4799.25,
+        "y": 1334.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "c716fb9b.f3ffc"
+                "8c3ef243.d5f688"
             ]
         ]
     },
     {
-        "id": "f346270d.843368",
+        "id": "4e3f5895.525ca8",
         "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": 4970.25,
+        "y": 1269.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "c716fb9b.f3ffc",
+        "id": "8c3ef243.d5f688",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3427.5,
-        "y": 967,
-        "z": "978d88fe.49f858",
+        "x": 4965.75,
+        "y": 1334.75,
+        "z": "21b8a150.843866",
         "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": "9a1eac1c.da1de8",
+        "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": 4341.75,
+        "y": 1033.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "96d25665.97a75",
+        "id": "2922d6af.6c9642",
         "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": 4367.75,
+        "y": 1150.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "4a3c4a39.62e724",
-                "e52cd6a7.6aeb28",
-                "bb40af56.1cbe7"
+                "7da6d8ec.042ad",
+                "feb3e7e4.820368",
+                "c44e5f71.e84558"
             ]
         ]
     },
     {
-        "id": "4a3c4a39.62e724",
+        "id": "7da6d8ec.042ad",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3062,
-        "y": 740,
-        "z": "978d88fe.49f858",
+        "x": 4563.2501220703125,
+        "y": 1102.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "9e28f8d9.f64138"
+                "e38aeca.3dbc21"
             ]
         ]
     },
     {
-        "id": "e52cd6a7.6aeb28",
+        "id": "feb3e7e4.820368",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3066,
-        "y": 780,
-        "z": "978d88fe.49f858",
+        "x": 4555.2501220703125,
+        "y": 1157.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "916c7538.648ed"
+                "7637358b.a7e4fc"
             ]
         ]
     },
     {
-        "id": "bb40af56.1cbe7",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "e38aeca.3dbc21",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3058,
-        "y": 820,
-        "z": "978d88fe.49f858",
+        "x": 4707.6324462890625,
+        "y": 1102.4056701660156,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a678576a.20b77"
+                "fc132576.25bf4"
             ]
         ]
     },
     {
-        "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": "fc132576.25bf4",
+        "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": 4891.75,
+        "y": 1100.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "823913cb.fbad5"
+            ]
+        ]
     },
     {
-        "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": "823913cb.fbad5",
+        "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": 5086.75,
+        "y": 1100.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "ac47c77.0d50538"
+            ]
+        ]
     },
     {
-        "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": "c44e5f71.e84558",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
-        "x": 3232,
-        "y": 740,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 4560.2501220703125,
+        "y": 1214.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "e748e54c.7c4d78"
+            ]
+        ]
     },
     {
-        "id": "b0af8ca6.269818",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
+        "id": "e748e54c.7c4d78",
+        "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": 4712.2501220703125,
+        "y": 1215.75,
+        "z": "21b8a150.843866",
         "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": "7637358b.a7e4fc",
+        "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": 4723.2501220703125,
+        "y": 1158.75,
+        "z": "21b8a150.843866",
         "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": "b7c2373e.9cd388",
+        "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": 4398.75,
+        "y": 925.75,
+        "z": "21b8a150.843866",
+        "wires": []
     },
     {
-        "id": "51ac9234.46b414",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "ac47c77.0d50538",
+        "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": 5289.75,
+        "y": 1104.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "6f72d542.94964c"
+                "ee4f92a0.59618"
             ]
         ]
     },
     {
-        "id": "a5f17af5.5d803",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "afac86b6.9de7f8",
+        "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": 5674.75,
+        "y": 1117.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "2dab9f7d.db59d8"
+                "25aa1b1d.6db59c",
+                "a1092777.856c6",
+                "2b2036c0.eb7f62"
             ]
         ]
     },
     {
-        "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": "ee4f92a0.59618",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
-        "comments": "",
         "outputs": 1,
-        "x": 3413,
-        "y": 1523,
-        "z": "978d88fe.49f858",
+        "x": 5468.75,
+        "y": 1104.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a1391891.c310f",
-                "ccc1b1df.33721"
+                "e370a3c1.84639",
+                "afac86b6.9de7f8"
             ]
         ]
     },
     {
-        "id": "5d06869f.f8bcb8",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "put proper values based on connectivity resource retrieved from AAI",
+        "id": "e370a3c1.84639",
+        "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": 5704.75,
+        "y": 1065.75,
+        "z": "21b8a150.843866",
         "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": "25aa1b1d.6db59c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3047.5,
-        "y": 1296,
-        "z": "978d88fe.49f858",
+        "x": 5884.75,
+        "y": 1108.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "427eefc5.61bc"
+                "345ab0d6.763128"
             ]
         ]
     },
     {
-        "id": "9dfaf98b.e80c9",
+        "id": "a1092777.856c6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3051.5,
-        "y": 1336,
-        "z": "978d88fe.49f858",
+        "x": 5876.75,
+        "y": 1163.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "8ac5fa96.75d4b"
+                "42378f39.6fe7f"
             ]
         ]
     },
     {
-        "id": "dcca7d62.830ee8",
+        "id": "2b2036c0.eb7f62",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3043.5,
-        "y": 1376,
-        "z": "978d88fe.49f858",
+        "x": 5881.75,
+        "y": 1220.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "39cf0825.d43ae"
+                "cd65837d.e470e"
             ]
         ]
     },
     {
-        "id": "39cf0825.d43ae",
+        "id": "cd65837d.e470e",
         "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": 6033.75,
+        "y": 1221.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "8ac5fa96.75d4b",
+        "id": "42378f39.6fe7f",
         "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",
+        "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": 3201.5,
-        "y": 1336,
-        "z": "978d88fe.49f858",
+        "x": 6044.75,
+        "y": 1166.75,
+        "z": "21b8a150.843866",
         "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",
+        "id": "345ab0d6.763128",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
-        "x": 3217.5,
-        "y": 1296,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 6029.13232421875,
+        "y": 1106.4056701660156,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "50b0a43e.7ed78c"
+            ]
+        ]
     },
     {
-        "id": "74572637.f29d7",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
+        "id": "50b0a43e.7ed78c",
+        "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": 2809.5,
-        "y": 1296,
-        "z": "978d88fe.49f858",
+        "x": 6243.75,
+        "y": 1102.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "135b0ed7.2faa91",
+        "id": "73d673d.bf12a0c",
         "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": 2744,
-        "y": 1256,
-        "z": "978d88fe.49f858",
+        "x": 4017.75,
+        "y": 1043.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "a58ac83b.b037d",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
+        "id": "941633f0.a03e2",
+        "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": "",
-        "x": 2756,
-        "y": 700,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 2579.75,
+        "y": 770.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "cee45ed9.f16768",
+                "eb58c452.cd625"
+            ]
+        ]
     },
     {
-        "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": "eb58c452.cd625",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3756,
-        "y": 967,
-        "z": "978d88fe.49f858",
+        "x": 2986.75,
+        "y": 788.75,
+        "z": "21b8a150.843866",
         "wires": [
-            []
+            [
+                "736cb25.e089b4c"
+            ]
         ]
     },
     {
-        "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?",
+        "id": "cee45ed9.f16768",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
         "comments": "",
-        "x": 3620,
-        "y": 926,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 2986.75,
+        "y": 733.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            [
+                "ba60006d.870c1"
+            ]
+        ]
     },
     {
-        "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",
-        "comments": "",
+        "id": "ba60006d.870c1",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 3753,
-        "y": 1522,
-        "z": "978d88fe.49f858",
+        "x": 3142.75,
+        "y": 731.75,
+        "z": "21b8a150.843866",
         "wires": [
-            []
+            [
+                "7f9728ff.5a56d",
+                "e892b304.06846"
+            ]
         ]
     },
     {
-        "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": "736cb25.e089b4c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
         "comments": "",
-        "x": 3611,
-        "y": 1480,
-        "z": "978d88fe.49f858",
-        "wires": []
+        "outputs": 1,
+        "x": 3119.75,
+        "y": 789.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "856ae03f.786118",
+        "id": "88154427.646e5",
         "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",
+        "name": "update service-instance resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \n      key='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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3683,
-        "y": 1013,
-        "z": "978d88fe.49f858",
+        "x": 5382.5,
+        "y": 842.25,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "ccc1b1df.33721",
+        "id": "ed48bc59.3a7d1",
         "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",
+        "name": "update service-instance resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \n      key='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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3682,
-        "y": 1571,
-        "z": "978d88fe.49f858",
+        "x": 4794.25,
+        "y": 2310,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]