Making sure not to use the same CLL instance name for all endpoints' description...

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / cloud_leased_line / GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json

index 2fdcec4..c96583a 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
@@ -1,199 +1,199 @@
  [\r
    {\r
-    "id": "61751fea.5e29c",\r
+    "id": "10a422cf.1eeed5",\r
      "type": "save",\r
      "name": "get all-vpn-bindings from aai",\r
      "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 309,\r
-    "y": 328,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 676,\r
+    "y": 287,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "9390d80.e27dda8",\r
-        "a2edd3b5.431178",\r
-        "d95bcddf.5304c8"\r
+        "b0a990da.c03088",\r
+        "b7ea05a6.0fe86",\r
+        "2c56ab13.0959e4"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "9390d80.e27dda8",\r
+    "id": "b0a990da.c03088",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 497,\r
-    "y": 341,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 864,\r
+    "y": 300,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "122deece.249539"\r
+        "455891ac.f0409"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "a2edd3b5.431178",\r
+    "id": "b7ea05a6.0fe86",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 504.4909362792969,\r
-    "y": 383.57403564453125,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 871.4909362792969,\r
+    "y": 342.57403564453125,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "d95bcddf.5304c8",\r
+    "id": "2c56ab13.0959e4",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 495,\r
-    "y": 430,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 862,\r
+    "y": 389,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "c3fd03f5.ced1a"\r
+        "630bfd04.7da00c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "122deece.249539",\r
+    "id": "455891ac.f0409",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 670,\r
-    "y": 339,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1037,\r
+    "y": 298,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "26858e32.576aa2"\r
+        "7e5b0143.2c92a8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "26858e32.576aa2",\r
+    "id": "7e5b0143.2c92a8",\r
      "type": "for",\r
      "name": "for vpnidx in all-vpn-bindings",\r
      "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 899,\r
-    "y": 340,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1266,\r
+    "y": 299,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "b9b3eee1.451228"\r
+        "62dd4d08.7a116c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "b9b3eee1.451228",\r
+    "id": "62dd4d08.7a116c",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic='true'>",\r
      "atomic": "true",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1114,\r
-    "y": 341,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1481,\r
+    "y": 300,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "1ab82d5c.a19413"\r
+        "7caf5b45.f9ab04"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "7e7f1310.5e5bcc",\r
+    "id": "76f6230c.40e14c",\r
      "type": "switchNode",\r
      "name": "switch vpnuuid is for this slice",\r
      "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1368,\r
-    "y": 263,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1735,\r
+    "y": 222,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "55ca13fd.72ee7c",\r
-        "6e8bc799.ce2fa8"\r
+        "a035fb12.104f38",\r
+        "a471cecf.79d2"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "55ca13fd.72ee7c",\r
+    "id": "a035fb12.104f38",\r
      "type": "outcomeTrue",\r
      "name": "true",\r
      "xml": "<outcome value='true'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1585,\r
-    "y": 242,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1952,\r
+    "y": 201,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "1ab82d5c.a19413"\r
+        "7caf5b45.f9ab04"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "6e8bc799.ce2fa8",\r
+    "id": "a471cecf.79d2",\r
      "type": "outcomeFalse",\r
      "name": "false",\r
      "xml": "<outcome value='false'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1585,\r
-    "y": 291,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1952,\r
+    "y": 250,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "1ab82d5c.a19413",\r
+    "id": "7caf5b45.f9ab04",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic='true'>",\r
      "atomic": "true",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1769,\r
-    "y": 328,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2136,\r
+    "y": 287,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "554ac9a2.79f95",\r
-        "2ade390a.34dac6",\r
-        "c0e6872b.6bc578"\r
+        "9e3d4f1.ef044b",\r
+        "1812ba90.3bec25",\r
+        "cefb7e41.dee868"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "c3307b8c.0344e",\r
+    "id": "82ff7ac2.5ab12",\r
      "type": "dgstart",\r
      "name": "DGSTART",\r
      "outputs": 1,\r
-    "x": 128,\r
-    "y": 69,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 495,\r
+    "y": 28,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "7e5b3842.1b2ff"\r
+        "60b5aea2.21792"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "7e5b3842.1b2ff",\r
+    "id": "60b5aea2.21792",\r
      "type": "service-logic",\r
      "name": "GENERIC-RESOURCE-API ${project.version}",\r
      "module": "GENERIC-RESOURCE-API",\r
@@ -201,3650 +201,3695 @@
      "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": 412.2856903076172,\r
-    "y": 130.23810863494873,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 779.2856903076172,\r
+    "y": 89.23810863494873,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "ff8ac0a6.a31ac8"\r
+        "414f5c44.935264"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "ff8ac0a6.a31ac8",\r
+    "id": "414f5c44.935264",\r
      "type": "method",\r
      "name": "method cll-vnf-topology-operation-cll-F1-Activate-w-Protection",\r
      "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate-w-Protection' mode='sync'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 418.42860412597656,\r
-    "y": 215.00003051757812,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 785.4286041259766,\r
+    "y": 174.00003051757812,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "610b4dde.c4293c"\r
+        "90230fbe.1f78e8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "610b4dde.c4293c",\r
+    "id": "90230fbe.1f78e8",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 728.238037109375,\r
-    "y": 206.66668701171875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1095.238037109375,\r
+    "y": 165.66668701171875,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "61751fea.5e29c",\r
-        "fda13949.60eb78",\r
-        "47d2cfff.4a0e4",\r
-        "8845442c.1d5de8",\r
-        "72564454.b964f4"\r
+        "10a422cf.1eeed5",\r
+        "c82b1b5b.8e5c4",\r
+        "476ddcd6.ba7404",\r
+        "cf6ce2f3.f820a",\r
+        "a8ba69c5.3110b8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "554ac9a2.79f95",\r
+    "id": "9e3d4f1.ef044b",\r
      "type": "set",\r
      "name": "set tmp.aai.vpn-binding",\r
      "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
      "comments": "",\r
-    "x": 1986,\r
-    "y": 266,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2353,\r
+    "y": 225,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "e1c41eb3.6dc5b8",\r
+    "id": "9b274b59.c02fc",\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": 4155,\r
-    "y": 152,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4522,\r
+    "y": 111,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "7981558d.d1f29c",\r
+    "id": "73b1b71.91a29c8",\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.cll-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": 4236,\r
-    "y": 467,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4603,\r
+    "y": 426,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "4cd7b5eb.5f75fc",\r
-        "8c7597f3.3a32c"\r
+        "bf94869d.abe8c",\r
+        "7e872687.f361d8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "4cd7b5eb.5f75fc",\r
+    "id": "bf94869d.abe8c",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4545.5,\r
-    "y": 436,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4912.5,\r
+    "y": 395,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "6a15735b.8f38bc"\r
+        "70666b8b.cebd9c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "8c7597f3.3a32c",\r
+    "id": "7e872687.f361d8",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4550.5,\r
-    "y": 501,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4917.5,\r
+    "y": 460,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "531c74ae.aa6424"\r
+        "2f157928.a7cc26"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "6a15735b.8f38bc",\r
+    "id": "70666b8b.cebd9c",\r
      "type": "returnFailure",\r
      "name": "return failure",\r
      "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
      "comments": "",\r
-    "x": 4721.5,\r
-    "y": 436,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5088.5,\r
+    "y": 395,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "531c74ae.aa6424",\r
+    "id": "2f157928.a7cc26",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4717,\r
-    "y": 501,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5084,\r
+    "y": 460,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "43cf60a0.0fca68",\r
+    "id": "2c68de8.698fe22",\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": 4100.5,\r
-    "y": 721,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4467.5,\r
+    "y": 680,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "1699b103.56f9ff",\r
+    "id": "432e6fef.6bc3f",\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": 4254.5,\r
-    "y": 769,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4621.5,\r
+    "y": 728,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "430829b5.022a48",\r
-        "ab60153e.89b358"\r
+        "4c8de07f.a04f7",\r
+        "1618ec6.a46fa94"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "430829b5.022a48",\r
+    "id": "4c8de07f.a04f7",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4600,\r
-    "y": 750,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4967,\r
+    "y": 709,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "af17e669.a567c"\r
+        "74c74a6e.6269c4"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "ab60153e.89b358",\r
+    "id": "1618ec6.a46fa94",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4604,\r
-    "y": 790,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4971,\r
+    "y": 749,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "879a181e.1e28f"\r
+        "1da4485d.51ad6"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "af17e669.a567c",\r
+    "id": "74c74a6e.6269c4",\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": 4758,\r
-    "y": 750,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5125,\r
+    "y": 709,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "879a181e.1e28f",\r
+    "id": "1da4485d.51ad6",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4761.5,\r
-    "y": 790,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5128.5,\r
+    "y": 749,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "c2dfb11c.b0c48",\r
-        "18154ac9.e63ffd"\r
+        "ee6915f8.624f38",\r
+        "90214377.544788"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "c2dfb11c.b0c48",\r
+    "id": "ee6915f8.624f38",\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": 5092,\r
-    "y": 755,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5459,\r
+    "y": 714,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "4bfe8ff3.b5155",\r
+    "id": "838cdc3e.4f58e",\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": 4956,\r
-    "y": 714,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5323,\r
+    "y": 673,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "18154ac9.e63ffd",\r
+    "id": "90214377.544788",\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": 5019,\r
-    "y": 801,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5386,\r
+    "y": 760,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "be8a4aef.c70ad",\r
+    "id": "aa46b84e.3356a",\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": 4093,\r
-    "y": 200,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4460,\r
+    "y": 159,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "c13323e9.9191e8",\r
+    "id": "d57f31e9.bb9eb",\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": 4119,\r
-    "y": 317,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4486,\r
+    "y": 276,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "fa844cfe.7b9158",\r
-        "40f7f2e0.45e324",\r
-        "9ec0d41c.764348"\r
+        "33a92b4f.9380e4",\r
+        "f049b484.8a771",\r
+        "3592f024.f5a328"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "fa844cfe.7b9158",\r
+    "id": "33a92b4f.9380e4",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4314.5001220703125,\r
-    "y": 269,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4681.5001220703125,\r
+    "y": 228,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "c5cba661.1feb9"\r
+        "14379d7c.41191b"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "40f7f2e0.45e324",\r
+    "id": "f049b484.8a771",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4306.5001220703125,\r
-    "y": 324,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4673.5001220703125,\r
+    "y": 283,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "fa86521c.e230b8"\r
+        "53127e40.7f1108"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "c5cba661.1feb9",\r
+    "id": "14379d7c.41191b",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>\n",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4458.8824462890625,\r
-    "y": 268.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4825.8824462890625,\r
+    "y": 227.65567016601562,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "fff76825.ceb828"\r
+        "88ec362d.bac6c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "12d83cc7.207cc3",\r
+    "id": "5831eff3.ba3a08",\r
      "type": "outcome",\r
      "name": "esr-thirdparty-sdnc",\r
      "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5041,\r
-    "y": 271,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5408,\r
+    "y": 230,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "f3a906e6.516618"\r
+        "ea688f7c.199be"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "fff76825.ceb828",\r
+    "id": "88ec362d.bac6c",\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": 4643,\r
-    "y": 267,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5010,\r
+    "y": 226,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "8f09ed7e.8205c8"\r
+        "280d7047.234eb8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "8f09ed7e.8205c8",\r
+    "id": "280d7047.234eb8",\r
      "type": "switchNode",\r
      "name": "switch related-to",\r
      "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4838,\r
-    "y": 267,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5205,\r
+    "y": 226,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "12d83cc7.207cc3"\r
+        "5831eff3.ba3a08"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "9ec0d41c.764348",\r
+    "id": "3592f024.f5a328",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4311.5001220703125,\r
-    "y": 381,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4678.5001220703125,\r
+    "y": 340,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "4cb38d5a.2cd9fc"\r
+        "5b037f74.b971e"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "4cb38d5a.2cd9fc",\r
+    "id": "5b037f74.b971e",\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": 4463.5001220703125,\r
-    "y": 382,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4830.5001220703125,\r
+    "y": 341,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "fa86521c.e230b8",\r
+    "id": "53127e40.7f1108",\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": 4474.5001220703125,\r
-    "y": 325,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4841.5001220703125,\r
+    "y": 284,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "fd5c650b.7ed3f8",\r
+    "id": "9d5c763c.8825a8",\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": 5426,\r
-    "y": 284,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5793,\r
+    "y": 243,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "11189fd0.36c55",\r
-        "2f53389c.6ed7",\r
-        "160dc233.835476"\r
+        "14eb5ad.a3dc725",\r
+        "4c145e69.4439a8",\r
+        "6146c55d.b50c7c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "f3a906e6.516618",\r
+    "id": "ea688f7c.199be",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 5220,\r
-    "y": 271,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5587,\r
+    "y": 230,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "8e3bb227.50f04",\r
-        "fd5c650b.7ed3f8"\r
+        "2ce20510.f1ea8a",\r
+        "9d5c763c.8825a8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "8e3bb227.50f04",\r
+    "id": "2ce20510.f1ea8a",\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": 5456,\r
-    "y": 232,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5823,\r
+    "y": 191,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "11189fd0.36c55",\r
+    "id": "14eb5ad.a3dc725",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5636,\r
-    "y": 275,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6003,\r
+    "y": 234,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "aadf27e6.e781b8"\r
+        "95245b22.847e1"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "2f53389c.6ed7",\r
+    "id": "4c145e69.4439a8",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5628,\r
-    "y": 330,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5995,\r
+    "y": 289,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "fd2ad840.4523f"\r
+        "8e4747a4.d218e8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "160dc233.835476",\r
+    "id": "6146c55d.b50c7c",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5633,\r
-    "y": 387,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6000,\r
+    "y": 346,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "2a94704d.0d4"\r
+        "6067fdf7.24ee8c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "2a94704d.0d4",\r
+    "id": "6067fdf7.24ee8c",\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": 5785,\r
-    "y": 388,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6152,\r
+    "y": 347,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "fd2ad840.4523f",\r
+    "id": "8e4747a4.d218e8",\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": 5796,\r
-    "y": 333,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6163,\r
+    "y": 292,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "aadf27e6.e781b8",\r
+    "id": "95245b22.847e1",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>\n",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5780.38232421875,\r
-    "y": 272.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6147.38232421875,\r
+    "y": 231.65567016601562,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "cdb54fc1.4aeb5"\r
+        "37f78c4b.9778a4"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "cdb54fc1.4aeb5",\r
+    "id": "37f78c4b.9778a4",\r
      "type": "set",\r
      "name": "set controller domainA data",\r
      "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
      "comments": "",\r
-    "x": 5995,\r
-    "y": 269,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6362,\r
+    "y": 228,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "33053457.2cf334",\r
+    "id": "105d488e.a9be97",\r
      "type": "set",\r
      "name": "set attachment_param for OTN B",\r
      "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-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": 3562,\r
-    "y": 1609,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3929,\r
+    "y": 1568,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "4445f35f.408fdc",\r
+    "id": "f1912cb6.f277c8",\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.cll-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": 3625,\r
-    "y": 1938,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3992,\r
+    "y": 1897,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "862258db.691038",\r
-        "af408a0a.92301"\r
+        "97bce09c.8125c",\r
+        "5d55eda4.32d174"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "862258db.691038",\r
+    "id": "97bce09c.8125c",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3920.5,\r
-    "y": 1905,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4287.5,\r
+    "y": 1864,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "95d8110a.825b98"\r
+        "f47c0fd1.452808"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "af408a0a.92301",\r
+    "id": "5d55eda4.32d174",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3925.5,\r
-    "y": 1970,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4292.5,\r
+    "y": 1929,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "ef7aa326.5032b8"\r
+        "acffe827.dd3a1"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "95d8110a.825b98",\r
+    "id": "f47c0fd1.452808",\r
      "type": "returnFailure",\r
      "name": "return failure",\r
      "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
      "comments": "",\r
-    "x": 4088.5,\r
-    "y": 1905,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4455.5,\r
+    "y": 1864,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "ef7aa326.5032b8",\r
+    "id": "acffe827.dd3a1",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4099,\r
-    "y": 1970,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4466,\r
+    "y": 1929,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "f246db35.fbb0b8",\r
+    "id": "b25ffa4f.8d40a",\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": 3501,\r
-    "y": 1666,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3868,\r
+    "y": 1625,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "2f733fde.bfa8d8",\r
+    "id": "cf848b89.db6cc",\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": 3521,\r
-    "y": 1763,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3888,\r
+    "y": 1722,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "d82ed114.d26fe",\r
-        "9b6a74e2.82fcf",\r
-        "105e680c.d4fe88"\r
+        "3599c19a.ddebee",\r
+        "34a9c77d.fd737",\r
+        "5dbb4cb9.edac8c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "d82ed114.d26fe",\r
+    "id": "3599c19a.ddebee",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3723.5001220703125,\r
-    "y": 1716,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4090.5001220703125,\r
+    "y": 1675,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "3d1669ca.d8e9be"\r
+        "cbdb928e.2f6908"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "9b6a74e2.82fcf",\r
+    "id": "34a9c77d.fd737",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3715.5001220703125,\r
-    "y": 1771,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4082.5001220703125,\r
+    "y": 1730,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "28df2cef.da0a5c"\r
+        "aab7df57.177ae"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "3d1669ca.d8e9be",\r
+    "id": "cbdb928e.2f6908",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>\n",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3867.8824462890625,\r
-    "y": 1713.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4234.8824462890625,\r
+    "y": 1672.6556701660156,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "b0c477a0.14b6b8"\r
+        "5b70bc96.d9f024"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "b0c477a0.14b6b8",\r
+    "id": "5b70bc96.d9f024",\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": 4052,\r
-    "y": 1728,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4419,\r
+    "y": 1687,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "e68df009.7524f"\r
+        "4020371.e4e7d48"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "105e680c.d4fe88",\r
+    "id": "5dbb4cb9.edac8c",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3720.5001220703125,\r
-    "y": 1828,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4087.5001220703125,\r
+    "y": 1787,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "3376d063.6334f8"\r
+        "cb2099e3.7f1de"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "3376d063.6334f8",\r
+    "id": "cb2099e3.7f1de",\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": 3872.5001220703125,\r
-    "y": 1829,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4239.5001220703125,\r
+    "y": 1788,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "28df2cef.da0a5c",\r
+    "id": "aab7df57.177ae",\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": 3883.5001220703125,\r
-    "y": 1774,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4250.5001220703125,\r
+    "y": 1733,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "86c78b55.020ad8",\r
+    "id": "b4cfde0a.4da658",\r
      "type": "outcome",\r
      "name": "esr-thirdparty-sdnc",\r
      "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4450,\r
-    "y": 1732,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4817,\r
+    "y": 1691,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "de4526ed.169098"\r
+        "f4ed5c16.5bfe98"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "e68df009.7524f",\r
+    "id": "4020371.e4e7d48",\r
      "type": "switchNode",\r
      "name": "switch related-to",\r
      "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4247,\r
-    "y": 1728,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4614,\r
+    "y": 1687,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "86c78b55.020ad8"\r
+        "b4cfde0a.4da658"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "bd56a946.09bfc8",\r
+    "id": "5139fea9.434dc8",\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": 4835,\r
-    "y": 1731,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5202,\r
+    "y": 1690,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "e62cd9e9.79901",\r
-        "3835956c.352dfa",\r
-        "ef4cce16.af464"\r
+        "d7e660a5.61d688",\r
+        "5cb5ba76.7f8a6c",\r
+        "f188d950.fea538"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "de4526ed.169098",\r
+    "id": "f4ed5c16.5bfe98",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 4627,\r
-    "y": 1724,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4994,\r
+    "y": 1683,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "84662003.28e938",\r
-        "bd56a946.09bfc8"\r
+        "5d010c90.067a14",\r
+        "5139fea9.434dc8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "84662003.28e938",\r
+    "id": "5d010c90.067a14",\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": 4865,\r
-    "y": 1679,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5232,\r
+    "y": 1638,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "2e3a7484.41bcbc",\r
+    "id": "9b19cdfe.3fc3d8",\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": 5194,\r
-    "y": 1835,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5561,\r
+    "y": 1794,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "acb63215.67cbc8",\r
+    "id": "c60dd4d0.e8d36",\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": 5205,\r
-    "y": 1780,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5572,\r
+    "y": 1739,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "bb7e5ab5.c4089",\r
+    "id": "285fdf09.377c58",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>\n",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5189.38232421875,\r
-    "y": 1719.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5556.38232421875,\r
+    "y": 1678.6556701660156,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "7c187be.7c53484"\r
+        "98960d3c.5507d"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "7c187be.7c53484",\r
+    "id": "98960d3c.5507d",\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": 5404,\r
-    "y": 1716,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5771,\r
+    "y": 1675,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "e62cd9e9.79901",\r
+    "id": "d7e660a5.61d688",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5045,\r
-    "y": 1722,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5412,\r
+    "y": 1681,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "bb7e5ab5.c4089"\r
+        "285fdf09.377c58"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "3835956c.352dfa",\r
+    "id": "5cb5ba76.7f8a6c",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5037,\r
-    "y": 1777,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5404,\r
+    "y": 1736,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "acb63215.67cbc8"\r
+        "c60dd4d0.e8d36"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "ef4cce16.af464",\r
+    "id": "f188d950.fea538",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5042,\r
-    "y": 1834,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5409,\r
+    "y": 1793,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "2e3a7484.41bcbc"\r
+        "9b19cdfe.3fc3d8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "1dc25027.0c33f8",\r
+    "id": "4f2225d8.9c49ec",\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": 3076,\r
-    "y": 680,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3443,\r
+    "y": 639,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "22e86b98.d5cd94",\r
-        "18519633.e9ee92"\r
+        "d58501ac.39534",\r
+        "2fb4f475.808574"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "22e86b98.d5cd94",\r
+    "id": "d58501ac.39534",\r
      "type": "outcome",\r
      "name": "Null",\r
      "xml": "<outcome value=''>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3290,\r
-    "y": 717,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3657,\r
+    "y": 676,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "d8801466.520d4"\r
+        "41d82fae.a5867"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "18519633.e9ee92",\r
+    "id": "2fb4f475.808574",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3292,\r
-    "y": 655,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3659,\r
+    "y": 614,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "6bc727fb.e5e2c8"\r
+        "918c203c.df9608"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "d8801466.520d4",\r
+    "id": "41d82fae.a5867",\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": 2870,\r
-    "y": 1960,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3237,\r
+    "y": 1919,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "57adf29e.03275c",\r
-        "3c463d1c.a1e9ca"\r
+        "5075f0ba.d591f8",\r
+        "d426d492.2d277"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "57adf29e.03275c",\r
+    "id": "5075f0ba.d591f8",\r
      "type": "outcome",\r
      "name": "Null",\r
      "xml": "<outcome value=''>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3123,\r
-    "y": 1994,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3490,\r
+    "y": 1953,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "163451dc.e800ce"\r
+        "e38a9aed.8397b"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "3c463d1c.a1e9ca",\r
+    "id": "d426d492.2d277",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3123,\r
-    "y": 1938,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3490,\r
+    "y": 1897,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "72b99bc1.9d63c4"\r
+        "16742fe3.bdb1e8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "163451dc.e800ce",\r
+    "id": "e38a9aed.8397b",\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": 3274,\r
-    "y": 1994,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3641,\r
+    "y": 1953,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "2a6d840b.d2c9ec",\r
+    "id": "5d106c04.0c1bfc",\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": 4150,\r
-    "y": 92,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4517,\r
+    "y": 51,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "24792ed6.12e172",\r
+    "id": "ff76ad24.0c9b6",\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": 3558,\r
-    "y": 1551,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3925,\r
+    "y": 1510,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "fe0662dd.a80948",\r
+    "id": "a35804af.f7d858",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3841,\r
-    "y": 349,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4208,\r
+    "y": 308,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "2a6d840b.d2c9ec",\r
-        "e1c41eb3.6dc5b8",\r
-        "be8a4aef.c70ad",\r
-        "c13323e9.9191e8",\r
-        "7981558d.d1f29c",\r
-        "1721d523.151643",\r
-        "9094f518.043e98",\r
-        "f54721e.ec69de"\r
+        "5d106c04.0c1bfc",\r
+        "9b274b59.c02fc",\r
+        "aa46b84e.3356a",\r
+        "d57f31e9.bb9eb",\r
+        "73b1b71.91a29c8",\r
+        "8951fa6a.a6da3",\r
+        "46bfac70.a8d9fc",\r
+        "d22b47c.48051b8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "72b99bc1.9d63c4",\r
+    "id": "16742fe3.bdb1e8",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 3274,\r
-    "y": 1937,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3641,\r
+    "y": 1896,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "24792ed6.12e172",\r
-        "33053457.2cf334",\r
-        "f246db35.fbb0b8",\r
-        "2f733fde.bfa8d8",\r
-        "4445f35f.408fdc",\r
-        "7c2a5c1b.45951c",\r
-        "db1559a9.21dcb8",\r
-        "64935ddb.b635b4"\r
+        "ff76ad24.0c9b6",\r
+        "105d488e.a9be97",\r
+        "b25ffa4f.8d40a",\r
+        "cf848b89.db6cc",\r
+        "f1912cb6.f277c8",\r
+        "7bb669b7.d54818",\r
+        "bfef7878.c9996",\r
+        "fc2523d9.c5b768"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "1ddc6cc6.41baa3",\r
+    "id": "b91faaf4.9b239",\r
      "type": "set",\r
      "name": "set sotn_value",\r
      "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='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": 3512,\r
-    "y": 2236,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3879,\r
+    "y": 2195,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "88e2026c.753db8",\r
+    "id": "332b3c8d.6566fc",\r
      "type": "execute",\r
      "name": "execute RestApiCallNode Create ethernet Service without token",\r
      "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3666,\r
-    "y": 2284,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4033,\r
+    "y": 2243,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "e41adb3.0072828",\r
-        "6a4db145.9abb38"\r
+        "f1ea3ac9.246e38",\r
+        "629d98b3.63b55"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "e41adb3.0072828",\r
+    "id": "f1ea3ac9.246e38",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4011.5,\r
-    "y": 2265,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4378.5,\r
+    "y": 2224,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "b46428d7.0cf41"\r
+        "d4e7ca44.3afb58"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "6a4db145.9abb38",\r
+    "id": "629d98b3.63b55",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4015.5,\r
-    "y": 2305,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4382.5,\r
+    "y": 2264,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "1616e093.24d98f"\r
+        "cda78bf5.1aa53"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "b46428d7.0cf41",\r
+    "id": "d4e7ca44.3afb58",\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": 4169.5,\r
-    "y": 2265,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4536.5,\r
+    "y": 2224,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "1616e093.24d98f",\r
+    "id": "cda78bf5.1aa53",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4173,\r
-    "y": 2305,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4540,\r
+    "y": 2264,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "f5ad5aa7.4c2ca",\r
-        "f30a934b.4a146"\r
+        "d94da46.8513a58",\r
+        "80579be4.10d908"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "f5ad5aa7.4c2ca",\r
+    "id": "d94da46.8513a58",\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": 4513,\r
-    "y": 2304,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4880,\r
+    "y": 2263,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "14882444.425ec4",\r
+    "id": "3ac4cfaa.a33bf8",\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": 4371,\r
-    "y": 2262,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4738,\r
+    "y": 2221,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "f30a934b.4a146",\r
+    "id": "80579be4.10d908",\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": 4442,\r
-    "y": 2353,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4809,\r
+    "y": 2312,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "35b5f42.3d7048c",\r
+    "id": "59ca2fb3.db456",\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": 3067,\r
-    "y": 620,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3434,\r
+    "y": 579,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "672937f1.5c86c",\r
+    "id": "e8c1824d.c7b678",\r
      "type": "comment",\r
      "name": "only dst ttp exists. No src",\r
      "info": "",\r
      "comments": "",\r
-    "x": 3662,\r
-    "y": 306,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4029,\r
+    "y": 265,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "cf6d8000.914ec",\r
+    "id": "6594c17a.b17458",\r
      "type": "comment",\r
      "name": "only src ttp exists. No dst",\r
      "info": "",\r
      "comments": "",\r
-    "x": 3219,\r
-    "y": 1884,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3586,\r
+    "y": 1843,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "6bc727fb.e5e2c8",\r
+    "id": "918c203c.df9608",\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": 3398,\r
-    "y": 468,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3765,\r
+    "y": 427,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "16d04d16.35cc13",\r
-        "81d801a9.0be79"\r
+        "bfcf03d4.3ffba",\r
+        "71ba846a.64e1d4"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "81d801a9.0be79",\r
+    "id": "71ba846a.64e1d4",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3640,\r
-    "y": 1057,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4007,\r
+    "y": 1016,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "87bd1b21.78447"\r
+        "98c2d638.1715f8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "16d04d16.35cc13",\r
+    "id": "bfcf03d4.3ffba",\r
      "type": "outcome",\r
      "name": "Null",\r
      "xml": "<outcome value=''>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 3634,\r
-    "y": 348,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4001,\r
+    "y": 307,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "fe0662dd.a80948"\r
+        "a35804af.f7d858"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "87bd1b21.78447",\r
+    "id": "98c2d638.1715f8",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 3798,\r
-    "y": 1056,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4165,\r
+    "y": 1015,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "6a4fd43b.29d0a4",\r
-        "bb732000.b077a",\r
-        "14bb373f.07c761",\r
-        "ee3130b2.515378",\r
-        "25e58429.ad4ee4",\r
-        "13fd978.b0ce7e9"\r
+        "d3cd38dd.2ebd58",\r
+        "ad06e711.5b1538",\r
+        "8a91f9fb.3806c",\r
+        "162c1530.673073",\r
+        "7140d593.b05bc4",\r
+        "baf6ec9f.d24be"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "bb732000.b077a",\r
+    "id": "ad06e711.5b1538",\r
      "type": "set",\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": 4062,\r
-    "y": 939,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4429,\r
+    "y": 898,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "25e58429.ad4ee4",\r
+    "id": "7140d593.b05bc4",\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.cll-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": 4143,\r
-    "y": 1254,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4510,\r
+    "y": 1213,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "69f73464.0e3e8c",\r
-        "5f37ff67.4bb2f"\r
+        "3f3f2221.846d2e",\r
+        "8610f4b1.bab488"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "69f73464.0e3e8c",\r
+    "id": "3f3f2221.846d2e",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4452.5,\r
-    "y": 1223,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4819.5,\r
+    "y": 1182,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "43cec921.9d623"\r
+        "1759fa75.7439f6"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "5f37ff67.4bb2f",\r
+    "id": "8610f4b1.bab488",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4457.5,\r
-    "y": 1288,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4824.5,\r
+    "y": 1247,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "a900d0fc.b4f8e"\r
+        "ea3b42ee.d3dc2"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "43cec921.9d623",\r
+    "id": "1759fa75.7439f6",\r
      "type": "returnFailure",\r
      "name": "return failure",\r
      "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
      "comments": "",\r
-    "x": 4628.5,\r
-    "y": 1223,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4995.5,\r
+    "y": 1182,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "a900d0fc.b4f8e",\r
+    "id": "ea3b42ee.d3dc2",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4624,\r
-    "y": 1288,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4991,\r
+    "y": 1247,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "14bb373f.07c761",\r
+    "id": "8a91f9fb.3806c",\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": 4000,\r
-    "y": 987,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4367,\r
+    "y": 946,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "ee3130b2.515378",\r
+    "id": "162c1530.673073",\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.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": 4026,\r
-    "y": 1104,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4393,\r
+    "y": 1063,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "7994d48a.ca38a4",\r
-        "46376621.e31dd8",\r
-        "662f2070.bc1d4"\r
+        "8b8f3e33.0b8288",\r
+        "bbf641fc.079918",\r
+        "aed8a0af.bcb0e8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "7994d48a.ca38a4",\r
+    "id": "8b8f3e33.0b8288",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4221.5001220703125,\r
-    "y": 1056,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4588.5001220703125,\r
+    "y": 1015,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "28f98c5.d17c774"\r
+        "175bae6d.5d0f5a"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "46376621.e31dd8",\r
+    "id": "bbf641fc.079918",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4213.5001220703125,\r
-    "y": 1111,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4580.5001220703125,\r
+    "y": 1070,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "b6666e55.258c4"\r
+        "fdde9a8e.52abd"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "28f98c5.d17c774",\r
+    "id": "175bae6d.5d0f5a",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>\n",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4365.8824462890625,\r
-    "y": 1055.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4732.8824462890625,\r
+    "y": 1014.6556701660156,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "abee57b5.2a2df"\r
+        "719f0fb2.9b4ea"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "abee57b5.2a2df",\r
+    "id": "719f0fb2.9b4ea",\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
      "outputs": 1,\r
-    "x": 4550,\r
-    "y": 1054,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4917,\r
+    "y": 1013,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "4e7ce11e.d4486"\r
+        "776708d.aaadf78"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "4e7ce11e.d4486",\r
+    "id": "776708d.aaadf78",\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
      "outputs": 1,\r
-    "x": 4745,\r
-    "y": 1054,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5112,\r
+    "y": 1013,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "cd73aa8e.57927"\r
+        "2f8639e1.f5b81e"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "662f2070.bc1d4",\r
+    "id": "aed8a0af.bcb0e8",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4218.5001220703125,\r
-    "y": 1168,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4585.5001220703125,\r
+    "y": 1127,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "65647ec7.0c6e5"\r
+        "16ba7b0.a295705"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "65647ec7.0c6e5",\r
+    "id": "16ba7b0.a295705",\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": 4370.5001220703125,\r
-    "y": 1169,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4737.5001220703125,\r
+    "y": 1128,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "b6666e55.258c4",\r
+    "id": "fdde9a8e.52abd",\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": 4381.5001220703125,\r
-    "y": 1112,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4748.5001220703125,\r
+    "y": 1071,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "6a4fd43b.29d0a4",\r
+    "id": "d3cd38dd.2ebd58",\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
-    "x": 4057,\r
-    "y": 879,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4424,\r
+    "y": 838,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "cd73aa8e.57927",\r
+    "id": "2f8639e1.f5b81e",\r
      "type": "outcome",\r
      "name": "esr-thirdparty-sdnc",\r
      "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4948,\r
-    "y": 1058,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5315,\r
+    "y": 1017,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "d2b1d416.053a58"\r
+        "4e6eba09.52f61c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "66918eb9.ab92e8",\r
+    "id": "d0ebf00f.416c5",\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": 5333,\r
-    "y": 1071,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5700,\r
+    "y": 1030,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "f8b9a196.010a1",\r
-        "fd17d420.f985",\r
-        "40d42743.f42fd8"\r
+        "504e55c8.8a8984",\r
+        "eddcd7ad.fdc98",\r
+        "17833a87.15b8f5"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "d2b1d416.053a58",\r
+    "id": "4e6eba09.52f61c",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 5127,\r
-    "y": 1058,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5494,\r
+    "y": 1017,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "c71b3067.5066e8",\r
-        "66918eb9.ab92e8"\r
+        "951ffcc3.fc60c8",\r
+        "d0ebf00f.416c5"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "c71b3067.5066e8",\r
+    "id": "951ffcc3.fc60c8",\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": 5363,\r
-    "y": 1019,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5730,\r
+    "y": 978,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "f8b9a196.010a1",\r
+    "id": "504e55c8.8a8984",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5543,\r
-    "y": 1062,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5910,\r
+    "y": 1021,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "27038b3e.3bcfc4"\r
+        "8e64943.8a64ae8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "fd17d420.f985",\r
+    "id": "eddcd7ad.fdc98",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5535,\r
-    "y": 1117,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5902,\r
+    "y": 1076,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "967c6c86.0bbb78"\r
+        "6bb74cc0.02d7dc"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "40d42743.f42fd8",\r
+    "id": "17833a87.15b8f5",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5540,\r
-    "y": 1174,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5907,\r
+    "y": 1133,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "35455e8c.6afe9a"\r
+        "43c2b842.215f48"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "35455e8c.6afe9a",\r
+    "id": "43c2b842.215f48",\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": 5692,\r
-    "y": 1175,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6059,\r
+    "y": 1134,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "967c6c86.0bbb78",\r
+    "id": "6bb74cc0.02d7dc",\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": 5703,\r
-    "y": 1120,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6070,\r
+    "y": 1079,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "27038b3e.3bcfc4",\r
+    "id": "8e64943.8a64ae8",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>\n",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 5687.38232421875,\r
-    "y": 1059.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6054.38232421875,\r
+    "y": 1018.6556701660156,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "501ec52c.0a5be4"\r
+        "fb3f7d81.a9fad8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "501ec52c.0a5be4",\r
+    "id": "fb3f7d81.a9fad8",\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": 5902,\r
-    "y": 1056,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6269,\r
+    "y": 1015,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "ce5771d5.1db118",\r
+    "id": "534dacd3.c0ac9c",\r
      "type": "comment",\r
      "name": "both src and dst exist",\r
      "info": "",\r
      "comments": "",\r
-    "x": 3676,\r
-    "y": 997,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4043,\r
+    "y": 956,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "2ade390a.34dac6",\r
+    "id": "1812ba90.3bec25",\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": 2238,\r
-    "y": 724,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2605,\r
+    "y": 683,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "faa20144.28683",\r
-        "a3241eaf.e05748"\r
+        "1c061163.c474df",\r
+        "695afc2e.f3ca34"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "a3241eaf.e05748",\r
+    "id": "695afc2e.f3ca34",\r
      "type": "outcomeFalse",\r
      "name": "false",\r
      "xml": "<outcome value='false'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 2645,\r
-    "y": 742,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3012,\r
+    "y": 701,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "73c18a9e.ba438c"\r
+        "fdf83271.37011"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "faa20144.28683",\r
+    "id": "1c061163.c474df",\r
      "type": "outcomeTrue",\r
      "name": "true",\r
      "xml": "<outcome value='true'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 2645,\r
-    "y": 687,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3012,\r
+    "y": 646,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "d5f3133.6f4a0f"\r
+        "ca8832e9.e2e2f8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "d5f3133.6f4a0f",\r
+    "id": "ca8832e9.e2e2f8",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 2801,\r
-    "y": 685,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3168,\r
+    "y": 644,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "35b5f42.3d7048c",\r
-        "1dc25027.0c33f8"\r
+        "59ca2fb3.db456",\r
+        "4f2225d8.9c49ec"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "73c18a9e.ba438c",\r
+    "id": "fdf83271.37011",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 2778,\r
-    "y": 743,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3145,\r
+    "y": 702,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "fda13949.60eb78",\r
+    "id": "c82b1b5b.8e5c4",\r
      "type": "set",\r
      "name": "unset tmp.aai.all-vpn-bindings",\r
      "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",\r
      "comments": "",\r
-    "x": 955,\r
-    "y": 159,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1322,\r
+    "y": 118,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "38085312.8a965c",\r
+    "id": "411de79.b4b0f18",\r
      "type": "comment",\r
      "name": "CLL new",\r
      "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
      "comments": "",\r
-    "x": 4072,\r
-    "y": 577,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4439,\r
+    "y": 536,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "1721d523.151643",\r
+    "id": "8951fa6a.a6da3",\r
      "type": "set",\r
      "name": "set leaf-otn-tunnels-list array",\r
      "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",\r
      "comments": "",\r
-    "x": 4132,\r
-    "y": 616,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4499,\r
+    "y": 575,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "47d2cfff.4a0e4",\r
+    "id": "476ddcd6.ba7404",\r
      "type": "set",\r
      "name": "unset leaf-otn-tunnels-list array",\r
      "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",\r
      "comments": "",\r
-    "x": 948,\r
-    "y": 67,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1315,\r
+    "y": 26,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "be7a05aa.4b83b",\r
+    "id": "1bf6340f.f5f2ec",\r
      "type": "comment",\r
      "name": "CLL new",\r
      "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
      "comments": "",\r
-    "x": 3484,\r
-    "y": 2093,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3851,\r
+    "y": 2052,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "7c2a5c1b.45951c",\r
+    "id": "7bb669b7.d54818",\r
      "type": "set",\r
      "name": "set root-otn-tunnels-list array",\r
      "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",\r
      "comments": "",\r
-    "x": 3540,\r
-    "y": 2142,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3907,\r
+    "y": 2101,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "f179b432.4e819",\r
+    "id": "6657df85.d2b128",\r
      "type": "set",\r
      "name": "unset root-otn-tunnels-list array",\r
      "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",\r
      "comments": "",\r
-    "x": 948,\r
-    "y": 106,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1315,\r
+    "y": 65,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "8845442c.1d5de8",\r
+    "id": "cf6ce2f3.f820a",\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": 979,\r
-    "y": 207,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1346,\r
+    "y": 166,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "72564454.b964f4",\r
+    "id": "a8ba69c5.3110b8",\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": 189,\r
-    "y": 682,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 556,\r
+    "y": 641,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "130c8849.c68768",\r
-        "9607da93.a7cfb8",\r
-        "675a11bf.37e84"\r
+        "502e9c54.45eb3c",\r
+        "889f52ba.eeef7",\r
+        "28d7625.1c6aa1e"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "130c8849.c68768",\r
+    "id": "502e9c54.45eb3c",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 408,\r
-    "y": 620,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 775,\r
+    "y": 579,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "19b84d16.53d643"\r
+        "1f16072d.60be49"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "9607da93.a7cfb8",\r
+    "id": "889f52ba.eeef7",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 417.490966796875,\r
-    "y": 662.5740356445312,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 784.490966796875,\r
+    "y": 621.5740356445312,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "675a11bf.37e84",\r
+    "id": "28d7625.1c6aa1e",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 406,\r
-    "y": 709,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 773,\r
+    "y": 668,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "13e02ffd.705ef8"\r
+        "ccd7626e.e5286"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "19b84d16.53d643",\r
+    "id": "1f16072d.60be49",\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": 605,\r
-    "y": 616,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 972,\r
+    "y": 575,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "95aa58da.ce0078"\r
+        "839ea221.6a3238"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "13e02ffd.705ef8",\r
+    "id": "ccd7626e.e5286",\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": 575,\r
-    "y": 710,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 942,\r
+    "y": 669,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "95aa58da.ce0078",\r
+    "id": "839ea221.6a3238",\r
      "type": "switchNode",\r
      "name": "switch related-to",\r
      "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 828.33349609375,\r
-    "y": 615.9999389648438,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1195.33349609375,\r
+    "y": 574.9999389648438,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "82937c17.5a3278"\r
+        "8ba544cb.07a21"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "82937c17.5a3278",\r
+    "id": "8ba544cb.07a21",\r
      "type": "outcome",\r
      "name": "connectivity",\r
      "xml": "<outcome value='connectivity'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1029.0001335144043,\r
-    "y": 617.000020980835,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1396.0001335144043,\r
+    "y": 576.000020980835,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "7d4de732.7e236"\r
+        "f797d924.6d542"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "7d4de732.7e236",\r
+    "id": "f797d924.6d542",\r
      "type": "save",\r
      "name": "get connectivity from aai",\r
      "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 159,\r
-    "y": 879,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 526,\r
+    "y": 838,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "f6447d51.51534",\r
-        "d2723085.ef21f",\r
-        "14bf719a.197f76"\r
+        "55f1b492.85099c",\r
+        "efb1ebef.255b68",\r
+        "f3e73178.97a2a"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "f6447d51.51534",\r
+    "id": "55f1b492.85099c",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 367,\r
-    "y": 843,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 734,\r
+    "y": 802,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "93da3cfa.70c248"\r
+        "b45da909.27452"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "d2723085.ef21f",\r
+    "id": "efb1ebef.255b68",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 367.490966796875,\r
-    "y": 888.5740356445312,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 734.490966796875,\r
+    "y": 847.5740356445312,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "14bf719a.197f76",\r
+    "id": "f3e73178.97a2a",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 365,\r
-    "y": 932,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 732,\r
+    "y": 891,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "836041f9.6829f8"\r
+        "e06cb3b.90f78d"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "836041f9.6829f8",\r
+    "id": "e06cb3b.90f78d",\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": 534,\r
-    "y": 933,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 901,\r
+    "y": 892,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "a94aa53a.b107d8",\r
+    "id": "58a3e896.b9ca7",\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": 506,\r
-    "y": 1427,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 873,\r
+    "y": 1386,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "21c47827.df1568"\r
+        "ed8e0c4d.c624f8"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "21c47827.df1568",\r
+    "id": "ed8e0c4d.c624f8",\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": 709,\r
-    "y": 1439,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1076,\r
+    "y": 1398,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "18be783b.f07278"\r
+        "31bb3da4.3ce832"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "18be783b.f07278",\r
+    "id": "31bb3da4.3ce832",\r
      "type": "outcome",\r
      "name": "UNI",\r
      "xml": "<outcome value='uni'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 875,\r
-    "y": 1436,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1242,\r
+    "y": 1395,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "11fb7f76.b02469"\r
+        "7ad884e0.ebf21c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "11fb7f76.b02469",\r
+    "id": "7ad884e0.ebf21c",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 1036,\r
-    "y": 1433,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1403,\r
+    "y": 1392,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "47d6d37a.9fb43c",\r
-        "1c027792.461348",\r
-        "ea05bf35.5069",\r
-        "9d31ed5b.d2c91",\r
-        "23eb7cf4.f6cfdc",\r
-        "99b18acf.7ec528"\r
+        "319b90ba.5fa548",\r
+        "5d60f478.58b2dc",\r
+        "478f42b4.faa2d4",\r
+        "573af6c.7f50588",\r
+        "1b5d7c99.3bb563",\r
+        "a7cc4e14.f32b08"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "1c027792.461348",\r
+    "id": "5d60f478.58b2dc",\r
      "type": "set",\r
      "name": "unset tmp.aai.uni",\r
      "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
      "comments": "",\r
-    "x": 1242,\r
-    "y": 1032.9999389648438,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1609,\r
+    "y": 991.9999389648438,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "47d6d37a.9fb43c",\r
+    "id": "319b90ba.5fa548",\r
      "type": "save",\r
      "name": "get uni from aai",\r
      "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1239,\r
-    "y": 1077.9999389648438,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1606,\r
+    "y": 1036.9999389648438,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "2a120b9c.2b340c",\r
-        "41aafa7d.002584",\r
-        "b80f04fd.7f4018"\r
+        "be8d977b.6062b8",\r
+        "2f61d10e.8f5e3e",\r
+        "9e1188e1.cf8b3"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "41aafa7d.002584",\r
+    "id": "2f61d10e.8f5e3e",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1434.490966796875,\r
-    "y": 1051.5739135742188,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1801.490966796875,\r
+    "y": 1010.5739135742188,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "b752ad58.1bdf1"\r
+        "771eefb0.aeb88"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "b80f04fd.7f4018",\r
+    "id": "9e1188e1.cf8b3",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1430,\r
-    "y": 1095.9998779296875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1797,\r
+    "y": 1054.9998779296875,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "81604b65.13211"\r
+        "47c4b052.107038"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "b752ad58.1bdf1",\r
+    "id": "771eefb0.aeb88",\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": 1597.0625,\r
-    "y": 1050.859619140625,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1964.0625,\r
+    "y": 1009.859619140625,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "81604b65.13211",\r
+    "id": "47c4b052.107038",\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": 1598,\r
-    "y": 1095.9998779296875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1965,\r
+    "y": 1054.9998779296875,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "1b5d0889.20238f",\r
+    "id": "2be34ba3.ed43bc",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 1600,\r
-    "y": 1142.9998779296875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1967,\r
+    "y": 1101.9998779296875,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "2a120b9c.2b340c",\r
+    "id": "be8d977b.6062b8",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1431,\r
-    "y": 1142.9998779296875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1798,\r
+    "y": 1101.9998779296875,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "1b5d0889.20238f"\r
+        "2be34ba3.ed43bc"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "450a13df.b4e0a4",\r
+    "id": "41b34545.fd0234",\r
      "type": "comment",\r
      "name": "CLL new",\r
      "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
      "comments": "",\r
-    "x": 1213,\r
-    "y": 1664,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1580,\r
+    "y": 1623,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "ea05bf35.5069",\r
+    "id": "478f42b4.faa2d4",\r
      "type": "set",\r
      "name": "set ethernet-srv-end-points-list array",\r
-    "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
+    "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.uni.data-owner`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
      "comments": "",\r
-    "x": 1304,\r
-    "y": 1718,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1671,\r
+    "y": 1677,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "93a880c5.cd0b3",\r
+    "id": "651de255.0b2e64",\r
      "type": "set",\r
      "name": "unset ethernet-srv-end-points-list",\r
      "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
      "comments": "",\r
-    "x": 1980.5,\r
-    "y": 1131,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2347.5,\r
+    "y": 1090,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "481f95ef.87ef1c",\r
+    "id": "d6d9ebdf.e9fb3",\r
      "type": "set",\r
      "name": "unset ethernet-srv-end-points-list",\r
      "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
      "comments": "",\r
-    "x": 1985.5,\r
-    "y": 1233,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2352.5,\r
+    "y": 1192,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "c1ad05eb.c84b48",\r
+    "id": "19b7b815.a2da88",\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": 469,\r
-    "y": 1683,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 836,\r
+    "y": 1642,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "7f234491.70b134"\r
+        "326b550a.9db58a"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "7f234491.70b134",\r
+    "id": "326b550a.9db58a",\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": 701,\r
-    "y": 1682,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1068,\r
+    "y": 1641,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "c6ba5a66.793238"\r
+        "ee715cec.70103"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "c6ba5a66.793238",\r
+    "id": "ee715cec.70103",\r
      "type": "outcome",\r
      "name": "vpn-binding",\r
      "xml": "<outcome value='vpn-binding'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 913,\r
-    "y": 1683,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1280,\r
+    "y": 1642,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "6ed8d899.fdc1a"\r
+        "43195eb9.e8bde"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "6ed8d899.fdc1a",\r
+    "id": "43195eb9.e8bde",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 169,\r
-    "y": 1839,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 536,\r
+    "y": 1798,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "d9421c0f.7a0898",\r
-        "953702c4.2d79b"\r
+        "1e409cd.23bb4e3",\r
+        "e0ab136c.d8395"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "953702c4.2d79b",\r
+    "id": "e0ab136c.d8395",\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": 404,\r
-    "y": 1826,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 771,\r
+    "y": 1785,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "d9421c0f.7a0898",\r
+    "id": "1e409cd.23bb4e3",\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": 394,\r
-    "y": 1887,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 761,\r
+    "y": 1846,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "329ab1cc.22fb9e",\r
-        "864547d3.a6077",\r
-        "b2aa6219.f09508"\r
+        "1385ba51.9ab07e",\r
+        "5c95ef7e.18572",\r
+        "b238e66d.1cae98"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "864547d3.a6077",\r
+    "id": "5c95ef7e.18572",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 607.490966796875,\r
-    "y": 1871.5740356445312,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 974.490966796875,\r
+    "y": 1830.5740356445312,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "6b83b223.ee9d94"\r
+        "a28f4f7.3d20fb"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "b2aa6219.f09508",\r
+    "id": "b238e66d.1cae98",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 603,\r
-    "y": 1916,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 970,\r
+    "y": 1875,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "4ac70bf0.89675c"\r
+        "20e3dbdd.0ffc3c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "329ab1cc.22fb9e",\r
+    "id": "1385ba51.9ab07e",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 605,\r
-    "y": 1976,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 972,\r
+    "y": 1935,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "f02a177d.26c7"\r
+        "dcbbe04b.ec00a"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "6b83b223.ee9d94",\r
+    "id": "a28f4f7.3d20fb",\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": 770.0625,\r
-    "y": 1870.8597412109375,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1137.0625,\r
+    "y": 1829.8597412109375,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "4ac70bf0.89675c",\r
+    "id": "20e3dbdd.0ffc3c",\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": 771,\r
-    "y": 1916,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1138,\r
+    "y": 1875,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "f02a177d.26c7",\r
+    "id": "dcbbe04b.ec00a",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 774,\r
-    "y": 1975,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1141,\r
+    "y": 1934,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "fc6eb753.cc314",\r
-        "6f8a0144.f9e8e8"\r
+        "5f788739.44bc78",\r
+        "7a2f8c3.df4e4f4"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "ace8d395.16f8f8",\r
+    "id": "968f8b65.0f9e28",\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.connectivity.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.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.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
+    "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.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.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-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": 173,\r
-    "y": 2474,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 540,\r
+    "y": 2433,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "fa159141.96876",\r
+    "id": "d784554f.a0db1",\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.cll-ethernet-service-loop-protection.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.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.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.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": 316,\r
-    "y": 2534,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 683,\r
+    "y": 2493,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "192fb1d6.9d578e",\r
-        "7d0ee5a8.eae4dc"\r
+        "d0e8b7bc.b13c",\r
+        "92d47971.6e56"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "192fb1d6.9d578e",\r
+    "id": "d0e8b7bc.b13c",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 628.5,\r
-    "y": 2511,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 995.5,\r
+    "y": 2470,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "7d0ee5a8.eae4dc",\r
+    "id": "92d47971.6e56",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 632.5,\r
-    "y": 2551,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 999.5,\r
+    "y": 2510,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "31d10b34.3ac65c"\r
+        "d5b32099.fe43f"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "7a578c61.6716c4",\r
+    "id": "1ff5a710.b4bb29",\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": 808.5,\r
-    "y": 2515,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1175.5,\r
+    "y": 2474,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "31d10b34.3ac65c",\r
+    "id": "d5b32099.fe43f",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 824,\r
-    "y": 2569,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1191,\r
+    "y": 2528,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "34d0fee.5345782"\r
+        "ca571afb.4a46e8",\r
+        "1210758a.a607e2",\r
+        "9f2557cf.e0f36",\r
+        "c6235f90.04d29"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "e5aa9a1b.90043",\r
+    "id": "7f59e1a7.53806",\r
      "type": "save",\r
      "name": "update vpn-binding resource (aka. OTN ) 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-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1119.5,\r
-    "y": 2538,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1486.5,\r
+    "y": 2497,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "dceb8020.64dda",\r
+    "id": "5a3937e0.a5f138",\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": 2586.5,\r
-    "y": 1889,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2953.5,\r
+    "y": 1848,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "34d0fee.5345782",\r
+    "id": "ca571afb.4a46e8",\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.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1081.5,\r
-    "y": 2580,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1448.5,\r
+    "y": 2539,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "1840e683.b61c39",\r
+    "id": "5eba1f1e.c5c1c",\r
      "type": "set",\r
      "name": "set leafOrRootAccess",\r
      "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",\r
      "comments": "",\r
-    "x": 1946.5,\r
-    "y": 1169,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2313.5,\r
+    "y": 1128,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "ebd04ab8.6f009",\r
+    "id": "14e15bd9.f573a4",\r
      "type": "set",\r
      "name": "set leafOrRootAccess",\r
      "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",\r
      "comments": "",\r
-    "x": 1947.5,\r
-    "y": 1273,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2314.5,\r
+    "y": 1232,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "9094f518.043e98",\r
+    "id": "46bfac70.a8d9fc",\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": 4241,\r
-    "y": 530,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4608,\r
+    "y": 489,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "13fd978.b0ce7e9",\r
+    "id": "baf6ec9f.d24be",\r
      "type": "save",\r
      "name": "update vpn-binding G 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-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 4144,\r
-    "y": 1349,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4511,\r
+    "y": 1308,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "db1559a9.21dcb8",\r
+    "id": "bfef7878.c9996",\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": 3638,\r
-    "y": 2021,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4005,\r
+    "y": 1980,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "93da3cfa.70c248",\r
+    "id": "b45da909.27452",\r
      "type": "switchNode",\r
      "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",\r
      "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 739,\r
-    "y": 829,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1106,\r
+    "y": 788,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "2c44355c.6d9982",\r
-        "16b41754.18b639"\r
+        "b0133784.5a4a",\r
+        "99418662.5bc768"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "2c44355c.6d9982",\r
+    "id": "b0133784.5a4a",\r
      "type": "outcomeTrue",\r
      "name": "true",\r
      "xml": "<outcome value='true'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1102,\r
-    "y": 852,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1469,\r
+    "y": 811,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "58ecddbb.063a6c"\r
+        "288f63da.bd0d24"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "16b41754.18b639",\r
+    "id": "99418662.5bc768",\r
      "type": "outcomeFalse",\r
      "name": "false",\r
      "xml": "<outcome value='false'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1102,\r
-    "y": 801,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1469,\r
+    "y": 760,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "255e639c.d2ebb4"\r
+        "e20160a5.497008"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "58ecddbb.063a6c",\r
+    "id": "288f63da.bd0d24",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 1258,\r
-    "y": 850,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1625,\r
+    "y": 809,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "9a61b358.c738d8"\r
+        "45fa8d37.dd8774"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "255e639c.d2ebb4",\r
+    "id": "e20160a5.497008",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1235,\r
-    "y": 802,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1602,\r
+    "y": 761,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "c0e6872b.6bc578",\r
+    "id": "cefb7e41.dee868",\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": 1995,\r
-    "y": 200,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2362,\r
+    "y": 159,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "64935ddb.b635b4",\r
+    "id": "fc2523d9.c5b768",\r
      "type": "set",\r
      "name": "set root-otn-tunnels-list array",\r
      "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",\r
      "comments": "",\r
-    "x": 3537,\r
-    "y": 2181,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3904,\r
+    "y": 2140,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "f54721e.ec69de",\r
+    "id": "d22b47c.48051b8",\r
      "type": "set",\r
      "name": "set leaf-otn-tunnels-list array",\r
      "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",\r
      "comments": "",\r
-    "x": 4127,\r
-    "y": 654,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4494,\r
+    "y": 613,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "9d31ed5b.d2c91",\r
+    "id": "573af6c.7f50588",\r
      "type": "set",\r
      "name": "set ethernet-srv-end-points-list array",\r
      "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",\r
      "comments": "",\r
-    "x": 1301,\r
-    "y": 1760,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1668,\r
+    "y": 1719,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "7af36070.5c1af",\r
+    "id": "b8cd961f.31b1e",\r
      "type": "set",\r
      "name": "set filename",\r
      "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",\r
      "comments": "",\r
-    "x": 480,\r
-    "y": 1494,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 847,\r
+    "y": 1453,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "2d8e3cc1.bb010c",\r
+    "id": "e61f86e7.4b844",\r
      "type": "execute",\r
      "name": "execute printContext",\r
      "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 511,\r
-    "y": 1534,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 878,\r
+    "y": 1493,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "fc6eb753.cc314",\r
+    "id": "5f788739.44bc78",\r
      "type": "set",\r
      "name": "set otn-tunnels-name-list array",\r
      "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",\r
      "comments": "",\r
-    "x": 1059,\r
-    "y": 1942,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1426,\r
+    "y": 1901,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "6f8a0144.f9e8e8",\r
+    "id": "7a2f8c3.df4e4f4",\r
      "type": "set",\r
      "name": "set otn-tunnels-name-list array",\r
      "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",\r
      "comments": "",\r
-    "x": 1062,\r
-    "y": 1984,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1429,\r
+    "y": 1943,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "1e5bd700.d21b81",\r
+    "id": "faabf01d.19b578",\r
      "type": "set",\r
      "name": "unset otn-tunnels-name-list array",\r
      "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",\r
      "comments": "",\r
-    "x": 505,\r
-    "y": 1624,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 872,\r
+    "y": 1583,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "144b407f.200e78",\r
+    "id": "9608fe0d.afb518",\r
      "type": "set",\r
      "name": "set filename",\r
      "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
      "comments": "",\r
-    "x": 260,\r
-    "y": 2003,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 627,\r
+    "y": 1962,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "76785af4.e022ac",\r
+    "id": "a9b8ee61.6ebf68",\r
      "type": "execute",\r
      "name": "execute printContext",\r
      "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 268,\r
-    "y": 2060,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 635,\r
+    "y": 2019,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "23eb7cf4.f6cfdc",\r
+    "id": "1b5d7c99.3bb563",\r
      "type": "execute",\r
      "name": "execute split tp-id to get pnf-name",\r
      "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1279,\r
-    "y": 1609,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1646,\r
+    "y": 1568,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "779a259e.64832c",\r
-        "277a0a61.75069e"\r
+        "7979c8cd.b373d",\r
+        "23095b34.b6c794"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "277a0a61.75069e",\r
+    "id": "23095b34.b6c794",\r
      "type": "failure",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1502,\r
-    "y": 1564,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1869,\r
+    "y": 1523,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "21f0cc68.0dd77c"\r
+        "b9f88a30.b1b1"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "779a259e.64832c",\r
+    "id": "7979c8cd.b373d",\r
      "type": "failure",\r
      "name": "failure",\r
      "xml": "<outcome value='failure'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1504,\r
-    "y": 1628,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1871,\r
+    "y": 1587,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "db13af98.99768"\r
+        "4c2d0979.5cdfa"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "21f0cc68.0dd77c",\r
+    "id": "b9f88a30.b1b1",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 1667,\r
-    "y": 1561,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2034,\r
+    "y": 1520,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "ec997076.0ceb28"\r
+        "a93541e2.34e668"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "db13af98.99768",\r
+    "id": "4c2d0979.5cdfa",\r
      "type": "returnFailure",\r
      "name": "return failure",\r
      "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
      "comments": "",\r
-    "x": 1666,\r
-    "y": 1624,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2033,\r
+    "y": 1583,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "ec997076.0ceb28",\r
+    "id": "a93541e2.34e668",\r
      "type": "set",\r
      "name": "set tmp.uni-node-id-short",\r
      "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
      "comments": "",\r
-    "x": 1887,\r
-    "y": 1575,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2254,\r
+    "y": 1534,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "2341ba90.ed99d6",\r
+    "id": "2126128b.9ba956",\r
      "type": "outcome",\r
      "name": "esr-thirdparty-sdnc",\r
      "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1432,\r
-    "y": 2300,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1799,\r
+    "y": 2259,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "35e4a68.098365a"\r
+        "62735f15.7b8b4"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "701770f6.4dd0f8",\r
+    "id": "47d236a4.c5327",\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.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1817,\r
-    "y": 2313,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2184,\r
+    "y": 2272,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "d75e7467.a58a4",\r
-        "74ab773b.95bd78",\r
-        "df0b8ca4.cd7bb8"\r
+        "fd91a13a.7b2ed",\r
+        "dc7a52c4.792ff8",\r
+        "81cf7ce4.5be808"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "35e4a68.098365a",\r
+    "id": "62735f15.7b8b4",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "outputs": 1,\r
-    "x": 1611,\r
-    "y": 2300,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1978,\r
+    "y": 2259,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "fa1aec8.0f5319",\r
-        "701770f6.4dd0f8"\r
+        "fb54c20.839104",\r
+        "47d236a4.c5327"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "fa1aec8.0f5319",\r
+    "id": "fb54c20.839104",\r
      "type": "set",\r
      "name": "set esr-thirdparty-sdnc domainConn id",\r
      "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
      "comments": "",\r
-    "x": 1847,\r
-    "y": 2261,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2214,\r
+    "y": 2220,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "d75e7467.a58a4",\r
+    "id": "fd91a13a.7b2ed",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 2027,\r
-    "y": 2304,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2394,\r
+    "y": 2263,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "1ccfad18.1b3fa3"\r
+        "66b9462d.a94c6"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "74ab773b.95bd78",\r
+    "id": "dc7a52c4.792ff8",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 2019,\r
-    "y": 2359,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2386,\r
+    "y": 2318,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "2692af0.8253f52"\r
+        "4ff23f6c.d7f718"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "df0b8ca4.cd7bb8",\r
+    "id": "81cf7ce4.5be808",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 2024,\r
-    "y": 2416,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2391,\r
+    "y": 2375,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "f048da7.b1469a8"\r
+        "45252a0c.1579ec"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "f048da7.b1469a8",\r
+    "id": "45252a0c.1579ec",\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": 2176,\r
-    "y": 2417,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2543,\r
+    "y": 2376,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "2692af0.8253f52",\r
+    "id": "4ff23f6c.d7f718",\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": 2187,\r
-    "y": 2362,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2554,\r
+    "y": 2321,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "1ccfad18.1b3fa3",\r
+    "id": "66b9462d.a94c6",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>\n",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 2171.38232421875,\r
-    "y": 2301.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2538.38232421875,\r
+    "y": 2260.6556701660156,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "64610343.e61854"\r
+        "d426c7f3.a4f758"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "64610343.e61854",\r
+    "id": "d426c7f3.a4f758",\r
      "type": "set",\r
      "name": "set controller domainConn data",\r
      "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.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": 2386,\r
-    "y": 2298,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2753,\r
+    "y": 2257,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "d3c52589.f54e9",\r
+    "id": "9097bb51.35f598",\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.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 510,\r
-    "y": 2346,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 877,\r
+    "y": 2305,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "f189c3f1.d69a28",\r
-        "4452e7a9.eaf9c8",\r
-        "77af657c.107d34"\r
+        "c5c9c64c.e5b6a",\r
+        "fbc95d65.751dd8",\r
+        "a12f5414.7f7f38"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "f189c3f1.d69a28",\r
+    "id": "c5c9c64c.e5b6a",\r
      "type": "success",\r
      "name": "success",\r
      "xml": "<outcome value='success'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 705.5001220703125,\r
-    "y": 2298,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1072.5001220703125,\r
+    "y": 2257,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "47b3661c.a1e7d8"\r
+        "cd1789e.857e878"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "4452e7a9.eaf9c8",\r
+    "id": "fbc95d65.751dd8",\r
      "type": "not-found",\r
      "name": "not-found",\r
      "xml": "<outcome value='not-found'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 697.5001220703125,\r
-    "y": 2353,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1064.5001220703125,\r
+    "y": 2312,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "34198ba3.49ea3c"\r
+        "641a2f60.3e56f"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "47b3661c.a1e7d8",\r
+    "id": "cd1789e.857e878",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>\n",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 849.8824462890625,\r
-    "y": 2297.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1216.8824462890625,\r
+    "y": 2256.6556701660156,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "cd5c4879.eeeaf"\r
+        "40024900.22ab5"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "cd5c4879.eeeaf",\r
+    "id": "40024900.22ab5",\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": 1034,\r
-    "y": 2296,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1401,\r
+    "y": 2255,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "7bf74b1f.d5837c"\r
+        "61575a21.5f4624"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "7bf74b1f.d5837c",\r
+    "id": "61575a21.5f4624",\r
      "type": "switchNode",\r
      "name": "switch related-to",\r
      "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1229,\r
-    "y": 2296,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1596,\r
+    "y": 2255,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "2341ba90.ed99d6"\r
+        "2126128b.9ba956"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "77af657c.107d34",\r
+    "id": "a12f5414.7f7f38",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 702.5001220703125,\r
-    "y": 2410,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1069.5001220703125,\r
+    "y": 2369,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "6c7ae4ee.17c334"\r
+        "73357d18.309cec"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "6c7ae4ee.17c334",\r
+    "id": "73357d18.309cec",\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": 854.5001220703125,\r
-    "y": 2411,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1221.5001220703125,\r
+    "y": 2370,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "34198ba3.49ea3c",\r
+    "id": "641a2f60.3e56f",\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": 865.5001220703125,\r
-    "y": 2354,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1232.5001220703125,\r
+    "y": 2313,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "303a4e11.243e7a",\r
+    "id": "1f9570cc.1dec3f",\r
      "type": "set",\r
      "name": "set tmp.pnf-name-forUrl",\r
      "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",\r
      "comments": "",\r
-    "x": 500,\r
-    "y": 2258,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 867,\r
+    "y": 2217,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "c718737.8cca71",\r
+    "id": "8c27b84f.305088",\r
      "type": "block",\r
      "name": "block : atomic",\r
      "xml": "<block atomic=\"true\">",\r
      "atomic": "true",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 245,\r
-    "y": 2389,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 612,\r
+    "y": 2348,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "303a4e11.243e7a",\r
-        "d3c52589.f54e9"\r
+        "1f9570cc.1dec3f",\r
+        "9097bb51.35f598"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "72622933.417d18",\r
+    "id": "518c62b.9bc109c",\r
      "type": "comment",\r
      "name": "Temporary skipping this check - to support multiple instances in one slice",\r
      "info": "",\r
      "comments": "",\r
-    "x": 1459.9666748046875,\r
-    "y": 206.88333129882812,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1826.9666748046875,\r
+    "y": 165.88333129882812,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "c3fd03f5.ced1a",\r
+    "id": "630bfd04.7da00c",\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": 662,\r
-    "y": 429,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1029,\r
+    "y": 388,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "c72dabdd.dd1b58",\r
+    "id": "87edee65.85ae28",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 221.5,\r
-    "y": 1398,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 588.5,\r
+    "y": 1357,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "a94aa53a.b107d8",\r
-        "c1ad05eb.c84b48",\r
-        "7af36070.5c1af",\r
-        "2d8e3cc1.bb010c",\r
-        "ace8d395.16f8f8",\r
-        "fa159141.96876",\r
-        "1e5bd700.d21b81",\r
-        "144b407f.200e78",\r
-        "76785af4.e022ac",\r
-        "c718737.8cca71",\r
-        "eca312ef.b3f488"\r
+        "58a3e896.b9ca7",\r
+        "19b7b815.a2da88",\r
+        "b8cd961f.31b1e",\r
+        "e61f86e7.4b844",\r
+        "968f8b65.0f9e28",\r
+        "d784554f.a0db1",\r
+        "faabf01d.19b578",\r
+        "9608fe0d.afb518",\r
+        "a9b8ee61.6ebf68",\r
+        "8c27b84f.305088",\r
+        "d6d125c6.7c1ef"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "99b18acf.7ec528",\r
+    "id": "a7cc4e14.f32b08",\r
      "type": "switchNode",\r
      "name": "switch uni type",\r
      "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1252,\r
-    "y": 1236,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1619,\r
+    "y": 1195,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "bfa56f6a.14e168",\r
-        "3c1ef869.c0abd8",\r
-        "3b2dd259.d313d6",\r
-        "42d627cc.4d9d98"\r
+        "b16fe4e0.6f4fa8",\r
+        "2186f280.8edb0e",\r
+        "ddeb0896.cc0458",\r
+        "c02b45cf.aa9298"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "bfa56f6a.14e168",\r
+    "id": "b16fe4e0.6f4fa8",\r
      "type": "outcome",\r
      "name": "leaf",\r
      "xml": "<outcome value='leaf'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1417,\r
-    "y": 1218,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1784,\r
+    "y": 1177,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "327e25a1.149b82"\r
+        "58f42d60.f5c1ac"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "3c1ef869.c0abd8",\r
+    "id": "2186f280.8edb0e",\r
      "type": "outcome",\r
      "name": "root",\r
      "xml": "<outcome value='root'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1420,\r
-    "y": 1257,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1787,\r
+    "y": 1216,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "bb94632d.8744e"\r
+        "2233c963.7160de"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "42d627cc.4d9d98",\r
+    "id": "c02b45cf.aa9298",\r
      "type": "other",\r
      "name": "other",\r
      "xml": "<outcome value='Other'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1414,\r
-    "y": 1335,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1781,\r
+    "y": 1294,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "aa99ff1e.001ee"\r
+        "7ed44e10.cd8f4"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "3b2dd259.d313d6",\r
+    "id": "ddeb0896.cc0458",\r
      "type": "outcome",\r
      "name": "secondary-root",\r
      "xml": "<outcome value='secondary-root'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1437,\r
-    "y": 1298,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1804,\r
+    "y": 1257,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "3c1ff952.ce0566"\r
+        "17bdedbb.6d9ba2"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "8b34828e.2e2fe8",\r
+    "id": "35f2d4d7.ba6b9c",\r
      "type": "set",\r
      "name": "unset ethernet-srv-end-points-list",\r
      "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
      "comments": "",\r
-    "x": 1983,\r
-    "y": 1331,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2350,\r
+    "y": 1290,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "7c827d8b.b5207c",\r
+    "id": "1bdb940e.a70dfc",\r
      "type": "set",\r
      "name": "set leafOrRootAccess",\r
      "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-backup' />\n",\r
      "comments": "",\r
-    "x": 1945,\r
-    "y": 1371,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2312,\r
+    "y": 1330,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
    },\r
    {\r
-    "id": "aa99ff1e.001ee",\r
+    "id": "7ed44e10.cd8f4",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1582,\r
-    "y": 1335,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1949,\r
+    "y": 1294,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        []\r
      ]\r
    },\r
    {\r
-    "id": "327e25a1.149b82",\r
+    "id": "58f42d60.f5c1ac",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1578,\r
-    "y": 1214,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1945,\r
+    "y": 1173,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "1840e683.b61c39"\r
+        "5eba1f1e.c5c1c"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "bb94632d.8744e",\r
+    "id": "2233c963.7160de",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1585,\r
-    "y": 1259,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1952,\r
+    "y": 1218,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "ebd04ab8.6f009"\r
+        "14e15bd9.f573a4"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "3c1ff952.ce0566",\r
+    "id": "17bdedbb.6d9ba2",\r
      "type": "block",\r
      "name": "block",\r
      "xml": "<block>",\r
      "atomic": "false",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 1584,\r
-    "y": 1299,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1951,\r
+    "y": 1258,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "7c827d8b.b5207c"\r
+        "1bdb940e.a70dfc"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "9a61b358.c738d8",\r
+    "id": "45fa8d37.dd8774",\r
      "type": "switchNode",\r
      "name": "switch conn type != mdsc",\r
      "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type != 'mdsc' `\">\n\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 218.56666564941406,\r
-    "y": 1158.933349609375,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 585.5666656494141,\r
+    "y": 1117.933349609375,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "4c9cf74b.527528"\r
+        "4985dcd9.148044"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "4c9cf74b.527528",\r
+    "id": "4985dcd9.148044",\r
      "type": "outcome",\r
      "name": "true",\r
      "xml": "<outcome value='true'>\n",\r
      "comments": "",\r
      "outputs": 1,\r
-    "x": 400.566650390625,\r
-    "y": 1159.933349609375,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 767.566650390625,\r
+    "y": 1118.933349609375,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": [\r
        [\r
-        "c72dabdd.dd1b58"\r
+        "87edee65.85ae28"\r
        ]\r
      ]\r
    },\r
    {\r
-    "id": "eca312ef.b3f488",\r
+    "id": "d6d125c6.7c1ef",\r
      "type": "set",\r
      "name": "unset ethernet-srv-end-points-list",\r
      "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
      "comments": "",\r
-    "x": 536.566650390625,\r
-    "y": 1336.9666748046875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 903.566650390625,\r
+    "y": 1295.9666748046875,\r
+    "z": "fbffbb46.f6ea5",\r
      "wires": []\r
+  },\r
+  {\r
+    "id": "1210758a.a607e2",\r
+    "type": "execute",\r
+    "name": "execute RestApiCallNode Create Performance Monitoring Data",\r
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\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": 1529.0000610351562,\r
+    "y": 2637.3334884643555,\r
+    "z": "fbffbb46.f6ea5",\r
+    "wires": [\r
+      []\r
+    ]\r
+  },\r
+  {\r
+    "id": "9f2557cf.e0f36",\r
+    "type": "execute",\r
+    "name": "execute RestconfDiscoveryNode establishSubscription",\r
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 1497.0000610351562,\r
+    "y": 2709.333366394043,\r
+    "z": "fbffbb46.f6ea5",\r
+    "wires": [\r
+      []\r
+    ]\r
+  },\r
+  {\r
+    "id": "c6235f90.04d29",\r
+    "type": "execute",\r
+    "name": "execute RestconfDiscoveryNode establishPersistentConnection",\r
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\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=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 1527.0000610351562,\r
+    "y": 2771.333366394043,\r
+    "z": "fbffbb46.f6ea5",\r
+    "wires": [\r
+      []\r
+    ]\r
    }\r
  ]
 \ No newline at end of file