Support for "Modify" operation of a given Transport Slice.
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
index 669eca8..d6eb686 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "c95751e3.8ae788",\r
+        "id": "eb07fd3d.499fe",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 133,\r
-        "y": 58,\r
-        "z": "978d88fe.49f858",\r
+        "x": 142,\r
+        "y": 92,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "a120d0c2.d16848"\r
+                "39c5ac20.45e1d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a120d0c2.d16848",\r
+        "id": "39c5ac20.45e1d4",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 264.2856903076172,\r
-        "y": 107.23810863494873,\r
-        "z": "978d88fe.49f858",\r
+        "x": 273.2856903076172,\r
+        "y": 141.23810863494873,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "e3f08946.3b4f3"\r
+                "2ea16900.365168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3f08946.3b4f3",\r
+        "id": "2ea16900.365168",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-activate",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 267.4286193847656,\r
-        "y": 192.00003242492676,\r
-        "z": "978d88fe.49f858",\r
+        "x": 276.4286193847656,\r
+        "y": 226.00003242492676,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "da15bb94.f35d78"\r
+                "65a4788.f116c88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da15bb94.f35d78",\r
+        "id": "65a4788.f116c88",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 417.238037109375,\r
-        "y": 321.6666564941406,\r
-        "z": "978d88fe.49f858",\r
+        "x": 426.238037109375,\r
+        "y": 355.6666564941406,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "a0613c64.0d3d18",\r
-                "bec74808.bd7fc8",\r
-                "6e589ca9.47c63c",\r
-                "a8ba9960.6cb65",\r
-                "d40da373.f15598",\r
-                "358d1f62.e4f2c8",\r
-                "a739ea85.93c65",\r
-                "19a0d774.67fb01"\r
+                "57f656d8.02c09",\r
+                "6ee54bdc.2fdd5c",\r
+                "4cf7ab90.c1f3ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0613c64.0d3d18",\r
-        "type": "set",\r
-        "name": "set vnf-level-oper-status to Active",\r
-        "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`' />",\r
+        "id": "57f656d8.02c09",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 760.3849563598633,\r
-        "y": 558.6705458434299,\r
-        "z": "978d88fe.49f858",\r
+        "x": 694.5716552734375,\r
+        "y": 742.59716796875,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bec74808.bd7fc8",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
+        "id": "d36cebd.8be9418",\r
+        "type": "comment",\r
+        "name": "new for TransportSlicing",\r
+        "info": "",\r
         "comments": "",\r
-        "x": 687.5716552734375,\r
-        "y": 1430.59716796875,\r
-        "z": "978d88fe.49f858",\r
+        "x": 726,\r
+        "y": 417,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e589ca9.47c63c",\r
-        "type": "set",\r
-        "name": "set vnf-index and vnf-object-path",\r
-        "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/'` \" />",\r
+        "id": "6ee54bdc.2fdd5c",\r
+        "type": "save",\r
+        "name": "get service-instance from aai",\r
+        "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 746,\r
+        "y": 513,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "4321e029.b0b21",\r
+                "df857197.b37508",\r
+                "caa9bf62.bc7768"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4321e029.b0b21",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 965,\r
+        "y": 451,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "1399e348.49a41d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "df857197.b37508",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 974.490966796875,\r
+        "y": 493.57403564453125,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "9c66f3b5.ba5a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "caa9bf62.bc7768",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 963,\r
+        "y": 540,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "83f89a00.0c0e7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9c66f3b5.ba5a",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1128.0623779296875,\r
+        "y": 496.8597717285156,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "83f89a00.0c0e7",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 766.5716018676758,\r
-        "y": 506.5968001158908,\r
-        "z": "978d88fe.49f858",\r
+        "x": 1132,\r
+        "y": 541,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a8ba9960.6cb65",\r
+        "id": "1399e348.49a41d",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1162,\r
+        "y": 447,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "8c655e36.efa51"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8c655e36.efa51",\r
         "type": "switchNode",\r
-        "name": "switch service-data.vnfs.vnf_length",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 775,\r
-        "y": 261,\r
-        "z": "978d88fe.49f858",\r
+        "x": 1385.33349609375,\r
+        "y": 446.99993896484375,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "752da5f3.b4cc4c",\r
-                "b945aefb.e762f",\r
-                "8cef6bde.bc7818"\r
+                "dae7ff66.9b9c6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8cef6bde.bc7818",\r
+        "id": "dae7ff66.9b9c6",\r
         "type": "outcome",\r
-        "name": "0",\r
-        "xml": "<outcome value='0'>\n",\r
+        "name": "connectivity",\r
+        "xml": "<outcome value='connectivity'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1586.0001335144043,\r
+        "y": 448.00002098083496,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "5afc15bc.b14b2c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "73d91f0d.979448",\r
+        "type": "set",\r
+        "name": "set attachment_param for OTN A",\r
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
+        "comments": "",\r
+        "x": 4405,\r
+        "y": 164,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "53d5aef.e4ebbd",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create OTN tunnel with token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4486,\r
+        "y": 479,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "ecc00da.2c7107",\r
+                "8ec5d396.327df"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ecc00da.2c7107",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1167.968994140625,\r
-        "y": 226.96875,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4795.5,\r
+        "y": 448,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "5417fb2d.edce0c"\r
+                "30cb0de4.d526fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5417fb2d.edce0c",\r
+        "id": "8ec5d396.327df",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4800.5,\r
+        "y": 513,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "d98d92f9.c81fa"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "30cb0de4.d526fa",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 1322.7778816223145,\r
-        "y": 245.889018535614,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4971.5,\r
+        "y": 448,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "752da5f3.b4cc4c",\r
-        "type": "other",\r
-        "name": "Null",\r
-        "xml": "<outcome value=''>\n",\r
+        "id": "d98d92f9.c81fa",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4967,\r
+        "y": 513,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b72def38.869578",\r
+        "type": "set",\r
+        "name": "set sotn_value",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",\r
+        "comments": "",\r
+        "x": 4352.5,\r
+        "y": 667,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "61d206ce.c84cc",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create ethernet Service without token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1161.0001335144043,\r
-        "y": 266.00007152557373,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4506.5,\r
+        "y": 715,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "5417fb2d.edce0c"\r
+                "4c218232.9ff344",\r
+                "70cfc429.d9d73c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b945aefb.e762f",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
+        "id": "4c218232.9ff344",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1154.0005416870117,\r
-        "y": 299.000075340271,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4852,\r
+        "y": 696,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "39deabe9.dfa46c"\r
+                "508ab9bd.6f59b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39deabe9.dfa46c",\r
+        "id": "70cfc429.d9d73c",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4856,\r
+        "y": 736,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "4484b215.bd52a4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "508ab9bd.6f59b",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
+        "comments": "",\r
+        "x": 5010,\r
+        "y": 696,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4484b215.bd52a4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
+        "comments": "",\r
         "outputs": 1,\r
