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

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

index 4ba32b4..d58ad7b 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,199 +1,199 @@
  [\r
      {\r
-        "id": "6467c9b6.3ea7b",\r
+        "id": "d35e2da9.70a7e",\r
          "type": "save",\r
          "name": "get all-vpn-bindings from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 415.8833312988281,\r
-        "y": 377,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 372,\r
+        "y": 306,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1c0c6fa0.017178",\r
-                "ec984d7b.605098",\r
-                "25450eba.0fd99a"\r
+                "88d19ab1.10b18",\r
+                "8fd12759.af6e18",\r
+                "50405d21.7eae84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c0c6fa0.017178",\r
+        "id": "88d19ab1.10b18",\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": 560,\r
+        "y": 319,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fcdf737f.3ba08"\r
+                "d472199a.beff9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec984d7b.605098",\r
+        "id": "8fd12759.af6e18",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 611.374267578125,\r
-        "y": 432.57403564453125,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 567.4909362792969,\r
+        "y": 361.57403564453125,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "25450eba.0fd99a",\r
+        "id": "50405d21.7eae84",\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": 558,\r
+        "y": 408,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f645589d.ed3d98"\r
+                "6b1a691d.f6617"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fcdf737f.3ba08",\r
+        "id": "d472199a.beff9",\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": 733,\r
+        "y": 317,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6641b1bb.011df8"\r
+                "f306805a.38d6f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6641b1bb.011df8",\r
+        "id": "f306805a.38d6f8",\r
          "type": "for",\r
          "name": "for vpnidx in all-vpn-bindings",\r
          "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1005.8833312988281,\r
-        "y": 389,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 962,\r
+        "y": 318,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "42fd94e4.9f459c"\r
+                "4a920666.d84d68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "42fd94e4.9f459c",\r
+        "id": "4a920666.d84d68",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1220.8833312988281,\r
-        "y": 390,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1177,\r
+        "y": 319,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "341f3db4.7e268a"\r
+                "fc848cba.fc33d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "802e937a.3ac",\r
+        "id": "841ae1dd.49d178",\r
          "type": "switchNode",\r
          "name": "switch vpnuuid is for this slice",\r
          "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1474.8833312988281,\r
-        "y": 312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1431,\r
+        "y": 241,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ccfe4ade.41ae98",\r
-                "912c0faa.e5e1c8"\r
+                "98ef6cc.4725e9",\r
+                "ab42fe03.c49e3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ccfe4ade.41ae98",\r
+        "id": "98ef6cc.4725e9",\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": 1648,\r
+        "y": 220,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "341f3db4.7e268a"\r
+                "fc848cba.fc33d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "912c0faa.e5e1c8",\r
+        "id": "ab42fe03.c49e3",\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": 1648,\r
+        "y": 269,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "341f3db4.7e268a",\r
+        "id": "fc848cba.fc33d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1875.8833312988281,\r
-        "y": 377,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1832,\r
+        "y": 306,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b1ca96f9.f78f38",\r
-                "2c3b3231.83c2be",\r
-                "4660bf61.473a18"\r
+                "53692e4a.48cde",\r
+                "957d0d12.f7d338",\r
+                "1f9b767f.d670b2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "377c3031.0fc7c",\r
+        "id": "524dbe59.8ef8f",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 234.88333129882812,\r
-        "y": 118,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 191,\r
+        "y": 47,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8b8ba227.5e7638"\r
+                "320667fa.12a2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8b8ba227.5e7638",\r
+        "id": "320667fa.12a2c",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -201,3545 +201,3558 @@
          "comments": "",\r
          "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
          "outputs": 1,\r
-        "x": 519.1690216064453,\r
-        "y": 179.23810863494873,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 475.2856903076172,\r
+        "y": 108.23810863494873,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6c55ded0.30c498"\r
+                "aa006c98.f12b58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6c55ded0.30c498",\r
+        "id": "aa006c98.f12b58",\r
          "type": "method",\r
          "name": "method cll-vnf-topology-operation-cll-F1-Activate",\r
          "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 525.3119354248047,\r
-        "y": 264.0000305175781,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 481.42860412597656,\r
+        "y": 193.00003051757812,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b63c19cf.5911b8"\r
+                "72fe4a66.39584c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b63c19cf.5911b8",\r
+        "id": "72fe4a66.39584c",\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": 791.238037109375,\r
+        "y": 184.66668701171875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6467c9b6.3ea7b",\r
-                "7714415.bcb45c",\r
-                "2cf2ff05.5ecb98",\r
-                "ff64d6f0.1d24e",\r
-                "c19ef147.be92d8"\r
+                "d35e2da9.70a7e",\r
+                "cce8745e.b515b8",\r
+                "706cb78c.da92b",\r
+                "88772a4.9b58658",\r
+                "4ace150.4554dec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b1ca96f9.f78f38",\r
+        "id": "53692e4a.48cde",\r
          "type": "set",\r
          "name": "set tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
          "comments": "",\r
-        "x": 2092.883331298828,\r
-        "y": 315,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2049,\r
+        "y": 244,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f11c1dac.45c748",\r
+        "id": "123fcc82.b79ae3",\r
          "type": "set",\r
          "name": "set attachment_param for OTN A",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 4261.883331298828,\r
-        "y": 201,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4218,\r
+        "y": 130,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c95c33ef.381fa8",\r
+        "id": "e308a3a2.af826",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4342.883331298828,\r
-        "y": 516,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4299,\r
+        "y": 445,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "89c7efd5.cb6558",\r
-                "d5cfec9d.5347f8"\r
+                "fedd6b9.d7f3318",\r
+                "39581c20.edb614"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89c7efd5.cb6558",\r
+        "id": "fedd6b9.d7f3318",\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": 4608.5,\r
+        "y": 414,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "beffe966.8b1b08"\r
+                "c49081cf.377c78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5cfec9d.5347f8",\r
+        "id": "39581c20.edb614",\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": 4613.5,\r
+        "y": 479,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "18fce568.1c292b"\r
+                "9c0572a4.3a997"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "beffe966.8b1b08",\r
+        "id": "c49081cf.377c78",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4828.383331298828,\r
-        "y": 485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4784.5,\r
+        "y": 414,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "18fce568.1c292b",\r
+        "id": "9c0572a4.3a997",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4823.883331298828,\r
-        "y": 550,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4780,\r
+        "y": 479,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "64fdffc9.427678",\r
+        "id": "2d297001.689a7",\r
          "type": "set",\r
          "name": "set sotn_value",\r
          "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",\r
          "comments": "",\r
-        "x": 4207.383331298828,\r
-        "y": 770,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4163.5,\r
+        "y": 699,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c0e95206.343c2",\r
+        "id": "54d9bbcc.0d0bac",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4361.383331298828,\r
-        "y": 818,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4317.5,\r
+        "y": 747,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7a1edf39.b6a0f8",\r
-                "b605ddae.9f2b2"\r
+                "2ade786d.c09b28",\r
+                "f17ad5b3.0ef818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a1edf39.b6a0f8",\r
+        "id": "2ade786d.c09b28",\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": 4663,\r
+        "y": 728,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "db29824f.2b664"\r
+                "72718fb4.e15e78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b605ddae.9f2b2",\r
+        "id": "f17ad5b3.0ef818",\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": 4667,\r
+        "y": 768,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "10ebb808.22b9d8"\r
+                "98b1fdb0.a42648"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db29824f.2b664",\r
+        "id": "72718fb4.e15e78",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4864.883331298828,\r
-        "y": 799,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4821,\r
+        "y": 728,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "10ebb808.22b9d8",\r
+        "id": "98b1fdb0.a42648",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4868.383331298828,\r
-        "y": 839,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4824.5,\r
+        "y": 768,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6d35eb39.2fe42c",\r
-                "b62c3c22.2cb09"\r
+                "fe12ce9.6a53ab",\r
+                "4eba4c2.fda54b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6d35eb39.2fe42c",\r
+        "id": "fe12ce9.6a53ab",\r
          "type": "save",\r
          "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5198.883331298828,\r
-        "y": 804,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5155,\r
+        "y": 733,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3f34bcf0.b30eb4",\r
+        "id": "9e233ee4.5c90e",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 5062.883331298828,\r
-        "y": 763,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5019,\r
+        "y": 692,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b62c3c22.2cb09",\r
+        "id": "4eba4c2.fda54b4",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5125.883331298828,\r
-        "y": 850,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5082,\r
+        "y": 779,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dc51dde.504a12",\r
+        "id": "fbd17573.b91cd8",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 4199.883331298828,\r
-        "y": 249,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4156,\r
+        "y": 178,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "25f0cbb9.ff400c",\r
+        "id": "985dbb20.1c3b78",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4225.883331298828,\r
-        "y": 366,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4182,\r
+        "y": 295,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "26af6a64.84f75e",\r
-                "dfaad5e6.3e7388",\r
-                "d4f19086.9e394"\r
+                "544c4f89.eba52",\r
+                "eb873b5e.d10b8",\r
+                "d8377d86.76164"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26af6a64.84f75e",\r
+        "id": "544c4f89.eba52",\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": 4377.5001220703125,\r
+        "y": 247,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "825f4729.b63ee8"\r
+                "cd232c91.ed7d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dfaad5e6.3e7388",\r
+        "id": "eb873b5e.d10b8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4413.383453369141,\r
-        "y": 373,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4369.5001220703125,\r
+        "y": 302,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "92b1984a.bc8b"\r
+                "7e7e18a4.ea2a98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "825f4729.b63ee8",\r
+        "id": "cd232c91.ed7d5",\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": 4521.8824462890625,\r
+        "y": 246.65567016601562,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "415768e6.6651f8"\r
+                "d5d46c3b.524dc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6a2d3e2.2e526",\r
+        "id": "4c85ec99.26bac4",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5147.883331298828,\r
-        "y": 320,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5104,\r
+        "y": 249,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e243a570.71b51"\r
+                "490c8cc0.c71134"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "415768e6.6651f8",\r
+        "id": "d5d46c3b.524dc8",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4749.883331298828,\r
-        "y": 316,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4706,\r
+        "y": 245,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ab4dd1f4.04e1f"\r
+                "cc43f2ea.19847"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab4dd1f4.04e1f",\r
+        "id": "cc43f2ea.19847",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4944.883331298828,\r
-        "y": 316,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4901,\r
+        "y": 245,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a6a2d3e2.2e526"\r
+                "4c85ec99.26bac4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d4f19086.9e394",\r
+        "id": "d8377d86.76164",\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": 4374.5001220703125,\r
+        "y": 359,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "28f88c03.cb5e5c"\r
+                "9cf617d3.aee3a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28f88c03.cb5e5c",\r
+        "id": "9cf617d3.aee3a8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4570.383453369141,\r
-        "y": 431,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4526.5001220703125,\r
+        "y": 360,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "92b1984a.bc8b",\r
+        "id": "7e7e18a4.ea2a98",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4581.383453369141,\r
-        "y": 374,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4537.5001220703125,\r
+        "y": 303,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "677439f1.5f7ed",\r
+        "id": "f42e9c90.ae58f",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5532.883331298828,\r
-        "y": 333,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5489,\r
+        "y": 262,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e7fd97d3.bbcd08",\r
-                "38bba5b7.de41b2",\r
-                "6bf961e8.c56a58"\r
+                "f404a9ca.fbce2",\r
+                "3fd1ebaf.c62a54",\r
+                "66a3972e.71bfa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e243a570.71b51",\r
+        "id": "490c8cc0.c71134",\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": 5283,\r
+        "y": 249,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "857cacb0.81444",\r
-                "677439f1.5f7ed"\r
+                "9ce5b4b0.4bb188",\r
+                "f42e9c90.ae58f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "857cacb0.81444",\r
+        "id": "9ce5b4b0.4bb188",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainA id",\r
          "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5562.883331298828,\r
-        "y": 281,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5519,\r
+        "y": 210,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7fd97d3.bbcd08",\r
+        "id": "f404a9ca.fbce2",\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": 5699,\r
+        "y": 253,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "60a50433.d26434"\r
+                "3597c274.50637e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "38bba5b7.de41b2",\r
+        "id": "3fd1ebaf.c62a54",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5734.883331298828,\r
-        "y": 379,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5691,\r
+        "y": 308,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "d9350787.861f1"\r
+                "ff90e84e.43d4b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6bf961e8.c56a58",\r
+        "id": "66a3972e.71bfa8",\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": 5696,\r
+        "y": 365,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1afc54ba.8ed313"\r
+                "ff823793.36814"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1afc54ba.8ed313",\r
+        "id": "ff823793.36814",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5891.883331298828,\r
-        "y": 437,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5848,\r
+        "y": 366,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9350787.861f1",\r
+        "id": "ff90e84e.43d4b8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5902.883331298828,\r
-        "y": 382,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5859,\r
+        "y": 311,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "60a50433.d26434",\r
+        "id": "3597c274.50637e",\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": 5843.38232421875,\r
+        "y": 250.65567016601562,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8367dac2.ac8b98"\r
+                "d39e28b5.1aec5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8367dac2.ac8b98",\r
+        "id": "d39e28b5.1aec5",\r
          "type": "set",\r
          "name": "set controller domainA data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 6101.883331298828,\r
-        "y": 318,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 6058,\r
+        "y": 247,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aa2473a.12d4d9",\r
+        "id": "139f2f1e.8fa159",\r
          "type": "set",\r
          "name": "set attachment_param for OTN B",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 3668.883331298828,\r
-        "y": 1658,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3625,\r
+        "y": 1587,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "28a663c6.7433b4",\r
+        "id": "18d2c2bc.05fd85",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3731.883331298828,\r
-        "y": 1987,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3688,\r
+        "y": 1916,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "422a3196.0fb7d",\r
-                "371e9e8f.f6f942"\r
+                "8895fa29.bf8e3",\r
+                "23c7c635.fd4722"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "422a3196.0fb7d",\r
+        "id": "8895fa29.bf8e3",\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": 3983.5,\r
+        "y": 1883,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c3084137.121c7"\r
+                "500b5538.e88684"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "371e9e8f.f6f942",\r
+        "id": "23c7c635.fd4722",\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": 3988.5,\r
+        "y": 1948,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c6676165.ac5c"\r
+                "909dfd67.2300d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3084137.121c7",\r
+        "id": "500b5538.e88684",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4195.383331298828,\r
-        "y": 1954,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4151.5,\r
+        "y": 1883,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c6676165.ac5c",\r
+        "id": "909dfd67.2300d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4205.883331298828,\r
-        "y": 2019,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4162,\r
+        "y": 1948,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dfee532c.a1419",\r
+        "id": "a49aeabe.b5ff8",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 3607.883331298828,\r
-        "y": 1715,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3564,\r
+        "y": 1644,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e52702af.314718",\r
+        "id": "642d00da.b53c68",\r
          "type": "get-resource",\r
          "name": "get-resource dst pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3627.883331298828,\r
-        "y": 1812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3584,\r
+        "y": 1741,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9ca1c561.5c796",\r
-                "9cf5cab4.99d6e",\r
-                "5d5762eb.724c64"\r
+                "1e5d6803.78b7d8",\r
+                "84307ec5.09a8d",\r
+                "b468d4fc.bc9c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ca1c561.5c796",\r
+        "id": "1e5d6803.78b7d8",\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": 3786.5001220703125,\r
+        "y": 1694,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "502f683e.00cf7"\r
+                "683b34d0.c1df64"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9cf5cab4.99d6e",\r
+        "id": "84307ec5.09a8d",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3822.3834533691406,\r
-        "y": 1820,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3778.5001220703125,\r
+        "y": 1749,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9587c00d.994eb"\r
+                "72cad52e.cb1d74"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "502f683e.00cf7",\r
+        "id": "683b34d0.c1df64",\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": 3930.8824462890625,\r
+        "y": 1691.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "39b96666.82062a"\r
+                "8511cae6.cbf588"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "39b96666.82062a",\r
+        "id": "8511cae6.cbf588",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4158.883331298828,\r
-        "y": 1777,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4115,\r
+        "y": 1706,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "94ae9a5d.e5d56"\r
+                "82496ff9.234ee"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d5762eb.724c64",\r
+        "id": "b468d4fc.bc9c8",\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": 3783.5001220703125,\r
+        "y": 1806,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7a00ac4a.8d918c"\r
+                "a6137ce1.b3b5c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a00ac4a.8d918c",\r
+        "id": "a6137ce1.b3b5c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3979.3834533691406,\r
-        "y": 1878,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3935.5001220703125,\r
+        "y": 1807,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9587c00d.994eb",\r
+        "id": "72cad52e.cb1d74",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 3990.3834533691406,\r
-        "y": 1823,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3946.5001220703125,\r
+        "y": 1752,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1540d0.014217",\r
+        "id": "7b4a137a.364fcc",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4556.883331298828,\r
-        "y": 1781,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4513,\r
+        "y": 1710,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c932c6af.938f38"\r
+                "37fe69a9.07064e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94ae9a5d.e5d56",\r
+        "id": "82496ff9.234ee",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4353.883331298828,\r
-        "y": 1777,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4310,\r
+        "y": 1706,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f1540d0.014217"\r
+                "7b4a137a.364fcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ff151e7.182fee",\r
+        "id": "4bdd9e57.a5e13",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4941.883331298828,\r
-        "y": 1780,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4898,\r
+        "y": 1709,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "40d3a7a.4400bd8",\r
-                "353377f9.20c718",\r
-                "f8f22501.0020d8"\r
+                "8afff046.26af98",\r
+                "5118b1e.53f805",\r
+                "5a800db8.063d6c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c932c6af.938f38",\r
+        "id": "37fe69a9.07064e",\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": 4690,\r
+        "y": 1702,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "53fc3a7e.05d404",\r
-                "2ff151e7.182fee"\r
+                "d299743b.8f6b68",\r
+                "4bdd9e57.a5e13"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53fc3a7e.05d404",\r
+        "id": "d299743b.8f6b68",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainB id",\r
          "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 4971.883331298828,\r
-        "y": 1728,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4928,\r
+        "y": 1657,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d551b07b.11f68",\r
+        "id": "2523ddf0.8e1c8a",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5300.883331298828,\r
-        "y": 1884,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5257,\r
+        "y": 1813,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c19bb319.e0e2b8",\r
+        "id": "6f850c0f.e212ac",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5311.883331298828,\r
-        "y": 1829,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5268,\r
+        "y": 1758,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2dbaf595.6cfed2",\r
+        "id": "546ca846.269108",\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": 5252.38232421875,\r
+        "y": 1697.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "eaeaf1b8.196fc"\r
+                "fac7ab27.77dda8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eaeaf1b8.196fc",\r
+        "id": "fac7ab27.77dda8",\r
          "type": "set",\r
          "name": "set controller domainB data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 5510.883331298828,\r
-        "y": 1765,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5467,\r
+        "y": 1694,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "40d3a7a.4400bd8",\r
+        "id": "8afff046.26af98",\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": 5108,\r
+        "y": 1700,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2dbaf595.6cfed2"\r
+                "546ca846.269108"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "353377f9.20c718",\r
+        "id": "5118b1e.53f805",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5143.883331298828,\r
-        "y": 1826,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5100,\r
+        "y": 1755,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c19bb319.e0e2b8"\r
+                "6f850c0f.e212ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8f22501.0020d8",\r
+        "id": "5a800db8.063d6c",\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": 5105,\r
+        "y": 1812,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "d551b07b.11f68"\r
+                "2523ddf0.8e1c8a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7d66e95.fb47e",\r
+        "id": "a1edca3.1a62bb8",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has dst-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3182.883331298828,\r
-        "y": 729,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3139,\r
+        "y": 658,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4d8bbec2.c0db6",\r
-                "507d82bd.8807cc"\r
+                "d4bdeded.3ef248",\r
+                "eead64c.0115918"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d8bbec2.c0db6",\r
+        "id": "d4bdeded.3ef248",\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": 3353,\r
+        "y": 695,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6524452d.4a2f94"\r
+                "614a0644.b0e3e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "507d82bd.8807cc",\r
+        "id": "eead64c.0115918",\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": 3355,\r
+        "y": 633,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4b590d33.c81684"\r
+                "295e16ce.878c6a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6524452d.4a2f94",\r
+        "id": "614a0644.b0e3e",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2976.883331298828,\r
-        "y": 2009,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2933,\r
+        "y": 1938,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "75800cfe.e64b04",\r
-                "28895848.af5c18"\r
+                "75bfd38b.356f64",\r
+                "f4c4b096.a3ce2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75800cfe.e64b04",\r
+        "id": "75bfd38b.356f64",\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": 3186,\r
+        "y": 1972,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "34389e65.7f3f0a"\r
+                "b0597a28.514d3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28895848.af5c18",\r
+        "id": "f4c4b096.a3ce2",\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": 3186,\r
+        "y": 1916,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4c94a377.c6d4e4"\r
+                "64045150.224658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "34389e65.7f3f0a",\r
+        "id": "b0597a28.514d3",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 3380.883331298828,\r
-        "y": 2043,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3337,\r
+        "y": 1972,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff717106.1f6f7",\r
+        "id": "cf5b963d.2b5a08",\r
          "type": "set",\r
          "name": "set vpn-bindingA and connectivityA",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 4256.883331298828,\r
-        "y": 141,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4213,\r
+        "y": 70,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "98bc8f5e.55646",\r
+        "id": "4badfb31.b82c1c",\r
          "type": "set",\r
          "name": "set vpn-bindingB and connectivityB",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",\r
          "comments": "",\r
-        "x": 3664.883331298828,\r
-        "y": 1600,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3621,\r
+        "y": 1529,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1901ad68.6869bb",\r
+        "id": "552020c2.f01db",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3947.883331298828,\r
-        "y": 398,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3904,\r
+        "y": 327,\r
+        "z": "5a4cb919.dfff38",\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
+                "cf5b963d.2b5a08",\r
+                "123fcc82.b79ae3",\r
+                "fbd17573.b91cd8",\r
+                "985dbb20.1c3b78",\r
+                "e308a3a2.af826",\r
+                "ec3b4a19.7f5ee",\r
+                "881b2d7a.c4e888",\r
+                "1a392cd7.238923"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c94a377.c6d4e4",\r
+        "id": "64045150.224658",\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": 3337,\r
+        "y": 1915,\r
+        "z": "5a4cb919.dfff38",\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
+                "4badfb31.b82c1c",\r
+                "139f2f1e.8fa159",\r
+                "a49aeabe.b5ff8",\r
+                "642d00da.b53c68",\r
+                "18d2c2bc.05fd85",\r
+                "724930a5.f44628",\r
+                "98331ea2.d141f",\r
+                "f84de17e.e8ea08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d79079df.baf578",\r
+        "id": "ed40d4d6.135678",\r
          "type": "set",\r
          "name": "set sotn_value",\r
          "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",\r
          "comments": "",\r
-        "x": 3618.883331298828,\r
-        "y": 2285,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3575,\r
+        "y": 2214,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "45ccc628.f5551",\r
+        "id": "b71c97.3dad8368",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3772.883331298828,\r
-        "y": 2333,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3729,\r
+        "y": 2262,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6173b4db.203ce4",\r
-                "7f21396.e7ee248"\r
+                "aa1d9a65.d56ee",\r
+                "ce785491.f82258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6173b4db.203ce4",\r
+        "id": "aa1d9a65.d56ee",\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": 4074.5,\r
+        "y": 2243,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2b5ddf83.e8a168"\r
+                "d8df230a.b47018"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7f21396.e7ee248",\r
+        "id": "ce785491.f82258",\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": 4078.5,\r
+        "y": 2283,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9fc151.f9cc46b"\r
+                "d2d57048.de12f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b5ddf83.e8a168",\r
+        "id": "d8df230a.b47018",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 4276.383331298828,\r
-        "y": 2314,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4232.5,\r
+        "y": 2243,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fc151.f9cc46b",\r
+        "id": "d2d57048.de12f",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4279.883331298828,\r
-        "y": 2354,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4236,\r
+        "y": 2283,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ec406c4.a093b1",\r
-                "ba32c60f.0ec53"\r
+                "703675c3.1d187c",\r
+                "6a8e2764.0748e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec406c4.a093b1",\r
+        "id": "703675c3.1d187c",\r
          "type": "save",\r
          "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4619.883331298828,\r
-        "y": 2353,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4576,\r
+        "y": 2282,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "650aeaf3.da502c",\r
+        "id": "b9adfc7b.f1d908",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 4477.883331298828,\r
-        "y": 2311,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4434,\r
+        "y": 2240,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ba32c60f.0ec53",\r
+        "id": "6a8e2764.0748e8",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4548.883331298828,\r
-        "y": 2402,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4505,\r
+        "y": 2331,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c8295377.ff6158",\r
+        "id": "641093d5.a73774",\r
          "type": "set",\r
          "name": "set attachment_param (gfp-n) for OTN",\r
          "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
          "comments": "",\r
-        "x": 3173.883331298828,\r
-        "y": 669,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3130,\r
+        "y": 598,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "17d3b71c.0a74f9",\r
+        "id": "29b91b19.d2edf4",\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": 3725,\r
+        "y": 284,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "12dd212a.e5931f",\r
+        "id": "df88a98e.3b797",\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": 3282,\r
+        "y": 1862,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4b590d33.c81684",\r
+        "id": "295e16ce.878c6a",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding has src-access-ltp",\r
          "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3504.883331298828,\r
-        "y": 517,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3461,\r
+        "y": 446,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e68f7957.57ea98",\r
-                "90c8120e.55a8c8"\r
+                "fdfbdf68.ace01",\r
+                "8f7ef737.3d4208"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90c8120e.55a8c8",\r
+        "id": "8f7ef737.3d4208",\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": 3703,\r
+        "y": 1035,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "5f92c041.e2a22"\r
+                "d545d977.39f008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e68f7957.57ea98",\r
+        "id": "fdfbdf68.ace01",\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": 3697,\r
+        "y": 326,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1901ad68.6869bb"\r
+                "552020c2.f01db"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f92c041.e2a22",\r
+        "id": "d545d977.39f008",\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": 3861,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "eb5cd95b.b46698",\r
-                "bcb9498.a9205b8",\r
-                "24e13fd8.afe2d8",\r
-                "57e5431f.63be4c",\r
-                "8b688219.8ed198",\r
-                "9c0b0957.1e6c48"\r
+                "127c7c35.f5600c",\r
+                "aa22b9fb.8c00d",\r
+                "7a8bb8ff.a3807",\r
+                "b6e4b7cd.3aab58",\r
+                "9befe6d.bfbfb18",\r
+                "61ff745d.2cf8b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bcb9498.a9205b8",\r
+        "id": "aa22b9fb.8c00d",\r
          "type": "set",\r
          "name": "set attachment_param for OTN G",\r
          "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",\r
          "comments": "",\r
-        "x": 4168.883331298828,\r
-        "y": 988,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4125,\r
+        "y": 917,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8b688219.8ed198",\r
+        "id": "9befe6d.bfbfb18",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create OTN tunnel with token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4249.883331298828,\r
-        "y": 1303,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4206,\r
+        "y": 1232,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4ea88210.ceec44",\r
-                "cd5b1128.4dbb9"\r
+                "602f32f4.cac7b4",\r
+                "1d093526.32224b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4ea88210.ceec44",\r
+        "id": "602f32f4.cac7b4",\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": 4515.5,\r
+        "y": 1201,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "9646de5b.fe3c7"\r
+                "4513cd6b.369634"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd5b1128.4dbb9",\r
+        "id": "1d093526.32224b",\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": 4520.5,\r
+        "y": 1266,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "55735b11.27f424"\r
+                "7640c8ac.188fc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9646de5b.fe3c7",\r
+        "id": "4513cd6b.369634",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",\r
          "comments": "",\r
-        "x": 4735.383331298828,\r
-        "y": 1272,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4691.5,\r
+        "y": 1201,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "55735b11.27f424",\r
+        "id": "7640c8ac.188fc8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4730.883331298828,\r
-        "y": 1337,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4687,\r
+        "y": 1266,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "24e13fd8.afe2d8",\r
+        "id": "7a8bb8ff.a3807",\r
          "type": "set",\r
          "name": "set pnf-name",\r
          "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 4106.883331298828,\r
-        "y": 1036,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4063,\r
+        "y": 965,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "57e5431f.63be4c",\r
+        "id": "b6e4b7cd.3aab58",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4132.883331298828,\r
-        "y": 1153,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4089,\r
+        "y": 1082,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1d187a80.e65b15",\r
-                "370c15e3.9b5fca",\r
-                "703dc49a.960884"\r
+                "bc604696.f19bf",\r
+                "6b2ab2eb.e94cac",\r
+                "158e3d74.81687b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1d187a80.e65b15",\r
+        "id": "bc604696.f19bf",\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": 4284.5001220703125,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "5c6509dd.e3a81"\r
+                "fbbae41a.6bb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "370c15e3.9b5fca",\r
+        "id": "6b2ab2eb.e94cac",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4320.383453369141,\r
-        "y": 1160,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4276.5001220703125,\r
+        "y": 1089,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ccfe239.f2e7de"\r
+                "5e10560f.7f2a6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c6509dd.e3a81",\r
+        "id": "fbbae41a.6bb8",\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": 4428.8824462890625,\r
+        "y": 1033.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "35d4ca24.cf236e"\r
+                "4ab90ec7.0f8a1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "35d4ca24.cf236e",\r
+        "id": "4ab90ec7.0f8a1",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4656.883331298828,\r
-        "y": 1103,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4613,\r
+        "y": 1032,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c8705d75.001f7"\r
+                "3bb025b6.92298a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c8705d75.001f7",\r
+        "id": "3bb025b6.92298a",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4851.883331298828,\r
-        "y": 1103,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4808,\r
+        "y": 1032,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b9376422.2a71"\r
+                "ce204654.d589e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "703dc49a.960884",\r
+        "id": "158e3d74.81687b",\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": 4281.5001220703125,\r
+        "y": 1146,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ece92d94.dd0ac"\r
+                "cfe04507.17faa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ece92d94.dd0ac",\r
+        "id": "cfe04507.17faa",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4477.383453369141,\r
-        "y": 1218,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4433.5001220703125,\r
+        "y": 1147,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ccfe239.f2e7de",\r
+        "id": "5e10560f.7f2a6",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 4488.383453369141,\r
-        "y": 1161,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4444.5001220703125,\r
+        "y": 1090,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb5cd95b.b46698",\r
+        "id": "127c7c35.f5600c",\r
          "type": "set",\r
          "name": "set vpn-bindingG and connectivityG",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",\r
          "comments": "",\r
-        "x": 4163.883331298828,\r
-        "y": 928,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4120,\r
+        "y": 857,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b9376422.2a71",\r
+        "id": "ce204654.d589e8",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5054.883331298828,\r
-        "y": 1107,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5011,\r
+        "y": 1036,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "d2480516.2fc378"\r
+                "fea8f5c8.b664d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9cb817ae.cef538",\r
+        "id": "17936311.45c0f5",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5439.883331298828,\r
-        "y": 1120,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5396,\r
+        "y": 1049,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a79825bb.dff1f8",\r
-                "1395d5f.298062a",\r
-                "7903ca2c.aa5cc4"\r
+                "bda3b861.07af08",\r
+                "8ce8739f.28fc08",\r
+                "8098fa71.4cbf3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2480516.2fc378",\r
+        "id": "fea8f5c8.b664d8",\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": 5190,\r
+        "y": 1036,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fbf9e6b6.15b5c",\r
-                "9cb817ae.cef538"\r
+                "619520a0.18d9e",\r
+                "17936311.45c0f5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fbf9e6b6.15b5c",\r
+        "id": "619520a0.18d9e",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainG id",\r
          "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 5469.883331298828,\r
-        "y": 1068,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5426,\r
+        "y": 997,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a79825bb.dff1f8",\r
+        "id": "bda3b861.07af08",\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": 5606,\r
+        "y": 1040,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c7dce557.6dded"\r
+                "3c9ad3f5.e5e4a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1395d5f.298062a",\r
+        "id": "8ce8739f.28fc08",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5641.883331298828,\r
-        "y": 1166,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5598,\r
+        "y": 1095,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "598e647b.5837b4"\r
+                "ec86cd9f.a15968"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7903ca2c.aa5cc4",\r
+        "id": "8098fa71.4cbf3",\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": 5603,\r
+        "y": 1152,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e6c7a6e7.b2f038"\r
+                "244270ad.8dfe1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6c7a6e7.b2f038",\r
+        "id": "244270ad.8dfe1",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5798.883331298828,\r
-        "y": 1224,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5755,\r
+        "y": 1153,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "598e647b.5837b4",\r
+        "id": "ec86cd9f.a15968",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 5809.883331298828,\r
-        "y": 1169,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5766,\r
+        "y": 1098,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7dce557.6dded",\r
+        "id": "3c9ad3f5.e5e4a4",\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": 5750.38232421875,\r
+        "y": 1037.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2cfbc0b6.6ae748"\r
+                "2068f2a1.5ec866"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cfbc0b6.6ae748",\r
+        "id": "2068f2a1.5ec866",\r
          "type": "set",\r
          "name": "set controller domainG data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 6008.883331298828,\r
-        "y": 1105,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5965,\r
+        "y": 1034,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fca9cd7.3028eb",\r
+        "id": "e69cbe2a.82be58",\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": 3739,\r
+        "y": 975,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c3b3231.83c2be",\r
+        "id": "957d0d12.f7d338",\r
          "type": "switchNode",\r
          "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
          "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2344.883331298828,\r
-        "y": 773,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2301,\r
+        "y": 702,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "81a947d8.a13a68",\r
-                "b480f4ae.d59fb8"\r
+                "7969493f.6a54d",\r
+                "9a6050c4.300548"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b480f4ae.d59fb8",\r
+        "id": "9a6050c4.300548",\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": 2708,\r
+        "y": 720,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "23d2aee5.d5b2fa"\r
+                "66cd0943.de62f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81a947d8.a13a68",\r
+        "id": "7969493f.6a54d",\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": 2708,\r
+        "y": 665,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "773948cf.a686e8"\r
+                "7c5fc999.6b62c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "773948cf.a686e8",\r
+        "id": "7c5fc999.6b62c",\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": 2864,\r
+        "y": 663,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c8295377.ff6158",\r
-                "c7d66e95.fb47e"\r
+                "641093d5.a73774",\r
+                "a1edca3.1a62bb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23d2aee5.d5b2fa",\r
+        "id": "66cd0943.de62f",\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": 2841,\r
+        "y": 721,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7714415.bcb45c",\r
+        "id": "cce8745e.b515b8",\r
          "type": "set",\r
          "name": "unset tmp.aai.all-vpn-bindings",\r
          "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",\r
          "comments": "",\r
-        "x": 1061.8833312988281,\r
-        "y": 208,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1018,\r
+        "y": 137,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "79981366.647454",\r
+        "id": "48ad099a.c16688",\r
          "type": "comment",\r
          "name": "CLL new",\r
          "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
          "comments": "",\r
-        "x": 4178.883331298828,\r
-        "y": 626,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4135,\r
+        "y": 555,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a0ef184.deb28",\r
+        "id": "ec3b4a19.7f5ee",\r
          "type": "set",\r
          "name": "set leaf-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 4238.883331298828,\r
-        "y": 665,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4195,\r
+        "y": 594,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2cf2ff05.5ecb98",\r
+        "id": "706cb78c.da92b",\r
          "type": "set",\r
          "name": "unset leaf-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",\r
          "comments": "",\r
-        "x": 1054.8833312988281,\r
-        "y": 116,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1011,\r
+        "y": 45,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7871357e.92d2f4",\r
+        "id": "9a38eb9e.71f4d8",\r
          "type": "comment",\r
          "name": "CLL new",\r
          "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
          "comments": "",\r
-        "x": 3590.883331298828,\r
-        "y": 2142,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3547,\r
+        "y": 2071,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c984548c.2e537",\r
+        "id": "724930a5.f44628",\r
          "type": "set",\r
          "name": "set root-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 3646.883331298828,\r
-        "y": 2191,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3603,\r
+        "y": 2120,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "efee660.b5b7f18",\r
+        "id": "2a414bdc.2311dc",\r
          "type": "set",\r
          "name": "unset root-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",\r
          "comments": "",\r
-        "x": 1054.8833312988281,\r
-        "y": 155,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1011,\r
+        "y": 84,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff64d6f0.1d24e",\r
+        "id": "88772a4.9b58658",\r
          "type": "execute",\r
          "name": "execute properties",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1085.8833312988281,\r
-        "y": 256,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1042,\r
+        "y": 185,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c19ef147.be92d8",\r
+        "id": "4ace150.4554dec",\r
          "type": "save",\r
          "name": "get service-instance from aai",\r
          "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 295.8833312988281,\r
-        "y": 731,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 252,\r
+        "y": 660,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "4acbe821.0c1ff8",\r
-                "63a107d4.a006c8",\r
-                "4bb92513.9b1ebc"\r
+                "ce4ab0d3.b836a",\r
+                "9dbee6c6.1a60a",\r
+                "290803ec.65c94c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4acbe821.0c1ff8",\r
+        "id": "ce4ab0d3.b836a",\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": 471,\r
+        "y": 598,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "d6a121aa.ecf888"\r
+                "280015e3.c315e2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63a107d4.a006c8",\r
+        "id": "9dbee6c6.1a60a",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 524.3742980957031,\r
-        "y": 711.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 480.490966796875,\r
+        "y": 640.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4bb92513.9b1ebc",\r
+        "id": "290803ec.65c94c",\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": 469,\r
+        "y": 687,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f58f94a6.d7fb9"\r
+                "f842cdf9.29a79"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6a121aa.ecf888",\r
+        "id": "280015e3.c315e2",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 711.8833312988281,\r
-        "y": 665,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 668,\r
+        "y": 594,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "46606d75.f5af5c"\r
+                "cd508bdd.302a88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f58f94a6.d7fb9",\r
+        "id": "f842cdf9.29a79",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 681.8833312988281,\r
-        "y": 759,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 638,\r
+        "y": 688,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "46606d75.f5af5c",\r
+        "id": "cd508bdd.302a88",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 935.2168273925781,\r
-        "y": 664.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 891.33349609375,\r
+        "y": 593.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "1dffeedd.2e39d1"\r
+                "d4df8e14.56fc08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1dffeedd.2e39d1",\r
+        "id": "d4df8e14.56fc08",\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": 1092.0001335144043,\r
+        "y": 595.000020980835,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "5eeac4ab.784bec"\r
+                "b67eb6e5.58b31"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5eeac4ab.784bec",\r
+        "id": "b67eb6e5.58b31",\r
          "type": "save",\r
          "name": "get connectivity from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 265.8833312988281,\r
-        "y": 928,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 222,\r
+        "y": 857,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "93ffca07.c36c6",\r
-                "a6155e5c.4a2e4",\r
-                "edf3ae2.0898ad"\r
+                "eb910f68.8a5408",\r
+                "a6536ba8.c4e148",\r
+                "6d1288a7.3722b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93ffca07.c36c6",\r
+        "id": "eb910f68.8a5408",\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": 430,\r
+        "y": 821,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "41f16b19.4ea28c"\r
+                "6687da8.fb06ca4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6155e5c.4a2e4",\r
+        "id": "a6536ba8.c4e148",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 474.3742980957031,\r
-        "y": 937.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 430.490966796875,\r
+        "y": 866.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "edf3ae2.0898ad",\r
+        "id": "6d1288a7.3722b8",\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": 428,\r
+        "y": 910,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "77488207.b4a2f4"\r
+                "a3e6b31.4b2495"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "77488207.b4a2f4",\r
+        "id": "a3e6b31.4b2495",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 640.8833312988281,\r
-        "y": 982,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 597,\r
+        "y": 911,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1853bc71.11bc54",\r
+        "id": "64de189c.ea0ca",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 612.8833312988281,\r
-        "y": 1476,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 569,\r
+        "y": 1405,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "aa99b60e.a0ae8"\r
+                "f09d5f3a.90b09"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa99b60e.a0ae8",\r
+        "id": "f09d5f3a.90b09",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 815.8833312988281,\r
-        "y": 1488,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 772,\r
+        "y": 1417,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6b5b67d6.d9cff8"\r
+                "be069a3d.2f258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b5b67d6.d9cff8",\r
+        "id": "be069a3d.2f258",\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": 938,\r
+        "y": 1414,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c9be5883.2f43"\r
+                "b33327bf.cf44b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c9be5883.2f43",\r
+        "id": "b33327bf.cf44b8",\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": 1099,\r
+        "y": 1411,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8328946b.83ccf",\r
-                "70436354.fbd2a4",\r
-                "71db6bb7.f92dd4",\r
-                "a3af61e2.8efbd8",\r
-                "1dbcecbe.b5c9a3"\r
+                "9b6250ff.75cf18",\r
+                "6e8e9c3e.00f634",\r
+                "db16830a.f6a5",\r
+                "611e4d54.277574",\r
+                "c0f4e533.035be8",\r
+                "ee82569c.a25768"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "70436354.fbd2a4",\r
+        "id": "6e8e9c3e.00f634",\r
          "type": "set",\r
          "name": "unset tmp.aai.uni",\r
          "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
          "comments": "",\r
-        "x": 1346.8833312988281,\r
-        "y": 1440,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1305,\r
+        "y": 1010.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8328946b.83ccf",\r
+        "id": "9b6250ff.75cf18",\r
          "type": "save",\r
          "name": "get uni from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1343.8833312988281,\r
-        "y": 1485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1302,\r
+        "y": 1055.9999389648438,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "95cc35e2.dbd57",\r
-                "6243e8b2.6e7d68",\r
-                "ea238384.cd0de8"\r
+                "1b290eb5.e974c9",\r
+                "b84573d.a8be19",\r
+                "ef2334eb.3c1b68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6243e8b2.6e7d68",\r
+        "id": "b84573d.a8be19",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1539.3742980957031,\r
-        "y": 1458.573974609375,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1497.490966796875,\r
+        "y": 1029.5739135742188,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "60cc7ad4.175214"\r
+                "45bb14a8.1a7924"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea238384.cd0de8",\r
+        "id": "ef2334eb.3c1b68",\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": 1493,\r
+        "y": 1073.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "33a586e8.574ea2"\r
+                "cd1f6950.fef1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60cc7ad4.175214",\r
+        "id": "45bb14a8.1a7924",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 1701.9458312988281,\r
-        "y": 1457.8596801757812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1660.0625,\r
+        "y": 1028.859619140625,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "33a586e8.574ea2",\r
+        "id": "cd1f6950.fef1f",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 1702.8833312988281,\r
-        "y": 1502.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1661,\r
+        "y": 1073.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3ed2826e.143bbe",\r
+        "id": "cd4af41f.be1a78",\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": 1663,\r
+        "y": 1120.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "95cc35e2.dbd57",\r
+        "id": "1b290eb5.e974c9",\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
-        "wires": [\r
-            [\r
-                "3ed2826e.143bbe"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "a3b35ff6.7d4a88",\r
-        "type": "switchNode",\r
-        "name": "switch conn type",\r
-        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 225.38333129882812,\r
-        "y": 1147,\r
-        "z": "3f6a2e0f.b66c8a",\r
-        "wires": [\r
-            [\r
-                "53e42336.cf6874",\r
-                "64e5ac9.b8c59d4",\r
-                "29d673d9.3ef8bc"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "fdb5b362.28d2e8",\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
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "53e42336.cf6874",\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
-        "wires": [\r
-            [\r
-                "2d911faf.b625f"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "64e5ac9.b8c59d4",\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
-        "wires": [\r
-            [\r
-                "c8a49fba.48732"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "29d673d9.3ef8bc",\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": 1494,\r
+        "y": 1120.9998779296875,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fdb5b362.28d2e8"\r
+                "cd4af41f.be1a78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "893647bf.8d35f8",\r
+        "id": "60f7024f.a382fc",\r
          "type": "comment",\r
          "name": "CLL new",\r
          "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",\r
          "comments": "",\r
-        "x": 1319.8833312988281,\r
-        "y": 1713,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1276,\r
+        "y": 1642,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "71db6bb7.f92dd4",\r
+        "id": "db16830a.f6a5",\r
          "type": "set",\r
          "name": "set ethernet-srv-end-points-list array",\r
          "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1410.8833312988281,\r
-        "y": 1767,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1367,\r
+        "y": 1696,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c8a49fba.48732",\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
-        "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
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "2d911faf.b625f",\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
-        "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
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "30a75a3e.13e116",\r
+        "id": "1989ebd9.8b76bc",\r
          "type": "set",\r
          "name": "unset ethernet-srv-end-points-list",\r
          "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
          "comments": "",\r
-        "x": 632.3833312988281,\r
-        "y": 1269,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2043.5,\r
+        "y": 1109,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c9ed31d4.2a59a",\r
+        "id": "9da50ff.0241af",\r
          "type": "set",\r
          "name": "unset ethernet-srv-end-points-list",\r
          "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
          "comments": "",\r
-        "x": 649.3833312988281,\r
-        "y": 1363,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2048.5,\r
+        "y": 1211,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7b94a56a.0cc0c4",\r
+        "id": "eda2f0f7.d8fb38",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 575.8833312988281,\r
-        "y": 1732,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 532,\r
+        "y": 1661,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "bd67d795.2e839"\r
+                "62852429.1f30ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd67d795.2e839",\r
+        "id": "62852429.1f30ac",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 807.8833312988281,\r
-        "y": 1731,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 764,\r
+        "y": 1660,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "148b77ab.48b7a"\r
+                "ede4a749.9f1af8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "148b77ab.48b7a",\r
+        "id": "ede4a749.9f1af8",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1019.8833312988281,\r
-        "y": 1732,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 976,\r
+        "y": 1661,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "90ccd6ae.a26198"\r
+                "b699a292.eb6f88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90ccd6ae.a26198",\r
+        "id": "b699a292.eb6f88",\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": 232,\r
+        "y": 1817,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "8f4c1c14.35a72",\r
-                "c6a7aee9.6724"\r
+                "13d7e483.3188fb",\r
+                "74bc3a8f.9628d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c6a7aee9.6724",\r
+        "id": "74bc3a8f.9628d4",\r
          "type": "set",\r
          "name": "unset tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
          "comments": "",\r
-        "x": 510.8833312988281,\r
-        "y": 1875,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 467,\r
+        "y": 1804,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f4c1c14.35a72",\r
+        "id": "13d7e483.3188fb",\r
          "type": "save",\r
          "name": "get vpn-binding from aai",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 500.8833312988281,\r
-        "y": 1936,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 457,\r
+        "y": 1865,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2e648939.1db066",\r
-                "6fc34533.3f02e4",\r
-                "f4ca0a98.2172d"\r
+                "bcef8cd9.e20998",\r
+                "764e27eb.b5496",\r
+                "21958602.3fa0ea"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6fc34533.3f02e4",\r
+        "id": "764e27eb.b5496",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 714.3742980957031,\r
-        "y": 1920.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 670.490966796875,\r
+        "y": 1849.5740356445312,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "24a8c225.12e4ae"\r
+                "9c812de2.87639"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4ca0a98.2172d",\r
+        "id": "21958602.3fa0ea",\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": 666,\r
+        "y": 1894,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a2a9b29c.7bdb18"\r
+                "2915d3a6.63730c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e648939.1db066",\r
+        "id": "bcef8cd9.e20998",\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": 668,\r
+        "y": 1954,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "6e035263.0ab9c4"\r
+                "bb26f0d0.bc6288"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24a8c225.12e4ae",\r
+        "id": "9c812de2.87639",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
          "comments": "",\r
-        "x": 876.9458312988281,\r
-        "y": 1919.8597412109375,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 833.0625,\r
+        "y": 1848.8597412109375,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a2a9b29c.7bdb18",\r
+        "id": "2915d3a6.63730c",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 877.8833312988281,\r
-        "y": 1965,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 834,\r
+        "y": 1894,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6e035263.0ab9c4",\r
+        "id": "bb26f0d0.bc6288",\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": 837,\r
+        "y": 1953,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fc704734.f5a92",\r
-                "534cefd0.094168"\r
+                "e8fb0469.22a408",\r
+                "b503b0ba.b1ff6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e9fd2d9.fce4a8",\r
+        "id": "445d8bb1.6c470c",\r
          "type": "set",\r
          "name": "set sotn_value",\r
          "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
          "comments": "",\r
-        "x": 279.8833312988281,\r
-        "y": 2523,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 236,\r
+        "y": 2452,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e44ba6b.3875e6",\r
+        "id": "925823e9.1c4a4",\r
          "type": "execute",\r
          "name": "execute RestApiCallNode Create ethernet Service without token",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 422.8833312988281,\r
-        "y": 2583,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 379,\r
+        "y": 2512,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b4c4bd8d.d5bdc",\r
-                "c813638c.89d0f"\r
+                "345842a4.88ef2e",\r
+                "a4dc32a8.6620d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b4c4bd8d.d5bdc",\r
+        "id": "345842a4.88ef2e",\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": 691.5,\r
+        "y": 2489,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c813638c.89d0f",\r
+        "id": "a4dc32a8.6620d8",\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": 695.5,\r
+        "y": 2529,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "3e668730.81c5e8"\r
+                "d1fda3bb.92b0e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c6aee6c.a3a53a",\r
+        "id": "cde1b667.7c4d6",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",\r
          "comments": "",\r
-        "x": 915.3833312988281,\r
-        "y": 2564,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 871.5,\r
+        "y": 2493,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e668730.81c5e8",\r
+        "id": "d1fda3bb.92b0e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 930.8833312988281,\r
-        "y": 2618,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 887,\r
+        "y": 2547,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e6168d7c.f871d"\r
+                "a9ee92c3.93f6e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59cef6d7.b8a21",\r
+        "id": "459839ba.ae33c",\r
          "type": "save",\r
          "name": "update vpn-binding resource (aka. OTN ) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1226.3833312988281,\r
-        "y": 2587,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1182.5,\r
+        "y": 2516,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b5303ab1.d78928",\r
+        "id": "120147ed.79206",\r
          "type": "comment",\r
          "name": "TODO: FIXME",\r
          "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
          "comments": "",\r
-        "x": 2693.383331298828,\r
-        "y": 1938,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2649.5,\r
+        "y": 1867,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e6168d7c.f871d",\r
+        "id": "a9ee92c3.93f6e8",\r
          "type": "save",\r
          "name": "update connectivity resource in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1188.3833312988281,\r
-        "y": 2629,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1144.5,\r
+        "y": 2558,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "878444f9.a47b7",\r
+        "id": "9d25e547.75567",\r
          "type": "set",\r
          "name": "set leafOrRootAccess",\r
          "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",\r
          "comments": "",\r
-        "x": 598.3833312988281,\r
-        "y": 1307,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2009.5,\r
+        "y": 1147,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e2c4a442.f42cf",\r
+        "id": "52a255e0.e77dec",\r
          "type": "set",\r
          "name": "set leafOrRootAccess",\r
          "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",\r
          "comments": "",\r
-        "x": 611.3833312988281,\r
-        "y": 1403,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2010.5,\r
+        "y": 1251,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dd4c3392.e1b02",\r
+        "id": "881b2d7a.c4e888",\r
          "type": "save",\r
          "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4347.883331298828,\r
-        "y": 579,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4304,\r
+        "y": 508,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9c0b0957.1e6c48",\r
+        "id": "61ff745d.2cf8b4",\r
          "type": "save",\r
          "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4250.883331298828,\r
-        "y": 1398,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4207,\r
+        "y": 1327,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "88e8f378.a2b808",\r
+        "id": "98331ea2.d141f",\r
          "type": "save",\r
          "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
          "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3744.883331298828,\r
-        "y": 2070,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3701,\r
+        "y": 1999,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "41f16b19.4ea28c",\r
+        "id": "6687da8.fb06ca4",\r
          "type": "switchNode",\r
          "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",\r
          "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 845.8833312988281,\r
-        "y": 878,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 802,\r
+        "y": 807,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7bf4aa70.c75d74",\r
-                "a798281b.2c68d8"\r
+                "11a4a5f5.385f32",\r
+                "192499d2.667f1e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bf4aa70.c75d74",\r
+        "id": "11a4a5f5.385f32",\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": 1165,\r
+        "y": 830,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e5a55559.f1ecf"\r
+                "1fc9c5be.8fac2a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a798281b.2c68d8",\r
+        "id": "192499d2.667f1e",\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": 1165,\r
+        "y": 779,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "486913c4.08fb54"\r
+                "5fe8520c.50e664"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5a55559.f1ecf",\r
+        "id": "1fc9c5be.8fac2a",\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": 1321,\r
+        "y": 828,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a3b35ff6.7d4a88"\r
+                "a46faf22.6dbda8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "486913c4.08fb54",\r
+        "id": "5fe8520c.50e664",\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": 1298,\r
+        "y": 780,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4660bf61.473a18",\r
+        "id": "1f9b767f.d670b2",\r
          "type": "set",\r
          "name": "unset tmp.aai.vpn-binding",\r
          "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",\r
          "comments": "",\r
-        "x": 2101.883331298828,\r
-        "y": 249,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2058,\r
+        "y": 178,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1fda4b4a.2131e5",\r
+        "id": "f84de17e.e8ea08",\r
          "type": "set",\r
          "name": "set root-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 3643.883331298828,\r
-        "y": 2230,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3600,\r
+        "y": 2159,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a6ffb7c.8797f4",\r
+        "id": "1a392cd7.238923",\r
          "type": "set",\r
          "name": "set leaf-otn-tunnels-list array",\r
          "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 4233.883331298828,\r
-        "y": 703,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4190,\r
+        "y": 632,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3af61e2.8efbd8",\r
+        "id": "611e4d54.277574",\r
          "type": "set",\r
          "name": "set ethernet-srv-end-points-list array",\r
          "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1407.8833312988281,\r
-        "y": 1809,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1364,\r
+        "y": 1738,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "14d69ea3.c37079",\r
+        "id": "dc7d7df9.afb81",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",\r
          "comments": "",\r
-        "x": 586.8833312988281,\r
-        "y": 1543,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 543,\r
+        "y": 1472,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e39ba7bd.aed5d8",\r
+        "id": "c70f6326.e297a",\r
          "type": "execute",\r
          "name": "execute printContext",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 617.8833312988281,\r
-        "y": 1583,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 574,\r
+        "y": 1512,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "fc704734.f5a92",\r
+        "id": "e8fb0469.22a408",\r
          "type": "set",\r
          "name": "set otn-tunnels-name-list array",\r
          "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1165.8833312988281,\r
-        "y": 1991,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1122,\r
+        "y": 1920,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "534cefd0.094168",\r
+        "id": "b503b0ba.b1ff6",\r
          "type": "set",\r
          "name": "set otn-tunnels-name-list array",\r
          "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1168.8833312988281,\r
-        "y": 2033,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1125,\r
+        "y": 1962,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "de368aef.16cb",\r
+        "id": "f7d70d92.8a17d",\r
          "type": "set",\r
          "name": "unset otn-tunnels-name-list array",\r
          "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",\r
          "comments": "",\r
-        "x": 611.8833312988281,\r
-        "y": 1673,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 568,\r
+        "y": 1602,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "61a182f0.95ec2c",\r
+        "id": "93ecab9f.5bb27",\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": 323,\r
+        "y": 1981,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fae7aeca.a940b8",\r
+        "id": "e1bf516d.80132",\r
          "type": "execute",\r
          "name": "execute printContext",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 374.8833312988281,\r
-        "y": 2109,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 331,\r
+        "y": 2038,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1dbcecbe.b5c9a3",\r
+        "id": "c0f4e533.035be8",\r
          "type": "execute",\r
          "name": "execute split tp-id to get pnf-name",\r
          "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1385.8833312988281,\r
-        "y": 1658,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1342,\r
+        "y": 1587,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2facd73.aebb428",\r
-                "7c34f1f3.22e088"\r
+                "ff9a5641.69fda",\r
+                "a44c9ce4.5d2008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7c34f1f3.22e088",\r
+        "id": "a44c9ce4.5d2008",\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": 1565,\r
+        "y": 1542,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "7e28ac3f.b53f7c"\r
+                "eaca171f.944a48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2facd73.aebb428",\r
+        "id": "ff9a5641.69fda",\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": 1567,\r
+        "y": 1606,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "c1661a7d.0e642"\r
+                "93d69fa.52d496"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7e28ac3f.b53f7c",\r
+        "id": "eaca171f.944a48",\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": 1730,\r
+        "y": 1539,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a55c6cbe.f3cef"\r
+                "b0447236.92d3b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c1661a7d.0e642",\r
+        "id": "93d69fa.52d496",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
          "comments": "",\r
-        "x": 1772.8833312988281,\r
-        "y": 1673,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1729,\r
+        "y": 1602,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a55c6cbe.f3cef",\r
+        "id": "b0447236.92d3b",\r
          "type": "set",\r
          "name": "set tmp.uni-node-id-short",\r
-        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -3]`' />\n",\r
+        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
          "comments": "",\r
-        "x": 1993.8833312988281,\r
-        "y": 1624,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1950,\r
+        "y": 1553,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3eb9377.85c18",\r
+        "id": "ab15b7a9.bc6bc8",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1538.8833312988281,\r
-        "y": 2349,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1495,\r
+        "y": 2278,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "fcb0361d.62eb48"\r
+                "be2440af.c20c98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dcd8db20.d12b7",\r
+        "id": "1405448e.40f263",\r
          "type": "execute",\r
          "name": "get esr-thirdparty-sdnc",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1923.8833312988281,\r
-        "y": 2362,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1880,\r
+        "y": 2291,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "62f93408.d79154",\r
-                "c38cc9d8.7f1bc",\r
-                "576ffe09.c4abd8"\r
+                "facba133.b01618",\r
+                "36457cd.f85a104",\r
+                "a0c24437.cf174"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fcb0361d.62eb48",\r
+        "id": "be2440af.c20c98",\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": 1674,\r
+        "y": 2278,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "90857791.e16908",\r
-                "dcd8db20.d12b7"\r
+                "eec40e11.9fdab",\r
+                "1405448e.40f263"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90857791.e16908",\r
+        "id": "eec40e11.9fdab",\r
          "type": "set",\r
          "name": "set esr-thirdparty-sdnc domainConn id",\r
          "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
          "comments": "",\r
-        "x": 1953.8833312988281,\r
-        "y": 2310,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1910,\r
+        "y": 2239,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "62f93408.d79154",\r
+        "id": "facba133.b01618",\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": 2090,\r
+        "y": 2282,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2c548a06.655d4e"\r
+                "926a046d.eed228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c38cc9d8.7f1bc",\r
+        "id": "36457cd.f85a104",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2125.883331298828,\r
-        "y": 2408,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2082,\r
+        "y": 2337,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "99196e80.99674"\r
+                "6ca22053.c9fba8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "576ffe09.c4abd8",\r
+        "id": "a0c24437.cf174",\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": 2087,\r
+        "y": 2394,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "ea704904.f61c3"\r
+                "f91dd017.676d7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea704904.f61c3",\r
+        "id": "f91dd017.676d7",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2282.883331298828,\r
-        "y": 2466,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2239,\r
+        "y": 2395,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "99196e80.99674",\r
+        "id": "6ca22053.c9fba8",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 2293.883331298828,\r
-        "y": 2411,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2250,\r
+        "y": 2340,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c548a06.655d4e",\r
+        "id": "926a046d.eed228",\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": 2234.38232421875,\r
+        "y": 2279.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "55de506e.ab2138"\r
+                "1e25e04f.ee7df"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "55de506e.ab2138",\r
+        "id": "1e25e04f.ee7df",\r
          "type": "set",\r
          "name": "set controller domainConn data",\r
          "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
          "comments": "",\r
-        "x": 2492.883331298828,\r
-        "y": 2347,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2449,\r
+        "y": 2276,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2eeb0084.f61b88",\r
+        "id": "46842cb8.91c5bc",\r
          "type": "get-resource",\r
          "name": "get-resource src pnf",\r
          "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 616.8833312988281,\r
-        "y": 2395,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 573,\r
+        "y": 2324,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "21d8f2c9.3cd2be",\r
-                "32ff82a0.3bb24e",\r
-                "21eb3441.66cbb4"\r
+                "80e94eed.70f82",\r
+                "e1101309.b00428",\r
+                "6cefa506.12a2dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21d8f2c9.3cd2be",\r
+        "id": "80e94eed.70f82",\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": 768.5001220703125,\r
+        "y": 2276,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "2571d7b1.c4fb5"\r
+                "a961cabf.5d77d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32ff82a0.3bb24e",\r
+        "id": "e1101309.b00428",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 804.3834533691406,\r
-        "y": 2402,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 760.5001220703125,\r
+        "y": 2331,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b0a2917a.ecde4"\r
+                "cfce6a08.8d1818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2571d7b1.c4fb5",\r
+        "id": "a961cabf.5d77d8",\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": 912.8824462890625,\r
+        "y": 2275.6556701660156,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a50320.52c78ce"\r
+                "41f5578e.096c08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a50320.52c78ce",\r
+        "id": "41f5578e.096c08",\r
          "type": "for",\r
          "name": "for each relationship",\r
          "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1140.8833312988281,\r
-        "y": 2345,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1097,\r
+        "y": 2274,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "b3deb273.cebb88"\r
+                "78702bad.3695f4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b3deb273.cebb88",\r
+        "id": "78702bad.3695f4",\r
          "type": "switchNode",\r
          "name": "switch related-to",\r
          "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1335.8833312988281,\r
-        "y": 2345,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1292,\r
+        "y": 2274,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "a3eb9377.85c18"\r
+                "ab15b7a9.bc6bc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21eb3441.66cbb4",\r
+        "id": "6cefa506.12a2dc",\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": 765.5001220703125,\r
+        "y": 2388,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "f2a9e7b0.6a4ff8"\r
+                "bbb236e9.1d475"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f2a9e7b0.6a4ff8",\r
+        "id": "bbb236e9.1d475",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 961.3834533691406,\r
-        "y": 2460,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 917.5001220703125,\r
+        "y": 2389,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b0a2917a.ecde4",\r
+        "id": "cfce6a08.8d1818",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
          "comments": "",\r
-        "x": 972.3834533691406,\r
-        "y": 2403,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 928.5001220703125,\r
+        "y": 2332,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e821cf32.5b22f",\r
+        "id": "fd11a034.71ffe8",\r
          "type": "set",\r
          "name": "set tmp.pnf-name-forUrl",\r
          "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",\r
          "comments": "",\r
-        "x": 606.8833312988281,\r
-        "y": 2307,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 563,\r
+        "y": 2236,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f92bafd0.7c69c8",\r
+        "id": "2ab715a0.ab46a2",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 351.8833312988281,\r
-        "y": 2438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 308,\r
+        "y": 2367,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": [\r
              [\r
-                "e821cf32.5b22f",\r
-                "2eeb0084.f61b88"\r
+                "fd11a034.71ffe8",\r
+                "46842cb8.91c5bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a832f3b6.8874e",\r
+        "id": "c68339b5.636678",\r
          "type": "comment",\r
          "name": "Temporary skipping this check - to support multiple instances in one slice",\r
          "info": "",\r
          "comments": "",\r
-        "x": 1566.8500061035156,\r
-        "y": 255.88333129882812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1522.9666748046875,\r
+        "y": 184.88333129882812,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f645589d.ed3d98",\r
+        "id": "6b1a691d.f6617",\r
          "type": "returnFailure",\r
          "name": "return failure",\r
          "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
          "comments": "",\r
-        "x": 768.8833312988281,\r
-        "y": 478,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 725,\r
+        "y": 407,\r
+        "z": "5a4cb919.dfff38",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "a46faf22.6dbda8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 284.5,\r
+        "y": 1376,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "64de189c.ea0ca",\r
+                "eda2f0f7.d8fb38",\r
+                "dc7d7df9.afb81",\r
+                "c70f6326.e297a",\r
+                "445d8bb1.6c470c",\r
+                "925823e9.1c4a4",\r
+                "f7d70d92.8a17d",\r
+                "93ecab9f.5bb27",\r
+                "e1bf516d.80132",\r
+                "2ab715a0.ab46a2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ee82569c.a25768",\r
+        "type": "switchNode",\r
+        "name": "switch uni type",\r
+        "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1315,\r
+        "y": 1214,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "ef11d348.e67b18",\r
+                "db4eac49.9ee78",\r
+                "ccd7386e.438c4",\r
+                "8a1e26c1.925918"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ef11d348.e67b18",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1480,\r
+        "y": 1196,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "1989ebd9.8b76bc",\r
+                "9d25e547.75567"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "db4eac49.9ee78",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1483,\r
+        "y": 1235,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "9da50ff.0241af",\r
+                "52a255e0.e77dec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8a1e26c1.925918",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1477,\r
+        "y": 1313,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "af3eb285.34bda8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ccd7386e.438c4",\r
+        "type": "outcome",\r
+        "name": "root-secondary",\r
+        "xml": "<outcome value='root-secondary'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1500,\r
+        "y": 1276,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            [\r
+                "8dd3ee03.704618",\r
+                "3acf3b0f.3b0184"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8dd3ee03.704618",\r
+        "type": "set",\r
+        "name": "unset ethernet-srv-end-points-list",\r
+        "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",\r
+        "comments": "",\r
+        "x": 2046,\r
+        "y": 1309,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "3acf3b0f.3b0184",\r
+        "type": "set",\r
+        "name": "set leafOrRootAccess",\r
+        "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",\r
+        "comments": "",\r
+        "x": 2008,\r
+        "y": 1349,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "af3eb285.34bda8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1629,\r
+        "y": 1334,\r
+        "z": "5a4cb919.dfff38",\r
+        "wires": [\r
+            []\r
+        ]\r
      }\r
  ]
 \ No newline at end of file