Support individual CLL deletion, and UNI removal from Ethernet Service, and

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / cloud_leased_line / GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.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.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json

index 795a741..4ba32b4 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,223 +1,199 @@
  [\r
      {\r
-        "id": "2395bbe0.4b8ec4",\r
+        "id": "6467c9b6.3ea7b",\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": 361,\r
-        "y": 348,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 415.8833312988281,\r
+        "y": 377,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "7a4b4c32.339f0c",\r
-                "476b558f.0cf4e4",\r
-                "c5f863d4.faa76"\r
+                "1c0c6fa0.017178",\r
+                "ec984d7b.605098",\r
+                "25450eba.0fd99a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a4b4c32.339f0c",\r
+        "id": "1c0c6fa0.017178",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 549,\r
-        "y": 361,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 603.8833312988281,\r
+        "y": 390,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "477b4d49.40f0ec"\r
+                "fcdf737f.3ba08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "476b558f.0cf4e4",\r
+        "id": "ec984d7b.605098",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 549.490966796875,\r
-        "y": 406.57403564453125,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 611.374267578125,\r
+        "y": 432.57403564453125,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
-            [\r
-                "9391f816.87a258"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "c5f863d4.faa76",\r
+        "id": "25450eba.0fd99a",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 547,\r
-        "y": 450,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 601.8833312988281,\r
+        "y": 479,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "7e716c79.c4ee54"\r
+                "f645589d.ed3d98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "477b4d49.40f0ec",\r
+        "id": "fcdf737f.3ba08",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 722,\r
-        "y": 359,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 776.8833312988281,\r
+        "y": 388,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "de48ad25.e4a568"\r
+                "6641b1bb.011df8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9391f816.87a258",\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": 712.0623779296875,\r
-        "y": 406.8597717285156,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "7e716c79.c4ee54",\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": 714,\r
-        "y": 449,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "de48ad25.e4a568",\r
+        "id": "6641b1bb.011df8",\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": 951,\r
-        "y": 360,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1005.8833312988281,\r
+        "y": 389,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "1fd8993c.e83297"\r
+                "42fd94e4.9f459c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1fd8993c.e83297",\r
+        "id": "42fd94e4.9f459c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1166,\r
-        "y": 361,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1220.8833312988281,\r
+        "y": 390,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "33755ee2.127952"\r
+                "341f3db4.7e268a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "edb565df.2fd588",\r
+        "id": "802e937a.3ac",\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": 1420,\r
-        "y": 283,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1474.8833312988281,\r
+        "y": 312,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "d9f77b89.2576a8",\r
-                "d1a41641.7e8658"\r
+                "ccfe4ade.41ae98",\r
+                "912c0faa.e5e1c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d9f77b89.2576a8",\r
+        "id": "ccfe4ade.41ae98",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1637,\r
-        "y": 262,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1691.8833312988281,\r
+        "y": 291,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "33755ee2.127952"\r
+                "341f3db4.7e268a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d1a41641.7e8658",\r
+        "id": "912c0faa.e5e1c8",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1637,\r
-        "y": 311,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1691.8833312988281,\r
+        "y": 340,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "33755ee2.127952",\r
+        "id": "341f3db4.7e268a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1821,\r
-        "y": 348,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1875.8833312988281,\r
+        "y": 377,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "9647ef19.c8c25",\r
-                "b3842f71.731b38",\r
-                "ca01ca51.23bb98"\r
+                "b1ca96f9.f78f38",\r
+                "2c3b3231.83c2be",\r
+                "4660bf61.473a18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48081245.456c3c",\r
+        "id": "377c3031.0fc7c",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 180,\r
-        "y": 89,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 234.88333129882812,\r
+        "y": 118,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "226f6982.562f5e"\r
+                "8b8ba227.5e7638"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "226f6982.562f5e",\r
+        "id": "8b8ba227.5e7638",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -225,3560 +201,3545 @@
          "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": 464.2856903076172,\r
-        "y": 150.23810863494873,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 519.1690216064453,\r
+        "y": 179.23810863494873,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "f533e2ec.f849f"\r
+                "6c55ded0.30c498"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f533e2ec.f849f",\r
+        "id": "6c55ded0.30c498",\r
          "type": "method",\r
          "name": "method cll-vnf-topology-operation-cll-F1-Activate",\r
          "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 470.42860412597656,\r
-        "y": 235.00003051757812,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 525.3119354248047,\r
+        "y": 264.0000305175781,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "15848be5.af4ba4"\r
+                "b63c19cf.5911b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15848be5.af4ba4",\r
+        "id": "b63c19cf.5911b8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 780.238037109375,\r
-        "y": 226.66668701171875,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 835.1213684082031,\r
+        "y": 255.66668701171875,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "2395bbe0.4b8ec4",\r
-                "5c62cbf5.952894",\r
-                "4957906b.cb3908",\r
-                "25a3d5e5.55ea62",\r
-                "624a734b.81957c"\r
+                "6467c9b6.3ea7b",\r
+                "7714415.bcb45c",\r
+                "2cf2ff05.5ecb98",\r
+                "ff64d6f0.1d24e",\r
+                "c19ef147.be92d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9647ef19.c8c25",\r
+        "id": "b1ca96f9.f78f38",\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": 2038,\r
-        "y": 286,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2092.883331298828,\r
+        "y": 315,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "927e2807.47e1",\r
+        "id": "f11c1dac.45c748",\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": 4207,\r
-        "y": 172,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4261.883331298828,\r
+        "y": 201,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "71f8cbde.7b70ec",\r
+        "id": "c95c33ef.381fa8",\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": 4288,\r
-        "y": 487,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4342.883331298828,\r
+        "y": 516,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "dca0592f.f2f0f8",\r
-                "7abf945b.d3630c"\r
+                "89c7efd5.cb6558",\r
+                "d5cfec9d.5347f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dca0592f.f2f0f8",\r
+        "id": "89c7efd5.cb6558",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4597.5,\r
-        "y": 456,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4652.383331298828,\r
+        "y": 485,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "4d6d008.1dd328"\r
+                "beffe966.8b1b08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7abf945b.d3630c",\r
+        "id": "d5cfec9d.5347f8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4602.5,\r
-        "y": 521,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4657.383331298828,\r
+        "y": 550,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "6ddc3bc2.826894"\r
+                "18fce568.1c292b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d6d008.1dd328",\r
+        "id": "beffe966.8b1b08",\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": 4773.5,\r
-        "y": 456,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4828.383331298828,\r
+        "y": 485,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ddc3bc2.826894",\r
+        "id": "18fce568.1c292b",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4769,\r
-        "y": 521,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4823.883331298828,\r
+        "y": 550,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "639d74a6.1d8f04",\r
+        "id": "64fdffc9.427678",\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": 4152.5,\r
-        "y": 741,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4207.383331298828,\r
+        "y": 770,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9456183.6b2d68",\r
+        "id": "c0e95206.343c2",\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": 4306.5,\r
-        "y": 789,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4361.383331298828,\r
+        "y": 818,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "3efbdf9b.54682",\r
-                "243cc169.72316e"\r
+                "7a1edf39.b6a0f8",\r
+                "b605ddae.9f2b2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3efbdf9b.54682",\r
+        "id": "7a1edf39.b6a0f8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4652,\r
-        "y": 770,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4706.883331298828,\r
+        "y": 799,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "ba970949.4ab53"\r
+                "db29824f.2b664"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "243cc169.72316e",\r
+        "id": "b605ddae.9f2b2",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4656,\r
-        "y": 810,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4710.883331298828,\r
+        "y": 839,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "4891a43f.02e58c"\r
+                "10ebb808.22b9d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ba970949.4ab53",\r
+        "id": "db29824f.2b664",\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": 4810,\r
-        "y": 770,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4864.883331298828,\r
+        "y": 799,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4891a43f.02e58c",\r
+        "id": "10ebb808.22b9d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4813.5,\r
-        "y": 810,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4868.383331298828,\r
+        "y": 839,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "388beb56.7c7234",\r
-                "eb334e0f.b54c3"\r
+                "6d35eb39.2fe42c",\r
+                "b62c3c22.2cb09"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "388beb56.7c7234",\r
+        "id": "6d35eb39.2fe42c",\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": 5144,\r
-        "y": 775,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5198.883331298828,\r
+        "y": 804,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d196af8c.f36ae8",\r
+        "id": "3f34bcf0.b30eb4",\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": 5008,\r
-        "y": 734,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5062.883331298828,\r
+        "y": 763,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb334e0f.b54c3",\r
+        "id": "b62c3c22.2cb09",\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": 5071,\r
-        "y": 821,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5125.883331298828,\r
+        "y": 850,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "51361643.15e97",\r
+        "id": "dc51dde.504a12",\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": 4145,\r
-        "y": 220,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4199.883331298828,\r
+        "y": 249,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7074e291.428a74",\r
+        "id": "25f0cbb9.ff400c",\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": 4171,\r
-        "y": 337,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4225.883331298828,\r
+        "y": 366,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "fd9f25cd.b6ab9",\r
-                "13f82e43.b47822",\r
-                "a1ba843c.92fa78"\r
+                "26af6a64.84f75e",\r
+                "dfaad5e6.3e7388",\r
+                "d4f19086.9e394"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd9f25cd.b6ab9",\r
+        "id": "26af6a64.84f75e",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4366.5001220703125,\r
-        "y": 289,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4421.383453369141,\r
+        "y": 318,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "10d11922.59185f"\r
+                "825f4729.b63ee8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13f82e43.b47822",\r
+        "id": "dfaad5e6.3e7388",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4358.5001220703125,\r
-        "y": 344,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4413.383453369141,\r
+        "y": 373,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "19650434.8dad4c"\r
+                "92b1984a.bc8b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10d11922.59185f",\r
+        "id": "825f4729.b63ee8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4510.8824462890625,\r
-        "y": 288.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4565.765777587891,\r
+        "y": 317.6556701660156,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "777ae9c7.6a278"\r
+                "415768e6.6651f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "391ce87d.ba3df8",\r
+        "id": "a6a2d3e2.2e526",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5093,\r
-        "y": 291,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5147.883331298828,\r
+        "y": 320,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "65b820ac.17e0d"\r
+                "e243a570.71b51"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "777ae9c7.6a278",\r
+        "id": "415768e6.6651f8",\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": 4695,\r
-        "y": 287,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4749.883331298828,\r
+        "y": 316,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "f4f1a808.b22bc"\r
+                "ab4dd1f4.04e1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4f1a808.b22bc",\r
+        "id": "ab4dd1f4.04e1f",\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": 4890,\r
-        "y": 287,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4944.883331298828,\r
+        "y": 316,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "391ce87d.ba3df8"\r
+                "a6a2d3e2.2e526"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1ba843c.92fa78",\r
+        "id": "d4f19086.9e394",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4363.5001220703125,\r
-        "y": 401,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4418.383453369141,\r
+        "y": 430,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a6d9e4b5.ea0fd8"\r
+                "28f88c03.cb5e5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6d9e4b5.ea0fd8",\r
+        "id": "28f88c03.cb5e5c",\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": 4515.5001220703125,\r
-        "y": 402,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4570.383453369141,\r
+        "y": 431,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "19650434.8dad4c",\r
+        "id": "92b1984a.bc8b",\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": 4526.5001220703125,\r
-        "y": 345,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4581.383453369141,\r
+        "y": 374,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5d042a1f.c8fb44",\r
+        "id": "677439f1.5f7ed",\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": 5478,\r
-        "y": 304,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5532.883331298828,\r
+        "y": 333,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "8c0f87c1.0cfa88",\r
-                "96b96977.b4fed8",\r
-                "6ce026da.737ea"\r
+                "e7fd97d3.bbcd08",\r
+                "38bba5b7.de41b2",\r
+                "6bf961e8.c56a58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "65b820ac.17e0d",\r
+        "id": "e243a570.71b51",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5272,\r
-        "y": 291,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5326.883331298828,\r
+        "y": 320,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "1918c44c.117ae4",\r
-                "5d042a1f.c8fb44"\r
+                "857cacb0.81444",\r
+                "677439f1.5f7ed"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1918c44c.117ae4",\r
+        "id": "857cacb0.81444",\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": 5508,\r
-        "y": 252,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5562.883331298828,\r
+        "y": 281,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8c0f87c1.0cfa88",\r
+        "id": "e7fd97d3.bbcd08",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5688,\r
-        "y": 295,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5742.883331298828,\r
+        "y": 324,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "e1aae278.d9aab"\r
+                "60a50433.d26434"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96b96977.b4fed8",\r
+        "id": "38bba5b7.de41b2",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5680,\r
-        "y": 350,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5734.883331298828,\r
+        "y": 379,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a74826f7.daef6"\r
+                "d9350787.861f1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ce026da.737ea",\r
+        "id": "6bf961e8.c56a58",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5685,\r
-        "y": 407,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5739.883331298828,\r
+        "y": 436,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "80c7718d.f0881"\r
+                "1afc54ba.8ed313"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80c7718d.f0881",\r
+        "id": "1afc54ba.8ed313",\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": 5837,\r
-        "y": 408,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5891.883331298828,\r
+        "y": 437,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a74826f7.daef6",\r
+        "id": "d9350787.861f1",\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": 5848,\r
-        "y": 353,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5902.883331298828,\r
+        "y": 382,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e1aae278.d9aab",\r
+        "id": "60a50433.d26434",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5832.38232421875,\r
-        "y": 292.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5887.265655517578,\r
+        "y": 321.6556701660156,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "b6fb5857.56d2c"\r
+                "8367dac2.ac8b98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b6fb5857.56d2c",\r
+        "id": "8367dac2.ac8b98",\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": 6047,\r
-        "y": 289,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 6101.883331298828,\r
+        "y": 318,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "881ac3d.2b73cc",\r
+        "id": "aa2473a.12d4d9",\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": 3614,\r
-        "y": 1629,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3668.883331298828,\r
+        "y": 1658,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f942fe34.857118",\r
+        "id": "28a663c6.7433b4",\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": 3677,\r
-        "y": 1958,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3731.883331298828,\r
+        "y": 1987,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "d6aba815.0c0b98",\r
-                "fb15fc4f.27732"\r
+                "422a3196.0fb7d",\r
+                "371e9e8f.f6f942"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6aba815.0c0b98",\r
+        "id": "422a3196.0fb7d",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3972.5,\r
-        "y": 1925,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4027.383331298828,\r
+        "y": 1954,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "f7e9b7f6.cb6cf8"\r
+                "c3084137.121c7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb15fc4f.27732",\r
+        "id": "371e9e8f.f6f942",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3977.5,\r
-        "y": 1990,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4032.383331298828,\r
+        "y": 2019,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "e7e93f9f.05e6f8"\r
+                "c6676165.ac5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7e9b7f6.cb6cf8",\r
+        "id": "c3084137.121c7",\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": 4140.5,\r
-        "y": 1925,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4195.383331298828,\r
+        "y": 1954,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7e93f9f.05e6f8",\r
+        "id": "c6676165.ac5c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4151,\r
-        "y": 1990,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4205.883331298828,\r
+        "y": 2019,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c6f7c9bc.a78ea8",\r
+        "id": "dfee532c.a1419",\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": 3553,\r
-        "y": 1686,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3607.883331298828,\r
+        "y": 1715,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f243ad6.97dd38",\r
+        "id": "e52702af.314718",\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": 3573,\r
-        "y": 1783,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3627.883331298828,\r
+        "y": 1812,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a8e6c84d.0f237",\r
-                "3ee8ddc2.b7378a",\r
-                "311698c.6883b68"\r
+                "9ca1c561.5c796",\r
+                "9cf5cab4.99d6e",\r
+                "5d5762eb.724c64"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8e6c84d.0f237",\r
+        "id": "9ca1c561.5c796",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3775.5001220703125,\r
-        "y": 1736,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3830.3834533691406,\r
+        "y": 1765,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "6ef9124f.c91bc4"\r
+                "502f683e.00cf7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ee8ddc2.b7378a",\r
+        "id": "9cf5cab4.99d6e",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3767.5001220703125,\r
-        "y": 1791,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3822.3834533691406,\r
+        "y": 1820,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "9b01e4a.2bf7598"\r
+                "9587c00d.994eb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ef9124f.c91bc4",\r
+        "id": "502f683e.00cf7",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3919.8824462890625,\r
-        "y": 1733.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3974.7657775878906,\r
+        "y": 1762.6556701660156,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "8bd570a1.9b5908"\r
+                "39b96666.82062a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8bd570a1.9b5908",\r
+        "id": "39b96666.82062a",\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": 4104,\r
-        "y": 1748,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4158.883331298828,\r
+        "y": 1777,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "5951fb7a.778dbc"\r
+                "94ae9a5d.e5d56"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "311698c.6883b68",\r
+        "id": "5d5762eb.724c64",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3772.5001220703125,\r
-        "y": 1848,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3827.3834533691406,\r
+        "y": 1877,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "25fe1469.5e13bc"\r
+                "7a00ac4a.8d918c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25fe1469.5e13bc",\r
+        "id": "7a00ac4a.8d918c",\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": 3924.5001220703125,\r
-        "y": 1849,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3979.3834533691406,\r
+        "y": 1878,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9b01e4a.2bf7598",\r
+        "id": "9587c00d.994eb",\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": 3935.5001220703125,\r
-        "y": 1794,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3990.3834533691406,\r
+        "y": 1823,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a9a3100d.7e9a38",\r
+        "id": "f1540d0.014217",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4502,\r
-        "y": 1752,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4556.883331298828,\r
+        "y": 1781,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "15a6f6cf.b80121"\r
+                "c932c6af.938f38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5951fb7a.778dbc",\r
+        "id": "94ae9a5d.e5d56",\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": 4299,\r
-        "y": 1748,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4353.883331298828,\r
+        "y": 1777,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a9a3100d.7e9a38"\r
+                "f1540d0.014217"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b462757e.f97cf",\r
+        "id": "2ff151e7.182fee",\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": 4887,\r
-        "y": 1751,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4941.883331298828,\r
+        "y": 1780,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "f548cd5f.cf97e8",\r
-                "7bf2c309.936484",\r
-                "37200156.6e45ae"\r
+                "40d3a7a.4400bd8",\r
+                "353377f9.20c718",\r
+                "f8f22501.0020d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15a6f6cf.b80121",\r
+        "id": "c932c6af.938f38",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4679,\r
-        "y": 1744,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4733.883331298828,\r
+        "y": 1773,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "24625031.3ccbb",\r
-                "b462757e.f97cf"\r
+                "53fc3a7e.05d404",\r
+                "2ff151e7.182fee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24625031.3ccbb",\r
+        "id": "53fc3a7e.05d404",\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": 4917,\r
-        "y": 1699,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4971.883331298828,\r
+        "y": 1728,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3717e4c0.7e91fc",\r
+        "id": "d551b07b.11f68",\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": 5246,\r
-        "y": 1855,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5300.883331298828,\r
+        "y": 1884,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ebaf4cad.7f7ac",\r
+        "id": "c19bb319.e0e2b8",\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": 5257,\r
-        "y": 1800,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5311.883331298828,\r
+        "y": 1829,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "95133e26.a5c4",\r
+        "id": "2dbaf595.6cfed2",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5241.38232421875,\r
-        "y": 1739.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5296.265655517578,\r
+        "y": 1768.6556701660156,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "74fa69d9.12322"\r
+                "eaeaf1b8.196fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74fa69d9.12322",\r
+        "id": "eaeaf1b8.196fc",\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": 5456,\r
-        "y": 1736,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5510.883331298828,\r
+        "y": 1765,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f548cd5f.cf97e8",\r
+        "id": "40d3a7a.4400bd8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5097,\r
-        "y": 1742,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5151.883331298828,\r
+        "y": 1771,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "95133e26.a5c4"\r
+                "2dbaf595.6cfed2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bf2c309.936484",\r
+        "id": "353377f9.20c718",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5089,\r
-        "y": 1797,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5143.883331298828,\r
+        "y": 1826,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "ebaf4cad.7f7ac"\r
+                "c19bb319.e0e2b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37200156.6e45ae",\r
+        "id": "f8f22501.0020d8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5094,\r
-        "y": 1854,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5148.883331298828,\r
+        "y": 1883,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "3717e4c0.7e91fc"\r
+                "d551b07b.11f68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4573661e.19551",\r
+        "id": "c7d66e95.fb47e",\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": 3128,\r
-        "y": 700,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3182.883331298828,\r
+        "y": 729,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "e3a931ba.d41978",\r
-                "cce98769.66d2f"\r
+                "4d8bbec2.c0db6",\r
+                "507d82bd.8807cc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3a931ba.d41978",\r
+        "id": "4d8bbec2.c0db6",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3342,\r
-        "y": 737,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3396.883331298828,\r
+        "y": 766,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "83f7a2a0.47e4a"\r
+                "6524452d.4a2f94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cce98769.66d2f",\r
+        "id": "507d82bd.8807cc",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3344,\r
-        "y": 675,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3398.883331298828,\r
+        "y": 704,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a3a1c771.fa4dc8"\r
+                "4b590d33.c81684"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83f7a2a0.47e4a",\r
+        "id": "6524452d.4a2f94",\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": 2922,\r
-        "y": 1980,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2976.883331298828,\r
+        "y": 2009,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "b17cf12.c5b4e9",\r
-                "375f750c.523c3a"\r
+                "75800cfe.e64b04",\r
+                "28895848.af5c18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b17cf12.c5b4e9",\r
+        "id": "75800cfe.e64b04",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3175,\r
-        "y": 2014,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3229.883331298828,\r
+        "y": 2043,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "b574ded7.ea26d"\r
+                "34389e65.7f3f0a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "375f750c.523c3a",\r
+        "id": "28895848.af5c18",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3175,\r
-        "y": 1958,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3229.883331298828,\r
+        "y": 1987,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "3eeb971b.8e101"\r
+                "4c94a377.c6d4e4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b574ded7.ea26d",\r
+        "id": "34389e65.7f3f0a",\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": 3326,\r
-        "y": 2014,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3380.883331298828,\r
+        "y": 2043,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "27c7cf1.51adcb",\r
+        "id": "ff717106.1f6f7",\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": 4202,\r
-        "y": 112,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4256.883331298828,\r
+        "y": 141,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e24e0a9e.a7db8",\r
+        "id": "98bc8f5e.55646",\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": 3610,\r
-        "y": 1571,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3664.883331298828,\r
+        "y": 1600,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6b14e6ca.05c05",\r
+        "id": "1901ad68.6869bb",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3893,\r
-        "y": 369,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3947.883331298828,\r
+        "y": 398,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "27c7cf1.51adcb",\r
-                "927e2807.47e1",\r
-                "51361643.15e97",\r
-                "7074e291.428a74",\r
-                "71f8cbde.7b70ec",\r
-                "41c50446.37f104",\r
-                "e5881b35.2a2bf8",\r
-                "ceaa1f2c.697ad"\r
+                "ff717106.1f6f7",\r
+                "f11c1dac.45c748",\r
+                "dc51dde.504a12",\r
+                "25f0cbb9.ff400c",\r
+                "c95c33ef.381fa8",\r
+                "7a0ef184.deb28",\r
+                "dd4c3392.e1b02",\r
+                "2a6ffb7c.8797f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3eeb971b.8e101",\r
+        "id": "4c94a377.c6d4e4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3326,\r
-        "y": 1957,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3380.883331298828,\r
+        "y": 1986,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "e24e0a9e.a7db8",\r
-                "881ac3d.2b73cc",\r
-                "c6f7c9bc.a78ea8",\r
-                "8f243ad6.97dd38",\r
-                "f942fe34.857118",\r
-                "51d22e16.357968",\r
-                "8caebf31.dc028",\r
-                "6ccc1a6d.d89cd4"\r
+                "98bc8f5e.55646",\r
+                "aa2473a.12d4d9",\r
+                "dfee532c.a1419",\r
+                "e52702af.314718",\r
+                "28a663c6.7433b4",\r
+                "c984548c.2e537",\r
+                "88e8f378.a2b808",\r
+                "1fda4b4a.2131e5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f87bcfd0.50c8c",\r
+        "id": "d79079df.baf578",\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": 3564,\r
-        "y": 2256,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3618.883331298828,\r
+        "y": 2285,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab6e58b.3c55528",\r
+        "id": "45ccc628.f5551",\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": 3718,\r
-        "y": 2304,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3772.883331298828,\r
+        "y": 2333,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "eff9a19.776a7e",\r
-                "ddb717fb.d9a6d8"\r
+                "6173b4db.203ce4",\r
+                "7f21396.e7ee248"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eff9a19.776a7e",\r
+        "id": "6173b4db.203ce4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4063.5,\r
-        "y": 2285,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4118.383331298828,\r
+        "y": 2314,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "59a2ea1f.0d3f14"\r
+                "2b5ddf83.e8a168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ddb717fb.d9a6d8",\r
+        "id": "7f21396.e7ee248",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4067.5,\r
-        "y": 2325,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4122.383331298828,\r
+        "y": 2354,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "81b55fda.fb8e98"\r
+                "9fc151.f9cc46b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59a2ea1f.0d3f14",\r
+        "id": "2b5ddf83.e8a168",\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": 4221.5,\r
-        "y": 2285,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4276.383331298828,\r
+        "y": 2314,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "81b55fda.fb8e98",\r
+        "id": "9fc151.f9cc46b",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4225,\r
-        "y": 2325,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4279.883331298828,\r
+        "y": 2354,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "1bcc30a0.546397",\r
-                "1eaaa262.028326"\r
+                "ec406c4.a093b1",\r
+                "ba32c60f.0ec53"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1bcc30a0.546397",\r
+        "id": "ec406c4.a093b1",\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": 4565,\r
-        "y": 2324,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4619.883331298828,\r
+        "y": 2353,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "68a7db89.5a89fc",\r
+        "id": "650aeaf3.da502c",\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": 4423,\r
-        "y": 2282,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4477.883331298828,\r
+        "y": 2311,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1eaaa262.028326",\r
+        "id": "ba32c60f.0ec53",\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": 4494,\r
-        "y": 2373,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4548.883331298828,\r
+        "y": 2402,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "71f36947.989c9",\r
+        "id": "c8295377.ff6158",\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": 3119,\r
-        "y": 640,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3173.883331298828,\r
+        "y": 669,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24508e5.8723172",\r
+        "id": "17d3b71c.0a74f9",\r
          "type": "comment",\r
          "name": "only dst ttp exists. No src",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3714,\r
-        "y": 326,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3768.883331298828,\r
+        "y": 355,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f3eaab4d.9a827",\r
+        "id": "12dd212a.e5931f",\r
          "type": "comment",\r
          "name": "only src ttp exists. No dst",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3271,\r
-        "y": 1904,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3325.883331298828,\r
+        "y": 1933,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3a1c771.fa4dc8",\r
+        "id": "4b590d33.c81684",\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": 3450,\r
-        "y": 488,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3504.883331298828,\r
+        "y": 517,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "6921df6d.0bad7",\r
-                "5859006e.3869c8"\r
+                "e68f7957.57ea98",\r
+                "90c8120e.55a8c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5859006e.3869c8",\r
+        "id": "90c8120e.55a8c8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3692,\r
-        "y": 1077,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3746.883331298828,\r
+        "y": 1106,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "6a1db5bd.d7e224"\r
+                "5f92c041.e2a22"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6921df6d.0bad7",\r
+        "id": "e68f7957.57ea98",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3686,\r
-        "y": 368,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3740.883331298828,\r
+        "y": 397,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "6b14e6ca.05c05"\r
+                "1901ad68.6869bb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a1db5bd.d7e224",\r
+        "id": "5f92c041.e2a22",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3850,\r
-        "y": 1076,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3904.883331298828,\r
+        "y": 1105,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "e8ac2c73.115cc",\r
-                "de077050.d3ab3",\r
-                "d36a1b80.8692c8",\r
-                "73f78d36.ab931c",\r
-                "8ec0e69e.0bdfb8",\r
-                "4004366.ff0b5c8"\r
+                "eb5cd95b.b46698",\r
+                "bcb9498.a9205b8",\r
+                "24e13fd8.afe2d8",\r
+                "57e5431f.63be4c",\r
+                "8b688219.8ed198",\r
+                "9c0b0957.1e6c48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "de077050.d3ab3",\r
+        "id": "bcb9498.a9205b8",\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": 4114,\r
-        "y": 959,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4168.883331298828,\r
+        "y": 988,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8ec0e69e.0bdfb8",\r
+        "id": "8b688219.8ed198",\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": 4195,\r
-        "y": 1274,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4249.883331298828,\r
+        "y": 1303,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a8d20b89.8deb88",\r
-                "ebe8f709.819288"\r
+                "4ea88210.ceec44",\r
+                "cd5b1128.4dbb9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8d20b89.8deb88",\r
+        "id": "4ea88210.ceec44",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4504.5,\r
-        "y": 1243,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4559.383331298828,\r
+        "y": 1272,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "f56a0e73.901ac"\r
+                "9646de5b.fe3c7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebe8f709.819288",\r
+        "id": "cd5b1128.4dbb9",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4509.5,\r
-        "y": 1308,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4564.383331298828,\r
+        "y": 1337,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "8bcbb353.d66038"\r
+                "55735b11.27f424"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f56a0e73.901ac",\r
+        "id": "9646de5b.fe3c7",\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": 4680.5,\r
-        "y": 1243,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4735.383331298828,\r
+        "y": 1272,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8bcbb353.d66038",\r
+        "id": "55735b11.27f424",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4676,\r
-        "y": 1308,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4730.883331298828,\r
+        "y": 1337,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d36a1b80.8692c8",\r
+        "id": "24e13fd8.afe2d8",\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": 4052,\r
-        "y": 1007,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4106.883331298828,\r
+        "y": 1036,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "73f78d36.ab931c",\r
+        "id": "57e5431f.63be4c",\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": 4078,\r
-        "y": 1124,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4132.883331298828,\r
+        "y": 1153,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "e0243648.484bc",\r
-                "e14aa09.d5d416",\r
-                "5447b1d0.03a8b"\r
+                "1d187a80.e65b15",\r
+                "370c15e3.9b5fca",\r
+                "703dc49a.960884"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e0243648.484bc",\r
+        "id": "1d187a80.e65b15",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4273.5001220703125,\r
-        "y": 1076,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4328.383453369141,\r
+        "y": 1105,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "94135ed.07ea02"\r
+                "5c6509dd.e3a81"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e14aa09.d5d416",\r
+        "id": "370c15e3.9b5fca",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4265.5001220703125,\r
-        "y": 1131,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4320.383453369141,\r
+        "y": 1160,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "1628394b.83cd8f"\r
+                "ccfe239.f2e7de"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94135ed.07ea02",\r
+        "id": "5c6509dd.e3a81",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4417.8824462890625,\r
-        "y": 1075.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4472.765777587891,\r
+        "y": 1104.6556701660156,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "fdedf72e.2dd36"\r
+                "35d4ca24.cf236e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fdedf72e.2dd36",\r
+        "id": "35d4ca24.cf236e",\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": 4602,\r
-        "y": 1074,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4656.883331298828,\r
+        "y": 1103,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "f99d2e19.85b668"\r
+                "c8705d75.001f7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f99d2e19.85b668",\r
+        "id": "c8705d75.001f7",\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": 4797,\r
-        "y": 1074,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4851.883331298828,\r
+        "y": 1103,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "ff4cc7a8.15eb18"\r
+                "b9376422.2a71"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5447b1d0.03a8b",\r
+        "id": "703dc49a.960884",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4270.5001220703125,\r
-        "y": 1188,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4325.383453369141,\r
+        "y": 1217,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "74603a77.be9d34"\r
+                "ece92d94.dd0ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74603a77.be9d34",\r
+        "id": "ece92d94.dd0ac",\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": 4422.5001220703125,\r
-        "y": 1189,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4477.383453369141,\r
+        "y": 1218,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1628394b.83cd8f",\r
+        "id": "ccfe239.f2e7de",\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": 4433.5001220703125,\r
-        "y": 1132,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4488.383453369141,\r
+        "y": 1161,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e8ac2c73.115cc",\r
+        "id": "eb5cd95b.b46698",\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": 4109,\r
-        "y": 899,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4163.883331298828,\r
+        "y": 928,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff4cc7a8.15eb18",\r
+        "id": "b9376422.2a71",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5000,\r
-        "y": 1078,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5054.883331298828,\r
+        "y": 1107,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "8469558b.e4d748"\r
+                "d2480516.2fc378"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf8a4c78.37fe58",\r
+        "id": "9cb817ae.cef538",\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": 5385,\r
-        "y": 1091,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5439.883331298828,\r
+        "y": 1120,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "44cef850.3e64a",\r
-                "9337c3a8.6f7408",\r
-                "6a44b1b.7cb45d"\r
+                "a79825bb.dff1f8",\r
+                "1395d5f.298062a",\r
+                "7903ca2c.aa5cc4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8469558b.e4d748",\r
+        "id": "d2480516.2fc378",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5179,\r
-        "y": 1078,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5233.883331298828,\r
+        "y": 1107,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "82428162.54c128",\r
-                "cf8a4c78.37fe58"\r
+                "fbf9e6b6.15b5c",\r
+                "9cb817ae.cef538"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "82428162.54c128",\r
+        "id": "fbf9e6b6.15b5c",\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": 5415,\r
-        "y": 1039,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5469.883331298828,\r
+        "y": 1068,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "44cef850.3e64a",\r
+        "id": "a79825bb.dff1f8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5595,\r
-        "y": 1082,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5649.883331298828,\r
+        "y": 1111,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "ffb7eeb1.dda348"\r
+                "c7dce557.6dded"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9337c3a8.6f7408",\r
+        "id": "1395d5f.298062a",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5587,\r
-        "y": 1137,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5641.883331298828,\r
+        "y": 1166,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "28235dd8.9620aa"\r
+                "598e647b.5837b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a44b1b.7cb45d",\r
+        "id": "7903ca2c.aa5cc4",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5592,\r
-        "y": 1194,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5646.883331298828,\r
+        "y": 1223,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a95b4d04.8ebfb"\r
+                "e6c7a6e7.b2f038"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a95b4d04.8ebfb",\r
+        "id": "e6c7a6e7.b2f038",\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": 5744,\r
-        "y": 1195,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5798.883331298828,\r
+        "y": 1224,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "28235dd8.9620aa",\r
+        "id": "598e647b.5837b4",\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": 5755,\r
-        "y": 1140,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5809.883331298828,\r
+        "y": 1169,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ffb7eeb1.dda348",\r
+        "id": "c7dce557.6dded",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5739.38232421875,\r
-        "y": 1079.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 5794.265655517578,\r
+        "y": 1108.6556701660156,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "eb1ea22e.dc12c"\r
+                "2cfbc0b6.6ae748"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eb1ea22e.dc12c",\r
+        "id": "2cfbc0b6.6ae748",\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": 5954,\r
-        "y": 1076,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 6008.883331298828,\r
+        "y": 1105,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "47e1e7c7.6cadf",\r
+        "id": "fca9cd7.3028eb",\r
          "type": "comment",\r
          "name": "both src and dst exist",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3728,\r
-        "y": 1017,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3782.883331298828,\r
+        "y": 1046,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3842f71.731b38",\r
+        "id": "2c3b3231.83c2be",\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": 2290,\r
-        "y": 744,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2344.883331298828,\r
+        "y": 773,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "fe4cd4cf.21da1",\r
-                "8d3265c3.ddab38"\r
+                "81a947d8.a13a68",\r
+                "b480f4ae.d59fb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8d3265c3.ddab38",\r
+        "id": "b480f4ae.d59fb8",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2697,\r
-        "y": 762,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2751.883331298828,\r
+        "y": 791,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "418df61.fe2be08"\r
+                "23d2aee5.d5b2fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe4cd4cf.21da1",\r
+        "id": "81a947d8.a13a68",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2697,\r
-        "y": 707,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2751.883331298828,\r
+        "y": 736,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "8b0dea0b.e78e98"\r
+                "773948cf.a686e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8b0dea0b.e78e98",\r
+        "id": "773948cf.a686e8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2853,\r
-        "y": 705,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2907.883331298828,\r
+        "y": 734,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "71f36947.989c9",\r
-                "4573661e.19551"\r
+                "c8295377.ff6158",\r
+                "c7d66e95.fb47e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "418df61.fe2be08",\r
+        "id": "23d2aee5.d5b2fa",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2830,\r
-        "y": 763,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2884.883331298828,\r
+        "y": 792,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5c62cbf5.952894",\r
+        "id": "7714415.bcb45c",\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": 1007,\r
-        "y": 179,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1061.8833312988281,\r
+        "y": 208,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a7fd19a0.011a5",\r
+        "id": "79981366.647454",\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": 4124,\r
-        "y": 597,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4178.883331298828,\r
+        "y": 626,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "41c50446.37f104",\r
+        "id": "7a0ef184.deb28",\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": 4184,\r
-        "y": 636,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4238.883331298828,\r
+        "y": 665,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4957906b.cb3908",\r
+        "id": "2cf2ff05.5ecb98",\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": 1000,\r
-        "y": 87,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1054.8833312988281,\r
+        "y": 116,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5277b309.13aef4",\r
+        "id": "7871357e.92d2f4",\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": 3536,\r
-        "y": 2113,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3590.883331298828,\r
+        "y": 2142,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "51d22e16.357968",\r
+        "id": "c984548c.2e537",\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": 3592,\r
-        "y": 2162,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3646.883331298828,\r
+        "y": 2191,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8191f581.e3e888",\r
+        "id": "efee660.b5b7f18",\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": 1000,\r
-        "y": 126,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1054.8833312988281,\r
+        "y": 155,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "25a3d5e5.55ea62",\r
+        "id": "ff64d6f0.1d24e",\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": 1031,\r
-        "y": 227,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1085.8833312988281,\r
+        "y": 256,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "624a734b.81957c",\r
+        "id": "c19ef147.be92d8",\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": 241,\r
-        "y": 702,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 295.8833312988281,\r
+        "y": 731,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "2ff4bd45.763852",\r
-                "237ce68a.9b5a2a",\r
-                "86bae4d8.c51f3"\r
+                "4acbe821.0c1ff8",\r
+                "63a107d4.a006c8",\r
+                "4bb92513.9b1ebc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ff4bd45.763852",\r
+        "id": "4acbe821.0c1ff8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 460,\r
-        "y": 640,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 514.8833312988281,\r
+        "y": 669,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "2f347c57.a92144"\r
+                "d6a121aa.ecf888"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "237ce68a.9b5a2a",\r
+        "id": "63a107d4.a006c8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 469.490966796875,\r
-        "y": 682.5740356445312,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 524.3742980957031,\r
+        "y": 711.5740356445312,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
-            [\r
-                "196b18f9.87f4a7"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "86bae4d8.c51f3",\r
+        "id": "4bb92513.9b1ebc",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 458,\r
-        "y": 729,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 512.8833312988281,\r
+        "y": 758,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "d6f02bd7.9f988"\r
+                "f58f94a6.d7fb9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2f347c57.a92144",\r
+        "id": "d6a121aa.ecf888",\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": 657,\r
-        "y": 636,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 711.8833312988281,\r
+        "y": 665,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "408bfafb.b2f244"\r
+                "46606d75.f5af5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "196b18f9.87f4a7",\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": 623.0623779296875,\r
-        "y": 685.8597717285156,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "d6f02bd7.9f988",\r
+        "id": "f58f94a6.d7fb9",\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": 627,\r
-        "y": 730,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 681.8833312988281,\r
+        "y": 759,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "408bfafb.b2f244",\r
+        "id": "46606d75.f5af5c",\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": 880.33349609375,\r
-        "y": 635.9999389648438,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 935.2168273925781,\r
+        "y": 664.9999389648438,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "7d8f8b2e.4aa30c"\r
+                "1dffeedd.2e39d1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7d8f8b2e.4aa30c",\r
+        "id": "1dffeedd.2e39d1",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1081.0001335144043,\r
-        "y": 637.000020980835,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1135.8834648132324,\r
+        "y": 666.000020980835,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "bd2be559.7e491"\r
+                "5eeac4ab.784bec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd2be559.7e491",\r
+        "id": "5eeac4ab.784bec",\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": 211,\r
-        "y": 899,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 265.8833312988281,\r
+        "y": 928,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "97323d62.80248",\r
-                "afdba634.5389a8",\r
-                "c784d901.2500c8"\r
+                "93ffca07.c36c6",\r
+                "a6155e5c.4a2e4",\r
+                "edf3ae2.0898ad"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "97323d62.80248",\r
+        "id": "93ffca07.c36c6",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 419,\r
-        "y": 863,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 473.8833312988281,\r
+        "y": 892,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "dc950dad.bba8c8"\r
+                "41f16b19.4ea28c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afdba634.5389a8",\r
+        "id": "a6155e5c.4a2e4",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 419.490966796875,\r
-        "y": 908.5740356445312,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 474.3742980957031,\r
+        "y": 937.5740356445312,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
-            [\r
-                "f09199a5.a037f"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "c784d901.2500c8",\r
+        "id": "edf3ae2.0898ad",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 417,\r
-        "y": 952,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 471.8833312988281,\r
+        "y": 981,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a903bba8.c7f45"\r
+                "77488207.b4a2f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f09199a5.a037f",\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": 582.0623779296875,\r
-        "y": 908.8597717285156,\r
-        "z": "ed7c1675.7a56b",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "a903bba8.c7f45",\r
+        "id": "77488207.b4a2f4",\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": 586,\r
-        "y": 953,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 640.8833312988281,\r
+        "y": 982,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c4e5acdc.5eea4",\r
+        "id": "1853bc71.11bc54",\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": 558,\r
-        "y": 1447,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 612.8833312988281,\r
+        "y": 1476,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "f2e2cc22.a529f"\r
+                "aa99b60e.a0ae8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f2e2cc22.a529f",\r
+        "id": "aa99b60e.a0ae8",\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": 761,\r
-        "y": 1459,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 815.8833312988281,\r
+        "y": 1488,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "c09b72f6.aeae98"\r
+                "6b5b67d6.d9cff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c09b72f6.aeae98",\r
+        "id": "6b5b67d6.d9cff8",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 927,\r
-        "y": 1456,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 981.8833312988281,\r
+        "y": 1485,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "bfe2cfaf.5416a"\r
+                "c9be5883.2f43"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfe2cfaf.5416a",\r
+        "id": "c9be5883.2f43",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1088,\r
-        "y": 1453,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1142.8833312988281,\r
+        "y": 1482,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "ed44bd0b.bb6278",\r
-                "85af841c.633c5",\r
-                "785dd3f1.f249ac",\r
-                "b8d52cff.f0dcb",\r
-                "4915b2e4.5fd2dc"\r
+                "8328946b.83ccf",\r
+                "70436354.fbd2a4",\r
+                "71db6bb7.f92dd4",\r
+                "a3af61e2.8efbd8",\r
+                "1dbcecbe.b5c9a3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85af841c.633c5",\r
+        "id": "70436354.fbd2a4",\r
          "type": "set",\r
          "name": "unset tmp.aai.uni",\r
          "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
          "comments": "",\r
-        "x": 1292,\r
-        "y": 1411,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1346.8833312988281,\r
+        "y": 1440,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ed44bd0b.bb6278",\r
+        "id": "8328946b.83ccf",\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": 1289,\r
-        "y": 1456,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1343.8833312988281,\r
+        "y": 1485,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "6b32d7eb.72211",\r
-                "7343128c.f923b4",\r
-                "b9b05d3.e5ae12"\r
+                "95cc35e2.dbd57",\r
+                "6243e8b2.6e7d68",\r
+                "ea238384.cd0de8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7343128c.f923b4",\r
+        "id": "6243e8b2.6e7d68",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1484.490966796875,\r
-        "y": 1429.573974609375,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1539.3742980957031,\r
+        "y": 1458.573974609375,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "5dcee0f6.9162a8"\r
+                "60cc7ad4.175214"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9b05d3.e5ae12",\r
+        "id": "ea238384.cd0de8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1480,\r
-        "y": 1473.9999389648438,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1534.8833312988281,\r
+        "y": 1502.9999389648438,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "b7ed6a74.25237"\r
+                "33a586e8.574ea2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5dcee0f6.9162a8",\r
+        "id": "60cc7ad4.175214",\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": 1647.0625,\r
-        "y": 1428.8596801757812,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1701.9458312988281,\r
+        "y": 1457.8596801757812,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b7ed6a74.25237",\r
+        "id": "33a586e8.574ea2",\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": 1648,\r
-        "y": 1473.9999389648438,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1702.8833312988281,\r
+        "y": 1502.9999389648438,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dfdfa822.c47e1",\r
+        "id": "3ed2826e.143bbe",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1650,\r
-        "y": 1520.9999389648438,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1704.8833312988281,\r
+        "y": 1549.9999389648438,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6b32d7eb.72211",\r
+        "id": "95cc35e2.dbd57",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1481,\r
-        "y": 1520.9999389648438,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1535.8833312988281,\r
+        "y": 1549.9999389648438,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "dfdfa822.c47e1"\r
+                "3ed2826e.143bbe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ed7a6be.5472c",\r
+        "id": "a3b35ff6.7d4a88",\r
          "type": "switchNode",\r
          "name": "switch conn type",\r
          "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 170.5,\r
-        "y": 1118,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 225.38333129882812,\r
+        "y": 1147,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "3e9a846b.aac024",\r
-                "fd2eac9f.aa3be8",\r
-                "81d85b97.ec18c"\r
+                "53e42336.cf6874",\r
+                "64e5ac9.b8c59d4",\r
+                "29d673d9.3ef8bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d4d11fc.e19976",\r
+        "id": "fdb5b362.28d2e8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 281.5,\r
-        "y": 1474,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 336.3833312988281,\r
+        "y": 1503,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3e9a846b.aac024",\r
+        "id": "53e42336.cf6874",\r
          "type": "outcome",\r
          "name": "leaf",\r
          "xml": "<outcome value='leaf'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 156.5,\r
-        "y": 1364,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 211.38333129882812,\r
+        "y": 1393,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "186f4361.0093b5"\r
+                "2d911faf.b625f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd2eac9f.aa3be8",\r
+        "id": "64e5ac9.b8c59d4",\r
          "type": "outcome",\r
          "name": "root",\r
          "xml": "<outcome value='root'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 157.5,\r
-        "y": 1422,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 212.38333129882812,\r
+        "y": 1451,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a8f57470.dafb1"\r
+                "c8a49fba.48732"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81d85b97.ec18c",\r
+        "id": "29d673d9.3ef8bc",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 159.5,\r
-        "y": 1476,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 214.38333129882812,\r
+        "y": 1505,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "3d4d11fc.e19976"\r
+                "fdb5b362.28d2e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "17f45567.72d3f3",\r
+        "id": "893647bf.8d35f8",\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": 1265,\r
-        "y": 1684,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1319.8833312988281,\r
+        "y": 1713,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "785dd3f1.f249ac",\r
+        "id": "71db6bb7.f92dd4",\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
          "comments": "",\r
-        "x": 1356,\r
-        "y": 1738,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1410.8833312988281,\r
+        "y": 1767,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a8f57470.dafb1",\r
+        "id": "c8a49fba.48732",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 273.5,\r
-        "y": 1418,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 328.3833312988281,\r
+        "y": 1447,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "6d0b5941.55c8f8",\r
-                "c4e5acdc.5eea4",\r
-                "3e47dbd3.f7afc4",\r
-                "c378a6a3.2e4c8",\r
-                "901c32b.8d67fd",\r
-                "d142c0f2.700e98",\r
-                "b2e88ff.3380b7",\r
-                "3026fc23.0fd5f4",\r
-                "f24a5646.1c02c8",\r
-                "db09832f.86c758",\r
-                "3c14b8ea.b96268",\r
-                "c7cb304b.f39168"\r
+                "c9ed31d4.2a59a",\r
+                "1853bc71.11bc54",\r
+                "e2c4a442.f42cf",\r
+                "7b94a56a.0cc0c4",\r
+                "14d69ea3.c37079",\r
+                "e39ba7bd.aed5d8",\r
+                "9e9fd2d9.fce4a8",\r
+                "3e44ba6b.3875e6",\r
+                "de368aef.16cb",\r
+                "61a182f0.95ec2c",\r
+                "fae7aeca.a940b8",\r
+                "f92bafd0.7c69c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "186f4361.0093b5",\r
+        "id": "2d911faf.b625f",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 286.5,\r
-        "y": 1360,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 341.3833312988281,\r
+        "y": 1389,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "c4e5acdc.5eea4",\r
-                "b5d90017.45ce98",\r
-                "913d2a70.ccfd3",\r
-                "c378a6a3.2e4c8",\r
-                "901c32b.8d67fd",\r
-                "d142c0f2.700e98",\r
-                "b2e88ff.3380b7",\r
-                "3026fc23.0fd5f4",\r
-                "f24a5646.1c02c8",\r
-                "db09832f.86c758",\r
-                "3c14b8ea.b96268",\r
-                "c7cb304b.f39168"\r
+                "1853bc71.11bc54",\r
+                "30a75a3e.13e116",\r
+                "878444f9.a47b7",\r
+                "7b94a56a.0cc0c4",\r
+                "14d69ea3.c37079",\r
+                "e39ba7bd.aed5d8",\r
+                "9e9fd2d9.fce4a8",\r
+                "3e44ba6b.3875e6",\r
+                "de368aef.16cb",\r
+                "61a182f0.95ec2c",\r
+                "fae7aeca.a940b8",\r
+                "f92bafd0.7c69c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b5d90017.45ce98",\r
+        "id": "30a75a3e.13e116",\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": 577.5,\r
-        "y": 1240,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 632.3833312988281,\r
+        "y": 1269,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6d0b5941.55c8f8",\r
+        "id": "c9ed31d4.2a59a",\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": 594.5,\r
-        "y": 1334,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 649.3833312988281,\r
+        "y": 1363,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c378a6a3.2e4c8",\r
+        "id": "7b94a56a.0cc0c4",\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": 521,\r
-        "y": 1703,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 575.8833312988281,\r
+        "y": 1732,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "3613e1a4.3cd206"\r
+                "bd67d795.2e839"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3613e1a4.3cd206",\r
+        "id": "bd67d795.2e839",\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": 753,\r
-        "y": 1702,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 807.8833312988281,\r
+        "y": 1731,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "c46d21fc.7c5088"\r
+                "148b77ab.48b7a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c46d21fc.7c5088",\r
+        "id": "148b77ab.48b7a",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 965,\r
-        "y": 1703,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1019.8833312988281,\r
+        "y": 1732,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "41d3d62e.c810a8"\r
+                "90ccd6ae.a26198"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41d3d62e.c810a8",\r
+        "id": "90ccd6ae.a26198",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 221,\r
-        "y": 1859,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 275.8833312988281,\r
+        "y": 1888,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "24bb38a6.cf0a88",\r
-                "80203aa0.6c8a6"\r
+                "8f4c1c14.35a72",\r
+                "c6a7aee9.6724"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80203aa0.6c8a6",\r
+        "id": "c6a7aee9.6724",\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": 456,\r
-        "y": 1846,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 510.8833312988281,\r
+        "y": 1875,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24bb38a6.cf0a88",\r
+        "id": "8f4c1c14.35a72",\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": 446,\r
-        "y": 1907,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 500.8833312988281,\r
+        "y": 1936,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "e7df9a86.a02dd8",\r
-                "d754cb82.42f37",\r
-                "80509f91.59bce8"\r
+                "2e648939.1db066",\r
+                "6fc34533.3f02e4",\r
+                "f4ca0a98.2172d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d754cb82.42f37",\r
+        "id": "6fc34533.3f02e4",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 659.490966796875,\r
-        "y": 1891.5740356445312,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 714.3742980957031,\r
+        "y": 1920.5740356445312,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "31b91fbf.39fff8"\r
+                "24a8c225.12e4ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80509f91.59bce8",\r
+        "id": "f4ca0a98.2172d",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 655,\r
-        "y": 1936,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 709.8833312988281,\r
+        "y": 1965,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "312541a.87b29be"\r
+                "a2a9b29c.7bdb18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7df9a86.a02dd8",\r
+        "id": "2e648939.1db066",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 657,\r
-        "y": 1996,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 711.8833312988281,\r
+        "y": 2025,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "f19203b2.563a88"\r
+                "6e035263.0ab9c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "31b91fbf.39fff8",\r
+        "id": "24a8c225.12e4ae",\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": 822.0625,\r
-        "y": 1890.8597412109375,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 876.9458312988281,\r
+        "y": 1919.8597412109375,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "312541a.87b29be",\r
+        "id": "a2a9b29c.7bdb18",\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": 823,\r
-        "y": 1936,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 877.8833312988281,\r
+        "y": 1965,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f19203b2.563a88",\r
+        "id": "6e035263.0ab9c4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 826,\r
-        "y": 1995,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 880.8833312988281,\r
+        "y": 2024,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "70164d90.2f08c4",\r
-                "27824a25.86f05e"\r
+                "fc704734.f5a92",\r
+                "534cefd0.094168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b2e88ff.3380b7",\r
+        "id": "9e9fd2d9.fce4a8",\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
          "comments": "",\r
-        "x": 225,\r
-        "y": 2494,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 279.8833312988281,\r
+        "y": 2523,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3026fc23.0fd5f4",\r
+        "id": "3e44ba6b.3875e6",\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.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": 368,\r
-        "y": 2554,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 422.8833312988281,\r
+        "y": 2583,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a9d1707f.7a88c8",\r
-                "8ab460b7.633638"\r
+                "b4c4bd8d.d5bdc",\r
+                "c813638c.89d0f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9d1707f.7a88c8",\r
+        "id": "b4c4bd8d.d5bdc",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 680.5,\r
-        "y": 2531,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 735.3833312988281,\r
+        "y": 2560,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8ab460b7.633638",\r
+        "id": "c813638c.89d0f",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 684.5,\r
-        "y": 2571,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 739.3833312988281,\r
+        "y": 2600,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "7ddc0654.bb96f8"\r
+                "3e668730.81c5e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1d8045c.1b61e8",\r
+        "id": "1c6aee6c.a3a53a",\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": 860.5,\r
-        "y": 2535,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 915.3833312988281,\r
+        "y": 2564,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7ddc0654.bb96f8",\r
+        "id": "3e668730.81c5e8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 876,\r
-        "y": 2589,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 930.8833312988281,\r
+        "y": 2618,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "1eddd66c.da478a"\r
+                "e6168d7c.f871d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cee3e55d.189dc",\r
+        "id": "59cef6d7.b8a21",\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": 1171.5,\r
-        "y": 2558,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1226.3833312988281,\r
+        "y": 2587,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bb915427.f0582",\r
+        "id": "b5303ab1.d78928",\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": 2638.5,\r
-        "y": 1909,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2693.383331298828,\r
+        "y": 1938,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1eddd66c.da478a",\r
+        "id": "e6168d7c.f871d",\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": 1133.5,\r
-        "y": 2600,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1188.3833312988281,\r
+        "y": 2629,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "913d2a70.ccfd3",\r
+        "id": "878444f9.a47b7",\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": 543.5,\r
-        "y": 1278,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 598.3833312988281,\r
+        "y": 1307,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e47dbd3.f7afc4",\r
+        "id": "e2c4a442.f42cf",\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": 556.5,\r
-        "y": 1374,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 611.3833312988281,\r
+        "y": 1403,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e5881b35.2a2bf8",\r
+        "id": "dd4c3392.e1b02",\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": 4293,\r
-        "y": 550,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4347.883331298828,\r
+        "y": 579,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4004366.ff0b5c8",\r
+        "id": "9c0b0957.1e6c48",\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": 4196,\r
-        "y": 1369,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4250.883331298828,\r
+        "y": 1398,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8caebf31.dc028",\r
+        "id": "88e8f378.a2b808",\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": 3690,\r
-        "y": 2041,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3744.883331298828,\r
+        "y": 2070,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dc950dad.bba8c8",\r
+        "id": "41f16b19.4ea28c",\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": 791,\r
-        "y": 849,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 845.8833312988281,\r
+        "y": 878,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "28d7875f.122df",\r
-                "47ffeb93.7b808c"\r
+                "7bf4aa70.c75d74",\r
+                "a798281b.2c68d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28d7875f.122df",\r
+        "id": "7bf4aa70.c75d74",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1154,\r
-        "y": 872,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1208.8833312988281,\r
+        "y": 901,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "f3fb6a94.133bb"\r
+                "e5a55559.f1ecf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "47ffeb93.7b808c",\r
+        "id": "a798281b.2c68d8",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1154,\r
-        "y": 821,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1208.8833312988281,\r
+        "y": 850,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "3da0dc2.736e6a4"\r
+                "486913c4.08fb54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f3fb6a94.133bb",\r
+        "id": "e5a55559.f1ecf",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1310,\r
-        "y": 870,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1364.8833312988281,\r
+        "y": 899,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "9ed7a6be.5472c"\r
+                "a3b35ff6.7d4a88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3da0dc2.736e6a4",\r
+        "id": "486913c4.08fb54",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1287,\r
-        "y": 822,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1341.8833312988281,\r
+        "y": 851,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ca01ca51.23bb98",\r
+        "id": "4660bf61.473a18",\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": 2047,\r
-        "y": 220,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2101.883331298828,\r
+        "y": 249,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ccc1a6d.d89cd4",\r
+        "id": "1fda4b4a.2131e5",\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": 3589,\r
-        "y": 2201,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 3643.883331298828,\r
+        "y": 2230,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ceaa1f2c.697ad",\r
+        "id": "2a6ffb7c.8797f4",\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": 4179,\r
-        "y": 674,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 4233.883331298828,\r
+        "y": 703,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b8d52cff.f0dcb",\r
+        "id": "a3af61e2.8efbd8",\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": 1353,\r
-        "y": 1780,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1407.8833312988281,\r
+        "y": 1809,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "901c32b.8d67fd",\r
+        "id": "14d69ea3.c37079",\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": 532,\r
-        "y": 1514,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 586.8833312988281,\r
+        "y": 1543,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d142c0f2.700e98",\r
+        "id": "e39ba7bd.aed5d8",\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": 563,\r
-        "y": 1554,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 617.8833312988281,\r
+        "y": 1583,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "70164d90.2f08c4",\r
+        "id": "fc704734.f5a92",\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": 1111,\r
-        "y": 1962,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1165.8833312988281,\r
+        "y": 1991,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "27824a25.86f05e",\r
+        "id": "534cefd0.094168",\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": 1114,\r
-        "y": 2004,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1168.8833312988281,\r
+        "y": 2033,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f24a5646.1c02c8",\r
+        "id": "de368aef.16cb",\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": 557,\r
-        "y": 1644,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 611.8833312988281,\r
+        "y": 1673,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "db09832f.86c758",\r
+        "id": "61a182f0.95ec2c",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
          "comments": "",\r
-        "x": 312,\r
-        "y": 2023,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 366.8833312988281,\r
+        "y": 2052,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3c14b8ea.b96268",\r
+        "id": "fae7aeca.a940b8",\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": 320,\r
-        "y": 2080,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 374.8833312988281,\r
+        "y": 2109,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4915b2e4.5fd2dc",\r
+        "id": "1dbcecbe.b5c9a3",\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": 1331,\r
-        "y": 1629,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1385.8833312988281,\r
+        "y": 1658,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "bfcf3bba.b5daa",\r
-                "9b18409e.c203c8"\r
+                "2facd73.aebb428",\r
+                "7c34f1f3.22e088"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b18409e.c203c8",\r
+        "id": "7c34f1f3.22e088",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1554,\r
-        "y": 1584,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1608.8833312988281,\r
+        "y": 1613,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "5afaf397.e20c3c"\r
+                "7e28ac3f.b53f7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfcf3bba.b5daa",\r
+        "id": "2facd73.aebb428",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1556,\r
-        "y": 1648,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1610.8833312988281,\r
+        "y": 1677,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "f7de9867.a0fd38"\r
+                "c1661a7d.0e642"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5afaf397.e20c3c",\r
+        "id": "7e28ac3f.b53f7c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1719,\r
-        "y": 1581,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1773.8833312988281,\r
+        "y": 1610,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "cdcfe3c8.962368"\r
+                "a55c6cbe.f3cef"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7de9867.a0fd38",\r
+        "id": "c1661a7d.0e642",\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": 1718,\r
-        "y": 1644,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1772.8833312988281,\r
+        "y": 1673,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cdcfe3c8.962368",\r
+        "id": "a55c6cbe.f3cef",\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 -3]`' />\n",\r
          "comments": "",\r
-        "x": 1939,\r
-        "y": 1595,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1993.8833312988281,\r
+        "y": 1624,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6d07bcb7.ffff34",\r
+        "id": "a3eb9377.85c18",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1484,\r
-        "y": 2320,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1538.8833312988281,\r
+        "y": 2349,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "9547fb43.8165f"\r
+                "fcb0361d.62eb48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "261f721d.19cda6",\r
+        "id": "dcd8db20.d12b7",\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": 1869,\r
-        "y": 2333,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1923.8833312988281,\r
+        "y": 2362,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "a4fad359.d63e7",\r
-                "d7202a06.97a2a8",\r
-                "d2a1d22e.b2ed6"\r
+                "62f93408.d79154",\r
+                "c38cc9d8.7f1bc",\r
+                "576ffe09.c4abd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9547fb43.8165f",\r
+        "id": "fcb0361d.62eb48",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1663,\r
-        "y": 2320,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1717.8833312988281,\r
+        "y": 2349,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "9b0cdae9.5834e8",\r
-                "261f721d.19cda6"\r
+                "90857791.e16908",\r
+                "dcd8db20.d12b7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b0cdae9.5834e8",\r
+        "id": "90857791.e16908",\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": 1899,\r
-        "y": 2281,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1953.8833312988281,\r
+        "y": 2310,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a4fad359.d63e7",\r
+        "id": "62f93408.d79154",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2079,\r
-        "y": 2324,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2133.883331298828,\r
+        "y": 2353,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "ce2ed097.248ac"\r
+                "2c548a06.655d4e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d7202a06.97a2a8",\r
+        "id": "c38cc9d8.7f1bc",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2071,\r
-        "y": 2379,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2125.883331298828,\r
+        "y": 2408,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "15f2754c.6e5b2b"\r
+                "99196e80.99674"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2a1d22e.b2ed6",\r
+        "id": "576ffe09.c4abd8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2076,\r
-        "y": 2436,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2130.883331298828,\r
+        "y": 2465,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "fe7bb44f.f58b7"\r
+                "ea704904.f61c3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe7bb44f.f58b7",\r
+        "id": "ea704904.f61c3",\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": 2228,\r
-        "y": 2437,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2282.883331298828,\r
+        "y": 2466,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "15f2754c.6e5b2b",\r
+        "id": "99196e80.99674",\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": 2239,\r
-        "y": 2382,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2293.883331298828,\r
+        "y": 2411,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ce2ed097.248ac",\r
+        "id": "2c548a06.655d4e",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2223.38232421875,\r
-        "y": 2321.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2278.265655517578,\r
+        "y": 2350.6556701660156,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "1c2a2a5a.6d8256"\r
+                "55de506e.ab2138"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c2a2a5a.6d8256",\r
+        "id": "55de506e.ab2138",\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": 2438,\r
-        "y": 2318,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 2492.883331298828,\r
+        "y": 2347,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9710382e.112c58",\r
+        "id": "2eeb0084.f61b88",\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": 562,\r
-        "y": 2366,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 616.8833312988281,\r
+        "y": 2395,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "afc311a9.64a498",\r
-                "1b364ee.7270531",\r
-                "aa64b78b.7ab17"\r
+                "21d8f2c9.3cd2be",\r
+                "32ff82a0.3bb24e",\r
+                "21eb3441.66cbb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afc311a9.64a498",\r
+        "id": "21d8f2c9.3cd2be",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 757.5001220703125,\r
-        "y": 2318,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 812.3834533691406,\r
+        "y": 2347,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "7cd619d5.a4e8c"\r
+                "2571d7b1.c4fb5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1b364ee.7270531",\r
+        "id": "32ff82a0.3bb24e",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 749.5001220703125,\r
-        "y": 2373,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 804.3834533691406,\r
+        "y": 2402,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "7127ee10.2a0b4"\r
+                "b0a2917a.ecde4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7cd619d5.a4e8c",\r
+        "id": "2571d7b1.c4fb5",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 901.8824462890625,\r
-        "y": 2317.6556701660156,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 956.7657775878906,\r
+        "y": 2346.6556701660156,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "fd5a5a0.ad9b128"\r
+                "a50320.52c78ce"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd5a5a0.ad9b128",\r
+        "id": "a50320.52c78ce",\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": 1086,\r
-        "y": 2316,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1140.8833312988281,\r
+        "y": 2345,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "8c513405.b809e8"\r
+                "b3deb273.cebb88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c513405.b809e8",\r
+        "id": "b3deb273.cebb88",\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": 1281,\r
-        "y": 2316,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1335.8833312988281,\r
+        "y": 2345,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "6d07bcb7.ffff34"\r
+                "a3eb9377.85c18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa64b78b.7ab17",\r
+        "id": "21eb3441.66cbb4",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 754.5001220703125,\r
-        "y": 2430,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 809.3834533691406,\r
+        "y": 2459,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "22a641d1.a7babe"\r
+                "f2a9e7b0.6a4ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "22a641d1.a7babe",\r
+        "id": "f2a9e7b0.6a4ff8",\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": 906.5001220703125,\r
-        "y": 2431,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 961.3834533691406,\r
+        "y": 2460,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7127ee10.2a0b4",\r
+        "id": "b0a2917a.ecde4",\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": 917.5001220703125,\r
-        "y": 2374,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 972.3834533691406,\r
+        "y": 2403,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "41c682cf.a83f2c",\r
+        "id": "e821cf32.5b22f",\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": 552,\r
-        "y": 2278,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 606.8833312988281,\r
+        "y": 2307,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7cb304b.f39168",\r
+        "id": "f92bafd0.7c69c8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 297,\r
-        "y": 2409,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 351.8833312988281,\r
+        "y": 2438,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": [\r
              [\r
-                "41c682cf.a83f2c",\r
-                "9710382e.112c58"\r
+                "e821cf32.5b22f",\r
+                "2eeb0084.f61b88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d390d070.3dc4c",\r
+        "id": "a832f3b6.8874e",\r
          "type": "comment",\r
          "name": "Temporary skipping this check - to support multiple instances in one slice",\r
          "info": "",\r
          "comments": "",\r
-        "x": 1511.9666748046875,\r
-        "y": 226.88333129882812,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1566.8500061035156,\r
+        "y": 255.88333129882812,\r
+        "z": "3f6a2e0f.b66c8a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "f645589d.ed3d98",\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": 768.8833312988281,\r
+        "y": 478,\r
+        "z": "3f6a2e0f.b66c8a",\r
          "wires": []\r
      }\r
  ]
 \ No newline at end of file