-        "x": 1301.2700843811035,\r
-        "y": 299.5547204017639,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5013.5,\r
+        "y": 736,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "ffe0cb12.24663"\r
+                "d5eb1314.bae0c8",\r
+                "10b6b358.4dd2d5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffe0cb12.24663",\r
-        "type": "for",\r
-        "name": "for vidx..service-data.vnfs.vnf_length[]",\r
-        "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
+        "id": "1158b528.feaadb",\r
+        "type": "comment",\r
+        "name": "TODO: FIXME:",\r
+        "info": "put proper values based on connectivity resource retrieved from AAI",\r
+        "comments": "",\r
+        "x": 4350,\r
+        "y": 623,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d5eb1314.bae0c8",\r
+        "type": "save",\r
+        "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5344,\r
+        "y": 701,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4e452bee.48e2ac",\r
+        "type": "comment",\r
+        "name": "TODO: FIXME",\r
+        "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
+        "comments": "",\r
+        "x": 5208,\r
+        "y": 660,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "10b6b358.4dd2d5",\r
+        "type": "save",\r
+        "name": "update connectivity resource in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5271,\r
+        "y": 747,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "cdb19fe7.3fcc18",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
+        "comments": "",\r
+        "x": 4343,\r
+        "y": 212,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "83225463.070fc",\r
+        "type": "get-resource",\r
+        "name": "get-resource src pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4369,\r
+        "y": 329,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "c77a135e.0cf11",\r
+                "733c4b21.b0276c",\r
+                "dfbdc2b7.10d7d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c77a135e.0cf11",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4564.5001220703125,\r
+        "y": 281,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "fc1575d4.07ce9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "733c4b21.b0276c",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1547.2862014770508,\r
-        "y": 306.42864084243774,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4556.5001220703125,\r
+        "y": 336,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "d581e614.41ca28"\r
+                "2d634f91.a839c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d581e614.41ca28",\r
+        "id": "fc1575d4.07ce9",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1766.6358337402344,\r
-        "y": 305.96872091293335,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4708.8824462890625,\r
+        "y": 280.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "26c3005d.c41c58"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fb614f2c.314568",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5291,\r
+        "y": 283,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "6cb341ea.d215b"\r
+                "5511aade.71874c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cb341ea.d215b",\r
+        "id": "26c3005d.c41c58",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4893,\r
+        "y": 279,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "d1afc9f2.3db068"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d1afc9f2.3db068",\r
         "type": "switchNode",\r
-        "name": "switch vnfid found",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1920.715431213379,\r
-        "y": 305.67880296707153,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5088,\r
+        "y": 279,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "7e8f8e16.82297"\r
+                "fb614f2c.314568"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e8f8e16.82297",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
+        "id": "dfbdc2b7.10d7d",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4561.5001220703125,\r
+        "y": 393,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "1874b649.d37aaa"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1874b649.d37aaa",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 4713.5001220703125,\r
+        "y": 394,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2d634f91.a839c8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 4724.5001220703125,\r
+        "y": 337,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "37df0014.a385b",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5676,\r
+        "y": 296,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "43de30da.db75e8",\r
+                "e5ad5cbe.572928",\r
+                "12e2c219.e2a25e"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5511aade.71874c",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 5470,\r
+        "y": 283,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "29681795.e63f18",\r
+                "37df0014.a385b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "29681795.e63f18",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domainA id",\r
+        "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 5706,\r
+        "y": 244,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "43de30da.db75e8",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5886,\r
+        "y": 287,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "9fb5e37f.eaa9f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e5ad5cbe.572928",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5878,\r
+        "y": 342,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "24f5f29e.218576"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "12e2c219.e2a25e",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5883,\r
+        "y": 399,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "cd568772.16e428"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cd568772.16e428",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 6035,\r
+        "y": 400,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "24f5f29e.218576",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 6046,\r
+        "y": 345,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9fb5e37f.eaa9f",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2131.6675758361816,\r
-        "y": 308.571494102478,\r
-        "z": "978d88fe.49f858",\r
+        "x": 6030.38232421875,\r
+        "y": 284.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "1efc1703.0b69f1"\r
+                "2b11e0ba.ac6cd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1efc1703.0b69f1",\r
+        "id": "2b11e0ba.ac6cd8",\r
         "type": "set",\r
