Support for 1+1 protection path for a cloud leased-line (CLL) service.

[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..d58ad7b 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": "d35e2da9.70a7e",\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": 372,\r
+        "y": 306,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7a4b4c32.339f0c",\r
-                "476b558f.0cf4e4",\r
-                "c5f863d4.faa76"\r
+                "88d19ab1.10b18",\r
+                "8fd12759.af6e18",\r
+                "50405d21.7eae84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a4b4c32.339f0c",\r
+        "id": "88d19ab1.10b18",\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": 560,\r
+        "y": 319,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "477b4d49.40f0ec"\r
+                "d472199a.beff9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "476b558f.0cf4e4",\r
+        "id": "8fd12759.af6e18",\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": 567.4909362792969,\r
+        "y": 361.57403564453125,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
-            [\r
-                "9391f816.87a258"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "c5f863d4.faa76",\r
+        "id": "50405d21.7eae84",\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": 558,\r
+        "y": 408,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7e716c79.c4ee54"\r
+                "6b1a691d.f6617"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "477b4d49.40f0ec",\r
+        "id": "d472199a.beff9",\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": 733,\r
+        "y": 317,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "de48ad25.e4a568"\r
+                "f306805a.38d6f8"\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": "f306805a.38d6f8",\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": 962,\r
+        "y": 318,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1fd8993c.e83297"\r
+                "4a920666.d84d68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1fd8993c.e83297",\r
+        "id": "4a920666.d84d68",\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": 1177,\r
+        "y": 319,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "33755ee2.127952"\r
+                "fc848cba.fc33d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "edb565df.2fd588",\r
+        "id": "841ae1dd.49d178",\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": 1431,\r
+        "y": 241,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "d9f77b89.2576a8",\r
-                "d1a41641.7e8658"\r
+                "98ef6cc.4725e9",\r
+                "ab42fe03.c49e3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d9f77b89.2576a8",\r
+        "id": "98ef6cc.4725e9",\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": 1648,\r
+        "y": 220,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "33755ee2.127952"\r
+                "fc848cba.fc33d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d1a41641.7e8658",\r
+        "id": "ab42fe03.c49e3",\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": 1648,\r
+        "y": 269,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "33755ee2.127952",\r
+        "id": "fc848cba.fc33d8",\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": 1832,\r
+        "y": 306,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9647ef19.c8c25",\r
-                "b3842f71.731b38",\r
-                "ca01ca51.23bb98"\r
+                "53692e4a.48cde",\r
+                "957d0d12.f7d338",\r
+                "1f9b767f.d670b2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "48081245.456c3c",\r
+        "id": "524dbe59.8ef8f",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 180,\r
-        "y": 89,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 191,\r
+        "y": 47,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "226f6982.562f5e"\r
+                "320667fa.12a2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "226f6982.562f5e",\r
+        "id": "320667fa.12a2c",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -225,3560 +201,3558 @@
          "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": 475.2856903076172,\r
+        "y": 108.23810863494873,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f533e2ec.f849f"\r
+                "aa006c98.f12b58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f533e2ec.f849f",\r
+        "id": "aa006c98.f12b58",\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": 481.42860412597656,\r
+        "y": 193.00003051757812,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "15848be5.af4ba4"\r
+                "72fe4a66.39584c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15848be5.af4ba4",\r
+        "id": "72fe4a66.39584c",\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": 791.238037109375,\r
+        "y": 184.66668701171875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2395bbe0.4b8ec4",\r
-                "5c62cbf5.952894",\r
-                "4957906b.cb3908",\r
-                "25a3d5e5.55ea62",\r
-                "624a734b.81957c"\r
+                "d35e2da9.70a7e",\r
+                "cce8745e.b515b8",\r
+                "706cb78c.da92b",\r
+                "88772a4.9b58658",\r
+                "4ace150.4554dec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9647ef19.c8c25",\r
+        "id": "53692e4a.48cde",\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": 2049,\r
+        "y": 244,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "927e2807.47e1",\r
+        "id": "123fcc82.b79ae3",\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": 4218,\r
+        "y": 130,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "71f8cbde.7b70ec",\r
+        "id": "e308a3a2.af826",\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": 4299,\r
+        "y": 445,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "dca0592f.f2f0f8",\r
-                "7abf945b.d3630c"\r
+                "fedd6b9.d7f3318",\r
+                "39581c20.edb614"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dca0592f.f2f0f8",\r
+        "id": "fedd6b9.d7f3318",\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": 4608.5,\r
+        "y": 414,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4d6d008.1dd328"\r
+                "c49081cf.377c78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7abf945b.d3630c",\r
+        "id": "39581c20.edb614",\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": 4613.5,\r
+        "y": 479,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6ddc3bc2.826894"\r
+                "9c0572a4.3a997"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d6d008.1dd328",\r
+        "id": "c49081cf.377c78",\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": 4784.5,\r
+        "y": 414,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ddc3bc2.826894",\r
+        "id": "9c0572a4.3a997",\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": 4780,\r
+        "y": 479,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "639d74a6.1d8f04",\r
+        "id": "2d297001.689a7",\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": 4163.5,\r
+        "y": 699,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9456183.6b2d68",\r
+        "id": "54d9bbcc.0d0bac",\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": 4317.5,\r
+        "y": 747,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3efbdf9b.54682",\r
-                "243cc169.72316e"\r
+                "2ade786d.c09b28",\r
+                "f17ad5b3.0ef818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3efbdf9b.54682",\r
+        "id": "2ade786d.c09b28",\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": 4663,\r
+        "y": 728,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ba970949.4ab53"\r
+                "72718fb4.e15e78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "243cc169.72316e",\r
+        "id": "f17ad5b3.0ef818",\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": 4667,\r
+        "y": 768,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4891a43f.02e58c"\r
+                "98b1fdb0.a42648"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ba970949.4ab53",\r
+        "id": "72718fb4.e15e78",\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": 4821,\r
+        "y": 728,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4891a43f.02e58c",\r
+        "id": "98b1fdb0.a42648",\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": 4824.5,\r
+        "y": 768,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "388beb56.7c7234",\r
-                "eb334e0f.b54c3"\r
+                "fe12ce9.6a53ab",\r
+                "4eba4c2.fda54b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "388beb56.7c7234",\r
+        "id": "fe12ce9.6a53ab",\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": 5155,\r
+        "y": 733,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d196af8c.f36ae8",\r
+        "id": "9e233ee4.5c90e",\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": 5019,\r
+        "y": 692,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb334e0f.b54c3",\r
+        "id": "4eba4c2.fda54b4",\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": 5082,\r
+        "y": 779,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "51361643.15e97",\r
+        "id": "fbd17573.b91cd8",\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": 4156,\r
+        "y": 178,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7074e291.428a74",\r
+        "id": "985dbb20.1c3b78",\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": 4182,\r
+        "y": 295,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fd9f25cd.b6ab9",\r
-                "13f82e43.b47822",\r
-                "a1ba843c.92fa78"\r
+                "544c4f89.eba52",\r
+                "eb873b5e.d10b8",\r
+                "d8377d86.76164"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd9f25cd.b6ab9",\r
+        "id": "544c4f89.eba52",\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": 4377.5001220703125,\r
+        "y": 247,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "10d11922.59185f"\r
+                "cd232c91.ed7d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13f82e43.b47822",\r
+        "id": "eb873b5e.d10b8",\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": 4369.5001220703125,\r
+        "y": 302,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "19650434.8dad4c"\r
+                "7e7e18a4.ea2a98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "10d11922.59185f",\r
+        "id": "cd232c91.ed7d5",\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": 4521.8824462890625,\r
+        "y": 246.65567016601562,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "777ae9c7.6a278"\r
+                "d5d46c3b.524dc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "391ce87d.ba3df8",\r
+        "id": "4c85ec99.26bac4",\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": 5104,\r
+        "y": 249,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "65b820ac.17e0d"\r
+                "490c8cc0.c71134"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "777ae9c7.6a278",\r
+        "id": "d5d46c3b.524dc8",\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": 4706,\r
+        "y": 245,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f4f1a808.b22bc"\r
+                "cc43f2ea.19847"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4f1a808.b22bc",\r
+        "id": "cc43f2ea.19847",\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": 4901,\r
+        "y": 245,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "391ce87d.ba3df8"\r
+                "4c85ec99.26bac4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1ba843c.92fa78",\r
+        "id": "d8377d86.76164",\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": 4374.5001220703125,\r
+        "y": 359,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a6d9e4b5.ea0fd8"\r
+                "9cf617d3.aee3a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6d9e4b5.ea0fd8",\r
+        "id": "9cf617d3.aee3a8",\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": 4526.5001220703125,\r
+        "y": 360,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "19650434.8dad4c",\r
+        "id": "7e7e18a4.ea2a98",\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": 4537.5001220703125,\r
+        "y": 303,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5d042a1f.c8fb44",\r
+        "id": "f42e9c90.ae58f",\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": 5489,\r
+        "y": 262,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8c0f87c1.0cfa88",\r
-                "96b96977.b4fed8",\r
-                "6ce026da.737ea"\r
+                "f404a9ca.fbce2",\r
+                "3fd1ebaf.c62a54",\r
+                "66a3972e.71bfa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "65b820ac.17e0d",\r
+        "id": "490c8cc0.c71134",\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": 5283,\r
+        "y": 249,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1918c44c.117ae4",\r
-                "5d042a1f.c8fb44"\r
+                "9ce5b4b0.4bb188",\r
+                "f42e9c90.ae58f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1918c44c.117ae4",\r
+        "id": "9ce5b4b0.4bb188",\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": 5519,\r
+        "y": 210,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8c0f87c1.0cfa88",\r
+        "id": "f404a9ca.fbce2",\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": 5699,\r
+        "y": 253,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e1aae278.d9aab"\r
+                "3597c274.50637e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96b96977.b4fed8",\r
+        "id": "3fd1ebaf.c62a54",\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": 5691,\r
+        "y": 308,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a74826f7.daef6"\r
+                "ff90e84e.43d4b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ce026da.737ea",\r
+        "id": "66a3972e.71bfa8",\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": 5696,\r
+        "y": 365,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "80c7718d.f0881"\r
+                "ff823793.36814"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80c7718d.f0881",\r
+        "id": "ff823793.36814",\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": 5848,\r
+        "y": 366,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a74826f7.daef6",\r
+        "id": "ff90e84e.43d4b8",\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": 5859,\r
+        "y": 311,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e1aae278.d9aab",\r
+        "id": "3597c274.50637e",\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": 5843.38232421875,\r
+        "y": 250.65567016601562,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b6fb5857.56d2c"\r
+                "d39e28b5.1aec5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b6fb5857.56d2c",\r
+        "id": "d39e28b5.1aec5",\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": 6058,\r
+        "y": 247,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "881ac3d.2b73cc",\r
+        "id": "139f2f1e.8fa159",\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": 3625,\r
+        "y": 1587,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f942fe34.857118",\r
+        "id": "18d2c2bc.05fd85",\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": 3688,\r
+        "y": 1916,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "d6aba815.0c0b98",\r
-                "fb15fc4f.27732"\r
+                "8895fa29.bf8e3",\r
+                "23c7c635.fd4722"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6aba815.0c0b98",\r
+        "id": "8895fa29.bf8e3",\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": 3983.5,\r
+        "y": 1883,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f7e9b7f6.cb6cf8"\r
+                "500b5538.e88684"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb15fc4f.27732",\r
+        "id": "23c7c635.fd4722",\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": 3988.5,\r
+        "y": 1948,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e7e93f9f.05e6f8"\r
+                "909dfd67.2300d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7e9b7f6.cb6cf8",\r
+        "id": "500b5538.e88684",\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": 4151.5,\r
+        "y": 1883,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7e93f9f.05e6f8",\r
+        "id": "909dfd67.2300d8",\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": 4162,\r
+        "y": 1948,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c6f7c9bc.a78ea8",\r
+        "id": "a49aeabe.b5ff8",\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": 3564,\r
+        "y": 1644,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f243ad6.97dd38",\r
+        "id": "642d00da.b53c68",\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": 3584,\r
+        "y": 1741,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a8e6c84d.0f237",\r
-                "3ee8ddc2.b7378a",\r
-                "311698c.6883b68"\r
+                "1e5d6803.78b7d8",\r
+                "84307ec5.09a8d",\r
+                "b468d4fc.bc9c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8e6c84d.0f237",\r
+        "id": "1e5d6803.78b7d8",\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": 3786.5001220703125,\r
+        "y": 1694,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6ef9124f.c91bc4"\r
+                "683b34d0.c1df64"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3ee8ddc2.b7378a",\r
+        "id": "84307ec5.09a8d",\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": 3778.5001220703125,\r
+        "y": 1749,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9b01e4a.2bf7598"\r
+                "72cad52e.cb1d74"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ef9124f.c91bc4",\r
+        "id": "683b34d0.c1df64",\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": 3930.8824462890625,\r
+        "y": 1691.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8bd570a1.9b5908"\r
+                "8511cae6.cbf588"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8bd570a1.9b5908",\r
+        "id": "8511cae6.cbf588",\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": 4115,\r
+        "y": 1706,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "5951fb7a.778dbc"\r
+                "82496ff9.234ee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "311698c.6883b68",\r
+        "id": "b468d4fc.bc9c8",\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": 3783.5001220703125,\r
+        "y": 1806,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "25fe1469.5e13bc"\r
+                "a6137ce1.b3b5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25fe1469.5e13bc",\r
+        "id": "a6137ce1.b3b5c",\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": 3935.5001220703125,\r
+        "y": 1807,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9b01e4a.2bf7598",\r
+        "id": "72cad52e.cb1d74",\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": 3946.5001220703125,\r
+        "y": 1752,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a9a3100d.7e9a38",\r
+        "id": "7b4a137a.364fcc",\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": 4513,\r
+        "y": 1710,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "15a6f6cf.b80121"\r
+                "37fe69a9.07064e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5951fb7a.778dbc",\r
+        "id": "82496ff9.234ee",\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": 4310,\r
+        "y": 1706,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a9a3100d.7e9a38"\r
+                "7b4a137a.364fcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b462757e.f97cf",\r
+        "id": "4bdd9e57.a5e13",\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": 4898,\r
+        "y": 1709,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f548cd5f.cf97e8",\r
-                "7bf2c309.936484",\r
-                "37200156.6e45ae"\r
+                "8afff046.26af98",\r
+                "5118b1e.53f805",\r
+                "5a800db8.063d6c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15a6f6cf.b80121",\r
+        "id": "37fe69a9.07064e",\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": 4690,\r
+        "y": 1702,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "24625031.3ccbb",\r
-                "b462757e.f97cf"\r
+                "d299743b.8f6b68",\r
+                "4bdd9e57.a5e13"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24625031.3ccbb",\r
+        "id": "d299743b.8f6b68",\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": 4928,\r
+        "y": 1657,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3717e4c0.7e91fc",\r
+        "id": "2523ddf0.8e1c8a",\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": 5257,\r
+        "y": 1813,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ebaf4cad.7f7ac",\r
+        "id": "6f850c0f.e212ac",\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": 5268,\r
+        "y": 1758,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "95133e26.a5c4",\r
+        "id": "546ca846.269108",\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": 5252.38232421875,\r
+        "y": 1697.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "74fa69d9.12322"\r
+                "fac7ab27.77dda8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74fa69d9.12322",\r
+        "id": "fac7ab27.77dda8",\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": 5467,\r
+        "y": 1694,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f548cd5f.cf97e8",\r
+        "id": "8afff046.26af98",\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": 5108,\r
+        "y": 1700,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "95133e26.a5c4"\r
+                "546ca846.269108"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bf2c309.936484",\r
+        "id": "5118b1e.53f805",\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": 5100,\r
+        "y": 1755,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ebaf4cad.7f7ac"\r
+                "6f850c0f.e212ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37200156.6e45ae",\r
+        "id": "5a800db8.063d6c",\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": 5105,\r
+        "y": 1812,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3717e4c0.7e91fc"\r
+                "2523ddf0.8e1c8a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4573661e.19551",\r
+        "id": "a1edca3.1a62bb8",\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": 3139,\r
+        "y": 658,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e3a931ba.d41978",\r
-                "cce98769.66d2f"\r
+                "d4bdeded.3ef248",\r
+                "eead64c.0115918"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3a931ba.d41978",\r
+        "id": "d4bdeded.3ef248",\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": 3353,\r
+        "y": 695,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "83f7a2a0.47e4a"\r
+                "614a0644.b0e3e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cce98769.66d2f",\r
+        "id": "eead64c.0115918",\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": 3355,\r
+        "y": 633,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a3a1c771.fa4dc8"\r
+                "295e16ce.878c6a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83f7a2a0.47e4a",\r
+        "id": "614a0644.b0e3e",\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": 2933,\r
+        "y": 1938,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b17cf12.c5b4e9",\r
-                "375f750c.523c3a"\r
+                "75bfd38b.356f64",\r
+                "f4c4b096.a3ce2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b17cf12.c5b4e9",\r
+        "id": "75bfd38b.356f64",\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": 3186,\r
+        "y": 1972,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b574ded7.ea26d"\r
+                "b0597a28.514d3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "375f750c.523c3a",\r
+        "id": "f4c4b096.a3ce2",\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": 3186,\r
+        "y": 1916,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3eeb971b.8e101"\r
+                "64045150.224658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b574ded7.ea26d",\r
+        "id": "b0597a28.514d3",\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": 3337,\r
+        "y": 1972,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "27c7cf1.51adcb",\r
+        "id": "cf5b963d.2b5a08",\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": 4213,\r
+        "y": 70,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e24e0a9e.a7db8",\r
+        "id": "4badfb31.b82c1c",\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": 3621,\r
+        "y": 1529,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6b14e6ca.05c05",\r
+        "id": "552020c2.f01db",\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": 3904,\r
+        "y": 327,\r
+        "z": "5a4cb919.dfff38",\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
+                "cf5b963d.2b5a08",\r
+                "123fcc82.b79ae3",\r
+                "fbd17573.b91cd8",\r
+                "985dbb20.1c3b78",\r
+                "e308a3a2.af826",\r
+                "ec3b4a19.7f5ee",\r
+                "881b2d7a.c4e888",\r
+                "1a392cd7.238923"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3eeb971b.8e101",\r
+        "id": "64045150.224658",\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": 3337,\r
+        "y": 1915,\r
+        "z": "5a4cb919.dfff38",\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
+                "4badfb31.b82c1c",\r
+                "139f2f1e.8fa159",\r
+                "a49aeabe.b5ff8",\r
+                "642d00da.b53c68",\r
+                "18d2c2bc.05fd85",\r
+                "724930a5.f44628",\r
+                "98331ea2.d141f",\r
+                "f84de17e.e8ea08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f87bcfd0.50c8c",\r
+        "id": "ed40d4d6.135678",\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": 3575,\r
+        "y": 2214,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab6e58b.3c55528",\r
+        "id": "b71c97.3dad8368",\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": 3729,\r
+        "y": 2262,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "eff9a19.776a7e",\r
-                "ddb717fb.d9a6d8"\r
+                "aa1d9a65.d56ee",\r
+                "ce785491.f82258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eff9a19.776a7e",\r
+        "id": "aa1d9a65.d56ee",\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": 4074.5,\r
+        "y": 2243,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "59a2ea1f.0d3f14"\r
+                "d8df230a.b47018"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ddb717fb.d9a6d8",\r
+        "id": "ce785491.f82258",\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": 4078.5,\r
+        "y": 2283,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "81b55fda.fb8e98"\r
+                "d2d57048.de12f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59a2ea1f.0d3f14",\r
+        "id": "d8df230a.b47018",\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": 4232.5,\r
+        "y": 2243,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "81b55fda.fb8e98",\r
+        "id": "d2d57048.de12f",\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": 4236,\r
+        "y": 2283,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1bcc30a0.546397",\r
-                "1eaaa262.028326"\r
+                "703675c3.1d187c",\r
+                "6a8e2764.0748e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1bcc30a0.546397",\r
+        "id": "703675c3.1d187c",\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": 4576,\r
+        "y": 2282,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "68a7db89.5a89fc",\r
+        "id": "b9adfc7b.f1d908",\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": 4434,\r
+        "y": 2240,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1eaaa262.028326",\r
+        "id": "6a8e2764.0748e8",\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": 4505,\r
+        "y": 2331,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "71f36947.989c9",\r
+        "id": "641093d5.a73774",\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": 3130,\r
+        "y": 598,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24508e5.8723172",\r
+        "id": "29b91b19.d2edf4",\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": 3725,\r
+        "y": 284,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f3eaab4d.9a827",\r
+        "id": "df88a98e.3b797",\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": 3282,\r
+        "y": 1862,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3a1c771.fa4dc8",\r
+        "id": "295e16ce.878c6a",\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": 3461,\r
+        "y": 446,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6921df6d.0bad7",\r
-                "5859006e.3869c8"\r
+                "fdfbdf68.ace01",\r
+                "8f7ef737.3d4208"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5859006e.3869c8",\r
+        "id": "8f7ef737.3d4208",\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": 3703,\r
+        "y": 1035,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6a1db5bd.d7e224"\r
+                "d545d977.39f008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6921df6d.0bad7",\r
+        "id": "fdfbdf68.ace01",\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": 3697,\r
+        "y": 326,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6b14e6ca.05c05"\r
+                "552020c2.f01db"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a1db5bd.d7e224",\r
+        "id": "d545d977.39f008",\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": 3861,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e8ac2c73.115cc",\r
-                "de077050.d3ab3",\r
-                "d36a1b80.8692c8",\r
-                "73f78d36.ab931c",\r
-                "8ec0e69e.0bdfb8",\r
-                "4004366.ff0b5c8"\r
+                "127c7c35.f5600c",\r
+                "aa22b9fb.8c00d",\r
+                "7a8bb8ff.a3807",\r
+                "b6e4b7cd.3aab58",\r
+                "9befe6d.bfbfb18",\r
+                "61ff745d.2cf8b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "de077050.d3ab3",\r
+        "id": "aa22b9fb.8c00d",\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": 4125,\r
+        "y": 917,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8ec0e69e.0bdfb8",\r
+        "id": "9befe6d.bfbfb18",\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": 4206,\r
+        "y": 1232,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a8d20b89.8deb88",\r
-                "ebe8f709.819288"\r
+                "602f32f4.cac7b4",\r
+                "1d093526.32224b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a8d20b89.8deb88",\r
+        "id": "602f32f4.cac7b4",\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": 4515.5,\r
+        "y": 1201,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f56a0e73.901ac"\r
+                "4513cd6b.369634"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebe8f709.819288",\r
+        "id": "1d093526.32224b",\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": 4520.5,\r
+        "y": 1266,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8bcbb353.d66038"\r
+                "7640c8ac.188fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f56a0e73.901ac",\r
+        "id": "4513cd6b.369634",\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": 4691.5,\r
+        "y": 1201,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8bcbb353.d66038",\r
+        "id": "7640c8ac.188fc8",\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": 4687,\r
+        "y": 1266,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d36a1b80.8692c8",\r
+        "id": "7a8bb8ff.a3807",\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": 4063,\r
+        "y": 965,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "73f78d36.ab931c",\r
+        "id": "b6e4b7cd.3aab58",\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": 4089,\r
+        "y": 1082,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e0243648.484bc",\r
-                "e14aa09.d5d416",\r
-                "5447b1d0.03a8b"\r
+                "bc604696.f19bf",\r
+                "6b2ab2eb.e94cac",\r
+                "158e3d74.81687b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e0243648.484bc",\r
+        "id": "bc604696.f19bf",\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": 4284.5001220703125,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "94135ed.07ea02"\r
+                "fbbae41a.6bb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e14aa09.d5d416",\r
+        "id": "6b2ab2eb.e94cac",\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": 4276.5001220703125,\r
+        "y": 1089,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1628394b.83cd8f"\r
+                "5e10560f.7f2a6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94135ed.07ea02",\r
+        "id": "fbbae41a.6bb8",\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": 4428.8824462890625,\r
+        "y": 1033.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fdedf72e.2dd36"\r
+                "4ab90ec7.0f8a1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fdedf72e.2dd36",\r
+        "id": "4ab90ec7.0f8a1",\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": 4613,\r
+        "y": 1032,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f99d2e19.85b668"\r
+                "3bb025b6.92298a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f99d2e19.85b668",\r
+        "id": "3bb025b6.92298a",\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": 4808,\r
+        "y": 1032,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ff4cc7a8.15eb18"\r
+                "ce204654.d589e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5447b1d0.03a8b",\r
+        "id": "158e3d74.81687b",\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": 4281.5001220703125,\r
+        "y": 1146,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "74603a77.be9d34"\r
+                "cfe04507.17faa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74603a77.be9d34",\r
+        "id": "cfe04507.17faa",\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": 4433.5001220703125,\r
+        "y": 1147,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1628394b.83cd8f",\r
+        "id": "5e10560f.7f2a6",\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": 4444.5001220703125,\r
+        "y": 1090,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e8ac2c73.115cc",\r
+        "id": "127c7c35.f5600c",\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": 4120,\r
+        "y": 857,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff4cc7a8.15eb18",\r
+        "id": "ce204654.d589e8",\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": 5011,\r
+        "y": 1036,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8469558b.e4d748"\r
+                "fea8f5c8.b664d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf8a4c78.37fe58",\r
+        "id": "17936311.45c0f5",\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": 5396,\r
+        "y": 1049,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "44cef850.3e64a",\r
-                "9337c3a8.6f7408",\r
-                "6a44b1b.7cb45d"\r
+                "bda3b861.07af08",\r
+                "8ce8739f.28fc08",\r
+                "8098fa71.4cbf3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8469558b.e4d748",\r
+        "id": "fea8f5c8.b664d8",\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": 5190,\r
+        "y": 1036,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "82428162.54c128",\r
-                "cf8a4c78.37fe58"\r
+                "619520a0.18d9e",\r
+                "17936311.45c0f5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "82428162.54c128",\r
+        "id": "619520a0.18d9e",\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": 5426,\r
+        "y": 997,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "44cef850.3e64a",\r
+        "id": "bda3b861.07af08",\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": 5606,\r
+        "y": 1040,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ffb7eeb1.dda348"\r
+                "3c9ad3f5.e5e4a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9337c3a8.6f7408",\r
+        "id": "8ce8739f.28fc08",\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": 5598,\r
+        "y": 1095,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "28235dd8.9620aa"\r
+                "ec86cd9f.a15968"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6a44b1b.7cb45d",\r
+        "id": "8098fa71.4cbf3",\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": 5603,\r
+        "y": 1152,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a95b4d04.8ebfb"\r
+                "244270ad.8dfe1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a95b4d04.8ebfb",\r
+        "id": "244270ad.8dfe1",\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": 5755,\r
+        "y": 1153,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "28235dd8.9620aa",\r
+        "id": "ec86cd9f.a15968",\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": 5766,\r
+        "y": 1098,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ffb7eeb1.dda348",\r
+        "id": "3c9ad3f5.e5e4a4",\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": 5750.38232421875,\r
+        "y": 1037.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "eb1ea22e.dc12c"\r
+                "2068f2a1.5ec866"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eb1ea22e.dc12c",\r
+        "id": "2068f2a1.5ec866",\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": 5965,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "47e1e7c7.6cadf",\r
+        "id": "e69cbe2a.82be58",\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": 3739,\r
+        "y": 975,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3842f71.731b38",\r
+        "id": "957d0d12.f7d338",\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": 2301,\r
+        "y": 702,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fe4cd4cf.21da1",\r
-                "8d3265c3.ddab38"\r
+                "7969493f.6a54d",\r
+                "9a6050c4.300548"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8d3265c3.ddab38",\r
+        "id": "9a6050c4.300548",\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": 2708,\r
+        "y": 720,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "418df61.fe2be08"\r
+                "66cd0943.de62f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe4cd4cf.21da1",\r
+        "id": "7969493f.6a54d",\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": 2708,\r
+        "y": 665,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8b0dea0b.e78e98"\r
+                "7c5fc999.6b62c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8b0dea0b.e78e98",\r
+        "id": "7c5fc999.6b62c",\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": 2864,\r
+        "y": 663,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "71f36947.989c9",\r
-                "4573661e.19551"\r
+                "641093d5.a73774",\r
+                "a1edca3.1a62bb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "418df61.fe2be08",\r
+        "id": "66cd0943.de62f",\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": 2841,\r
+        "y": 721,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5c62cbf5.952894",\r
+        "id": "cce8745e.b515b8",\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": 1018,\r
+        "y": 137,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a7fd19a0.011a5",\r
+        "id": "48ad099a.c16688",\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": 4135,\r
+        "y": 555,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "41c50446.37f104",\r
+        "id": "ec3b4a19.7f5ee",\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": 4195,\r
+        "y": 594,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4957906b.cb3908",\r
+        "id": "706cb78c.da92b",\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": 1011,\r
+        "y": 45,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5277b309.13aef4",\r
+        "id": "9a38eb9e.71f4d8",\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": 3547,\r
+        "y": 2071,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "51d22e16.357968",\r
+        "id": "724930a5.f44628",\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": 3603,\r
+        "y": 2120,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8191f581.e3e888",\r
+        "id": "2a414bdc.2311dc",\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": 1011,\r
+        "y": 84,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "25a3d5e5.55ea62",\r
+        "id": "88772a4.9b58658",\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": 1042,\r
+        "y": 185,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "624a734b.81957c",\r
+        "id": "4ace150.4554dec",\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": 252,\r
+        "y": 660,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2ff4bd45.763852",\r
-                "237ce68a.9b5a2a",\r
-                "86bae4d8.c51f3"\r
+                "ce4ab0d3.b836a",\r
+                "9dbee6c6.1a60a",\r
+                "290803ec.65c94c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ff4bd45.763852",\r
+        "id": "ce4ab0d3.b836a",\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": 471,\r
+        "y": 598,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2f347c57.a92144"\r
+                "280015e3.c315e2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "237ce68a.9b5a2a",\r
+        "id": "9dbee6c6.1a60a",\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": 480.490966796875,\r
+        "y": 640.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
-            [\r
-                "196b18f9.87f4a7"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "86bae4d8.c51f3",\r
+        "id": "290803ec.65c94c",\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": 469,\r
+        "y": 687,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "d6f02bd7.9f988"\r
+                "f842cdf9.29a79"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2f347c57.a92144",\r
+        "id": "280015e3.c315e2",\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": 668,\r
+        "y": 594,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "408bfafb.b2f244"\r
+                "cd508bdd.302a88"\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": "f842cdf9.29a79",\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": 638,\r
+        "y": 688,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "408bfafb.b2f244",\r
+        "id": "cd508bdd.302a88",\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": 891.33349609375,\r
+        "y": 593.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7d8f8b2e.4aa30c"\r
+                "d4df8e14.56fc08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7d8f8b2e.4aa30c",\r
+        "id": "d4df8e14.56fc08",\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": 1092.0001335144043,\r
+        "y": 595.000020980835,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "bd2be559.7e491"\r
+                "b67eb6e5.58b31"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd2be559.7e491",\r
+        "id": "b67eb6e5.58b31",\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": 222,\r
+        "y": 857,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "97323d62.80248",\r
-                "afdba634.5389a8",\r
-                "c784d901.2500c8"\r
+                "eb910f68.8a5408",\r
+                "a6536ba8.c4e148",\r
+                "6d1288a7.3722b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "97323d62.80248",\r
+        "id": "eb910f68.8a5408",\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": 430,\r
+        "y": 821,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "dc950dad.bba8c8"\r
+                "6687da8.fb06ca4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afdba634.5389a8",\r
+        "id": "a6536ba8.c4e148",\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": 430.490966796875,\r
+        "y": 866.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
-            [\r
-                "f09199a5.a037f"\r
-            ]\r
+            []\r
          ]\r
      },\r
      {\r
-        "id": "c784d901.2500c8",\r
+        "id": "6d1288a7.3722b8",\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": 428,\r
+        "y": 910,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a903bba8.c7f45"\r
+                "a3e6b31.4b2495"\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": "a3e6b31.4b2495",\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": 597,\r
+        "y": 911,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c4e5acdc.5eea4",\r
+        "id": "64de189c.ea0ca",\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": 569,\r
+        "y": 1405,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f2e2cc22.a529f"\r
+                "f09d5f3a.90b09"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f2e2cc22.a529f",\r
+        "id": "f09d5f3a.90b09",\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": 772,\r
+        "y": 1417,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c09b72f6.aeae98"\r
+                "be069a3d.2f258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c09b72f6.aeae98",\r
+        "id": "be069a3d.2f258",\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": 938,\r
+        "y": 1414,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "bfe2cfaf.5416a"\r
+                "b33327bf.cf44b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfe2cfaf.5416a",\r
+        "id": "b33327bf.cf44b8",\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": 1099,\r
+        "y": 1411,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ed44bd0b.bb6278",\r
-                "85af841c.633c5",\r
-                "785dd3f1.f249ac",\r
-                "b8d52cff.f0dcb",\r
-                "4915b2e4.5fd2dc"\r
+                "9b6250ff.75cf18",\r
+                "6e8e9c3e.00f634",\r
+                "db16830a.f6a5",\r
+                "611e4d54.277574",\r
+                "c0f4e533.035be8",\r
+                "ee82569c.a25768"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85af841c.633c5",\r
+        "id": "6e8e9c3e.00f634",\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": 1305,\r
+        "y": 1010.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ed44bd0b.bb6278",\r
+        "id": "9b6250ff.75cf18",\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": 1302,\r
+        "y": 1055.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6b32d7eb.72211",\r
-                "7343128c.f923b4",\r
-                "b9b05d3.e5ae12"\r
+                "1b290eb5.e974c9",\r
+                "b84573d.a8be19",\r
+                "ef2334eb.3c1b68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7343128c.f923b4",\r
+        "id": "b84573d.a8be19",\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": 1497.490966796875,\r
+        "y": 1029.5739135742188,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "5dcee0f6.9162a8"\r
+                "45bb14a8.1a7924"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9b05d3.e5ae12",\r
+        "id": "ef2334eb.3c1b68",\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": 1493,\r
+        "y": 1073.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b7ed6a74.25237"\r
+                "cd1f6950.fef1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5dcee0f6.9162a8",\r
+        "id": "45bb14a8.1a7924",\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": 1660.0625,\r
+        "y": 1028.859619140625,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b7ed6a74.25237",\r
+        "id": "cd1f6950.fef1f",\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": 1661,\r
+        "y": 1073.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dfdfa822.c47e1",\r
+        "id": "cd4af41f.be1a78",\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": 1663,\r
+        "y": 1120.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "6b32d7eb.72211",\r
+        "id": "1b290eb5.e974c9",\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": 1494,\r
+        "y": 1120.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "dfdfa822.c47e1"\r
+                "cd4af41f.be1a78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ed7a6be.5472c",\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
-        "wires": [\r
-            [\r
-                "3e9a846b.aac024",\r
-                "fd2eac9f.aa3be8",\r
-                "81d85b97.ec18c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3d4d11fc.e19976",\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
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "3e9a846b.aac024",\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
-        "wires": [\r
-            [\r
-                "186f4361.0093b5"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "fd2eac9f.aa3be8",\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
-        "wires": [\r
-            [\r
-                "a8f57470.dafb1"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "81d85b97.ec18c",\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
-        "wires": [\r
-            [\r
-                "3d4d11fc.e19976"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "17f45567.72d3f3",\r
+        "id": "60f7024f.a382fc",\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": 1276,\r
+        "y": 1642,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "785dd3f1.f249ac",\r
+        "id": "db16830a.f6a5",\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": 1367,\r
+        "y": 1696,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a8f57470.dafb1",\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
-        "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
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "186f4361.0093b5",\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
-        "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
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "b5d90017.45ce98",\r
+        "id": "1989ebd9.8b76bc",\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": 2043.5,\r
+        "y": 1109,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6d0b5941.55c8f8",\r
+        "id": "9da50ff.0241af",\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": 2048.5,\r
+        "y": 1211,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c378a6a3.2e4c8",\r
+        "id": "eda2f0f7.d8fb38",\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": 532,\r
+        "y": 1661,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3613e1a4.3cd206"\r
+                "62852429.1f30ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3613e1a4.3cd206",\r
+        "id": "62852429.1f30ac",\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": 764,\r
+        "y": 1660,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c46d21fc.7c5088"\r
+                "ede4a749.9f1af8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c46d21fc.7c5088",\r
+        "id": "ede4a749.9f1af8",\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": 976,\r
+        "y": 1661,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "41d3d62e.c810a8"\r
+                "b699a292.eb6f88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41d3d62e.c810a8",\r
+        "id": "b699a292.eb6f88",\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": 232,\r
+        "y": 1817,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "24bb38a6.cf0a88",\r
-                "80203aa0.6c8a6"\r
+                "13d7e483.3188fb",\r
+                "74bc3a8f.9628d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80203aa0.6c8a6",\r
+        "id": "74bc3a8f.9628d4",\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": 467,\r
+        "y": 1804,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24bb38a6.cf0a88",\r
+        "id": "13d7e483.3188fb",\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": 457,\r
+        "y": 1865,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e7df9a86.a02dd8",\r
-                "d754cb82.42f37",\r
-                "80509f91.59bce8"\r
+                "bcef8cd9.e20998",\r
+                "764e27eb.b5496",\r
+                "21958602.3fa0ea"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d754cb82.42f37",\r
+        "id": "764e27eb.b5496",\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": 670.490966796875,\r
+        "y": 1849.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "31b91fbf.39fff8"\r
+                "9c812de2.87639"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "80509f91.59bce8",\r
+        "id": "21958602.3fa0ea",\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": 666,\r
+        "y": 1894,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "312541a.87b29be"\r
+                "2915d3a6.63730c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7df9a86.a02dd8",\r
+        "id": "bcef8cd9.e20998",\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": 668,\r
+        "y": 1954,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f19203b2.563a88"\r
+                "bb26f0d0.bc6288"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "31b91fbf.39fff8",\r
+        "id": "9c812de2.87639",\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": 833.0625,\r
+        "y": 1848.8597412109375,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "312541a.87b29be",\r
+        "id": "2915d3a6.63730c",\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": 834,\r
+        "y": 1894,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f19203b2.563a88",\r
+        "id": "bb26f0d0.bc6288",\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": 837,\r
+        "y": 1953,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "70164d90.2f08c4",\r
-                "27824a25.86f05e"\r
+                "e8fb0469.22a408",\r
+                "b503b0ba.b1ff6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b2e88ff.3380b7",\r
+        "id": "445d8bb1.6c470c",\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": 236,\r
+        "y": 2452,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3026fc23.0fd5f4",\r
+        "id": "925823e9.1c4a4",\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": 379,\r
+        "y": 2512,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a9d1707f.7a88c8",\r
-                "8ab460b7.633638"\r
+                "345842a4.88ef2e",\r
+                "a4dc32a8.6620d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9d1707f.7a88c8",\r
+        "id": "345842a4.88ef2e",\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": 691.5,\r
+        "y": 2489,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8ab460b7.633638",\r
+        "id": "a4dc32a8.6620d8",\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": 695.5,\r
+        "y": 2529,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7ddc0654.bb96f8"\r
+                "d1fda3bb.92b0e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1d8045c.1b61e8",\r
+        "id": "cde1b667.7c4d6",\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": 871.5,\r
+        "y": 2493,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7ddc0654.bb96f8",\r
+        "id": "d1fda3bb.92b0e",\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": 887,\r
+        "y": 2547,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1eddd66c.da478a"\r
+                "a9ee92c3.93f6e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cee3e55d.189dc",\r
+        "id": "459839ba.ae33c",\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": 1182.5,\r
+        "y": 2516,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bb915427.f0582",\r
+        "id": "120147ed.79206",\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": 2649.5,\r
+        "y": 1867,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1eddd66c.da478a",\r
+        "id": "a9ee92c3.93f6e8",\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": 1144.5,\r
+        "y": 2558,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "913d2a70.ccfd3",\r
+        "id": "9d25e547.75567",\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": 2009.5,\r
+        "y": 1147,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e47dbd3.f7afc4",\r
+        "id": "52a255e0.e77dec",\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": 2010.5,\r
+        "y": 1251,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e5881b35.2a2bf8",\r
+        "id": "881b2d7a.c4e888",\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": 4304,\r
+        "y": 508,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4004366.ff0b5c8",\r
+        "id": "61ff745d.2cf8b4",\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": 4207,\r
+        "y": 1327,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "8caebf31.dc028",\r
+        "id": "98331ea2.d141f",\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": 3701,\r
+        "y": 1999,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dc950dad.bba8c8",\r
+        "id": "6687da8.fb06ca4",\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": 802,\r
+        "y": 807,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "28d7875f.122df",\r
-                "47ffeb93.7b808c"\r
+                "11a4a5f5.385f32",\r
+                "192499d2.667f1e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28d7875f.122df",\r
+        "id": "11a4a5f5.385f32",\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": 1165,\r
+        "y": 830,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f3fb6a94.133bb"\r
+                "1fc9c5be.8fac2a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "47ffeb93.7b808c",\r
+        "id": "192499d2.667f1e",\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": 1165,\r
+        "y": 779,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3da0dc2.736e6a4"\r
+                "5fe8520c.50e664"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f3fb6a94.133bb",\r
+        "id": "1fc9c5be.8fac2a",\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": 1321,\r
+        "y": 828,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9ed7a6be.5472c"\r
+                "a46faf22.6dbda8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3da0dc2.736e6a4",\r
+        "id": "5fe8520c.50e664",\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": 1298,\r
+        "y": 780,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ca01ca51.23bb98",\r
+        "id": "1f9b767f.d670b2",\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": 2058,\r
+        "y": 178,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6ccc1a6d.d89cd4",\r
+        "id": "f84de17e.e8ea08",\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": 3600,\r
+        "y": 2159,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ceaa1f2c.697ad",\r
+        "id": "1a392cd7.238923",\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": 4190,\r
+        "y": 632,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b8d52cff.f0dcb",\r
+        "id": "611e4d54.277574",\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": 1364,\r
+        "y": 1738,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "901c32b.8d67fd",\r
+        "id": "dc7d7df9.afb81",\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": 543,\r
+        "y": 1472,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d142c0f2.700e98",\r
+        "id": "c70f6326.e297a",\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": 574,\r
+        "y": 1512,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "70164d90.2f08c4",\r
+        "id": "e8fb0469.22a408",\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": 1122,\r
+        "y": 1920,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "27824a25.86f05e",\r
+        "id": "b503b0ba.b1ff6",\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": 1125,\r
+        "y": 1962,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f24a5646.1c02c8",\r
+        "id": "f7d70d92.8a17d",\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": 568,\r
+        "y": 1602,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "db09832f.86c758",\r
+        "id": "93ecab9f.5bb27",\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": 323,\r
+        "y": 1981,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3c14b8ea.b96268",\r
+        "id": "e1bf516d.80132",\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": 331,\r
+        "y": 2038,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4915b2e4.5fd2dc",\r
+        "id": "c0f4e533.035be8",\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": 1342,\r
+        "y": 1587,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "bfcf3bba.b5daa",\r
-                "9b18409e.c203c8"\r
+                "ff9a5641.69fda",\r
+                "a44c9ce4.5d2008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b18409e.c203c8",\r
+        "id": "a44c9ce4.5d2008",\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": 1565,\r
+        "y": 1542,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "5afaf397.e20c3c"\r
+                "eaca171f.944a48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfcf3bba.b5daa",\r
+        "id": "ff9a5641.69fda",\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": 1567,\r
+        "y": 1606,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f7de9867.a0fd38"\r
+                "93d69fa.52d496"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5afaf397.e20c3c",\r
+        "id": "eaca171f.944a48",\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": 1730,\r
+        "y": 1539,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "cdcfe3c8.962368"\r
+                "b0447236.92d3b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f7de9867.a0fd38",\r
+        "id": "93d69fa.52d496",\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": 1729,\r
+        "y": 1602,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "cdcfe3c8.962368",\r
+        "id": "b0447236.92d3b",\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
+        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
          "comments": "",\r
-        "x": 1939,\r
-        "y": 1595,\r
-        "z": "ed7c1675.7a56b",\r
+        "x": 1950,\r
+        "y": 1553,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6d07bcb7.ffff34",\r
+        "id": "ab15b7a9.bc6bc8",\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": 1495,\r
+        "y": 2278,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9547fb43.8165f"\r
+                "be2440af.c20c98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "261f721d.19cda6",\r
+        "id": "1405448e.40f263",\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": 1880,\r
+        "y": 2291,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a4fad359.d63e7",\r
-                "d7202a06.97a2a8",\r
-                "d2a1d22e.b2ed6"\r
+                "facba133.b01618",\r
+                "36457cd.f85a104",\r
+                "a0c24437.cf174"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9547fb43.8165f",\r
+        "id": "be2440af.c20c98",\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": 1674,\r
+        "y": 2278,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9b0cdae9.5834e8",\r
-                "261f721d.19cda6"\r
+                "eec40e11.9fdab",\r
+                "1405448e.40f263"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9b0cdae9.5834e8",\r
+        "id": "eec40e11.9fdab",\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": 1910,\r
+        "y": 2239,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a4fad359.d63e7",\r
+        "id": "facba133.b01618",\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": 2090,\r
+        "y": 2282,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ce2ed097.248ac"\r
+                "926a046d.eed228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d7202a06.97a2a8",\r
+        "id": "36457cd.f85a104",\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": 2082,\r
+        "y": 2337,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "15f2754c.6e5b2b"\r
+                "6ca22053.c9fba8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2a1d22e.b2ed6",\r
+        "id": "a0c24437.cf174",\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": 2087,\r
+        "y": 2394,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fe7bb44f.f58b7"\r
+                "f91dd017.676d7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fe7bb44f.f58b7",\r
+        "id": "f91dd017.676d7",\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": 2239,\r
+        "y": 2395,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "15f2754c.6e5b2b",\r
+        "id": "6ca22053.c9fba8",\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": 2250,\r
+        "y": 2340,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ce2ed097.248ac",\r
+        "id": "926a046d.eed228",\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": 2234.38232421875,\r
+        "y": 2279.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1c2a2a5a.6d8256"\r
+                "1e25e04f.ee7df"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c2a2a5a.6d8256",\r
+        "id": "1e25e04f.ee7df",\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": 2449,\r
+        "y": 2276,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9710382e.112c58",\r
+        "id": "46842cb8.91c5bc",\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": 573,\r
+        "y": 2324,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "afc311a9.64a498",\r
-                "1b364ee.7270531",\r
-                "aa64b78b.7ab17"\r
+                "80e94eed.70f82",\r
+                "e1101309.b00428",\r
+                "6cefa506.12a2dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afc311a9.64a498",\r
+        "id": "80e94eed.70f82",\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": 768.5001220703125,\r
+        "y": 2276,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7cd619d5.a4e8c"\r
+                "a961cabf.5d77d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1b364ee.7270531",\r
+        "id": "e1101309.b00428",\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": 760.5001220703125,\r
+        "y": 2331,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7127ee10.2a0b4"\r
+                "cfce6a08.8d1818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7cd619d5.a4e8c",\r
+        "id": "a961cabf.5d77d8",\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": 912.8824462890625,\r
+        "y": 2275.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fd5a5a0.ad9b128"\r
+                "41f5578e.096c08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd5a5a0.ad9b128",\r
+        "id": "41f5578e.096c08",\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": 1097,\r
+        "y": 2274,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8c513405.b809e8"\r
+                "78702bad.3695f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c513405.b809e8",\r
+        "id": "78702bad.3695f4",\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": 1292,\r
+        "y": 2274,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6d07bcb7.ffff34"\r
+                "ab15b7a9.bc6bc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa64b78b.7ab17",\r
+        "id": "6cefa506.12a2dc",\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": 765.5001220703125,\r
+        "y": 2388,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "22a641d1.a7babe"\r
+                "bbb236e9.1d475"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "22a641d1.a7babe",\r
+        "id": "bbb236e9.1d475",\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": 917.5001220703125,\r
+        "y": 2389,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7127ee10.2a0b4",\r
+        "id": "cfce6a08.8d1818",\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": 928.5001220703125,\r
+        "y": 2332,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "41c682cf.a83f2c",\r
+        "id": "fd11a034.71ffe8",\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": 563,\r
+        "y": 2236,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7cb304b.f39168",\r
+        "id": "2ab715a0.ab46a2",\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": 308,\r
+        "y": 2367,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "41c682cf.a83f2c",\r
-                "9710382e.112c58"\r
+                "fd11a034.71ffe8",\r
+                "46842cb8.91c5bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d390d070.3dc4c",\r
+        "id": "c68339b5.636678",\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": 1522.9666748046875,\r
+        "y": 184.88333129882812,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "6b1a691d.f6617",\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": 725,\r
+        "y": 407,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a46faf22.6dbda8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 284.5,\r
+        "y": 1376,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "64de189c.ea0ca",\r
+                "eda2f0f7.d8fb38",\r
+                "dc7d7df9.afb81",\r
+                "c70f6326.e297a",\r
+                "445d8bb1.6c470c",\r
+                "925823e9.1c4a4",\r
+                "f7d70d92.8a17d",\r
+                "93ecab9f.5bb27",\r
+                "e1bf516d.80132",\r
+                "2ab715a0.ab46a2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ee82569c.a25768",\r
+        "type": "switchNode",\r
+        "name": "switch uni type",\r
+        "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1315,\r
+        "y": 1214,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "ef11d348.e67b18",\r
+                "db4eac49.9ee78",\r
+                "ccd7386e.438c4",\r
+                "8a1e26c1.925918"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ef11d348.e67b18",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1480,\r
+        "y": 1196,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "1989ebd9.8b76bc",\r
+                "9d25e547.75567"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "db4eac49.9ee78",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1483,\r
+        "y": 1235,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "9da50ff.0241af",\r
+                "52a255e0.e77dec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8a1e26c1.925918",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1477,\r
+        "y": 1313,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "af3eb285.34bda8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ccd7386e.438c4",\r
+        "type": "outcome",\r
+        "name": "root-secondary",\r
+        "xml": "<outcome value='root-secondary'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1500,\r
+        "y": 1276,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "8dd3ee03.704618",\r
+                "3acf3b0f.3b0184"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8dd3ee03.704618",\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": 2046,\r
+        "y": 1309,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3acf3b0f.3b0184",\r
+        "type": "set",\r
+        "name": "set leafOrRootAccess",\r
+        "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",\r
+        "comments": "",\r
+        "x": 2008,\r
+        "y": 1349,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "af3eb285.34bda8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1629,\r
+        "y": 1334,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            []\r
+        ]\r
      }\r
  ]
 \ No newline at end of file