Adding support for connecting a single ONU port to multiple clouds with different...

[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 4ba32b4..1828f87 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,199 +1,199 @@
  [\r
      {\r
-        "id": "6467c9b6.3ea7b",\r
+        "id": "4a53e986.e1345",\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": 415.8833312988281,\r
-        "y": 377,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 401.8833312988281,\r
+        "y": 341,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1c0c6fa0.017178",\r
-                "ec984d7b.605098",\r
-                "25450eba.0fd99a"\r
+                "bee28b81.87faf8",\r
+                "2e0d3206.b3958e",\r
+                "2caa6605.779652"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c0c6fa0.017178",\r
+        "id": "bee28b81.87faf8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 603.8833312988281,\r
-        "y": 390,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 589.8833312988281,\r
+        "y": 354,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fcdf737f.3ba08"\r
+                "db2a2eb9.c4729"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec984d7b.605098",\r
+        "id": "2e0d3206.b3958e",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 611.374267578125,\r
-        "y": 432.57403564453125,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 597.374267578125,\r
+        "y": 396.57403564453125,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "25450eba.0fd99a",\r
+        "id": "2caa6605.779652",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 601.8833312988281,\r
-        "y": 479,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 587.8833312988281,\r
+        "y": 443,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f645589d.ed3d98"\r
+                "9a0e1ef7.428b9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fcdf737f.3ba08",\r
+        "id": "db2a2eb9.c4729",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 776.8833312988281,\r
-        "y": 388,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 762.8833312988281,\r
+        "y": 352,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6641b1bb.011df8"\r
+                "b1233538.ceab4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6641b1bb.011df8",\r
+        "id": "b1233538.ceab4",\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": 1005.8833312988281,\r
-        "y": 389,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 991.8833312988281,\r
+        "y": 353,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "42fd94e4.9f459c"\r
+                "f68da0c8.dc2638"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "42fd94e4.9f459c",\r
+        "id": "f68da0c8.dc2638",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1220.8833312988281,\r
-        "y": 390,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1206.8833312988281,\r
+        "y": 354,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "341f3db4.7e268a"\r
+                "947d4965.a799f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "802e937a.3ac",\r
+        "id": "ab775a4c.a509d",\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": 1474.8833312988281,\r
-        "y": 312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1460.8833312988281,\r
+        "y": 276,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ccfe4ade.41ae98",\r
-                "912c0faa.e5e1c8"\r
+                "1ae0d7f3.280b18",\r
+                "b7c135fb.7fc808"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ccfe4ade.41ae98",\r
+        "id": "1ae0d7f3.280b18",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1691.8833312988281,\r
-        "y": 291,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1677.8833312988281,\r
+        "y": 255,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "341f3db4.7e268a"\r
+                "947d4965.a799f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "912c0faa.e5e1c8",\r
+        "id": "b7c135fb.7fc808",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1691.8833312988281,\r
-        "y": 340,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1677.8833312988281,\r
+        "y": 304,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "341f3db4.7e268a",\r
+        "id": "947d4965.a799f8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1875.8833312988281,\r
-        "y": 377,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1861.8833312988281,\r
+        "y": 341,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b1ca96f9.f78f38",\r
-                "2c3b3231.83c2be",\r
-                "4660bf61.473a18"\r
+                "7307d136.f98668",\r
+                "d6d93ab.df041c8",\r
+                "ed4d0298.cdb578"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "377c3031.0fc7c",\r
+        "id": "d12da893.5808e",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 234.88333129882812,\r
-        "y": 118,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 220.88333129882812,\r
+        "y": 82,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8b8ba227.5e7638"\r
+                "ba22940.68974f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8b8ba227.5e7638",\r
+        "id": "ba22940.68974f",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -201,3545 +201,3545 @@
          "comments": "",\r
          "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
          "outputs": 1,\r
-        "x": 519.1690216064453,\r
-        "y": 179.23810863494873,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 505.1690216064453,\r
+        "y": 143.23810863494873,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6c55ded0.30c498"\r
+                "f0aeb23e.8f1f7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6c55ded0.30c498",\r
+        "id": "f0aeb23e.8f1f7",\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": 525.3119354248047,\r
-        "y": 264.0000305175781,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 511.3119354248047,\r
+        "y": 228.00003051757812,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b63c19cf.5911b8"\r
+                "849eab75.e48858"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b63c19cf.5911b8",\r
+        "id": "849eab75.e48858",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 835.1213684082031,\r
-        "y": 255.66668701171875,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 821.1213684082031,\r
+        "y": 219.66668701171875,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6467c9b6.3ea7b",\r
-                "7714415.bcb45c",\r
-                "2cf2ff05.5ecb98",\r
-                "ff64d6f0.1d24e",\r
-                "c19ef147.be92d8"\r
+                "4a53e986.e1345",\r
+                "9dad0003.283738",\r
+                "47e937a3.3ee608",\r
+                "fa83bc41.1d8b08",\r
+                "39b1b2.d055464e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b1ca96f9.f78f38",\r
+        "id": "7307d136.f98668",\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": 2092.883331298828,\r
-        "y": 315,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2078.883331298828,\r
+        "y": 279,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f11c1dac.45c748",\r
+        "id": "5be24b21.11ebc4",\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": 4261.883331298828,\r
-        "y": 201,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4247.883331298828,\r
+        "y": 165,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c95c33ef.381fa8",\r
+        "id": "66c2f1fa.df4e",\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": 4342.883331298828,\r
-        "y": 516,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4328.883331298828,\r
+        "y": 480,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "89c7efd5.cb6558",\r
-                "d5cfec9d.5347f8"\r
+                "78ae8a16.bcde6c",\r
+                "163e60b5.f624ef"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89c7efd5.cb6558",\r
+        "id": "78ae8a16.bcde6c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4652.383331298828,\r
-        "y": 485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4638.383331298828,\r
+        "y": 449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "beffe966.8b1b08"\r
+                "a86780cc.869ba"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5cfec9d.5347f8",\r
+        "id": "163e60b5.f624ef",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4657.383331298828,\r
-        "y": 550,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4643.383331298828,\r
+        "y": 514,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "18fce568.1c292b"\r
+                "496a02d9.361154"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "beffe966.8b1b08",\r
+        "id": "a86780cc.869ba",\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": 4828.383331298828,\r
-        "y": 485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4814.383331298828,\r
+        "y": 449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "18fce568.1c292b",\r
+        "id": "496a02d9.361154",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4823.883331298828,\r
-        "y": 550,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4809.883331298828,\r
+        "y": 514,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "64fdffc9.427678",\r
+        "id": "4c8b1659.abc1b",\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": 4207.383331298828,\r
-        "y": 770,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4193.383331298828,\r
+        "y": 734,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c0e95206.343c2",\r
+        "id": "902cb9fb.0d496",\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": 4361.383331298828,\r
-        "y": 818,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4347.383331298828,\r
+        "y": 782,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7a1edf39.b6a0f8",\r
-                "b605ddae.9f2b2"\r
+                "f961065e.0e576",\r
+                "6ca1f611.56dee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a1edf39.b6a0f8",\r
+        "id": "f961065e.0e576",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4706.883331298828,\r
-        "y": 799,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4692.883331298828,\r
+        "y": 763,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "db29824f.2b664"\r
+                "6296fab8.967dac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b605ddae.9f2b2",\r
+        "id": "6ca1f611.56dee",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4710.883331298828,\r
-        "y": 839,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4696.883331298828,\r
+        "y": 803,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "10ebb808.22b9d8"\r
+                "ef7067c4.7ea328"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db29824f.2b664",\r
+        "id": "6296fab8.967dac",\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": 4864.883331298828,\r
-        "y": 799,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4850.883331298828,\r
+        "y": 763,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "10ebb808.22b9d8",\r
+        "id": "ef7067c4.7ea328",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4868.383331298828,\r
-        "y": 839,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4854.383331298828,\r
+        "y": 803,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6d35eb39.2fe42c",\r
-                "b62c3c22.2cb09"\r
+                "ee477ca2.a65568",\r
+                "5e527e99.1f4728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6d35eb39.2fe42c",\r
+        "id": "ee477ca2.a65568",\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": 5198.883331298828,\r
-        "y": 804,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5184.883331298828,\r
+        "y": 768,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3f34bcf0.b30eb4",\r
+        "id": "f9d5afb7.0291b",\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": 5062.883331298828,\r
-        "y": 763,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5048.883331298828,\r
+        "y": 727,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b62c3c22.2cb09",\r
+        "id": "5e527e99.1f4728",\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": 5125.883331298828,\r
-        "y": 850,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5111.883331298828,\r
+        "y": 814,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dc51dde.504a12",\r
+        "id": "48c30a65.f0f584",\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": 4199.883331298828,\r
-        "y": 249,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4185.883331298828,\r
+        "y": 213,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "25f0cbb9.ff400c",\r
+        "id": "bc523ecb.f956a8",\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": 4225.883331298828,\r
-        "y": 366,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4211.883331298828,\r
+        "y": 330,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "26af6a64.84f75e",\r
-                "dfaad5e6.3e7388",\r
-                "d4f19086.9e394"\r
+                "a72840b5.dc70e",\r
+                "54e4a8de.9445f8",\r
+                "4012660e.b55b2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26af6a64.84f75e",\r
+        "id": "a72840b5.dc70e",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4421.383453369141,\r
-        "y": 318,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4407.383453369141,\r
+        "y": 282,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "825f4729.b63ee8"\r
+                "9d071aa.9c29c68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dfaad5e6.3e7388",\r
+        "id": "54e4a8de.9445f8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4413.383453369141,\r
-        "y": 373,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4399.383453369141,\r
+        "y": 337,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "92b1984a.bc8b"\r
+                "3662c50c.d754d2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "825f4729.b63ee8",\r
+        "id": "9d071aa.9c29c68",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4565.765777587891,\r
-        "y": 317.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4551.765777587891,\r
+        "y": 281.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "415768e6.6651f8"\r
+                "c1155c42.4dc2e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6a2d3e2.2e526",\r
+        "id": "a3b68f87.0c3248",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5147.883331298828,\r
-        "y": 320,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5133.883331298828,\r
+        "y": 284,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e243a570.71b51"\r
+                "e6d1f56a.1147f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "415768e6.6651f8",\r
+        "id": "c1155c42.4dc2e8",\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": 4749.883331298828,\r
-        "y": 316,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4735.883331298828,\r
+        "y": 280,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ab4dd1f4.04e1f"\r
+                "e3565ab9.0a825"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab4dd1f4.04e1f",\r
+        "id": "e3565ab9.0a825",\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": 4944.883331298828,\r
-        "y": 316,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4930.883331298828,\r
+        "y": 280,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a6a2d3e2.2e526"\r
+                "a3b68f87.0c3248"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d4f19086.9e394",\r
+        "id": "4012660e.b55b2",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4418.383453369141,\r
-        "y": 430,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4404.383453369141,\r
+        "y": 394,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "28f88c03.cb5e5c"\r
+                "7e9c03d8.c41c7c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28f88c03.cb5e5c",\r
+        "id": "7e9c03d8.c41c7c",\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": 4570.383453369141,\r
-        "y": 431,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4556.383453369141,\r
+        "y": 395,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "92b1984a.bc8b",\r
+        "id": "3662c50c.d754d2",\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": 4581.383453369141,\r
-        "y": 374,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4567.383453369141,\r
+        "y": 338,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "677439f1.5f7ed",\r
+        "id": "99fa8e6f.e803d8",\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": 5532.883331298828,\r
-        "y": 333,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5518.883331298828,\r
+        "y": 297,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e7fd97d3.bbcd08",\r
-                "38bba5b7.de41b2",\r
-                "6bf961e8.c56a58"\r
+                "a38e0436.5aedc",\r
+                "80f6747e.265c78",\r
+                "c370b7ba.84a26"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e243a570.71b51",\r
+        "id": "e6d1f56a.1147f8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5326.883331298828,\r
-        "y": 320,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5312.883331298828,\r
+        "y": 284,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "857cacb0.81444",\r
-                "677439f1.5f7ed"\r
+                "4599703a.c42f3",\r
+                "99fa8e6f.e803d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "857cacb0.81444",\r
+        "id": "4599703a.c42f3",\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": 5562.883331298828,\r
-        "y": 281,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5548.883331298828,\r
+        "y": 245,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7fd97d3.bbcd08",\r
+        "id": "a38e0436.5aedc",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5742.883331298828,\r
-        "y": 324,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5728.883331298828,\r
+        "y": 288,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "60a50433.d26434"\r
+                "8c88cbf0.e09b1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "38bba5b7.de41b2",\r
+        "id": "80f6747e.265c78",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5734.883331298828,\r
-        "y": 379,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5720.883331298828,\r
+        "y": 343,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d9350787.861f1"\r
+                "e2be9acb.77d62"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6bf961e8.c56a58",\r
+        "id": "c370b7ba.84a26",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5739.883331298828,\r
-        "y": 436,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5725.883331298828,\r
+        "y": 400,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1afc54ba.8ed313"\r
+                "856ee89c.2898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1afc54ba.8ed313",\r
+        "id": "856ee89c.2898",\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": 5891.883331298828,\r
-        "y": 437,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5877.883331298828,\r
+        "y": 401,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9350787.861f1",\r
+        "id": "e2be9acb.77d62",\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": 5902.883331298828,\r
-        "y": 382,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5888.883331298828,\r
+        "y": 346,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "60a50433.d26434",\r
+        "id": "8c88cbf0.e09b1",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5887.265655517578,\r
-        "y": 321.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5873.265655517578,\r
+        "y": 285.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8367dac2.ac8b98"\r
+                "a4a57efc.888ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8367dac2.ac8b98",\r
+        "id": "a4a57efc.888ff8",\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": 6101.883331298828,\r
-        "y": 318,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 6087.883331298828,\r
+        "y": 282,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aa2473a.12d4d9",\r
+        "id": "172d91c5.a78676",\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": 3668.883331298828,\r
-        "y": 1658,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3654.883331298828,\r
+        "y": 1622,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "28a663c6.7433b4",\r
+        "id": "f13d198f.d5c79",\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": 3731.883331298828,\r
-        "y": 1987,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3717.883331298828,\r
+        "y": 1951,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "422a3196.0fb7d",\r
-                "371e9e8f.f6f942"\r
+                "3640aede.8913a2",\r
+                "f1b1c8d.9945bb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "422a3196.0fb7d",\r
+        "id": "3640aede.8913a2",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4027.383331298828,\r
-        "y": 1954,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4013.383331298828,\r
+        "y": 1918,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c3084137.121c7"\r
+                "4b0d0deb.6577e4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "371e9e8f.f6f942",\r
+        "id": "f1b1c8d.9945bb8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4032.383331298828,\r
-        "y": 2019,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4018.383331298828,\r
+        "y": 1983,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c6676165.ac5c"\r
+                "5da14040.cb50b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3084137.121c7",\r
+        "id": "4b0d0deb.6577e4",\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": 4195.383331298828,\r
-        "y": 1954,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4181.383331298828,\r
+        "y": 1918,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c6676165.ac5c",\r
+        "id": "5da14040.cb50b8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4205.883331298828,\r
-        "y": 2019,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4191.883331298828,\r
+        "y": 1983,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dfee532c.a1419",\r
+        "id": "1e50105a.a8b96",\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": 3607.883331298828,\r
-        "y": 1715,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3593.883331298828,\r
+        "y": 1679,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e52702af.314718",\r
+        "id": "dfe45c65.d48f6",\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": 3627.883331298828,\r
-        "y": 1812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3613.883331298828,\r
+        "y": 1776,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9ca1c561.5c796",\r
-                "9cf5cab4.99d6e",\r
-                "5d5762eb.724c64"\r
+                "56d2f84a.b524e8",\r
+                "43f5b436.ace8b4",\r
+                "a9c884c3.3b2c18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ca1c561.5c796",\r
+        "id": "56d2f84a.b524e8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3830.3834533691406,\r
-        "y": 1765,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3816.3834533691406,\r
+        "y": 1729,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "502f683e.00cf7"\r
+                "10cf7345.17615d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9cf5cab4.99d6e",\r
+        "id": "43f5b436.ace8b4",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3822.3834533691406,\r
-        "y": 1820,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3808.3834533691406,\r
+        "y": 1784,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9587c00d.994eb"\r
+                "40e41e98.b2ab3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "502f683e.00cf7",\r
+        "id": "10cf7345.17615d",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3974.7657775878906,\r
-        "y": 1762.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3960.7657775878906,\r
+        "y": 1726.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "39b96666.82062a"\r
+                "69889215.886b4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "39b96666.82062a",\r
+        "id": "69889215.886b4c",\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": 4158.883331298828,\r
-        "y": 1777,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4144.883331298828,\r
+        "y": 1741,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "94ae9a5d.e5d56"\r
+                "3c1ff953.79a23e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d5762eb.724c64",\r
+        "id": "a9c884c3.3b2c18",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3827.3834533691406,\r
-        "y": 1877,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3813.3834533691406,\r
+        "y": 1841,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7a00ac4a.8d918c"\r
+                "8ab7ecfb.f03ee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a00ac4a.8d918c",\r
+        "id": "8ab7ecfb.f03ee",\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": 3979.3834533691406,\r
-        "y": 1878,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3965.3834533691406,\r
+        "y": 1842,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9587c00d.994eb",\r
+        "id": "40e41e98.b2ab3",\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": 3990.3834533691406,\r
-        "y": 1823,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3976.3834533691406,\r
+        "y": 1787,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1540d0.014217",\r
+        "id": "37ef2104.1e9d5e",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4556.883331298828,\r
-        "y": 1781,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4542.883331298828,\r
+        "y": 1745,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c932c6af.938f38"\r
+                "901dac81.52118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94ae9a5d.e5d56",\r
+        "id": "3c1ff953.79a23e",\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": 4353.883331298828,\r
-        "y": 1777,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4339.883331298828,\r
+        "y": 1741,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f1540d0.014217"\r
+                "37ef2104.1e9d5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ff151e7.182fee",\r
+        "id": "86b8c4cb.c3747",\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": 4941.883331298828,\r
-        "y": 1780,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4927.883331298828,\r
+        "y": 1744,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "40d3a7a.4400bd8",\r
-                "353377f9.20c718",\r
-                "f8f22501.0020d8"\r
+                "b5f45931.a1805",\r
+                "34bcb3b6.e69b1c",\r
+                "d4cc1381.862c48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c932c6af.938f38",\r
+        "id": "901dac81.52118",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4733.883331298828,\r
-        "y": 1773,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4719.883331298828,\r
+        "y": 1737,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "53fc3a7e.05d404",\r
-                "2ff151e7.182fee"\r
+                "81cd4229.29ba8",\r
+                "86b8c4cb.c3747"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53fc3a7e.05d404",\r
+        "id": "81cd4229.29ba8",\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": 4971.883331298828,\r
-        "y": 1728,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4957.883331298828,\r
+        "y": 1692,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d551b07b.11f68",\r
+        "id": "a6f965e8.0bb248",\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": 5300.883331298828,\r
-        "y": 1884,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5286.883331298828,\r
+        "y": 1848,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c19bb319.e0e2b8",\r
+        "id": "3b503e2a.8c5dd2",\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": 5311.883331298828,\r
-        "y": 1829,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5297.883331298828,\r
+        "y": 1793,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2dbaf595.6cfed2",\r
+        "id": "a84f2510.1ebf08",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5296.265655517578,\r
-        "y": 1768.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5282.265655517578,\r
+        "y": 1732.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "eaeaf1b8.196fc"\r
+                "f83738f1.e5e14"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eaeaf1b8.196fc",\r
+        "id": "f83738f1.e5e14",\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": 5510.883331298828,\r
-        "y": 1765,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5496.883331298828,\r
+        "y": 1729,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "40d3a7a.4400bd8",\r
+        "id": "b5f45931.a1805",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5151.883331298828,\r
-        "y": 1771,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5137.883331298828,\r
+        "y": 1735,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2dbaf595.6cfed2"\r
+                "a84f2510.1ebf08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "353377f9.20c718",\r
+        "id": "34bcb3b6.e69b1c",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5143.883331298828,\r
-        "y": 1826,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5129.883331298828,\r
+        "y": 1790,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c19bb319.e0e2b8"\r
+                "3b503e2a.8c5dd2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8f22501.0020d8",\r
+        "id": "d4cc1381.862c48",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5148.883331298828,\r
-        "y": 1883,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5134.883331298828,\r
+        "y": 1847,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d551b07b.11f68"\r
+                "a6f965e8.0bb248"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7d66e95.fb47e",\r
+        "id": "4a95df1.67c3fa",\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": 3182.883331298828,\r
-        "y": 729,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3168.883331298828,\r
+        "y": 693,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "4d8bbec2.c0db6",\r
-                "507d82bd.8807cc"\r
+                "60b8b463.e4925c",\r
+                "5e23be29.1eb6a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d8bbec2.c0db6",\r
+        "id": "60b8b463.e4925c",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3396.883331298828,\r
-        "y": 766,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3382.883331298828,\r
+        "y": 730,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6524452d.4a2f94"\r
+                "4d4203c4.4fd81c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "507d82bd.8807cc",\r
+        "id": "5e23be29.1eb6a",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3398.883331298828,\r
-        "y": 704,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3384.883331298828,\r
+        "y": 668,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "4b590d33.c81684"\r
+                "402d5674.bb5698"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6524452d.4a2f94",\r
+        "id": "4d4203c4.4fd81c",\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": 2976.883331298828,\r
-        "y": 2009,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2962.883331298828,\r
+        "y": 1973,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "75800cfe.e64b04",\r
-                "28895848.af5c18"\r
+                "4155de88.54a1f",\r
+                "11e38b5d.85c715"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75800cfe.e64b04",\r
+        "id": "4155de88.54a1f",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3229.883331298828,\r
-        "y": 2043,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3215.883331298828,\r
+        "y": 2007,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "34389e65.7f3f0a"\r
+                "97b4f973.8f85a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28895848.af5c18",\r
+        "id": "11e38b5d.85c715",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3229.883331298828,\r
-        "y": 1987,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3215.883331298828,\r
+        "y": 1951,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "4c94a377.c6d4e4"\r
+                "4bdf7725.9cef3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "34389e65.7f3f0a",\r
+        "id": "97b4f973.8f85a8",\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": 3380.883331298828,\r
-        "y": 2043,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3366.883331298828,\r
+        "y": 2007,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff717106.1f6f7",\r
+        "id": "15e2350c.3f989b",\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": 4256.883331298828,\r
-        "y": 141,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4242.883331298828,\r
+        "y": 105,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "98bc8f5e.55646",\r
+        "id": "22f55219.d9af6e",\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": 3664.883331298828,\r
-        "y": 1600,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3650.883331298828,\r
+        "y": 1564,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1901ad68.6869bb",\r
+        "id": "9157e39e.50973",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3947.883331298828,\r
-        "y": 398,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3933.883331298828,\r
+        "y": 362,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ff717106.1f6f7",\r
-                "f11c1dac.45c748",\r
-                "dc51dde.504a12",\r
-                "25f0cbb9.ff400c",\r
-                "c95c33ef.381fa8",\r
-                "7a0ef184.deb28",\r
-                "dd4c3392.e1b02",\r
-                "2a6ffb7c.8797f4"\r
+                "15e2350c.3f989b",\r
+                "5be24b21.11ebc4",\r
+                "48c30a65.f0f584",\r
+                "bc523ecb.f956a8",\r
+                "66c2f1fa.df4e",\r
+                "738a4fa7.5a68d",\r
+                "9521e4ca.a61af",\r
+                "224f4283.917d26"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c94a377.c6d4e4",\r
+        "id": "4bdf7725.9cef3",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3380.883331298828,\r
-        "y": 1986,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3366.883331298828,\r
+        "y": 1950,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "98bc8f5e.55646",\r
-                "aa2473a.12d4d9",\r
-                "dfee532c.a1419",\r
-                "e52702af.314718",\r
-                "28a663c6.7433b4",\r
-                "c984548c.2e537",\r
-                "88e8f378.a2b808",\r
-                "1fda4b4a.2131e5"\r
+                "22f55219.d9af6e",\r
+                "172d91c5.a78676",\r
+                "1e50105a.a8b96",\r
+                "dfe45c65.d48f6",\r
+                "f13d198f.d5c79",\r
+                "78f084cb.41e754",\r
+                "e35a6c95.6b3d6",\r
+                "1ced8517.ce35e3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d79079df.baf578",\r
+        "id": "e7e7eca7.931088",\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": 3618.883331298828,\r
-        "y": 2285,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3604.883331298828,\r
+        "y": 2249,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "45ccc628.f5551",\r
+        "id": "5544b67f.df3238",\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": 3772.883331298828,\r
-        "y": 2333,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3758.883331298828,\r
+        "y": 2297,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6173b4db.203ce4",\r
-                "7f21396.e7ee248"\r
+                "b36c5e4.a4b982",\r
+                "75e03418.7b0a3c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6173b4db.203ce4",\r
+        "id": "b36c5e4.a4b982",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4118.383331298828,\r
-        "y": 2314,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4104.383331298828,\r
+        "y": 2278,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2b5ddf83.e8a168"\r
+                "996a2de3.86ff68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7f21396.e7ee248",\r
+        "id": "75e03418.7b0a3c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4122.383331298828,\r
-        "y": 2354,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4108.383331298828,\r
+        "y": 2318,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9fc151.f9cc46b"\r
+                "1787d971.8d0d67"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b5ddf83.e8a168",\r
+        "id": "996a2de3.86ff68",\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": 4276.383331298828,\r
-        "y": 2314,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4262.383331298828,\r
+        "y": 2278,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fc151.f9cc46b",\r
+        "id": "1787d971.8d0d67",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4279.883331298828,\r
-        "y": 2354,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4265.883331298828,\r
+        "y": 2318,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ec406c4.a093b1",\r
-                "ba32c60f.0ec53"\r
+                "79bbcc28.d4fd3c",\r
+                "137b8fb9.4aaa78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec406c4.a093b1",\r
+        "id": "79bbcc28.d4fd3c",\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": 4619.883331298828,\r
-        "y": 2353,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4605.883331298828,\r
+        "y": 2317,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "650aeaf3.da502c",\r
+        "id": "9aab71de.3f671",\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": 4477.883331298828,\r
-        "y": 2311,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4463.883331298828,\r
+        "y": 2275,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ba32c60f.0ec53",\r
+        "id": "137b8fb9.4aaa78",\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": 4548.883331298828,\r
-        "y": 2402,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4534.883331298828,\r
+        "y": 2366,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c8295377.ff6158",\r
+        "id": "e7a16254.b52678",\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": 3173.883331298828,\r
-        "y": 669,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3159.883331298828,\r
+        "y": 633,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "17d3b71c.0a74f9",\r
+        "id": "b98d7c04.aadb6",\r
          "type": "comment",\r
          "name": "only dst ttp exists. No src",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3768.883331298828,\r
-        "y": 355,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3754.883331298828,\r
+        "y": 319,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "12dd212a.e5931f",\r
+        "id": "f9466402.70d608",\r
          "type": "comment",\r
          "name": "only src ttp exists. No dst",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3325.883331298828,\r
-        "y": 1933,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3311.883331298828,\r
+        "y": 1897,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4b590d33.c81684",\r
+        "id": "402d5674.bb5698",\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": 3504.883331298828,\r
-        "y": 517,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3490.883331298828,\r
+        "y": 481,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e68f7957.57ea98",\r
-                "90c8120e.55a8c8"\r
+                "40174504.12275c",\r
+                "483f6800.997ef8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90c8120e.55a8c8",\r
+        "id": "483f6800.997ef8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3746.883331298828,\r
-        "y": 1106,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3732.883331298828,\r
+        "y": 1070,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "5f92c041.e2a22"\r
+                "f91cd9b2.b4ebc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e68f7957.57ea98",\r
+        "id": "40174504.12275c",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3740.883331298828,\r
-        "y": 397,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3726.883331298828,\r
+        "y": 361,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1901ad68.6869bb"\r
+                "9157e39e.50973"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f92c041.e2a22",\r
+        "id": "f91cd9b2.b4ebc8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3904.883331298828,\r
-        "y": 1105,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3890.883331298828,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "eb5cd95b.b46698",\r
-                "bcb9498.a9205b8",\r
-                "24e13fd8.afe2d8",\r
-                "57e5431f.63be4c",\r
-                "8b688219.8ed198",\r
-                "9c0b0957.1e6c48"\r
+                "e0a89dfb.b97bd8",\r
+                "356efc92.1be0c4",\r
+                "b98c51bd.b1df7",\r
+                "c9386596.fb5188",\r
+                "99a335d9.47dc9",\r
+                "1d1e23b2.17cb04"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bcb9498.a9205b8",\r
+        "id": "356efc92.1be0c4",\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": 4168.883331298828,\r
-        "y": 988,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4154.883331298828,\r
+        "y": 952,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8b688219.8ed198",\r
+        "id": "99a335d9.47dc9",\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": 4249.883331298828,\r
-        "y": 1303,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4235.883331298828,\r
+        "y": 1267,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "4ea88210.ceec44",\r
-                "cd5b1128.4dbb9"\r
+                "2ae3d84f.15cb3",\r
+                "a0cd8374.ae65d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4ea88210.ceec44",\r
+        "id": "2ae3d84f.15cb3",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4559.383331298828,\r
-        "y": 1272,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4545.383331298828,\r
+        "y": 1236,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "9646de5b.fe3c7"\r
+                "d03fdf1c.3b45d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd5b1128.4dbb9",\r
+        "id": "a0cd8374.ae65d8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4564.383331298828,\r
-        "y": 1337,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4550.383331298828,\r
+        "y": 1301,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "55735b11.27f424"\r
+                "f8c3fa12.5c834"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9646de5b.fe3c7",\r
+        "id": "d03fdf1c.3b45d",\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": 4735.383331298828,\r
-        "y": 1272,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4721.383331298828,\r
+        "y": 1236,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "55735b11.27f424",\r
+        "id": "f8c3fa12.5c834",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4730.883331298828,\r
-        "y": 1337,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4716.883331298828,\r
+        "y": 1301,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "24e13fd8.afe2d8",\r
+        "id": "b98c51bd.b1df7",\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": 4106.883331298828,\r
-        "y": 1036,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4092.883331298828,\r
+        "y": 1000,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "57e5431f.63be4c",\r
+        "id": "c9386596.fb5188",\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": 4132.883331298828,\r
-        "y": 1153,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4118.883331298828,\r
+        "y": 1117,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1d187a80.e65b15",\r
-                "370c15e3.9b5fca",\r
-                "703dc49a.960884"\r
+                "312e9154.f9dbd6",\r
+                "38e6d39b.3fc964",\r
+                "d52b1c1f.8a6ca8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1d187a80.e65b15",\r
+        "id": "312e9154.f9dbd6",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4328.383453369141,\r
-        "y": 1105,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4314.383453369141,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "5c6509dd.e3a81"\r
+                "6d3eafaf.02fb48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "370c15e3.9b5fca",\r
+        "id": "38e6d39b.3fc964",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4320.383453369141,\r
-        "y": 1160,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4306.383453369141,\r
+        "y": 1124,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ccfe239.f2e7de"\r
+                "3519bfd5.fa4b3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c6509dd.e3a81",\r
+        "id": "6d3eafaf.02fb48",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4472.765777587891,\r
-        "y": 1104.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4458.765777587891,\r
+        "y": 1068.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "35d4ca24.cf236e"\r
+                "6a66b1f9.955598"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "35d4ca24.cf236e",\r
+        "id": "6a66b1f9.955598",\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": 4656.883331298828,\r
-        "y": 1103,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4642.883331298828,\r
+        "y": 1067,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c8705d75.001f7"\r
+                "43b05855.517cf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c8705d75.001f7",\r
+        "id": "43b05855.517cf",\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": 4851.883331298828,\r
-        "y": 1103,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4837.883331298828,\r
+        "y": 1067,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b9376422.2a71"\r
+                "c21a24cd.dd2528"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "703dc49a.960884",\r
+        "id": "d52b1c1f.8a6ca8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4325.383453369141,\r
-        "y": 1217,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4311.383453369141,\r
+        "y": 1181,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ece92d94.dd0ac"\r
+                "db81dd24.8006b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ece92d94.dd0ac",\r
+        "id": "db81dd24.8006b",\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": 4477.383453369141,\r
-        "y": 1218,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4463.383453369141,\r
+        "y": 1182,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ccfe239.f2e7de",\r
+        "id": "3519bfd5.fa4b3",\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": 4488.383453369141,\r
-        "y": 1161,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4474.383453369141,\r
+        "y": 1125,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb5cd95b.b46698",\r
+        "id": "e0a89dfb.b97bd8",\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": 4163.883331298828,\r
-        "y": 928,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4149.883331298828,\r
+        "y": 892,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b9376422.2a71",\r
+        "id": "c21a24cd.dd2528",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5054.883331298828,\r
-        "y": 1107,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5040.883331298828,\r
+        "y": 1071,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d2480516.2fc378"\r
+                "f7c609f5.0c2d28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9cb817ae.cef538",\r
+        "id": "dff3e5ec.9273",\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": 5439.883331298828,\r
-        "y": 1120,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5425.883331298828,\r
+        "y": 1084,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a79825bb.dff1f8",\r
-                "1395d5f.298062a",\r
-                "7903ca2c.aa5cc4"\r
+                "2769bc77.6b9fa4",\r
+                "7925966f.3df658",\r
+                "161a4207.178c96"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2480516.2fc378",\r
+        "id": "f7c609f5.0c2d28",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5233.883331298828,\r
-        "y": 1107,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5219.883331298828,\r
+        "y": 1071,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fbf9e6b6.15b5c",\r
-                "9cb817ae.cef538"\r
+                "3634d6f2.f94292",\r
+                "dff3e5ec.9273"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fbf9e6b6.15b5c",\r
+        "id": "3634d6f2.f94292",\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": 5469.883331298828,\r
-        "y": 1068,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5455.883331298828,\r
+        "y": 1032,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a79825bb.dff1f8",\r
+        "id": "2769bc77.6b9fa4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5649.883331298828,\r
-        "y": 1111,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5635.883331298828,\r
+        "y": 1075,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c7dce557.6dded"\r
+                "8b0e2b2b.7a21d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1395d5f.298062a",\r
+        "id": "7925966f.3df658",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5641.883331298828,\r
-        "y": 1166,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5627.883331298828,\r
+        "y": 1130,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "598e647b.5837b4"\r
+                "b9107d6e.7c0358"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7903ca2c.aa5cc4",\r
+        "id": "161a4207.178c96",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5646.883331298828,\r
-        "y": 1223,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5632.883331298828,\r
+        "y": 1187,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e6c7a6e7.b2f038"\r
+                "d5598bab.3dfb58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6c7a6e7.b2f038",\r
+        "id": "d5598bab.3dfb58",\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": 5798.883331298828,\r
-        "y": 1224,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5784.883331298828,\r
+        "y": 1188,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "598e647b.5837b4",\r
+        "id": "b9107d6e.7c0358",\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": 5809.883331298828,\r
-        "y": 1169,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5795.883331298828,\r
+        "y": 1133,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7dce557.6dded",\r
+        "id": "8b0e2b2b.7a21d",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5794.265655517578,\r
-        "y": 1108.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5780.265655517578,\r
+        "y": 1072.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2cfbc0b6.6ae748"\r
+                "f80d31a9.31f3d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cfbc0b6.6ae748",\r
+        "id": "f80d31a9.31f3d",\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": 6008.883331298828,\r
-        "y": 1105,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5994.883331298828,\r
+        "y": 1069,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fca9cd7.3028eb",\r
+        "id": "d718b282.287ca",\r
          "type": "comment",\r
          "name": "both src and dst exist",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3782.883331298828,\r
-        "y": 1046,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3768.883331298828,\r
+        "y": 1010,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c3b3231.83c2be",\r
+        "id": "d6d93ab.df041c8",\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": 2344.883331298828,\r
-        "y": 773,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2330.883331298828,\r
+        "y": 737,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "81a947d8.a13a68",\r
-                "b480f4ae.d59fb8"\r
+                "7d753f63.af1d7",\r
+                "7719dbd9.957fc4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b480f4ae.d59fb8",\r
+        "id": "7719dbd9.957fc4",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2751.883331298828,\r
-        "y": 791,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2737.883331298828,\r
+        "y": 755,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "23d2aee5.d5b2fa"\r
+                "2b5dce30.392f92"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81a947d8.a13a68",\r
+        "id": "7d753f63.af1d7",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2751.883331298828,\r
-        "y": 736,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2737.883331298828,\r
+        "y": 700,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "773948cf.a686e8"\r
+                "155f7f13.57fce1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "773948cf.a686e8",\r
+        "id": "155f7f13.57fce1",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2907.883331298828,\r
-        "y": 734,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2893.883331298828,\r
+        "y": 698,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c8295377.ff6158",\r
-                "c7d66e95.fb47e"\r
+                "e7a16254.b52678",\r
+                "4a95df1.67c3fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23d2aee5.d5b2fa",\r
+        "id": "2b5dce30.392f92",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2884.883331298828,\r
-        "y": 792,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2870.883331298828,\r
+        "y": 756,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7714415.bcb45c",\r
+        "id": "9dad0003.283738",\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": 1061.8833312988281,\r
-        "y": 208,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1047.8833312988281,\r
+        "y": 172,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "79981366.647454",\r
+        "id": "a6d3cb9.27687b8",\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": 4178.883331298828,\r
-        "y": 626,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4164.883331298828,\r
+        "y": 590,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a0ef184.deb28",\r
+        "id": "738a4fa7.5a68d",\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": 4238.883331298828,\r
-        "y": 665,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4224.883331298828,\r
+        "y": 629,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2cf2ff05.5ecb98",\r
+        "id": "47e937a3.3ee608",\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": 1054.8833312988281,\r
-        "y": 116,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1040.8833312988281,\r
+        "y": 80,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7871357e.92d2f4",\r
+        "id": "6f67cdff.5c5554",\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": 3590.883331298828,\r
-        "y": 2142,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3576.883331298828,\r
+        "y": 2106,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c984548c.2e537",\r
+        "id": "78f084cb.41e754",\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": 3646.883331298828,\r
-        "y": 2191,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3632.883331298828,\r
+        "y": 2155,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "efee660.b5b7f18",\r
+        "id": "912dde6.9b60fa",\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": 1054.8833312988281,\r
-        "y": 155,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1040.8833312988281,\r
+        "y": 119,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff64d6f0.1d24e",\r
+        "id": "fa83bc41.1d8b08",\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": 1085.8833312988281,\r
-        "y": 256,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1071.8833312988281,\r
+        "y": 220,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c19ef147.be92d8",\r
+        "id": "39b1b2.d055464e",\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": 295.8833312988281,\r
-        "y": 731,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 281.8833312988281,\r
+        "y": 695,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "4acbe821.0c1ff8",\r
-                "63a107d4.a006c8",\r
-                "4bb92513.9b1ebc"\r
+                "e70c3582.89ad08",\r
+                "3aeaa08a.574a",\r
+                "1322af3c.bc6319"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4acbe821.0c1ff8",\r
+        "id": "e70c3582.89ad08",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 514.8833312988281,\r
-        "y": 669,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 500.8833312988281,\r
+        "y": 633,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "d6a121aa.ecf888"\r
+                "9c476365.2b909"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63a107d4.a006c8",\r
+        "id": "3aeaa08a.574a",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 524.3742980957031,\r
-        "y": 711.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 510.3742980957031,\r
+        "y": 675.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4bb92513.9b1ebc",\r
+        "id": "1322af3c.bc6319",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 512.8833312988281,\r
-        "y": 758,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 498.8833312988281,\r
+        "y": 722,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f58f94a6.d7fb9"\r
+                "23db95da.1941e2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6a121aa.ecf888",\r
+        "id": "9c476365.2b909",\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": 711.8833312988281,\r
-        "y": 665,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 697.8833312988281,\r
+        "y": 629,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "46606d75.f5af5c"\r
+                "1a5a20de.60b4cf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f58f94a6.d7fb9",\r
+        "id": "23db95da.1941e2",\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": 681.8833312988281,\r
-        "y": 759,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 667.8833312988281,\r
+        "y": 723,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "46606d75.f5af5c",\r
+        "id": "1a5a20de.60b4cf",\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": 935.2168273925781,\r
-        "y": 664.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 921.2168273925781,\r
+        "y": 628.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1dffeedd.2e39d1"\r
+                "59a859e2.c48ca8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1dffeedd.2e39d1",\r
+        "id": "59a859e2.c48ca8",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1135.8834648132324,\r
-        "y": 666.000020980835,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1121.8834648132324,\r
+        "y": 630.000020980835,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "5eeac4ab.784bec"\r
+                "ae28be96.a81b18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5eeac4ab.784bec",\r
+        "id": "ae28be96.a81b18",\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": 265.8833312988281,\r
-        "y": 928,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 251.88333129882812,\r
+        "y": 892,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "93ffca07.c36c6",\r
-                "a6155e5c.4a2e4",\r
-                "edf3ae2.0898ad"\r
+                "4595d435.587aa4",\r
+                "60a8c3ff.237aec",\r
+                "18e77ed.3460901"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93ffca07.c36c6",\r
+        "id": "4595d435.587aa4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 473.8833312988281,\r
-        "y": 892,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 459.8833312988281,\r
+        "y": 856,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "41f16b19.4ea28c"\r
+                "9c5806bb.83c05"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6155e5c.4a2e4",\r
+        "id": "60a8c3ff.237aec",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 474.3742980957031,\r
-        "y": 937.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 460.3742980957031,\r
+        "y": 901.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "edf3ae2.0898ad",\r
+        "id": "18e77ed.3460901",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 471.8833312988281,\r
-        "y": 981,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 457.8833312988281,\r
+        "y": 945,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "77488207.b4a2f4"\r
+                "a170b783.101ed"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "77488207.b4a2f4",\r
+        "id": "a170b783.101ed",\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": 640.8833312988281,\r
-        "y": 982,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 626.8833312988281,\r
+        "y": 946,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1853bc71.11bc54",\r
+        "id": "aaf101ae.84a298",\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": 612.8833312988281,\r
-        "y": 1476,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 598.8833312988281,\r
+        "y": 1440,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "aa99b60e.a0ae8"\r
+                "48f75925.f13078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa99b60e.a0ae8",\r
+        "id": "48f75925.f13078",\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": 815.8833312988281,\r
-        "y": 1488,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 801.8833312988281,\r
+        "y": 1452,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6b5b67d6.d9cff8"\r
+                "dc596581.8a224"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b5b67d6.d9cff8",\r
+        "id": "dc596581.8a224",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 981.8833312988281,\r
-        "y": 1485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 967.8833312988281,\r
+        "y": 1449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c9be5883.2f43"\r
+                "63611a55.44e3fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c9be5883.2f43",\r
+        "id": "63611a55.44e3fc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1142.8833312988281,\r
-        "y": 1482,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1128.8833312988281,\r
+        "y": 1446,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8328946b.83ccf",\r
-                "70436354.fbd2a4",\r
-                "71db6bb7.f92dd4",\r
-                "a3af61e2.8efbd8",\r
-                "1dbcecbe.b5c9a3"\r
+                "155181d9.def56e",\r
+                "450c0202.9562fc",\r
+                "e522d7e8.f0b6d",\r
+                "b85bac18.623698",\r
+                "d97c4e37.51bad8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "70436354.fbd2a4",\r
+        "id": "450c0202.9562fc",\r
          "type": "set",\r
          "name": "unset tmp.aai.uni",\r
          "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
          "comments": "",\r
-        "x": 1346.8833312988281,\r
-        "y": 1440,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1332.8833312988281,\r
+        "y": 1404,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8328946b.83ccf",\r
+        "id": "155181d9.def56e",\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": 1343.8833312988281,\r
-        "y": 1485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1329.8833312988281,\r
+        "y": 1449,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "95cc35e2.dbd57",\r
-                "6243e8b2.6e7d68",\r
-                "ea238384.cd0de8"\r
+                "c73d859f.d40f2",\r
+                "cdecbb41.644898",\r
+                "ca040aae.e9fa08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6243e8b2.6e7d68",\r
+        "id": "cdecbb41.644898",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1539.3742980957031,\r
-        "y": 1458.573974609375,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1525.3742980957031,\r
+        "y": 1422.573974609375,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "60cc7ad4.175214"\r
+                "dcd0fdd9.1c84f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea238384.cd0de8",\r
+        "id": "ca040aae.e9fa08",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1534.8833312988281,\r
-        "y": 1502.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1520.8833312988281,\r
+        "y": 1466.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "33a586e8.574ea2"\r
+                "7c23dd25.00653c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60cc7ad4.175214",\r
+        "id": "dcd0fdd9.1c84f",\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": 1701.9458312988281,\r
-        "y": 1457.8596801757812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1687.9458312988281,\r
+        "y": 1421.8596801757812,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "33a586e8.574ea2",\r
+        "id": "7c23dd25.00653c",\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": 1702.8833312988281,\r
-        "y": 1502.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1688.8833312988281,\r
+        "y": 1466.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3ed2826e.143bbe",\r
+        "id": "c84187cf.6e6008",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1704.8833312988281,\r
-        "y": 1549.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1690.8833312988281,\r
+        "y": 1513.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "95cc35e2.dbd57",\r
+        "id": "c73d859f.d40f2",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1535.8833312988281,\r
-        "y": 1549.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1521.8833312988281,\r
+        "y": 1513.9999389648438,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3ed2826e.143bbe"\r
+                "c84187cf.6e6008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3b35ff6.7d4a88",\r
+        "id": "a7f36b9f.f75b88",\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": 225.38333129882812,\r
-        "y": 1147,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 211.38333129882812,\r
+        "y": 1111,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "53e42336.cf6874",\r
-                "64e5ac9.b8c59d4",\r
-                "29d673d9.3ef8bc"\r
+                "b58d5b5e.9a197",\r
+                "5c723a86.22c16c",\r
+                "fb40210e.8c5be8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fdb5b362.28d2e8",\r
+        "id": "ce504b34.d68ac8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 336.3833312988281,\r
-        "y": 1503,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 322.3833312988281,\r
+        "y": 1467,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "53e42336.cf6874",\r
+        "id": "b58d5b5e.9a197",\r
          "type": "outcome",\r
          "name": "leaf",\r
          "xml": "<outcome value='leaf'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 211.38333129882812,\r
-        "y": 1393,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 197.38333129882812,\r
+        "y": 1357,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2d911faf.b625f"\r
+                "67ff853e.386644"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "64e5ac9.b8c59d4",\r
+        "id": "5c723a86.22c16c",\r
          "type": "outcome",\r
          "name": "root",\r
          "xml": "<outcome value='root'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 212.38333129882812,\r
-        "y": 1451,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 198.38333129882812,\r
+        "y": 1415,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c8a49fba.48732"\r
+                "402699af.4c591"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "29d673d9.3ef8bc",\r
+        "id": "fb40210e.8c5be8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 214.38333129882812,\r
-        "y": 1505,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 200.38333129882812,\r
+        "y": 1469,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fdb5b362.28d2e8"\r
+                "ce504b34.d68ac8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "893647bf.8d35f8",\r
+        "id": "5d006f15.710a08",\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": 1319.8833312988281,\r
-        "y": 1713,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1305.8833312988281,\r
+        "y": 1677,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "71db6bb7.f92dd4",\r
+        "id": "e522d7e8.f0b6d",\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": 1410.8833312988281,\r
-        "y": 1767,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1396.8833312988281,\r
+        "y": 1731,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c8a49fba.48732",\r
+        "id": "402699af.4c591",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 328.3833312988281,\r
-        "y": 1447,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 314.3833312988281,\r
+        "y": 1411,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c9ed31d4.2a59a",\r
-                "1853bc71.11bc54",\r
-                "e2c4a442.f42cf",\r
-                "7b94a56a.0cc0c4",\r
-                "14d69ea3.c37079",\r
-                "e39ba7bd.aed5d8",\r
-                "9e9fd2d9.fce4a8",\r
-                "3e44ba6b.3875e6",\r
-                "de368aef.16cb",\r
-                "61a182f0.95ec2c",\r
-                "fae7aeca.a940b8",\r
-                "f92bafd0.7c69c8"\r
+                "784b1e5c.92c77",\r
+                "aaf101ae.84a298",\r
+                "dfffb0d0.b2d2d",\r
+                "3502903c.982ab",\r
+                "5524ecac.5cf47c",\r
+                "a12bd239.f8368",\r
+                "f8f2651c.3a035",\r
+                "f84d6f72.692148",\r
+                "5d1396ed.19b6f8",\r
+                "1b4871a6.1cd8a6",\r
+                "48083140.e99758",\r
+                "d94511cd.5d63f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2d911faf.b625f",\r
+        "id": "67ff853e.386644",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 341.3833312988281,\r
-        "y": 1389,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 326.3833312988281,\r
+        "y": 1348,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "1853bc71.11bc54",\r
-                "30a75a3e.13e116",\r
-                "878444f9.a47b7",\r
-                "7b94a56a.0cc0c4",\r
-                "14d69ea3.c37079",\r
-                "e39ba7bd.aed5d8",\r
-                "9e9fd2d9.fce4a8",\r
-                "3e44ba6b.3875e6",\r
-                "de368aef.16cb",\r
-                "61a182f0.95ec2c",\r
-                "fae7aeca.a940b8",\r
-                "f92bafd0.7c69c8"\r
+                "aaf101ae.84a298",\r
+                "80e8f9a6.45b808",\r
+                "70ed09af.22122",\r
+                "3502903c.982ab",\r
+                "5524ecac.5cf47c",\r
+                "a12bd239.f8368",\r
+                "f8f2651c.3a035",\r
+                "f84d6f72.692148",\r
+                "5d1396ed.19b6f8",\r
+                "1b4871a6.1cd8a6",\r
+                "48083140.e99758",\r
+                "d94511cd.5d63f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30a75a3e.13e116",\r
+        "id": "80e8f9a6.45b808",\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": 632.3833312988281,\r
-        "y": 1269,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 618.3833312988281,\r
+        "y": 1233,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c9ed31d4.2a59a",\r
+        "id": "784b1e5c.92c77",\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": 649.3833312988281,\r
-        "y": 1363,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 635.3833312988281,\r
+        "y": 1327,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7b94a56a.0cc0c4",\r
+        "id": "3502903c.982ab",\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": 575.8833312988281,\r
-        "y": 1732,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 561.8833312988281,\r
+        "y": 1696,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "bd67d795.2e839"\r
+                "2dc7d020.0f01c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd67d795.2e839",\r
+        "id": "2dc7d020.0f01c8",\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": 807.8833312988281,\r
-        "y": 1731,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 793.8833312988281,\r
+        "y": 1695,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "148b77ab.48b7a"\r
+                "9a9b2fc1.cfc378"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "148b77ab.48b7a",\r
+        "id": "9a9b2fc1.cfc378",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1019.8833312988281,\r
-        "y": 1732,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1005.8833312988281,\r
+        "y": 1696,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "90ccd6ae.a26198"\r
+                "3ee84e3e.71c9c2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90ccd6ae.a26198",\r
+        "id": "3ee84e3e.71c9c2",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 275.8833312988281,\r
-        "y": 1888,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 261.8833312988281,\r
+        "y": 1852,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "8f4c1c14.35a72",\r
-                "c6a7aee9.6724"\r
+                "a6f3ac42.8fbf28",\r
+                "c5253df7.0ed11"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c6a7aee9.6724",\r
+        "id": "c5253df7.0ed11",\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": 510.8833312988281,\r
-        "y": 1875,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 496.8833312988281,\r
+        "y": 1839,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f4c1c14.35a72",\r
+        "id": "a6f3ac42.8fbf28",\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": 500.8833312988281,\r
-        "y": 1936,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 486.8833312988281,\r
+        "y": 1900,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2e648939.1db066",\r
-                "6fc34533.3f02e4",\r
-                "f4ca0a98.2172d"\r
+                "b27c66fe.f461f8",\r
+                "d86a808d.b5d38",\r
+                "51be47ba.06369"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6fc34533.3f02e4",\r
+        "id": "d86a808d.b5d38",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 714.3742980957031,\r
-        "y": 1920.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 700.3742980957031,\r
+        "y": 1884.5740356445312,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "24a8c225.12e4ae"\r
+                "40ccd27e.7bf8ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4ca0a98.2172d",\r
+        "id": "51be47ba.06369",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 709.8833312988281,\r
-        "y": 1965,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 695.8833312988281,\r
+        "y": 1929,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a2a9b29c.7bdb18"\r
+                "10ad75eb.cd3092"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e648939.1db066",\r
+        "id": "b27c66fe.f461f8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 711.8833312988281,\r
-        "y": 2025,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 697.8833312988281,\r
+        "y": 1989,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "6e035263.0ab9c4"\r
+                "f72f31f7.42e17"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24a8c225.12e4ae",\r
+        "id": "40ccd27e.7bf8ec",\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": 876.9458312988281,\r
-        "y": 1919.8597412109375,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 862.9458312988281,\r
+        "y": 1883.8597412109375,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a2a9b29c.7bdb18",\r
+        "id": "10ad75eb.cd3092",\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": 877.8833312988281,\r
-        "y": 1965,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 863.8833312988281,\r
+        "y": 1929,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6e035263.0ab9c4",\r
+        "id": "f72f31f7.42e17",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 880.8833312988281,\r
-        "y": 2024,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 866.8833312988281,\r
+        "y": 1988,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fc704734.f5a92",\r
-                "534cefd0.094168"\r
+                "c01095c8.c5a848",\r
+                "1e0b480.37d7ab8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e9fd2d9.fce4a8",\r
+        "id": "f8f2651c.3a035",\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": 279.8833312988281,\r
-        "y": 2523,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 265.8833312988281,\r
+        "y": 2487,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e44ba6b.3875e6",\r
+        "id": "f84d6f72.692148",\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": 422.8833312988281,\r
-        "y": 2583,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 408.8833312988281,\r
+        "y": 2547,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b4c4bd8d.d5bdc",\r
-                "c813638c.89d0f"\r
+                "7174c4fb.4236d4",\r
+                "3df090d7.e28cf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b4c4bd8d.d5bdc",\r
+        "id": "7174c4fb.4236d4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 735.3833312988281,\r
-        "y": 2560,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 721.3833312988281,\r
+        "y": 2524,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c813638c.89d0f",\r
+        "id": "3df090d7.e28cf",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 739.3833312988281,\r
-        "y": 2600,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 725.3833312988281,\r
+        "y": 2564,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "3e668730.81c5e8"\r
+                "bbef1ecc.7916"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c6aee6c.a3a53a",\r
+        "id": "4d6cfe8e.59e2a",\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": 915.3833312988281,\r
-        "y": 2564,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 901.3833312988281,\r
+        "y": 2528,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e668730.81c5e8",\r
+        "id": "bbef1ecc.7916",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 930.8833312988281,\r
-        "y": 2618,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 916.8833312988281,\r
+        "y": 2582,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e6168d7c.f871d"\r
+                "b94bbfec.158258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59cef6d7.b8a21",\r
+        "id": "b2dda6de.cb3b28",\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": 1226.3833312988281,\r
-        "y": 2587,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1212.3833312988281,\r
+        "y": 2551,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b5303ab1.d78928",\r
+        "id": "1cb10652.ba5e0a",\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": 2693.383331298828,\r
-        "y": 1938,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2679.383331298828,\r
+        "y": 1902,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e6168d7c.f871d",\r
+        "id": "b94bbfec.158258",\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": 1188.3833312988281,\r
-        "y": 2629,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1174.3833312988281,\r
+        "y": 2593,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "878444f9.a47b7",\r
+        "id": "70ed09af.22122",\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": 598.3833312988281,\r
-        "y": 1307,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 584.3833312988281,\r
+        "y": 1271,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e2c4a442.f42cf",\r
+        "id": "dfffb0d0.b2d2d",\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": 611.3833312988281,\r
-        "y": 1403,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 597.3833312988281,\r
+        "y": 1367,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dd4c3392.e1b02",\r
+        "id": "9521e4ca.a61af",\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": 4347.883331298828,\r
-        "y": 579,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4333.883331298828,\r
+        "y": 543,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9c0b0957.1e6c48",\r
+        "id": "1d1e23b2.17cb04",\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": 4250.883331298828,\r
-        "y": 1398,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4236.883331298828,\r
+        "y": 1362,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "88e8f378.a2b808",\r
+        "id": "e35a6c95.6b3d6",\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": 3744.883331298828,\r
-        "y": 2070,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3730.883331298828,\r
+        "y": 2034,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "41f16b19.4ea28c",\r
+        "id": "9c5806bb.83c05",\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": 845.8833312988281,\r
-        "y": 878,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 831.8833312988281,\r
+        "y": 842,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7bf4aa70.c75d74",\r
-                "a798281b.2c68d8"\r
+                "24382f34.66808",\r
+                "ea56d949.8ce4b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bf4aa70.c75d74",\r
+        "id": "24382f34.66808",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1208.8833312988281,\r
-        "y": 901,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1194.8833312988281,\r
+        "y": 865,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e5a55559.f1ecf"\r
+                "d7ed30c6.74c9b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a798281b.2c68d8",\r
+        "id": "ea56d949.8ce4b",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1208.8833312988281,\r
-        "y": 850,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1194.8833312988281,\r
+        "y": 814,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "486913c4.08fb54"\r
+                "3707e8cf.65827"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5a55559.f1ecf",\r
+        "id": "d7ed30c6.74c9b",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1364.8833312988281,\r
-        "y": 899,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1350.8833312988281,\r
+        "y": 863,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a3b35ff6.7d4a88"\r
+                "a7f36b9f.f75b88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "486913c4.08fb54",\r
+        "id": "3707e8cf.65827",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1341.8833312988281,\r
-        "y": 851,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1327.8833312988281,\r
+        "y": 815,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4660bf61.473a18",\r
+        "id": "ed4d0298.cdb578",\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": 2101.883331298828,\r
-        "y": 249,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2087.883331298828,\r
+        "y": 213,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1fda4b4a.2131e5",\r
+        "id": "1ced8517.ce35e3",\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": 3643.883331298828,\r
-        "y": 2230,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3629.883331298828,\r
+        "y": 2194,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a6ffb7c.8797f4",\r
+        "id": "224f4283.917d26",\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": 4233.883331298828,\r
-        "y": 703,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4219.883331298828,\r
+        "y": 667,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3af61e2.8efbd8",\r
+        "id": "b85bac18.623698",\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": 1407.8833312988281,\r
-        "y": 1809,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1393.8833312988281,\r
+        "y": 1773,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "14d69ea3.c37079",\r
+        "id": "5524ecac.5cf47c",\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": 586.8833312988281,\r
-        "y": 1543,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 572.8833312988281,\r
+        "y": 1507,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e39ba7bd.aed5d8",\r
+        "id": "a12bd239.f8368",\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": 617.8833312988281,\r
-        "y": 1583,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 603.8833312988281,\r
+        "y": 1547,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "fc704734.f5a92",\r
+        "id": "c01095c8.c5a848",\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": 1165.8833312988281,\r
-        "y": 1991,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1151.8833312988281,\r
+        "y": 1955,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "534cefd0.094168",\r
+        "id": "1e0b480.37d7ab8",\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": 1168.8833312988281,\r
-        "y": 2033,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1154.8833312988281,\r
+        "y": 1997,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "de368aef.16cb",\r
+        "id": "5d1396ed.19b6f8",\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": 611.8833312988281,\r
-        "y": 1673,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 597.8833312988281,\r
+        "y": 1637,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "61a182f0.95ec2c",\r
+        "id": "1b4871a6.1cd8a6",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
          "comments": "",\r
-        "x": 366.8833312988281,\r
-        "y": 2052,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 352.8833312988281,\r
+        "y": 2016,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fae7aeca.a940b8",\r
+        "id": "48083140.e99758",\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": 374.8833312988281,\r
-        "y": 2109,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 360.8833312988281,\r
+        "y": 2073,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1dbcecbe.b5c9a3",\r
+        "id": "d97c4e37.51bad8",\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": 1385.8833312988281,\r
-        "y": 1658,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1371.8833312988281,\r
+        "y": 1622,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2facd73.aebb428",\r
-                "7c34f1f3.22e088"\r
+                "3df77641.8d727a",\r
+                "f024d61d.5a31c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7c34f1f3.22e088",\r
+        "id": "f024d61d.5a31c",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1608.8833312988281,\r
-        "y": 1613,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1594.8833312988281,\r
+        "y": 1577,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "7e28ac3f.b53f7c"\r
+                "3c67000e.e921c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2facd73.aebb428",\r
+        "id": "3df77641.8d727a",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1610.8833312988281,\r
-        "y": 1677,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1596.8833312988281,\r
+        "y": 1641,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "c1661a7d.0e642"\r
+                "de64177a.8916f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7e28ac3f.b53f7c",\r
+        "id": "3c67000e.e921c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1773.8833312988281,\r
-        "y": 1610,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1759.8833312988281,\r
+        "y": 1574,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a55c6cbe.f3cef"\r
+                "9bea7c66.5f62c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c1661a7d.0e642",\r
+        "id": "de64177a.8916f",\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": 1772.8833312988281,\r
-        "y": 1673,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1758.8833312988281,\r
+        "y": 1637,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a55c6cbe.f3cef",\r
+        "id": "9bea7c66.5f62c8",\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": 1993.8833312988281,\r
-        "y": 1624,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1979.8833312988281,\r
+        "y": 1588,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3eb9377.85c18",\r
+        "id": "7a38583b.020a88",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1538.8833312988281,\r
-        "y": 2349,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1524.8833312988281,\r
+        "y": 2313,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "fcb0361d.62eb48"\r
+                "c388a6bf.f87f3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dcd8db20.d12b7",\r
+        "id": "a2f5b878.ad169",\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": 1923.8833312988281,\r
-        "y": 2362,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1909.8833312988281,\r
+        "y": 2326,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "62f93408.d79154",\r
-                "c38cc9d8.7f1bc",\r
-                "576ffe09.c4abd8"\r
+                "7866488b.2039a8",\r
+                "bdc692ef.1c0858",\r
+                "823a852f.40d29"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fcb0361d.62eb48",\r
+        "id": "c388a6bf.f87f3",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1717.8833312988281,\r
-        "y": 2349,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1703.8833312988281,\r
+        "y": 2313,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "90857791.e16908",\r
-                "dcd8db20.d12b7"\r
+                "5c79d6d8.a6a8e",\r
+                "a2f5b878.ad169"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90857791.e16908",\r
+        "id": "5c79d6d8.a6a8e",\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": 1953.8833312988281,\r
-        "y": 2310,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1939.8833312988281,\r
+        "y": 2274,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "62f93408.d79154",\r
+        "id": "7866488b.2039a8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2133.883331298828,\r
-        "y": 2353,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2119.883331298828,\r
+        "y": 2317,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2c548a06.655d4e"\r
+                "4da79570.cd80cc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c38cc9d8.7f1bc",\r
+        "id": "bdc692ef.1c0858",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2125.883331298828,\r
-        "y": 2408,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2111.883331298828,\r
+        "y": 2372,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "99196e80.99674"\r
+                "5ef7fec5.5efb98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "576ffe09.c4abd8",\r
+        "id": "823a852f.40d29",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2130.883331298828,\r
-        "y": 2465,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2116.883331298828,\r
+        "y": 2429,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "ea704904.f61c3"\r
+                "57488074.1d65e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea704904.f61c3",\r
+        "id": "57488074.1d65e",\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": 2282.883331298828,\r
-        "y": 2466,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2268.883331298828,\r
+        "y": 2430,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "99196e80.99674",\r
+        "id": "5ef7fec5.5efb98",\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": 2293.883331298828,\r
-        "y": 2411,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2279.883331298828,\r
+        "y": 2375,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c548a06.655d4e",\r
+        "id": "4da79570.cd80cc",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2278.265655517578,\r
-        "y": 2350.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2264.265655517578,\r
+        "y": 2314.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "55de506e.ab2138"\r
+                "69f8caaf.bba51c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "55de506e.ab2138",\r
+        "id": "69f8caaf.bba51c",\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": 2492.883331298828,\r
-        "y": 2347,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2478.883331298828,\r
+        "y": 2311,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2eeb0084.f61b88",\r
+        "id": "53cc84ce.e1faf4",\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": 616.8833312988281,\r
-        "y": 2395,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 602.8833312988281,\r
+        "y": 2359,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "21d8f2c9.3cd2be",\r
-                "32ff82a0.3bb24e",\r
-                "21eb3441.66cbb4"\r
+                "bb343bdc.881868",\r
+                "8bc84f5e.0473d8",\r
+                "78444b47.33ec34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21d8f2c9.3cd2be",\r
+        "id": "bb343bdc.881868",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 812.3834533691406,\r
-        "y": 2347,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 798.3834533691406,\r
+        "y": 2311,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "2571d7b1.c4fb5"\r
+                "bf3ecbb9.4dd008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32ff82a0.3bb24e",\r
+        "id": "8bc84f5e.0473d8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 804.3834533691406,\r
-        "y": 2402,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 790.3834533691406,\r
+        "y": 2366,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b0a2917a.ecde4"\r
+                "ef40b092.bc09e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2571d7b1.c4fb5",\r
+        "id": "bf3ecbb9.4dd008",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 956.7657775878906,\r
-        "y": 2346.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 942.7657775878906,\r
+        "y": 2310.6556701660156,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a50320.52c78ce"\r
+                "1285266.d4ce8da"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a50320.52c78ce",\r
+        "id": "1285266.d4ce8da",\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": 1140.8833312988281,\r
-        "y": 2345,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1126.8833312988281,\r
+        "y": 2309,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "b3deb273.cebb88"\r
+                "640d04c1.8428dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b3deb273.cebb88",\r
+        "id": "640d04c1.8428dc",\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": 1335.8833312988281,\r
-        "y": 2345,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1321.8833312988281,\r
+        "y": 2309,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "a3eb9377.85c18"\r
+                "7a38583b.020a88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21eb3441.66cbb4",\r
+        "id": "78444b47.33ec34",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 809.3834533691406,\r
-        "y": 2459,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 795.3834533691406,\r
+        "y": 2423,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "f2a9e7b0.6a4ff8"\r
+                "b417de17.8b3a6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f2a9e7b0.6a4ff8",\r
+        "id": "b417de17.8b3a6",\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": 961.3834533691406,\r
-        "y": 2460,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 947.3834533691406,\r
+        "y": 2424,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b0a2917a.ecde4",\r
+        "id": "ef40b092.bc09e",\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": 972.3834533691406,\r
-        "y": 2403,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 958.3834533691406,\r
+        "y": 2367,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e821cf32.5b22f",\r
+        "id": "fc4eafc.4810e5",\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": 606.8833312988281,\r
-        "y": 2307,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 592.8833312988281,\r
+        "y": 2271,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f92bafd0.7c69c8",\r
+        "id": "d94511cd.5d63f",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 351.8833312988281,\r
-        "y": 2438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 337.8833312988281,\r
+        "y": 2402,\r
+        "z": "db287b1f.2984a8",\r
          "wires": [\r
              [\r
-                "e821cf32.5b22f",\r
-                "2eeb0084.f61b88"\r
+                "fc4eafc.4810e5",\r
+                "53cc84ce.e1faf4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a832f3b6.8874e",\r
+        "id": "1a955b8d.047dd4",\r
          "type": "comment",\r
          "name": "Temporary skipping this check - to support multiple instances in one slice",\r
          "info": "",\r
          "comments": "",\r
-        "x": 1566.8500061035156,\r
-        "y": 255.88333129882812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1552.8500061035156,\r
+        "y": 219.88333129882812,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f645589d.ed3d98",\r
+        "id": "9a0e1ef7.428b9",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 768.8833312988281,\r
-        "y": 478,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 754.8833312988281,\r
+        "y": 442,\r
+        "z": "db287b1f.2984a8",\r
          "wires": []\r
      }\r
  ]
 \ No newline at end of file