-        "name": "set tmp.vidx and ctx.vnf-data",\r
-        "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",\r
+        "name": "set controller domainA data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 2341.199951171875,\r
-        "y": 310.32159423828125,\r
-        "z": "978d88fe.49f858",\r
+        "x": 6245,\r
+        "y": 281,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d40da373.f15598",\r
-        "type": "save",\r
-        "name": "update AnAI - vnf-instance.orchestration-status",\r
-        "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\" />",\r
+        "id": "4cf7ab90.c1f3ec",\r
+        "type": "execute",\r
+        "name": "execute properties",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 785.9999618530273,\r
-        "y": 625.0103714736179,\r
-        "z": "978d88fe.49f858",\r
+        "x": 712,\r
+        "y": 461,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "358d1f62.e4f2c8",\r
+        "id": "fec1365a.907b4",\r
         "type": "set",\r
-        "name": "copy input data to service data",\r
-        "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.' />",\r
+        "name": "set attachment_param for OTN B",\r
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",\r
         "comments": "",\r
-        "x": 765.0000762939453,\r
-        "y": 456.01033284980804,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3812,\r
+        "y": 1621,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a739ea85.93c65",\r
-        "type": "switchNode",\r
-        "name": "switch vnf-level-oper-status",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",\r
+        "id": "eb21cc8f.003df8",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create OTN tunnel with token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 751.7499389648438,\r
-        "y": 361.00390270072967,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3875,\r
+        "y": 1950,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "c40ac9fb.21106",\r
-                "625ef5e9.0fa304"\r
+                "fc655ff.669232",\r
+                "dfbdc395.b4aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c40ac9fb.21106",\r
-        "type": "outcome",\r
-        "name": "outcome Created",\r
-        "xml": "<outcome value='Created'>\n",\r
+        "id": "fc655ff.669232",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1131.5833320617676,\r
-        "y": 366.1149909766391,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4170.5,\r
+        "y": 1917,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "50da061e.3d2a4"\r
+                "d2ad58a1.dbb57"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "625ef5e9.0fa304",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
+        "id": "dfbdc395.b4aa",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1109.583351135254,\r
-        "y": 416.1150024207309,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4175.5,\r
+        "y": 1982,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "9d9a6d0b.f63a18"\r
+                "43fba27a.3e8bd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d9a6d0b.f63a18",\r
+        "id": "d2ad58a1.dbb57",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'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`\" />",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 1269.0831184387207,\r
-        "y": 419.1150014670566,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4338.5,\r
+        "y": 1917,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50da061e.3d2a4",\r
+        "id": "43fba27a.3e8bd4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
+        "comments": "",\r
         "outputs": 1,\r
-        "x": 1341.889705657959,\r
-        "y": 377.44016626197845,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4349,\r
+        "y": 1982,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7a49c1a1.74cca",\r
-        "type": "comment",\r
-        "name": "new for TransportSlicing",\r
-        "info": "",\r
+        "id": "a7e92939.08a52",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 726,\r
-        "y": 699,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3751,\r
+        "y": 1678,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "19a0d774.67fb01",\r
-        "type": "save",\r
-        "name": "get service-instance from aai",\r
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $service-data.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\">",\r
+        "id": "25024bed.781cdc",\r
+        "type": "get-resource",\r
+        "name": "get-resource dst pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 737,\r
-        "y": 749,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3771,\r
+        "y": 1775,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "ef923a7d.6928a8",\r
-                "981c314b.31ecb8",\r
-                "65818037.104038"\r
+                "17a289eb.8378c6",\r
+                "4e86abed.341d6c",\r
+                "9944c222.7ecb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef923a7d.6928a8",\r
+        "id": "17a289eb.8378c6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 953,\r
-        "y": 714,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3973.5001220703125,\r
+        "y": 1728,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "c4da4ce2.e86fd"\r
+                "2250bf3f.3fcd88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "981c314b.31ecb8",\r
+        "id": "4e86abed.341d6c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 962.490966796875,\r
-        "y": 756.5740356445312,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3965.5001220703125,\r
+        "y": 1783,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "2c51a746.8529b8"\r
+                "7fe7998e.7db16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "65818037.104038",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
+        "id": "2250bf3f.3fcd88",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4117.8824462890625,\r
+        "y": 1725.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "19367b54.5d4395"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "19367b54.5d4395",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4302,\r
+        "y": 1740,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "e137d17b.53afd"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9944c222.7ecb4",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 951,\r
-        "y": 803,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3970.5001220703125,\r
+        "y": 1840,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "11f3085c.6c3b58"\r
+                "c7e8bb41.e69fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c51a746.8529b8",\r
+        "id": "c7e8bb41.e69fc8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1116.0623779296875,\r
-        "y": 759.8597717285156,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4122.5001220703125,\r
+        "y": 1841,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11f3085c.6c3b58",\r
+        "id": "7fe7998e.7db16",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1120,\r
-        "y": 804,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4133.5001220703125,\r
+        "y": 1786,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c4da4ce2.e86fd",\r
-        "type": "for",\r
-        "name": "for each relationship",\r
-        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
+        "id": "18a3ba34.8443fe",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1150,\r
-        "y": 710,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4700,\r
+        "y": 1744,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "eb26c03f.cde3a"\r
+                "cca686b1.a86b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb26c03f.cde3a",\r
+        "id": "e137d17b.53afd",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
-        "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
+        "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1373.33349609375,\r
-        "y": 709.9999389648438,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4497,\r
+        "y": 1740,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "b65d7d38.16fc68"\r
+                "18a3ba34.8443fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b65d7d38.16fc68",\r
-        "type": "outcome",\r
-        "name": "connectivity",\r
-        "xml": "<outcome value='connectivity'>\n",\r
+        "id": "ec259c93.12e46",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1574.0001335144043,\r
-        "y": 711.000020980835,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5085,\r
+        "y": 1743,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "fda5561b.cca698"\r
+                "cf9d2f3.18e805",\r
+                "1901d45c.9387cc",\r
+                "86a361e1.5f9008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "edc6ee23.1891a",\r
-        "type": "save",\r
-        "name": "get connectivityA from aai",\r
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityA\" >\n",\r
+        "id": "cca686b1.a86b48",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 4877,\r
+        "y": 1736,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "2d219530.71913a",\r
+                "ec259c93.12e46"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2d219530.71913a",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domainB id",\r
+        "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
+        "comments": "",\r
+        "x": 5115,\r
+        "y": 1691,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "bb17bcb1.afece8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 5444,\r
+        "y": 1847,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "e71302c9.0e3fc8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 5455,\r
+        "y": 1792,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c367d2df.137348",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2179,\r
-        "y": 599,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5439.38232421875,\r
+        "y": 1731.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "81d6e319.abfd8",\r
-                "313c36d7.969d3a",\r
-                "3d5cf6f2.953e9a"\r
+                "bfc16252.e05aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fda5561b.cca698",\r
-        "type": "switchNode",\r
-        "name": "switch $rel-index == 0",\r
-        "xml": "<switch test=\"`$rel-index == 0`\">\n\n",\r
+        "id": "bfc16252.e05aa",\r
+        "type": "set",\r
+        "name": "set controller domainB data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
+        "comments": "",\r
+        "x": 5654,\r
+        "y": 1728,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cf9d2f3.18e805",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1762,\r
-        "y": 709,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5295,\r
+        "y": 1734,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "44bd1b.3cc782e4",\r
-                "f85fb605.a76398"\r
+                "c367d2df.137348"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44bd1b.3cc782e4",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
+        "id": "1901d45c.9387cc",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1985,\r
-        "y": 599,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5287,\r
+        "y": 1789,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "edc6ee23.1891a"\r
+                "e71302c9.0e3fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f85fb605.a76398",\r
-        "type": "outcomeFalse",\r
-        "name": "false",\r
-        "xml": "<outcome value='false'>\n",\r
+        "id": "86a361e1.5f9008",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1971,\r
-        "y": 1156,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5292,\r
+        "y": 1846,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "7b60b790.bc4c4"\r
+                "bb17bcb1.afece8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b60b790.bc4c4",\r
+        "id": "5afc15bc.b14b2c",\r
         "type": "save",\r
