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

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / cloud_leased_line / GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.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..a522c41 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": "9ee6a3c1.bedb",\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": 450.33331298828125,\r
+        "y": 350.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "1c0c6fa0.017178",\r
-                "ec984d7b.605098",\r
-                "25450eba.0fd99a"\r
+                "3d418b0.8302bf6",\r
+                "48d7e3bc.f2883c",\r
+                "8ec621b1.80ebc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c0c6fa0.017178",\r
+        "id": "3d418b0.8302bf6",\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": 638.3333129882812,\r
+        "y": 363.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "fcdf737f.3ba08"\r
+                "9c98306.e2cffd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec984d7b.605098",\r
+        "id": "48d7e3bc.f2883c",\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": 645.8242492675781,\r
+        "y": 405.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "25450eba.0fd99a",\r
+        "id": "8ec621b1.80ebc8",\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": 636.3333129882812,\r
+        "y": 452.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "f645589d.ed3d98"\r
+                "57052eb0.583298"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fcdf737f.3ba08",\r
+        "id": "9c98306.e2cffd",\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": 811.3333129882812,\r
+        "y": 361.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6641b1bb.011df8"\r
+                "53767e53.94959"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6641b1bb.011df8",\r
+        "id": "53767e53.94959",\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": 1040.3333129882812,\r
+        "y": 362.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "42fd94e4.9f459c"\r
+                "c415e278.f5611"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "42fd94e4.9f459c",\r
+        "id": "c415e278.f5611",\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": 1255.3333129882812,\r
+        "y": 363.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "341f3db4.7e268a"\r
+                "c71ad5b.64b44a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "802e937a.3ac",\r
+        "id": "3d675d8e.b88daa",\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": 1509.3333129882812,\r
+        "y": 285.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ccfe4ade.41ae98",\r
-                "912c0faa.e5e1c8"\r
+                "bbedabe9.bd4b",\r
+                "34793819.776c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ccfe4ade.41ae98",\r
+        "id": "bbedabe9.bd4b",\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": 1726.3333129882812,\r
+        "y": 264.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "341f3db4.7e268a"\r
+                "c71ad5b.64b44a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "912c0faa.e5e1c8",\r
+        "id": "34793819.776c6",\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": 1726.3333129882812,\r
+        "y": 313.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "341f3db4.7e268a",\r
+        "id": "c71ad5b.64b44a8",\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": 1910.3333129882812,\r
+        "y": 350.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "b1ca96f9.f78f38",\r
-                "2c3b3231.83c2be",\r
-                "4660bf61.473a18"\r
+                "3dd08dae.27e4a2",\r
+                "52a060f7.3567c8",\r
+                "a8591f2d.71e23"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "377c3031.0fc7c",\r
+        "id": "e6629469.2dd4b8",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 234.88333129882812,\r
-        "y": 118,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 269.33331298828125,\r
+        "y": 91.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "8b8ba227.5e7638"\r
+                "e4a2a292.f645d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8b8ba227.5e7638",\r
+        "id": "e4a2a292.f645d8",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -201,3545 +201,3712 @@
          "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": 553.6190032958984,\r