-        "name": "get connectivityB from aai",\r
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[1].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityB\" >\n",\r
+        "name": "get connectivity from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2167,\r
-        "y": 1156,\r
-        "z": "978d88fe.49f858",\r
+        "x": 1824,\r
+        "y": 450,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "8b96b70e.2f635",\r
-                "20f5c9d8.832b4e",\r
-                "f513c25.b78554"\r
+                "c4ea2f12.0682f8",\r
+                "89ba984f.fbff08",\r
+                "4c31ddac.b140a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81d6e319.abfd8",\r
+        "id": "c4ea2f12.0682f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2385,\r
-        "y": 559,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2032,\r
+        "y": 414,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "98b1c0b9.f7f4b"\r
+                "207f18a3.1780c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "313c36d7.969d3a",\r
+        "id": "89ba984f.fbff08",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2385.490966796875,\r
-        "y": 604.5740356445312,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2032.490966796875,\r
+        "y": 459.57403564453125,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "d4d990d4.f7b0a8"\r
+                "db0bb70b.5af75"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d5cf6f2.953e9a",\r
+        "id": "4c31ddac.b140a4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2383,\r
-        "y": 648,\r
-        "z": "978d88fe.49f858",\r
-        "wires": [\r
-            [\r
-                "97be5e5a.798428"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "98b1c0b9.f7f4b",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 2557.66650390625,\r
-        "y": 558,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2030,\r
+        "y": 503,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "2d415746.a7be9",\r
-                "96d25665.97a75",\r
-                "2f11d14a.7d5856",\r
-                "d0c66bee.225358"\r
+                "34efc961.392a36"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4d990d4.f7b0a8",\r
+        "id": "db0bb70b.5af75",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2548.0623779296875,\r
-        "y": 604.8597717285156,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2195.0623779296875,\r
+        "y": 459.8597717285156,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97be5e5a.798428",\r
+        "id": "34efc961.392a36",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2552,\r
-        "y": 649,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2199,\r
+        "y": 504,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b96b70e.2f635",\r
+        "id": "da2f8124.076ab8",\r
+        "type": "save",\r
+        "name": "get vpn-binding from aai",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2505,\r
+        "y": 503,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "28f88824.b7c4b8",\r
+                "d6ad8583.7ca128",\r
+                "c9e967f5.e899f8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f459c148.932bf8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 2885,\r
+        "y": 591,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "1c6e3351.8ccb0d"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "28f88824.b7c4b8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2387,\r
-        "y": 1127,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2716,\r
+        "y": 592,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "aff8819.10cbe8"\r
+                "f459c148.932bf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20f5c9d8.832b4e",\r
+        "id": "d6ad8583.7ca128",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2388.490966796875,\r
-        "y": 1172.5740356445312,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2718.490966796875,\r
+        "y": 487.57403564453125,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "cb55df0.f8980a"\r
+                "ef5820a6.09d9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f513c25.b78554",\r
+        "id": "c9e967f5.e899f8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2385,\r
-        "y": 1218,\r
-        "z": "978d88fe.49f858",\r
-        "wires": [\r
-            [\r
-                "fd8e37a.cf27348"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "aff8819.10cbe8",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 2559.66650390625,\r
-        "y": 1128,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2714,\r
+        "y": 532,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "490cf25b.6f8bbc",\r
-                "7192c89b.9fa8a",\r
-                "83e10369.9e2a48",\r
-                "8632824a.a7d1a"\r
+                "bd9d5fad.2d262"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb55df0.f8980a",\r
+        "id": "bd9d5fad.2d262",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2550.0623779296875,\r
-        "y": 1174.8597717285156,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2882,\r
+        "y": 532,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fd8e37a.cf27348",\r
+        "id": "ef5820a6.09d9d",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2554,\r
-        "y": 1219,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2881.0625,\r
+        "y": 486.8597412109375,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2d415746.a7be9",\r
-        "type": "save",\r
-        "name": "get vpn-binding-A from aai",\r
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivityA.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-bindingA\" >\n",\r
+        "id": "207f18a3.1780c8",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2782,\r
-        "y": 556,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2233,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "2054e000.51325",\r
-                "24cb3e35.5919ba",\r
-                "49ca8d9.cac6774"\r
+                "208bed02.1187fa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "490cf25b.6f8bbc",\r
-        "type": "save",\r
-        "name": "get vpn-binding-B from aai",\r
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivityB.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-bindingB\" >\n",\r
+        "id": "208bed02.1187fa",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2438,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "f005e0a8.cc7dc8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f005e0a8.cc7dc8",\r
+        "type": "outcome",\r
+        "name": "vpn-binding",\r
+        "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2786,\r
-        "y": 1126,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2604,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "9697ed36.e16ad8",\r
-                "1b825f20.68c389",\r
-                "214845f.325e5ba"\r
+                "51d187ad.ad3078"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8505e692.6e58e8",\r
+        "id": "51d187ad.ad3078",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3166,\r
-        "y": 556,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2767,\r
+        "y": 409,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "1e245d3c.a778db",\r
-                "f09e2868.9a86c8"\r
+                "da2f8124.076ab8",\r
+                "1e447cc1.915cb3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e245d3c.a778db",\r
-        "type": "set",\r
-        "name": "set attachment_param for OTN A",\r
-        "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",\r
-        "comments": "",\r
-        "x": 3402,\r
-        "y": 555,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "2054e000.51325",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "aecb0c53.70b3e8",\r
+        "type": "switchNode",\r
+        "name": "switch vpn-binding has dst-access-ltp",\r
+        "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2993,\r
-        "y": 558,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3326,\r
+        "y": 692,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "8505e692.6e58e8"\r
+                "45f40514.0a111c",\r
+                "e5457af4.842818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24cb3e35.5919ba",\r
-        "type": "not-found",\r
-        "name": "not-found",\r
-        "xml": "<outcome value='not-found'>\n",\r
+        "id": "45f40514.0a111c",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2993.490966796875,\r
-        "y": 603.5740356445312,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3540,\r
+        "y": 729,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "7b7e2f47.0a22b"\r
+                "4c5d5e83.4b55d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49ca8d9.cac6774",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
+        "id": "e5457af4.842818",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2991,\r
-        "y": 647,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3542,\r
+        "y": 667,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "f869989c.799108"\r
+                "d204a9f5.cb1f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f869989c.799108",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
-        "comments": "",\r
-        "x": 3158,\r
-        "y": 646,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "7b7e2f47.0a22b",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
-        "comments": "",\r
-        "x": 3156.0623779296875,\r
-        "y": 603.8597717285156,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "9697ed36.e16ad8",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "4c5d5e83.4b55d8",\r
+        "type": "switchNode",\r
+        "name": "switch vpn-binding has src-access-ltp",\r
+        "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2993,\r
-        "y": 1129,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3120,\r
+        "y": 1972,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "d0988988.8d0a18"\r
+                "e25a0aae.dc3b6",\r
+                "5811aab2.c9cdb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b825f20.68c389",\r
-        "type": "not-found",\r
-        "name": "not-found",\r
-        "xml": "<outcome value='not-found'>\n",\r
+        "id": "e25a0aae.dc3b6",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2993.490966796875,\r
-        "y": 1174.5740356445312,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3373,\r
+        "y": 2006,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "875a2548.0cfdc8"\r
+                "e2283676.c05cf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "214845f.325e5ba",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
+        "id": "5811aab2.c9cdb4",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2991,\r
-        "y": 1218,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3373,\r
+        "y": 1950,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "5743b059.d8fee"\r
+                "5f1f11a6.4b622"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5743b059.d8fee",\r
+        "id": "e2283676.c05cf8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3160,\r
-        "y": 1219,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3524,\r
+        "y": 2006,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "875a2548.0cfdc8",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "id": "ef6002a3.a9265",\r
+        "type": "set",\r
+        "name": "set vpn-bindingA and connectivityA",\r
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
+        "comments": "",\r
+        "x": 4400,\r
+        "y": 104,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d11d0786.01d8c8",\r
+        "type": "set",\r
+        "name": "set vpn-bindingB and connectivityB",\r
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
         "comments": "",\r
-        "x": 3156.0623779296875,\r
-        "y": 1174.8597717285156,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3808,\r
+        "y": 1563,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d0988988.8d0a18",\r
+        "id": "4923e79.d3d2a98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
+        "comments": "",\r
         "outputs": 1,\r
-        "x": 3162,\r
-        "y": 1129,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4091,\r
+        "y": 361,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "ef6002a3.a9265",\r
+                "73d91f0d.979448",\r
+                "cdb19fe7.3fcc18",\r
+                "83225463.070fc",\r
+                "b72def38.869578",\r
+                "61d206ce.c84cc",\r
+                "53d5aef.e4ebbd"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5f1f11a6.4b622",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 3524,\r
+        "y": 1949,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "7dda745d.4071a4",\r
-                "6468b39.c45bd4c"\r
+                "d11d0786.01d8c8",\r
+                "fec1365a.907b4",\r
+                "a7e92939.08a52",\r
+                "25024bed.781cdc",\r
+                "eb21cc8f.003df8",\r
+                "1be8ac25.0620fc",\r
+                "6fb79d87.420834"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7dda745d.4071a4",\r
+        "id": "1be8ac25.0620fc",\r
         "type": "set",\r
-        "name": "set attachment_param for OTN B",\r
-        "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",\r
+        "name": "set sotn_value",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",\r
         "comments": "",\r
-        "x": 3398,\r
-        "y": 1128,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3753,\r
+        "y": 2092,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f09e2868.9a86c8",\r
+        "id": "6fb79d87.420834",\r
         "type": "execute",\r
-        "name": "execute RestApiCallNode Create OTN tunnel with token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/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`\" />",\r
+        "name": "execute RestApiCallNode Create ethernet Service without token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3480,\r
-        "y": 601,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3907,\r
+        "y": 2140,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "a8d618e8.7c53c8",\r
-                "84fddcaa.8b02a"\r
+                "6175c964.8889d",\r
+                "add709ae.0740f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8d618e8.7c53c8",\r
+        "id": "6175c964.8889d",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3790.5,\r
-        "y": 568,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4252.5,\r
+        "y": 2121,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "6eacb8a7.7aa3d"\r
+                "7caa2ba7.6bf4dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84fddcaa.8b02a",\r
+        "id": "add709ae.0740f",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3805.5,\r
-        "y": 633,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4256.5,\r
+        "y": 2161,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "b82bd962.cbba2"\r
+                "43eb2ee.41b33d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6eacb8a7.7aa3d",\r
+        "id": "7caa2ba7.6bf4dc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 3974.5,\r
-        "y": 564,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4410.5,\r
+        "y": 2121,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b82bd962.cbba2",\r
+        "id": "43eb2ee.41b33d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4000,\r
-        "y": 626,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4414,\r
+        "y": 2161,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "30f33337.055d14",\r
+                "948532eb.e6c7c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bc6f9b2b.7321f",\r
+        "type": "comment",\r
+        "name": "TODO: FIXME:",\r
+        "info": "put proper values based on connectivity resource retrieved from AAI",\r
+        "comments": "",\r
+        "x": 3750.5,\r
+        "y": 2048,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "30f33337.055d14",\r
+        "type": "save",\r
+        "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4754,\r
+        "y": 2160,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "74c1bd3a.398664",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
+        "id": "227afae6.b4c94e",\r
+        "type": "comment",\r
+        "name": "TODO: FIXME",\r
+        "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
+        "comments": "",\r
+        "x": 4612,\r
+        "y": 2118,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "948532eb.e6c7c",\r
+        "type": "save",\r
+        "name": "update connectivity resource in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3775,\r
-        "y": 1150,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4683,\r
+        "y": 2209,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
-            [\r
-                "fc791248.fc4648"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "fdc0c54.10c51b8",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "55624da8.df976c",\r
+        "type": "set",\r
+        "name": "set attachment_param (gfp-n) for OTN",\r
+        "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
+        "comments": "",\r
+        "x": 3317,\r
+        "y": 632,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "1e447cc1.915cb3",\r
+        "type": "set",\r
+        "name": "unset tmp.aai.vpn-binding",\r
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
+        "comments": "",\r
+        "x": 2951,\r
+        "y": 280,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f396e52b.35559",\r
+        "type": "comment",\r
+        "name": "only dst ttp exists. No src",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3912,\r
+        "y": 318,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "72b06eec.578eb8",\r
+        "type": "comment",\r
+        "name": "only src ttp exists. No dst",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 3469,\r
+        "y": 1896,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "d204a9f5.cb1f",\r
+        "type": "switchNode",\r
+        "name": "switch vpn-binding has src-access-ltp",\r
+        "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3790,\r
-        "y": 1215,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3648,\r
+        "y": 480,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "16f26dc2.3147e2"\r
+                "7da55af.10937a4",\r
+                "d30ba4e8.997a68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc791248.fc4648",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",\r
+        "id": "d30ba4e8.997a68",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
-        "x": 3959,\r
-        "y": 1146,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 3890,\r
+        "y": 1069,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "b0909b7a.d37638"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "16f26dc2.3147e2",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
+        "id": "7da55af.10937a4",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3984.5,\r
-        "y": 1208,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3884,\r
+        "y": 360,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
-            []\r
+            [\r
+                "4923e79.d3d2a98"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "6468b39.c45bd4c",\r
-        "type": "execute",\r
-        "name": "execute RestApiCallNode Create OTN tunnel with token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/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`\" />",\r
-        "comments": "",\r
+        "id": "b0909b7a.d37638",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3464.5,\r
-        "y": 1183,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4048,\r
+        "y": 1068,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "74c1bd3a.398664",\r
-                "fdc0c54.10c51b8"\r
+                "aadf2b5c.a1838",\r
+                "8fb5b52a.4e2ae",\r
+                "a006da1c.c23038",\r
+                "7e67d000.77abb",\r
+                "23d1e7d8.976258"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f11d14a.7d5856",\r
+        "id": "8fb5b52a.4e2ae",\r
         "type": "set",\r
-        "name": "set sotn_value",\r
-        "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' />",\r
+        "name": "set attachment_param for OTN G",\r
+        "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",\r
         "comments": "",\r
-        "x": 2766.5,\r
-        "y": 898,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4312,\r
+        "y": 951,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d0c66bee.225358",\r
+        "id": "23d1e7d8.976258",\r
         "type": "execute",\r
-        "name": "execute RestApiCallNode Create ethernet Service without token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"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\"/>",\r
+        "name": "execute RestApiCallNode Create OTN tunnel with token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2920.5,\r
-        "y": 946,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4393,\r
+        "y": 1266,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "3db41fa8.f38878",\r
-                "fbb2729e.49853"\r
+                "c8d598bd.cbc8e",\r
+                "c93ae11e.1c54c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3db41fa8.f38878",\r
+        "id": "c8d598bd.cbc8e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3266,\r
-        "y": 927,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4702.5,\r
+        "y": 1235,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "f346270d.843368"\r
+                "a086276f.4222f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fbb2729e.49853",\r
+        "id": "c93ae11e.1c54c8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3270,\r
-        "y": 967,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4707.5,\r
+        "y": 1300,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "c716fb9b.f3ffc"\r
+                "51323b7.caecec4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f346270d.843368",\r
+        "id": "a086276f.4222f8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 3424,\r
-        "y": 927,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4878.5,\r
+        "y": 1235,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c716fb9b.f3ffc",\r
+        "id": "51323b7.caecec4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3427.5,\r
-        "y": 967,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4874,\r
+        "y": 1300,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
-            [\r
-                "3124f6f9.b8bd1a",\r
-                "856ae03f.786118"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "4c34ee00.d0d39",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME:",\r
-        "info": "put proper values based on connectivity resource retrieved from AAI",\r
+        "id": "a006da1c.c23038",\r
+        "type": "set",\r
+        "name": "set pnf-name",\r
+        "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 2764,\r
-        "y": 854,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4250,\r
+        "y": 999,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "96d25665.97a75",\r
+        "id": "7e67d000.77abb",\r
         "type": "get-resource",\r
-        "name": "get-resource esr-thirdparty-sdnc",\r
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
+        "name": "get-resource src pnf",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2816,\r
-        "y": 780,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4276,\r
+        "y": 1116,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "4a3c4a39.62e724",\r
-                "e52cd6a7.6aeb28",\r
-                "bb40af56.1cbe7"\r
+                "ec2bb2c1.50dad",\r
+                "6fe2c398.ccd7b4",\r
+                "2cf209f9.a94e2e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a3c4a39.62e724",\r
+        "id": "ec2bb2c1.50dad",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3062,\r
-        "y": 740,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4471.5001220703125,\r
+        "y": 1068,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "9e28f8d9.f64138"\r
+                "e5c84b9e.98975"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e52cd6a7.6aeb28",\r
+        "id": "6fe2c398.ccd7b4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3066,\r
-        "y": 780,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4463.5001220703125,\r
+        "y": 1123,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "916c7538.648ed"\r
+                "be59a3.0881066"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb40af56.1cbe7",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
+        "id": "e5c84b9e.98975",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3058,\r
-        "y": 820,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4615.8824462890625,\r
+        "y": 1067.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "a678576a.20b77"\r
+                "40635ccb.0881a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a678576a.20b77",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
+        "id": "40635ccb.0881a4",\r
+        "type": "for",\r
+        "name": "for each relationship",\r
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
-        "x": 3216,\r
-        "y": 820,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 4800,\r
+        "y": 1066,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "ff02a9b.ff8ffd8"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "916c7538.648ed",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
+        "id": "ff02a9b.ff8ffd8",\r
+        "type": "switchNode",\r
+        "name": "switch related-to",\r
+        "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
-        "x": 3216,\r
-        "y": 780,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 4995,\r
+        "y": 1066,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "d3d180f4.36fa68"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "9e28f8d9.f64138",\r
-        "type": "set",\r
-        "name": "set controller data",\r
-        "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",\r
+        "id": "2cf209f9.a94e2e",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
-        "x": 3232,\r
-        "y": 740,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 4468.5001220703125,\r
+        "y": 1180,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "2b5a1252.216fe6"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "b0af8ca6.269818",\r
-        "type": "comment",\r
-        "name": "Get controller info and send request",\r
-        "info": "",\r
+        "id": "2b5a1252.216fe6",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2824,\r
-        "y": 740,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4620.5001220703125,\r
+        "y": 1181,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "83e10369.9e2a48",\r
-        "type": "set",\r
-        "name": "set sotn_value",\r
-        "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' />",\r
+        "id": "be59a3.0881066",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2752,\r
-        "y": 1454,\r
-        "z": "978d88fe.49f858",\r
+        "x": 4631.5001220703125,\r
+        "y": 1124,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8632824a.a7d1a",\r
-        "type": "execute",\r
-        "name": "execute RestApiCallNode Create ethernet Service without token",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"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\"/>",\r
+        "id": "aadf2b5c.a1838",\r
+        "type": "set",\r
+        "name": "set vpn-bindingG and connectivityG",\r
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
         "comments": "",\r
-        "outputs": 1,\r
-        "x": 2906,\r
-        "y": 1502,\r
-        "z": "978d88fe.49f858",\r
-        "wires": [\r
-            [\r
-                "51ac9234.46b414",\r
-                "a5f17af5.5d803"\r
-            ]\r
-        ]\r
+        "x": 4307,\r
+        "y": 891,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": []\r
     },\r
     {\r
-        "id": "51ac9234.46b414",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
+        "id": "d3d180f4.36fa68",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3251.5,\r
-        "y": 1483,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5198,\r
+        "y": 1070,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "6f72d542.94964c"\r
+                "8355bb98.2142e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5f17af5.5d803",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "d998285a.8338c",\r
+        "type": "execute",\r
+        "name": "get esr-thirdparty-sdnc",\r
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3255.5,\r
-        "y": 1523,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5583,\r
+        "y": 1083,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "2dab9f7d.db59d8"\r
+                "38daac86.dbf464",\r
+                "21dc6947.7d9bae",\r
+                "a47aca30.5160e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f72d542.94964c",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",\r
-        "comments": "",\r
-        "x": 3409.5,\r
-        "y": 1483,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "2dab9f7d.db59d8",\r
+        "id": "8355bb98.2142e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
-        "comments": "",\r
         "outputs": 1,\r
-        "x": 3413,\r
-        "y": 1523,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5377,\r
+        "y": 1070,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "a1391891.c310f",\r
-                "ccc1b1df.33721"\r
+                "583e9682.750428",\r
+                "d998285a.8338c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d06869f.f8bcb8",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME:",\r
-        "info": "put proper values based on connectivity resource retrieved from AAI",\r
+        "id": "583e9682.750428",\r
+        "type": "set",\r
+        "name": "set esr-thirdparty-sdnc domainG id",\r
+        "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 2749.5,\r
-        "y": 1410,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5613,\r
+        "y": 1031,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7192c89b.9fa8a",\r
-        "type": "get-resource",\r
-        "name": "get-resource esr-thirdparty-sdnc",\r
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2801.5,\r
-        "y": 1336,\r
-        "z": "978d88fe.49f858",\r
-        "wires": [\r
-            [\r
-                "e2e5c437.a11d5",\r
-                "9dfaf98b.e80c9",\r
-                "dcca7d62.830ee8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "e2e5c437.a11d5",\r
+        "id": "38daac86.dbf464",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3047.5,\r
-        "y": 1296,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5793,\r
+        "y": 1074,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "427eefc5.61bc"\r
+                "10b34ad5.e58d9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9dfaf98b.e80c9",\r
+        "id": "21dc6947.7d9bae",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3051.5,\r
-        "y": 1336,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5785,\r
+        "y": 1129,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "8ac5fa96.75d4b"\r
+                "6ce9bc65.05009c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dcca7d62.830ee8",\r
+        "id": "a47aca30.5160e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3043.5,\r
-        "y": 1376,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5790,\r
+        "y": 1186,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             [\r
-                "39cf0825.d43ae"\r
+                "18239e9b.852729"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39cf0825.d43ae",\r
+        "id": "18239e9b.852729",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3201.5,\r
-        "y": 1376,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5942,\r
+        "y": 1187,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ac5fa96.75d4b",\r
+        "id": "6ce9bc65.05009c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3201.5,\r
-        "y": 1336,\r
-        "z": "978d88fe.49f858",\r
+        "x": 5953,\r
+        "y": 1132,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "427eefc5.61bc",\r
-        "type": "set",\r
-        "name": "set controller data",\r
-        "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",\r
-        "comments": "",\r
-        "x": 3217.5,\r
-        "y": 1296,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "74572637.f29d7",\r
-        "type": "comment",\r
-        "name": "Get controller info and send request",\r
-        "info": "",\r
+        "id": "10b34ad5.e58d9d",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
-        "x": 2809.5,\r
-        "y": 1296,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 5937.38232421875,\r
+        "y": 1071.6556701660156,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "d4058b68.bd8818"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "135b0ed7.2faa91",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME:",\r
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",\r
+        "id": "d4058b68.bd8818",\r
+        "type": "set",\r
+        "name": "set controller domainG data",\r
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 2744,\r
-        "y": 1256,\r
-        "z": "978d88fe.49f858",\r
+        "x": 6152,\r
+        "y": 1068,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a58ac83b.b037d",\r
+        "id": "3a09f359.556f04",\r
         "type": "comment",\r
-        "name": "TODO: FIXME:",\r
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",\r
+        "name": "both src and dst exist",\r
+        "info": "",\r
         "comments": "",\r
-        "x": 2756,\r
-        "y": 700,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3926,\r
+        "y": 1009,\r
+        "z": "f351885d.7dcd3",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3124f6f9.b8bd1a",\r
-        "type": "save",\r
-        "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.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",\r
+        "id": "1c6e3351.8ccb0d",\r
+        "type": "switchNode",\r
+        "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
+        "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3756,\r
-        "y": 967,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2488,\r
+        "y": 736,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
-            []\r
+            [\r
+                "91c41639.2357b",\r
+                "5aa31f25.4b2718"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "554a4766.c457a",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME",\r
-        "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
-        "comments": "",\r
-        "x": 3620,\r
-        "y": 926,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "a1391891.c310f",\r
-        "type": "save",\r
-        "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.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",\r
+        "id": "5aa31f25.4b2718",\r
+        "type": "outcomeFalse",\r
+        "name": "false",\r
+        "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3753,\r
-        "y": 1522,\r
-        "z": "978d88fe.49f858",\r
+        "x": 2895,\r
+        "y": 754,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
-            []\r
+            [\r
+                "49ef7599.6e682c"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "90d3682d.e54348",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME",\r
-        "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
+        "id": "91c41639.2357b",\r
+        "type": "outcomeTrue",\r
+        "name": "true",\r
+        "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
-        "x": 3611,\r
-        "y": 1480,\r
-        "z": "978d88fe.49f858",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 2895,\r
+        "y": 699,\r
+        "z": "f351885d.7dcd3",\r
+        "wires": [\r
+            [\r
+                "c7ffb45b.775578"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "856ae03f.786118",\r
-        "type": "save",\r
-        "name": "update connectivity resource in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Activated' />\n",\r
-        "comments": "",\r
+        "id": "c7ffb45b.775578",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3683,\r
-        "y": 1013,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3051,\r
+        "y": 697,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
-            []\r
+            [\r
+                "55624da8.df976c",\r
+                "aecb0c53.70b3e8"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "ccc1b1df.33721",\r
-        "type": "save",\r
-        "name": "update connectivity resource in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Activated' />\n",\r
+        "id": "49ef7599.6e682c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3682,\r
-        "y": 1571,\r
-        "z": "978d88fe.49f858",\r
+        "x": 3028,\r
+        "y": 755,\r
+        "z": "f351885d.7dcd3",\r
         "wires": [\r
             []\r
         ]\r