+        "y": 152.23811626434326,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6c55ded0.30c498"\r
+                "94591033.455c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6c55ded0.30c498",\r
+        "id": "94591033.455c8",\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": 559.7619171142578,\r
+        "y": 237.00003814697266,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "b63c19cf.5911b8"\r
+                "fa712947.37c038"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b63c19cf.5911b8",\r
+        "id": "fa712947.37c038",\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": 869.5713500976562,\r
+        "y": 228.66669464111328,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6467c9b6.3ea7b",\r
-                "7714415.bcb45c",\r
-                "2cf2ff05.5ecb98",\r
-                "ff64d6f0.1d24e",\r
-                "c19ef147.be92d8"\r
+                "9ee6a3c1.bedb",\r
+                "b5b4ab5e.850cd8",\r
+                "8297c516.b14308",\r
+                "e7860d61.a71378",\r
+                "a8115aec.3c3d6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b1ca96f9.f78f38",\r
+        "id": "3dd08dae.27e4a2",\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": 2127.3333129882812,\r
+        "y": 288.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f11c1dac.45c748",\r
+        "id": "a8b9f4f8.1eb4e8",\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": 4296.333312988281,\r
+        "y": 174.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c95c33ef.381fa8",\r
+        "id": "24ae2ddb.2d91ca",\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": 4377.333312988281,\r
+        "y": 489.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "89c7efd5.cb6558",\r
-                "d5cfec9d.5347f8"\r
+                "d90569fe.c301e",\r
+                "9a0fd68f.7364"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89c7efd5.cb6558",\r
+        "id": "d90569fe.c301e",\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": 4686.833312988281,\r
+        "y": 458.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "beffe966.8b1b08"\r
+                "bfcc154c.9d015"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5cfec9d.5347f8",\r
+        "id": "9a0fd68f.7364",\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": 4691.833312988281,\r
+        "y": 523.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "18fce568.1c292b"\r
+                "5fe18426.281bd4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "beffe966.8b1b08",\r
+        "id": "bfcc154c.9d015",\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": 4862.833312988281,\r
+        "y": 458.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "18fce568.1c292b",\r
+        "id": "5fe18426.281bd4",\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": 4858.333312988281,\r
+        "y": 523.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "64fdffc9.427678",\r
+        "id": "3e254ec8.8f602a",\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": 4241.833312988281,\r
+        "y": 743.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c0e95206.343c2",\r
+        "id": "4a6469cd.4f0b98",\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": 4395.833312988281,\r
+        "y": 791.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "7a1edf39.b6a0f8",\r
-                "b605ddae.9f2b2"\r
+                "826c2f73.5d5e88",\r
+                "403359b0.843728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a1edf39.b6a0f8",\r
+        "id": "826c2f73.5d5e88",\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": 4741.333312988281,\r
+        "y": 772.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "db29824f.2b664"\r
+                "80c327f3.9b168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b605ddae.9f2b2",\r
+        "id": "403359b0.843728",\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": 4745.333312988281,\r
+        "y": 812.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "10ebb808.22b9d8"\r
+                "6ab9c98a.fce4d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db29824f.2b664",\r
+        "id": "80c327f3.9b168",\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": 4899.333312988281,\r
+        "y": 772.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "10ebb808.22b9d8",\r
+        "id": "6ab9c98a.fce4d8",\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": 4902.833312988281,\r
+        "y": 812.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6d35eb39.2fe42c",\r
-                "b62c3c22.2cb09"\r
+                "e1c867b8.192bd",\r
+                "913acec9.956098"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6d35eb39.2fe42c",\r
+        "id": "e1c867b8.192bd",\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": 5233.333312988281,\r
+        "y": 777.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3f34bcf0.b30eb4",\r
+        "id": "b428e7f5.22dd58",\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": 5097.333312988281,\r
+        "y": 736.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b62c3c22.2cb09",\r
+        "id": "913acec9.956098",\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": 5160.333312988281,\r
+        "y": 823.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dc51dde.504a12",\r
+        "id": "c0a903ed.d424f",\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": 4234.333312988281,\r
+        "y": 222.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "25f0cbb9.ff400c",\r
+        "id": "c9a2a428.5985e8",\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": 4260.333312988281,\r
+        "y": 339.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "26af6a64.84f75e",\r
-                "dfaad5e6.3e7388",\r
-                "d4f19086.9e394"\r
+                "fe7b0b4f.4f25b8",\r
+                "1f23a1db.9239d6",\r
+                "80067a1b.7e8398"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26af6a64.84f75e",\r
+        "id": "fe7b0b4f.4f25b8",\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": 4455.833435058594,\r
+        "y": 291.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "825f4729.b63ee8"\r
+                "b7ec9659.601c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dfaad5e6.3e7388",\r
+        "id": "1f23a1db.9239d6",\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": 4447.833435058594,\r
+        "y": 346.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "92b1984a.bc8b"\r
+                "fe1da93b.8b0db8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "825f4729.b63ee8",\r
+        "id": "b7ec9659.601c4",\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": 4600.215759277344,\r
+        "y": 290.65567779541016,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "415768e6.6651f8"\r
+                "5d87f5d0.3bfe2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6a2d3e2.2e526",\r
+        "id": "4b9cdc3a.96a434",\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": 5182.333312988281,\r
+        "y": 293.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e243a570.71b51"\r
+                "c5c0e693.b5a978"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "415768e6.6651f8",\r
+        "id": "5d87f5d0.3bfe2c",\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": 4784.333312988281,\r
+        "y": 289.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ab4dd1f4.04e1f"\r
+                "3668fdab.2d6312"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab4dd1f4.04e1f",\r
+        "id": "3668fdab.2d6312",\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": 4979.333312988281,\r
+        "y": 289.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "a6a2d3e2.2e526"\r
+                "4b9cdc3a.96a434"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d4f19086.9e394",\r
+        "id": "80067a1b.7e8398",\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": 4452.833435058594,\r
+        "y": 403.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "28f88c03.cb5e5c"\r
+                "72f714cc.b21364"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28f88c03.cb5e5c",\r
+        "id": "72f714cc.b21364",\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": 4604.833435058594,\r
+        "y": 404.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "92b1984a.bc8b",\r
+        "id": "fe1da93b.8b0db8",\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": 4615.833435058594,\r
+        "y": 347.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "677439f1.5f7ed",\r
+        "id": "247e40ac.03f008",\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": 5567.333312988281,\r
+        "y": 306.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e7fd97d3.bbcd08",\r
-                "38bba5b7.de41b2",\r
-                "6bf961e8.c56a58"\r
+                "2769fc5a.203d24",\r
+                "510b4bec.e64154",\r
+                "dc91b912.6316b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e243a570.71b51",\r
+        "id": "c5c0e693.b5a978",\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": 5361.333312988281,\r
+        "y": 293.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "857cacb0.81444",\r
-                "677439f1.5f7ed"\r
+                "d3a253e8.52c87",\r
+                "247e40ac.03f008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "857cacb0.81444",\r
+        "id": "d3a253e8.52c87",\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": 5597.333312988281,\r
+        "y": 254.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7fd97d3.bbcd08",\r
+        "id": "2769fc5a.203d24",\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": 5777.333312988281,\r
+        "y": 297.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "60a50433.d26434"\r
+                "373ad72a.24ed2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "38bba5b7.de41b2",\r
+        "id": "510b4bec.e64154",\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": 5769.333312988281,\r
+        "y": 352.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d9350787.861f1"\r
+                "fed052ea.46fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6bf961e8.c56a58",\r
+        "id": "dc91b912.6316b8",\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": 5774.333312988281,\r
+        "y": 409.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "1afc54ba.8ed313"\r
+                "62129ad3.e59fd4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1afc54ba.8ed313",\r
+        "id": "62129ad3.e59fd4",\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": 5926.333312988281,\r
+        "y": 410.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9350787.861f1",\r
+        "id": "fed052ea.46fa",\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": 5937.333312988281,\r
+        "y": 355.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "60a50433.d26434",\r
+        "id": "373ad72a.24ed2",\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": 5921.715637207031,\r
+        "y": 294.65567779541016,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "8367dac2.ac8b98"\r
+                "53739ad0.387d34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8367dac2.ac8b98",\r
+        "id": "53739ad0.387d34",\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": 6136.333312988281,\r
+        "y": 291.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aa2473a.12d4d9",\r
+        "id": "a04b7e22.2aeb18",\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": 3703.3333129882812,\r
+        "y": 1631.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "28a663c6.7433b4",\r
+        "id": "a747fd61.4d43f8",\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": 3766.3333129882812,\r
+        "y": 1960.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "422a3196.0fb7d",\r
-                "371e9e8f.f6f942"\r
+                "1746de51.5350e2",\r
+                "3d545b09.cac1fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "422a3196.0fb7d",\r
+        "id": "1746de51.5350e2",\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": 4061.8333129882812,\r
+        "y": 1927.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c3084137.121c7"\r
+                "fee57d61.96dd7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "371e9e8f.f6f942",\r
+        "id": "3d545b09.cac1fc",\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": 4066.8333129882812,\r
+        "y": 1992.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c6676165.ac5c"\r
+                "3e571aef.d1d9c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3084137.121c7",\r
+        "id": "fee57d61.96dd7",\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": 4229.833312988281,\r
+        "y": 1927.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c6676165.ac5c",\r
+        "id": "3e571aef.d1d9c6",\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": 4240.333312988281,\r
+        "y": 1992.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dfee532c.a1419",\r
+        "id": "c298ee7.360a71",\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": 3642.3333129882812,\r
+        "y": 1688.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e52702af.314718",\r
+        "id": "374df09c.221b4",\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": 3662.3333129882812,\r
+        "y": 1785.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9ca1c561.5c796",\r
-                "9cf5cab4.99d6e",\r
-                "5d5762eb.724c64"\r
+                "b8613e52.06e248",\r
+                "b100c849.f8697",\r
+                "9726d82.0cb02a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ca1c561.5c796",\r
+        "id": "b8613e52.06e248",\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": 3864.8334350585938,\r
+        "y": 1738.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "502f683e.00cf7"\r
+                "fe5dc3f.664f44"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9cf5cab4.99d6e",\r
+        "id": "b100c849.f8697",\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": 3856.8334350585938,\r
+        "y": 1793.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9587c00d.994eb"\r
+                "45b746dd.1fc3c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "502f683e.00cf7",\r
+        "id": "fe5dc3f.664f44",\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": 4009.2157592773438,\r
+        "y": 1735.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "39b96666.82062a"\r
+                "38c123a7.87ff54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "39b96666.82062a",\r
+        "id": "38c123a7.87ff54",\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": 4193.333312988281,\r
+        "y": 1750.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "94ae9a5d.e5d56"\r
+                "8269be24.8785c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d5762eb.724c64",\r
+        "id": "9726d82.0cb02a8",\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": 3861.8334350585938,\r
+        "y": 1850.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "7a00ac4a.8d918c"\r
+                "920b3194.25369"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a00ac4a.8d918c",\r
+        "id": "920b3194.25369",\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": 4013.8334350585938,\r
+        "y": 1851.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9587c00d.994eb",\r
+        "id": "45b746dd.1fc3c8",\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": 4024.8334350585938,\r
+        "y": 1796.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1540d0.014217",\r
+        "id": "3be7fe46.7bed5a",\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": 4591.333312988281,\r
+        "y": 1754.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c932c6af.938f38"\r
+                "9242c93c.f02488"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94ae9a5d.e5d56",\r
+        "id": "8269be24.8785c8",\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": 4388.333312988281,\r
+        "y": 1750.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "f1540d0.014217"\r
+                "3be7fe46.7bed5a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ff151e7.182fee",\r
+        "id": "24d5bcbc.e5fd54",\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": 4976.333312988281,\r
+        "y": 1753.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "40d3a7a.4400bd8",\r
-                "353377f9.20c718",\r
-                "f8f22501.0020d8"\r
+                "7fafe45b.58f05c",\r
+                "c7d3d0e7.e6edb8",\r
+                "2bbce26d.997346"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c932c6af.938f38",\r
+        "id": "9242c93c.f02488",\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": 4768.333312988281,\r
+        "y": 1746.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "53fc3a7e.05d404",\r
-                "2ff151e7.182fee"\r
+                "4aece362.c97204",\r
+                "24d5bcbc.e5fd54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53fc3a7e.05d404",\r
+        "id": "4aece362.c97204",\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": 5006.333312988281,\r
+        "y": 1701.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d551b07b.11f68",\r
+        "id": "5653f279.fa187c",\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": 5335.333312988281,\r
+        "y": 1857.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c19bb319.e0e2b8",\r
+        "id": "991ab386.c1ab2",\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": 5346.333312988281,\r
+        "y": 1802.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2dbaf595.6cfed2",\r
+        "id": "f903abd6.bcb5e",\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": 5330.715637207031,\r
+        "y": 1741.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "eaeaf1b8.196fc"\r
+                "9d78b23c.6c7458"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eaeaf1b8.196fc",\r
+        "id": "9d78b23c.6c7458",\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": 5545.333312988281,\r
+        "y": 1738.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "40d3a7a.4400bd8",\r
+        "id": "7fafe45b.58f05c",\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": 5186.333312988281,\r
+        "y": 1744.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2dbaf595.6cfed2"\r
+                "f903abd6.bcb5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "353377f9.20c718",\r
+        "id": "c7d3d0e7.e6edb8",\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": 5178.333312988281,\r
+        "y": 1799.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c19bb319.e0e2b8"\r
+                "991ab386.c1ab2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8f22501.0020d8",\r
+        "id": "2bbce26d.997346",\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": 5183.333312988281,\r
+        "y": 1856.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d551b07b.11f68"\r
+                "5653f279.fa187c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7d66e95.fb47e",\r
+        "id": "d6212bc2.789e7",\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": 3217.3333129882812,\r
+        "y": 702.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "4d8bbec2.c0db6",\r
-                "507d82bd.8807cc"\r
+                "e3d89802.393a78",\r
+                "22a27baf.15e97c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d8bbec2.c0db6",\r
+        "id": "e3d89802.393a78",\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": 3431.3333129882812,\r
+        "y": 739.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6524452d.4a2f94"\r
+                "793df4ee.f1df74"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "507d82bd.8807cc",\r
+        "id": "22a27baf.15e97c",\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": 3433.3333129882812,\r
+        "y": 677.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "4b590d33.c81684"\r
+                "7ecfd25a.90cdcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6524452d.4a2f94",\r
+        "id": "793df4ee.f1df74",\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": 3011.3333129882812,\r
+        "y": 1982.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "75800cfe.e64b04",\r
-                "28895848.af5c18"\r
+                "3123087e.cfd848",\r
+                "426b4898.f559d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75800cfe.e64b04",\r
+        "id": "3123087e.cfd848",\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": 3264.3333129882812,\r
+        "y": 2016.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "34389e65.7f3f0a"\r
+                "534033f3.f59e9c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28895848.af5c18",\r
+        "id": "426b4898.f559d8",\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": 3264.3333129882812,\r
+        "y": 1960.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "4c94a377.c6d4e4"\r
+                "d5f2676f.c2a88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "34389e65.7f3f0a",\r
+        "id": "534033f3.f59e9c",\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": 3415.3333129882812,\r
+        "y": 2016.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff717106.1f6f7",\r
+        "id": "c77b264c.fe2528",\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": 4291.333312988281,\r
+        "y": 114.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "98bc8f5e.55646",\r
+        "id": "6ed23267.9185fc",\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": 3699.3333129882812,\r
+        "y": 1573.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1901ad68.6869bb",\r
+        "id": "7d0cb107.7824a8",\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": 3982.3333129882812,\r
+        "y": 371.00000762939453,\r
+        "z": "d12a8890.0a99a",\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
+                "c77b264c.fe2528",\r
+                "a8b9f4f8.1eb4e8",\r
+                "c0a903ed.d424f",\r
+                "c9a2a428.5985e8",\r
+                "24ae2ddb.2d91ca",\r
+                "1656bf6f.d0ade1",\r
+                "d2ff3c56.4372d",\r
+                "9499a947.255148"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4c94a377.c6d4e4",\r
+        "id": "d5f2676f.c2a88",\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": 3415.3333129882812,\r
+        "y": 1959.0000076293945,\r
+        "z": "d12a8890.0a99a",\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
+                "6ed23267.9185fc",\r
+                "a04b7e22.2aeb18",\r
+                "c298ee7.360a71",\r
+                "374df09c.221b4",\r
+                "a747fd61.4d43f8",\r
+                "ad599918.3fac7",\r
+                "cedd744c.d4173",\r
+                "c2c48b41.449c5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d79079df.baf578",\r
+        "id": "dd92322c.d6fdb",\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": 3653.3333129882812,\r
+        "y": 2258.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "45ccc628.f5551",\r
+        "id": "4e1fc9cd.44e65",\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": 3807.3333129882812,\r
+        "y": 2306.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6173b4db.203ce4",\r
-                "7f21396.e7ee248"\r
+                "3bc05be0.577364",\r
+                "9453988b.761fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6173b4db.203ce4",\r
+        "id": "3bc05be0.577364",\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": 4152.833312988281,\r
+        "y": 2287.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2b5ddf83.e8a168"\r
+                "48b1874d.6dc6a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7f21396.e7ee248",\r
+        "id": "9453988b.761fc",\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": 4156.833312988281,\r
+        "y": 2327.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9fc151.f9cc46b"\r
+                "e2a44822.8eb888"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b5ddf83.e8a168",\r
+        "id": "48b1874d.6dc6a",\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": 4310.833312988281,\r
+        "y": 2287.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fc151.f9cc46b",\r
+        "id": "e2a44822.8eb888",\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": 4314.333312988281,\r
+        "y": 2327.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ec406c4.a093b1",\r
-                "ba32c60f.0ec53"\r
+                "3369ff99.af45f",\r
+                "6ce9279e.5956d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec406c4.a093b1",\r
+        "id": "3369ff99.af45f",\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": 4654.333312988281,\r
+        "y": 2326.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "650aeaf3.da502c",\r
+        "id": "64323d0d.a53eec",\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": 4512.333312988281,\r
+        "y": 2284.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ba32c60f.0ec53",\r
+        "id": "6ce9279e.5956d",\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": 4583.333312988281,\r
+        "y": 2375.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c8295377.ff6158",\r
+        "id": "8b193137.7290b",\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": 3208.3333129882812,\r
+        "y": 642.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "17d3b71c.0a74f9",\r
+        "id": "6b6c5120.d697b",\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": 3803.3333129882812,\r
+        "y": 328.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "12dd212a.e5931f",\r
+        "id": "7a49b0ec.1116e8",\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": 3360.3333129882812,\r
+        "y": 1906.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4b590d33.c81684",\r
+        "id": "7ecfd25a.90cdcc",\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": 3539.3333129882812,\r
+        "y": 490.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e68f7957.57ea98",\r
-                "90c8120e.55a8c8"\r
+                "c5975b58.7cfb78",\r
+                "8fa5c52a.f6d0f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90c8120e.55a8c8",\r
+        "id": "8fa5c52a.f6d0f",\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": 3781.3333129882812,\r
+        "y": 1079.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "5f92c041.e2a22"\r
+                "1a8ceecd.14cfa1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e68f7957.57ea98",\r
+        "id": "c5975b58.7cfb78",\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": 3775.3333129882812,\r
+        "y": 370.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "1901ad68.6869bb"\r
+                "7d0cb107.7824a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f92c041.e2a22",\r
+        "id": "1a8ceecd.14cfa1",\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": 3939.3333129882812,\r
+        "y": 1078.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "eb5cd95b.b46698",\r
-                "bcb9498.a9205b8",\r
-                "24e13fd8.afe2d8",\r
-                "57e5431f.63be4c",\r
-                "8b688219.8ed198",\r
-                "9c0b0957.1e6c48"\r
+                "cfc45fbc.625408",\r
+                "87ccca6a.f8f9b8",\r
+                "e86d624f.d5f408",\r
+                "3e480e6a.3eb6c2",\r
+                "178f13fb.65189c",\r
+                "8c5d7664.9247c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bcb9498.a9205b8",\r
+        "id": "87ccca6a.f8f9b8",\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": 4203.333312988281,\r
+        "y": 961.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8b688219.8ed198",\r
+        "id": "178f13fb.65189c",\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": 4284.333312988281,\r
+        "y": 1276.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "4ea88210.ceec44",\r
-                "cd5b1128.4dbb9"\r
+                "47471e7d.1bf5e",\r
+                "2f64742a.d54c2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4ea88210.ceec44",\r
+        "id": "47471e7d.1bf5e",\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": 4593.833312988281,\r
+        "y": 1245.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9646de5b.fe3c7"\r
+                "27252576.feabca"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd5b1128.4dbb9",\r
+        "id": "2f64742a.d54c2c",\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": 4598.833312988281,\r
+        "y": 1310.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "55735b11.27f424"\r
+                "d2def383.359ac8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9646de5b.fe3c7",\r
+        "id": "27252576.feabca",\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": 4769.833312988281,\r
+        "y": 1245.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "55735b11.27f424",\r
+        "id": "d2def383.359ac8",\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": 4765.333312988281,\r
+        "y": 1310.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "24e13fd8.afe2d8",\r
+        "id": "e86d624f.d5f408",\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": 4141.333312988281,\r
+        "y": 1009.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "57e5431f.63be4c",\r
+        "id": "3e480e6a.3eb6c2",\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": 4167.333312988281,\r
+        "y": 1126.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "1d187a80.e65b15",\r
-                "370c15e3.9b5fca",\r
-                "703dc49a.960884"\r
+                "2fe7a70f.325738",\r
+                "de56dd13.56cbc",\r
+                "da128a7e.2de4c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1d187a80.e65b15",\r
+        "id": "2fe7a70f.325738",\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": 4362.833435058594,\r
+        "y": 1078.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "5c6509dd.e3a81"\r
+                "236585d1.bff802"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "370c15e3.9b5fca",\r
+        "id": "de56dd13.56cbc",\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": 4354.833435058594,\r
+        "y": 1133.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ccfe239.f2e7de"\r
+                "7ab4252e.e507d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c6509dd.e3a81",\r
+        "id": "236585d1.bff802",\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": 4507.215759277344,\r
+        "y": 1077.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "35d4ca24.cf236e"\r
+                "d1f5d3f1.d937a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "35d4ca24.cf236e",\r
+        "id": "d1f5d3f1.d937a8",\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": 4691.333312988281,\r
+        "y": 1076.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c8705d75.001f7"\r
+                "b6dba6f2.6f5a68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c8705d75.001f7",\r
+        "id": "b6dba6f2.6f5a68",\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": 4886.333312988281,\r
+        "y": 1076.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "b9376422.2a71"\r
+                "decb3043.cd12c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "703dc49a.960884",\r
+        "id": "da128a7e.2de4c8",\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": 4359.833435058594,\r
+        "y": 1190.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ece92d94.dd0ac"\r
+                "98ee3a25.1ab9e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ece92d94.dd0ac",\r
+        "id": "98ee3a25.1ab9e",\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": 4511.833435058594,\r
+        "y": 1191.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ccfe239.f2e7de",\r
+        "id": "7ab4252e.e507d4",\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": 4522.833435058594,\r
+        "y": 1134.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb5cd95b.b46698",\r
+        "id": "cfc45fbc.625408",\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": 4198.333312988281,\r
+        "y": 901.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b9376422.2a71",\r
+        "id": "decb3043.cd12c",\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": 5089.333312988281,\r
+        "y": 1080.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d2480516.2fc378"\r
+                "b6ba573a.60741"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9cb817ae.cef538",\r
+        "id": "f4847f5f.1d887",\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": 5474.333312988281,\r
+        "y": 1093.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "a79825bb.dff1f8",\r
-                "1395d5f.298062a",\r
-                "7903ca2c.aa5cc4"\r
+                "e228c69c.360f98",\r
+                "9bce816d.2db348",\r
+                "41d83525.ce00b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2480516.2fc378",\r
+        "id": "b6ba573a.60741",\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": 5268.333312988281,\r
+        "y": 1080.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "fbf9e6b6.15b5c",\r
-                "9cb817ae.cef538"\r
+                "5b50b3ea.1f8ef4",\r
+                "f4847f5f.1d887"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fbf9e6b6.15b5c",\r
+        "id": "5b50b3ea.1f8ef4",\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": 5504.333312988281,\r
+        "y": 1041.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a79825bb.dff1f8",\r
+        "id": "e228c69c.360f98",\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": 5684.333312988281,\r
+        "y": 1084.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c7dce557.6dded"\r
+                "189e198c.62579e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1395d5f.298062a",\r
+        "id": "9bce816d.2db348",\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": 5676.333312988281,\r
+        "y": 1139.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "598e647b.5837b4"\r
+                "a893456b.716548"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7903ca2c.aa5cc4",\r
+        "id": "41d83525.ce00b4",\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": 5681.333312988281,\r
+        "y": 1196.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e6c7a6e7.b2f038"\r
+                "7bd5c1c9.c0b778"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6c7a6e7.b2f038",\r
+        "id": "7bd5c1c9.c0b778",\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": 5833.333312988281,\r
+        "y": 1197.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "598e647b.5837b4",\r
+        "id": "a893456b.716548",\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": 5844.333312988281,\r
+        "y": 1142.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7dce557.6dded",\r
+        "id": "189e198c.62579e",\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": 5828.715637207031,\r
+        "y": 1081.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2cfbc0b6.6ae748"\r
+                "ae6db88e.b087a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cfbc0b6.6ae748",\r
+        "id": "ae6db88e.b087a",\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": 6043.333312988281,\r
+        "y": 1078.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fca9cd7.3028eb",\r
+        "id": "56d817b5.d38a48",\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": 3817.3333129882812,\r
+        "y": 1019.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c3b3231.83c2be",\r
+        "id": "52a060f7.3567c8",\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": 2379.3333129882812,\r
+        "y": 746.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "81a947d8.a13a68",\r
-                "b480f4ae.d59fb8"\r
+                "f7d2b361.6e54e",\r
+                "d75a20a3.76dfd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b480f4ae.d59fb8",\r
+        "id": "d75a20a3.76dfd",\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": 2786.3333129882812,\r
+        "y": 764.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "23d2aee5.d5b2fa"\r
+                "87632a9d.0edf7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81a947d8.a13a68",\r
+        "id": "f7d2b361.6e54e",\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": 2786.3333129882812,\r
+        "y": 709.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "773948cf.a686e8"\r
+                "d139f1fa.1d1b08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "773948cf.a686e8",\r
+        "id": "d139f1fa.1d1b08",\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": 2942.3333129882812,\r
+        "y": 707.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c8295377.ff6158",\r
-                "c7d66e95.fb47e"\r
+                "8b193137.7290b",\r
+                "d6212bc2.789e7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23d2aee5.d5b2fa",\r
+        "id": "87632a9d.0edf7",\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": 2919.3333129882812,\r
+        "y": 765.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7714415.bcb45c",\r
+        "id": "b5b4ab5e.850cd8",\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": 1096.3333129882812,\r
+        "y": 181.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "79981366.647454",\r
+        "id": "7e254bc9.6368cc",\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": 4213.333312988281,\r
+        "y": 599.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a0ef184.deb28",\r
+        "id": "1656bf6f.d0ade1",\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": 4273.333312988281,\r
+        "y": 638.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2cf2ff05.5ecb98",\r
+        "id": "8297c516.b14308",\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": 1089.3333129882812,\r
+        "y": 89.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7871357e.92d2f4",\r
+        "id": "b5552ed0.c09148",\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": 3625.3333129882812,\r
+        "y": 2115.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c984548c.2e537",\r
+        "id": "ad599918.3fac7",\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": 3681.3333129882812,\r
+        "y": 2164.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "efee660.b5b7f18",\r
+        "id": "1fbc8dc6.5c716a",\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": 1089.3333129882812,\r
+        "y": 128.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff64d6f0.1d24e",\r
+        "id": "e7860d61.a71378",\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": 1120.3333129882812,\r
+        "y": 229.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c19ef147.be92d8",\r
+        "id": "a8115aec.3c3d6",\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": 330.33331298828125,\r
+        "y": 704.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "4acbe821.0c1ff8",\r
-                "63a107d4.a006c8",\r
-                "4bb92513.9b1ebc"\r
+                "9234c3d4.71d2d8",\r
+                "71dab0f1.557458",\r
+                "d5b7dbc9.87e818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4acbe821.0c1ff8",\r
+        "id": "9234c3d4.71d2d8",\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": 549.3333129882812,\r
+        "y": 642.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d6a121aa.ecf888"\r
+                "deed2b95.51b008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63a107d4.a006c8",\r
+        "id": "71dab0f1.557458",\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": 558.8242797851562,\r
+        "y": 684.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4bb92513.9b1ebc",\r
+        "id": "d5b7dbc9.87e818",\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": 547.3333129882812,\r
+        "y": 731.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "f58f94a6.d7fb9"\r
+                "1f43e158.ba10c7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6a121aa.ecf888",\r
+        "id": "deed2b95.51b008",\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": 746.3333129882812,\r
+        "y": 638.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "46606d75.f5af5c"\r
+                "2dc9974e.fd8eb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f58f94a6.d7fb9",\r
+        "id": "1f43e158.ba10c7",\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": 716.3333129882812,\r
+        "y": 732.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "46606d75.f5af5c",\r
+        "id": "2dc9974e.fd8eb",\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": 969.6668090820312,\r
+        "y": 637.9999465942383,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "1dffeedd.2e39d1"\r
+                "ba6829c9.a61c58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1dffeedd.2e39d1",\r
+        "id": "ba6829c9.a61c58",\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": 1170.3334465026855,\r
+        "y": 639.0000286102295,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "5eeac4ab.784bec"\r
+                "64a3ee9a.60466"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5eeac4ab.784bec",\r
+        "id": "64a3ee9a.60466",\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": 300.33331298828125,\r
+        "y": 901.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "93ffca07.c36c6",\r
-                "a6155e5c.4a2e4",\r
-                "edf3ae2.0898ad"\r
+                "b06f4672.19b5b",\r
+                "1bbc50b7.a546f7",\r
+                "46ec206d.bba02"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93ffca07.c36c6",\r
+        "id": "b06f4672.19b5b",\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": 508.33331298828125,\r
+        "y": 865.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "41f16b19.4ea28c"\r
+                "71154b9b.41ff14"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6155e5c.4a2e4",\r
+        "id": "1bbc50b7.a546f7",\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": 508.82427978515625,\r
+        "y": 910.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "edf3ae2.0898ad",\r
+        "id": "46ec206d.bba02",\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": 506.33331298828125,\r
+        "y": 954.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "77488207.b4a2f4"\r
+                "d5a43e3e.bfb46"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "77488207.b4a2f4",\r
+        "id": "d5a43e3e.bfb46",\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": 675.3333129882812,\r
+        "y": 955.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1853bc71.11bc54",\r
+        "id": "c36699ae.d9b4d8",\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": 647.3333129882812,\r
+        "y": 1449.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "aa99b60e.a0ae8"\r
+                "cf4994da.4e15f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa99b60e.a0ae8",\r
+        "id": "cf4994da.4e15f8",\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": 850.3333129882812,\r
+        "y": 1461.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6b5b67d6.d9cff8"\r
+                "5493f71f.74de8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b5b67d6.d9cff8",\r
+        "id": "5493f71f.74de8",\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": 1016.3333129882812,\r
+        "y": 1458.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c9be5883.2f43"\r
+                "ee9f0ecc.141c08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c9be5883.2f43",\r
+        "id": "ee9f0ecc.141c08",\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": 1177.3333129882812,\r
+        "y": 1455.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "8328946b.83ccf",\r
-                "70436354.fbd2a4",\r
-                "71db6bb7.f92dd4",\r
-                "a3af61e2.8efbd8",\r
-                "1dbcecbe.b5c9a3"\r
+                "4557d328.03c724",\r
+                "aa5d4b55.ae996",\r
+                "977d1c3.25b4f6",\r
+                "f4df7601.a8481",\r
+                "e57dfa3b.7a1478",\r
+                "7a26c91d.a51bf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "70436354.fbd2a4",\r
+        "id": "aa5d4b55.ae996",\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": 1383.3333129882812,\r
+        "y": 1054.9999465942383,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8328946b.83ccf",\r
+        "id": "4557d328.03c724",\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": 1380.3333129882812,\r
+        "y": 1099.9999465942383,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "95cc35e2.dbd57",\r
-                "6243e8b2.6e7d68",\r
-                "ea238384.cd0de8"\r
+                "93fcd434.d90c9",\r
+                "74ecef95.a69828",\r
+                "c24f7a8a.a1ade"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6243e8b2.6e7d68",\r
+        "id": "74ecef95.a69828",\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": 1575.8242797851562,\r
+        "y": 1073.5739212036133,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "60cc7ad4.175214"\r
+                "ae28b8c.fba5c48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea238384.cd0de8",\r
+        "id": "c24f7a8a.a1ade",\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": 1571.3333129882812,\r
+        "y": 1117.999885559082,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "33a586e8.574ea2"\r
+                "90024c2d.8db9e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60cc7ad4.175214",\r
+        "id": "ae28b8c.fba5c48",\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": 1738.3958129882812,\r
+        "y": 1072.8596267700195,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "33a586e8.574ea2",\r
+        "id": "90024c2d.8db9e",\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": 1739.3333129882812,\r
+        "y": 1117.999885559082,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3ed2826e.143bbe",\r
+        "id": "3a69019e.e0465e",\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": 1741.3333129882812,\r
+        "y": 1164.999885559082,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "95cc35e2.dbd57",\r
+        "id": "93fcd434.d90c9",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1535.8833312988281,\r
-        "y": 1549.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1572.3333129882812,\r
+        "y": 1164.999885559082,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "3ed2826e.143bbe"\r
+                "3a69019e.e0465e"\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
-        "wires": [\r
-            [\r
-                "fdb5b362.28d2e8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "893647bf.8d35f8",\r
+        "id": "87587932.9e7dd",\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": 1354.3333129882812,\r
+        "y": 1686.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "71db6bb7.f92dd4",\r
+        "id": "977d1c3.25b4f6",\r
          "type": "set",\r
          "name": "set ethernet-srv-end-points-list array",\r
-        "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.uni.data-owner`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1410.8833312988281,\r
-        "y": 1767,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1445.3333129882812,\r
+        "y": 1740.0000076293945,\r
+        "z": "d12a8890.0a99a",\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": "1a612904.ca3407",\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": 2121.8333129882812,\r
+        "y": 1153.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c9ed31d4.2a59a",\r
+        "id": "70124697.bdc348",\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": 2126.8333129882812,\r
+        "y": 1255.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7b94a56a.0cc0c4",\r
+        "id": "d56221fe.c2bbf",\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": 610.3333129882812,\r
+        "y": 1705.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "bd67d795.2e839"\r
+                "aeacc57e.1c70e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd67d795.2e839",\r
+        "id": "aeacc57e.1c70e",\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": 842.3333129882812,\r
+        "y": 1704.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "148b77ab.48b7a"\r
+                "dab1af90.85d2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "148b77ab.48b7a",\r
+        "id": "dab1af90.85d2c",\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": 1054.3333129882812,\r
+        "y": 1705.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "90ccd6ae.a26198"\r
+                "6cc09a7e.3eecf4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90ccd6ae.a26198",\r
+        "id": "6cc09a7e.3eecf4",\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": 310.33331298828125,\r
+        "y": 1861.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "8f4c1c14.35a72",\r
-                "c6a7aee9.6724"\r
+                "acf145f8.65836",\r
+                "d6c02212.5df71"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c6a7aee9.6724",\r
+        "id": "d6c02212.5df71",\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": 545.3333129882812,\r
+        "y": 1848.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f4c1c14.35a72",\r
+        "id": "acf145f8.65836",\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": 535.3333129882812,\r
+        "y": 1909.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2e648939.1db066",\r
-                "6fc34533.3f02e4",\r
-                "f4ca0a98.2172d"\r
+                "87fb6e74.97fee8",\r
+                "cc7c3629.07cd7",\r
+                "419399de.ad60b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6fc34533.3f02e4",\r
+        "id": "cc7c3629.07cd7",\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": 748.8242797851562,\r
+        "y": 1893.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "24a8c225.12e4ae"\r
+                "739447c7.2df608"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4ca0a98.2172d",\r
+        "id": "419399de.ad60b8",\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": 744.3333129882812,\r
+        "y": 1938.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "a2a9b29c.7bdb18"\r
+                "a817deb7.6d09d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e648939.1db066",\r
+        "id": "87fb6e74.97fee8",\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": 746.3333129882812,\r
+        "y": 1998.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6e035263.0ab9c4"\r
+                "40dff6fa.ed3558"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24a8c225.12e4ae",\r
+        "id": "739447c7.2df608",\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": 911.3958129882812,\r
+        "y": 1892.859748840332,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a2a9b29c.7bdb18",\r
+        "id": "a817deb7.6d09d",\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": 912.3333129882812,\r
+        "y": 1938.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6e035263.0ab9c4",\r
+        "id": "40dff6fa.ed3558",\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": 915.3333129882812,\r
+        "y": 1997.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "fc704734.f5a92",\r
-                "534cefd0.094168"\r
+                "e2deabd9.c69c8",\r
+                "574db0eb.1dd5f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e9fd2d9.fce4a8",\r
+        "id": "bcc45625.ebbc48",\r
          "type": "set",\r
          "name": "set sotn_value",\r
-        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n\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": 335.33331298828125,\r
+        "y": 2499.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e44ba6b.3875e6",\r
+        "id": "fa8a8b3f.f0a5f8",\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": 457.33331298828125,\r
+        "y": 2556.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "b4c4bd8d.d5bdc",\r
-                "c813638c.89d0f"\r
+                "2e9bd62d.c02afa",\r
+                "55c19c27.0b4a64"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b4c4bd8d.d5bdc",\r
+        "id": "2e9bd62d.c02afa",\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": 769.8333129882812,\r
+        "y": 2533.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c813638c.89d0f",\r
+        "id": "55c19c27.0b4a64",\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": 773.8333129882812,\r
+        "y": 2573.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "3e668730.81c5e8"\r
+                "19a8d296.6252e5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c6aee6c.a3a53a",\r
+        "id": "81214b8b.cb073",\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": 949.8333129882812,\r
+        "y": 2537.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e668730.81c5e8",\r
+        "id": "19a8d296.6252e5",\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": 965.3333129882812,\r
+        "y": 2591.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e6168d7c.f871d"\r
+                "89591cea.6097a8",\r
+                "e0a0a9f7.c3b968",\r
+                "39281a09.347b8e",\r
+                "8394d0d1.93103"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59cef6d7.b8a21",\r
+        "id": "d3d37efd.5c6f1",\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": 1260.8333129882812,\r
+        "y": 2560.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b5303ab1.d78928",\r
+        "id": "e1720f9a.264c28",\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": 2727.8333129882812,\r
+        "y": 1911.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e6168d7c.f871d",\r
+        "id": "89591cea.6097a8",\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": 1222.8333129882812,\r
+        "y": 2602.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "878444f9.a47b7",\r
+        "id": "7128141a.22afcc",\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": 2087.8333129882812,\r
+        "y": 1191.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e2c4a442.f42cf",\r
+        "id": "59bf9e6a.8c5448",\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": 2088.8333129882812,\r
+        "y": 1295.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dd4c3392.e1b02",\r
+        "id": "d2ff3c56.4372d",\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": 4382.333312988281,\r
+        "y": 552.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9c0b0957.1e6c48",\r
+        "id": "8c5d7664.9247c8",\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": 4285.333312988281,\r
+        "y": 1371.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "88e8f378.a2b808",\r
+        "id": "cedd744c.d4173",\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": 3779.3333129882812,\r
+        "y": 2043.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "41f16b19.4ea28c",\r
+        "id": "71154b9b.41ff14",\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": 880.3333129882812,\r
+        "y": 851.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "7bf4aa70.c75d74",\r
-                "a798281b.2c68d8"\r
+                "549c1dfb.8f3224",\r
+                "34cb7bd3.43733c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bf4aa70.c75d74",\r
+        "id": "549c1dfb.8f3224",\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": 1243.3333129882812,\r
+        "y": 874.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e5a55559.f1ecf"\r
+                "e217a5f3.43edf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a798281b.2c68d8",\r
+        "id": "34cb7bd3.43733c",\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": 1243.3333129882812,\r
+        "y": 823.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "486913c4.08fb54"\r
+                "845a9945.5ecef8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5a55559.f1ecf",\r
+        "id": "e217a5f3.43edf8",\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": 1399.3333129882812,\r
+        "y": 872.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "a3b35ff6.7d4a88"\r
+                "462f3353.3aa76c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "486913c4.08fb54",\r
+        "id": "845a9945.5ecef8",\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": 1376.3333129882812,\r
+        "y": 824.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4660bf61.473a18",\r
+        "id": "a8591f2d.71e23",\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": 2136.3333129882812,\r
+        "y": 222.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1fda4b4a.2131e5",\r
+        "id": "c2c48b41.449c5",\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": 3678.3333129882812,\r
+        "y": 2203.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a6ffb7c.8797f4",\r
+        "id": "9499a947.255148",\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": 4268.333312988281,\r
+        "y": 676.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3af61e2.8efbd8",\r
+        "id": "f4df7601.a8481",\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": 1442.3333129882812,\r
+        "y": 1782.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "14d69ea3.c37079",\r
+        "id": "c236e813.0b75c",\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": 621.3333129882812,\r
+        "y": 1516.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e39ba7bd.aed5d8",\r
+        "id": "ccf5136c.426918",\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": 652.3333129882812,\r
+        "y": 1556.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "fc704734.f5a92",\r
+        "id": "e2deabd9.c69c8",\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": 1200.3333129882812,\r
+        "y": 1964.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "534cefd0.094168",\r
+        "id": "574db0eb.1dd5f",\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": 1203.3333129882812,\r
+        "y": 2006.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "de368aef.16cb",\r
+        "id": "67d19d91.7e0464",\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": 646.3333129882812,\r
+        "y": 1646.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "61a182f0.95ec2c",\r
+        "id": "6dec5e05.6defc8",\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": 401.33331298828125,\r
+        "y": 2025.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fae7aeca.a940b8",\r
+        "id": "4d2f3635.de76f",\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": 409.33331298828125,\r
+        "y": 2082.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1dbcecbe.b5c9a3",\r
+        "id": "e57dfa3b.7a1478",\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": 1420.3333129882812,\r
+        "y": 1631.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2facd73.aebb428",\r
-                "7c34f1f3.22e088"\r
+                "42d55673.4b259",\r
+                "c68b8996.7afed8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7c34f1f3.22e088",\r
+        "id": "c68b8996.7afed8",\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": 1643.3333129882812,\r
+        "y": 1586.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "7e28ac3f.b53f7c"\r
+                "30a6d609.f0af22"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2facd73.aebb428",\r
+        "id": "42d55673.4b259",\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": 1645.3333129882812,\r
+        "y": 1650.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c1661a7d.0e642"\r
+                "36f16c60.30df3c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7e28ac3f.b53f7c",\r
+        "id": "30a6d609.f0af22",\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": 1808.3333129882812,\r
+        "y": 1583.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "a55c6cbe.f3cef"\r
+                "33a6db5.6665724"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c1661a7d.0e642",\r
+        "id": "36f16c60.30df3c",\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": 1807.3333129882812,\r
+        "y": 1646.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a55c6cbe.f3cef",\r
+        "id": "33a6db5.6665724",\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": 2028.3333129882812,\r
+        "y": 1597.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3eb9377.85c18",\r
+        "id": "9a45a6ac.6bb008",\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": 1573.3333129882812,\r
+        "y": 2322.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "fcb0361d.62eb48"\r
+                "90552bad.c118e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dcd8db20.d12b7",\r
+        "id": "746f3218.6a2f4c",\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": 1958.3333129882812,\r
+        "y": 2335.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "62f93408.d79154",\r
-                "c38cc9d8.7f1bc",\r
-                "576ffe09.c4abd8"\r
+                "cc717bee.327628",\r
+                "4215d2eb.6b41b4",\r
+                "6de2353d.61ff6c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fcb0361d.62eb48",\r
+        "id": "90552bad.c118e",\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": 1752.3333129882812,\r
+        "y": 2322.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "90857791.e16908",\r
-                "dcd8db20.d12b7"\r
+                "f2b28f1.371b57",\r
+                "746f3218.6a2f4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90857791.e16908",\r
+        "id": "f2b28f1.371b57",\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": 1988.3333129882812,\r
+        "y": 2283.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "62f93408.d79154",\r
+        "id": "cc717bee.327628",\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": 2168.3333129882812,\r
+        "y": 2326.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2c548a06.655d4e"\r
+                "864e3f3b.37515"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c38cc9d8.7f1bc",\r
+        "id": "4215d2eb.6b41b4",\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": 2160.3333129882812,\r
+        "y": 2381.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "99196e80.99674"\r
+                "dbafb74f.d2c48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "576ffe09.c4abd8",\r
+        "id": "6de2353d.61ff6c",\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": 2165.3333129882812,\r
+        "y": 2438.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ea704904.f61c3"\r
+                "d9191b0b.ddee58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea704904.f61c3",\r
+        "id": "d9191b0b.ddee58",\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": 2317.3333129882812,\r
+        "y": 2439.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "99196e80.99674",\r
+        "id": "dbafb74f.d2c48",\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": 2328.3333129882812,\r
+        "y": 2384.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c548a06.655d4e",\r
+        "id": "864e3f3b.37515",\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": 2312.7156372070312,\r
+        "y": 2323.65567779541,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "55de506e.ab2138"\r
+                "f35ba5bd.48a6c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "55de506e.ab2138",\r
+        "id": "f35ba5bd.48a6c8",\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": 2527.3333129882812,\r
+        "y": 2320.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2eeb0084.f61b88",\r
+        "id": "8481025.43fb9",\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": 651.3333129882812,\r
+        "y": 2368.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "21d8f2c9.3cd2be",\r
-                "32ff82a0.3bb24e",\r
-                "21eb3441.66cbb4"\r
+                "372d54fa.9f96f4",\r
+                "9dc1c4cc.c7a94",\r
+                "2d38b1b0.a69f26"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21d8f2c9.3cd2be",\r
+        "id": "372d54fa.9f96f4",\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": 846.8334350585938,\r
+        "y": 2320.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2571d7b1.c4fb5"\r
+                "eb66892d.1f2808"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32ff82a0.3bb24e",\r
+        "id": "9dc1c4cc.c7a94",\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": 838.8334350585938,\r
+        "y": 2375.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "b0a2917a.ecde4"\r
+                "79e4473c.6cea88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2571d7b1.c4fb5",\r
+        "id": "eb66892d.1f2808",\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": 991.2157592773438,\r
+        "y": 2319.65567779541,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "a50320.52c78ce"\r
+                "a488eeff.b05b28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a50320.52c78ce",\r
+        "id": "a488eeff.b05b28",\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": 1175.3333129882812,\r
+        "y": 2318.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "b3deb273.cebb88"\r
+                "52486109.89e3d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b3deb273.cebb88",\r
+        "id": "52486109.89e3d",\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": 1370.3333129882812,\r
+        "y": 2318.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "a3eb9377.85c18"\r
+                "9a45a6ac.6bb008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21eb3441.66cbb4",\r
+        "id": "2d38b1b0.a69f26",\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": 843.8334350585938,\r
+        "y": 2432.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "f2a9e7b0.6a4ff8"\r
+                "7ec62576.a9581c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f2a9e7b0.6a4ff8",\r
+        "id": "7ec62576.a9581c",\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": 995.8334350585938,\r
+        "y": 2433.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b0a2917a.ecde4",\r
+        "id": "79e4473c.6cea88",\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": 1006.8334350585938,\r
+        "y": 2376.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e821cf32.5b22f",\r
+        "id": "46b10267.ea0e94",\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": 641.3333129882812,\r
+        "y": 2280.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f92bafd0.7c69c8",\r
+        "id": "9e415421.d3d5",\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": 386.33331298828125,\r
+        "y": 2411.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e821cf32.5b22f",\r
-                "2eeb0084.f61b88"\r
+                "46b10267.ea0e94",\r
+                "8481025.43fb9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a832f3b6.8874e",\r
+        "id": "e5923dd1.06f5c",\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": 1601.2999877929688,\r
+        "y": 228.88333892822266,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f645589d.ed3d98",\r
+        "id": "57052eb0.583298",\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": 803.3333129882812,\r
+        "y": 451.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "b87c2610.4dcfe8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 362.83331298828125,\r
+        "y": 1420.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "c36699ae.d9b4d8",\r
+                "d56221fe.c2bbf",\r
+                "c236e813.0b75c",\r
+                "ccf5136c.426918",\r
+                "bcc45625.ebbc48",\r
+                "fa8a8b3f.f0a5f8",\r
+                "67d19d91.7e0464",\r
+                "6dec5e05.6defc8",\r
+                "4d2f3635.de76f",\r
+                "9e415421.d3d5",\r
+                "4fcc44c7.7479d4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7a26c91d.a51bf",\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": 1393.3333129882812,\r
+        "y": 1258.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "a9279133.62197",\r
+                "c4ef1cec.86081",\r
+                "5303ba0b.725dcc",\r
+                "84ee69ca.e736d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "a9279133.62197",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1558.3333129882812,\r
+        "y": 1240.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "df04fed1.2e9e3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c4ef1cec.86081",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1561.3333129882812,\r
+        "y": 1279.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "1437703.dec509"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "84ee69ca.e736d8",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1555.3333129882812,\r
+        "y": 1357.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "c52f2275.ca0538"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5303ba0b.725dcc",\r
+        "type": "outcome",\r
+        "name": "root-secondary",\r
+        "xml": "<outcome value='root-secondary'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1578.3333129882812,\r
+        "y": 1320.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "bb188e14.1d1858"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f4fe23e8.e2bba",\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": 2124.3333129882812,\r
+        "y": 1353.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a68d577a.75b008",\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": 2086.3333129882812,\r
+        "y": 1393.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "c52f2275.ca0538",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1707.3333129882812,\r
+        "y": 1378.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e0a0a9f7.c3b968",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create Performance Monitoring Data",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\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": 1296.9166870117188,\r
+        "y": 2677.333625793457,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "df04fed1.2e9e3",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1693.2499389648438,\r
+        "y": 1236.3332595825195,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "7128141a.22afcc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1437703.dec509",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1695.2499389648438,\r
+        "y": 1274.3332595825195,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "59bf9e6a.8c5448"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bb188e14.1d1858",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1738.2499389648438,\r
+        "y": 1321.3332595825195,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "a68d577a.75b008"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "39281a09.347b8e",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishSubscription",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1264.9166870117188,\r
+        "y": 2749.3335037231445,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "8394d0d1.93103",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishPersistentConnection",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1294.9166870117188,\r
+        "y": 2811.3335037231445,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4fcc44c7.7479d4",\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": 688.3333129882812,\r
+        "y": 1358.1667556762695,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "462f3353.3aa76c",\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": 229.3333282470703,\r
+        "y": 1069.166633605957,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "66788e31.cd8e5",\r
+                "15c226b1.2f2f21"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "15c226b1.2f2f21",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 414.33331298828125,\r
+        "y": 1243.166633605957,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "b87c2610.4dcfe8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "66788e31.cd8e5",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 417.33331298828125,\r
+        "y": 1198.166633605957,\r
+        "z": "d12a8890.0a99a",\r
+        "wires": [\r
+            [\r
+                "b87c2610.4dcfe8"\r
+            ]\r
+        ]\r
      }\r
  ]
 \ No newline at end of file