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 035df45..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": "b052f7e.a3d5288",\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": 356.75,\r
-        "y": 462,\r
-        "z": "111f91bb.269a56",\r
+        "x": 450.33331298828125,\r
+        "y": 350.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e207ef26.f8a29",\r
-                "15b30bbc.e66fc4",\r
-                "c73b1c6f.dfba4"\r
+                "3d418b0.8302bf6",\r
+                "48d7e3bc.f2883c",\r
+                "8ec621b1.80ebc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e207ef26.f8a29",\r
+        "id": "3d418b0.8302bf6",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 544.75,\r
-        "y": 475,\r
-        "z": "111f91bb.269a56",\r
+        "x": 638.3333129882812,\r
+        "y": 363.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "53374de6.fbbc9c"\r
+                "9c98306.e2cffd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15b30bbc.e66fc4",\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": 552.2409362792969,\r
-        "y": 517.5740356445312,\r
-        "z": "111f91bb.269a56",\r
+        "x": 645.8242492675781,\r
+        "y": 405.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c73b1c6f.dfba4",\r
+        "id": "8ec621b1.80ebc8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 542.75,\r
-        "y": 564,\r
-        "z": "111f91bb.269a56",\r
+        "x": 636.3333129882812,\r
+        "y": 452.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "1d9a3789.c423c"\r
+                "57052eb0.583298"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53374de6.fbbc9c",\r
+        "id": "9c98306.e2cffd",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 717.75,\r
-        "y": 473,\r
-        "z": "111f91bb.269a56",\r
+        "x": 811.3333129882812,\r
+        "y": 361.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "74134804.4c5ab"\r
+                "53767e53.94959"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74134804.4c5ab",\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": 946.75,\r
-        "y": 474,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1040.3333129882812,\r
+        "y": 362.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "88398d04.70bb08"\r
+                "c415e278.f5611"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "88398d04.70bb08",\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": 1161.75,\r
-        "y": 475,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1255.3333129882812,\r
+        "y": 363.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "60755719.5aec98"\r
+                "c71ad5b.64b44a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23c1dec0.4bd442",\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": 1415.75,\r
-        "y": 397,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1509.3333129882812,\r
+        "y": 285.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "14654146.223b47",\r
-                "d151f4bf.d5f298"\r
+                "bbedabe9.bd4b",\r
+                "34793819.776c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14654146.223b47",\r
+        "id": "bbedabe9.bd4b",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1632.75,\r
-        "y": 376,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1726.3333129882812,\r
+        "y": 264.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "60755719.5aec98"\r
+                "c71ad5b.64b44a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d151f4bf.d5f298",\r
+        "id": "34793819.776c6",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1632.75,\r
-        "y": 425,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1726.3333129882812,\r
+        "y": 313.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "60755719.5aec98",\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": 1816.75,\r
-        "y": 462,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1910.3333129882812,\r
+        "y": 350.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e58078ca.32c2b8",\r
-                "db55a5db.cc9e2",\r
-                "d1721022.90ae5"\r
+                "3dd08dae.27e4a2",\r
+                "52a060f7.3567c8",\r
+                "a8591f2d.71e23"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebc2ede2.3e82f8",\r
+        "id": "e6629469.2dd4b8",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 175.75,\r
-        "y": 203,\r
-        "z": "111f91bb.269a56",\r
+        "x": 269.33331298828125,\r
+        "y": 91.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "19d2750a.7ada53"\r
+                "e4a2a292.f645d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "19d2750a.7ada53",\r
+        "id": "e4a2a292.f645d8",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -201,3651 +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": 460.0356903076172,\r
-        "y": 264.23810863494873,\r
-        "z": "111f91bb.269a56",\r
+        "x": 553.6190032958984,\r
+        "y": 152.23811626434326,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "32b35910.0922e6"\r
+                "94591033.455c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32b35910.0922e6",\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": 466.17860412597656,\r
-        "y": 349.0000305175781,\r
-        "z": "111f91bb.269a56",\r
+        "x": 559.7619171142578,\r
+        "y": 237.00003814697266,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9f4c6f10.a708b"\r
+                "fa712947.37c038"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9f4c6f10.a708b",\r
+        "id": "fa712947.37c038",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 775.988037109375,\r
-        "y": 340.66668701171875,\r
-        "z": "111f91bb.269a56",\r
+        "x": 869.5713500976562,\r
+        "y": 228.66669464111328,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "b052f7e.a3d5288",\r
-                "14b40144.c74357",\r
-                "8371652a.c1422",\r
-                "ab74b4be.cbc48",\r
-                "77984a30.f32474"\r
+                "9ee6a3c1.bedb",\r
+                "b5b4ab5e.850cd8",\r
+                "8297c516.b14308",\r
+                "e7860d61.a71378",\r
+                "a8115aec.3c3d6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e58078ca.32c2b8",\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": 2033.75,\r
-        "y": 400,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2127.3333129882812,\r
+        "y": 288.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bd448e7d.80d888",\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": 4202.75,\r
-        "y": 286,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4296.333312988281,\r
+        "y": 174.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "13f5ead.1dca895",\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": 4283.75,\r
-        "y": 601,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4377.333312988281,\r
+        "y": 489.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "322b352.ceea84a",\r
-                "b686bcae.ff7c7"\r
+                "d90569fe.c301e",\r
+                "9a0fd68f.7364"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "322b352.ceea84a",\r
+        "id": "d90569fe.c301e",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4593.25,\r
-        "y": 570,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4686.833312988281,\r
+        "y": 458.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "1e1970be.0764a7"\r
+                "bfcc154c.9d015"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b686bcae.ff7c7",\r
+        "id": "9a0fd68f.7364",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4598.25,\r
-        "y": 635,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4691.833312988281,\r
+        "y": 523.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "bd24692b.5a8508"\r
+                "5fe18426.281bd4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1e1970be.0764a7",\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": 4769.25,\r
-        "y": 570,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4862.833312988281,\r
+        "y": 458.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bd24692b.5a8508",\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": 4764.75,\r
-        "y": 635,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4858.333312988281,\r
+        "y": 523.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bdfec131.c9a298",\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": 4148.25,\r
-        "y": 855,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4241.833312988281,\r
+        "y": 743.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "68cdfef7.64c51",\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": 4302.25,\r
-        "y": 903,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4395.833312988281,\r
+        "y": 791.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "534fa647.cdf3",\r
-                "626cbb12.a73134"\r
+                "826c2f73.5d5e88",\r
+                "403359b0.843728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "534fa647.cdf3",\r
+        "id": "826c2f73.5d5e88",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4647.75,\r
-        "y": 884,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4741.333312988281,\r
+        "y": 772.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2db65967.f1a87e"\r
+                "80c327f3.9b168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "626cbb12.a73134",\r
+        "id": "403359b0.843728",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4651.75,\r
-        "y": 924,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4745.333312988281,\r
+        "y": 812.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "54fc5ed8.18991"\r
+                "6ab9c98a.fce4d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2db65967.f1a87e",\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": 4805.75,\r
-        "y": 884,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4899.333312988281,\r
+        "y": 772.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "54fc5ed8.18991",\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": 4809.25,\r
-        "y": 924,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4902.833312988281,\r
+        "y": 812.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "5bbebd3d.56e454",\r
-                "7821e9b0.59a868"\r
+                "e1c867b8.192bd",\r
+                "913acec9.956098"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5bbebd3d.56e454",\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": 5139.75,\r
-        "y": 889,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5233.333312988281,\r
+        "y": 777.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "72ed7974.8997",\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": 5003.75,\r
-        "y": 848,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5097.333312988281,\r
+        "y": 736.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7821e9b0.59a868",\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": 5066.75,\r
-        "y": 935,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5160.333312988281,\r
+        "y": 823.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "47a40348.350864",\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": 4140.75,\r
-        "y": 334,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4234.333312988281,\r
+        "y": 222.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e86c4698.44de68",\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": 4166.75,\r
-        "y": 451,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4260.333312988281,\r
+        "y": 339.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "3bef2a94.7a3c56",\r
-                "8e5e548f.b7d088",\r
-                "9e92c765.4c36e"\r
+                "fe7b0b4f.4f25b8",\r
+                "1f23a1db.9239d6",\r
+                "80067a1b.7e8398"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3bef2a94.7a3c56",\r
+        "id": "fe7b0b4f.4f25b8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4362.2501220703125,\r
-        "y": 403,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4455.833435058594,\r
+        "y": 291.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "8ae11b21.8072d"\r
+                "b7ec9659.601c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8e5e548f.b7d088",\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": 4354.2501220703125,\r
-        "y": 458,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4447.833435058594,\r
+        "y": 346.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "85930301.e40178"\r
+                "fe1da93b.8b0db8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ae11b21.8072d",\r
+        "id": "b7ec9659.601c4",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4506.6324462890625,\r
-        "y": 402.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4600.215759277344,\r
+        "y": 290.65567779541016,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2b001bb5.f3beac"\r
+                "5d87f5d0.3bfe2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "44cbb5eb.fe11fc",\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": 5088.75,\r
-        "y": 405,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5182.333312988281,\r
+        "y": 293.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "8828c3a6.4773b"\r
+                "c5c0e693.b5a978"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b001bb5.f3beac",\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": 4690.75,\r
-        "y": 401,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4784.333312988281,\r
+        "y": 289.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e234651a.d8201"\r
+                "3668fdab.2d6312"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e234651a.d8201",\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": 4885.75,\r
-        "y": 401,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4979.333312988281,\r
+        "y": 289.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "44cbb5eb.fe11fc"\r
+                "4b9cdc3a.96a434"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e92c765.4c36e",\r
+        "id": "80067a1b.7e8398",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4359.2501220703125,\r
-        "y": 515,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4452.833435058594,\r
+        "y": 403.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2e1c6b8c.8fd4dc"\r
+                "72f714cc.b21364"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e1c6b8c.8fd4dc",\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": 4511.2501220703125,\r
-        "y": 516,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4604.833435058594,\r
+        "y": 404.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "85930301.e40178",\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": 4522.2501220703125,\r
-        "y": 459,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4615.833435058594,\r
+        "y": 347.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "90e4153e.8023d8",\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": 5473.75,\r
-        "y": 418,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5567.333312988281,\r
+        "y": 306.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "bac51d99.85cdd8",\r
-                "432bf875.253be8",\r
-                "32be30ae.8624b"\r
+                "2769fc5a.203d24",\r
+                "510b4bec.e64154",\r
+                "dc91b912.6316b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8828c3a6.4773b",\r
+        "id": "c5c0e693.b5a978",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5267.75,\r
-        "y": 405,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5361.333312988281,\r
+        "y": 293.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "580b4f3c.2239f",\r
-                "90e4153e.8023d8"\r
+                "d3a253e8.52c87",\r
+                "247e40ac.03f008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "580b4f3c.2239f",\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": 5503.75,\r
-        "y": 366,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5597.333312988281,\r
+        "y": 254.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bac51d99.85cdd8",\r
+        "id": "2769fc5a.203d24",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5683.75,\r
-        "y": 409,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5777.333312988281,\r
+        "y": 297.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "7a8928ea.c03e88"\r
+                "373ad72a.24ed2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "432bf875.253be8",\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": 5675.75,\r
-        "y": 464,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5769.333312988281,\r
+        "y": 352.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "609d607b.1ff68"\r
+                "fed052ea.46fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32be30ae.8624b",\r
+        "id": "dc91b912.6316b8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5680.75,\r
-        "y": 521,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5774.333312988281,\r
+        "y": 409.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e7f093f9.7ecc4"\r
+                "62129ad3.e59fd4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7f093f9.7ecc4",\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": 5832.75,\r
-        "y": 522,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5926.333312988281,\r
+        "y": 410.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "609d607b.1ff68",\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": 5843.75,\r
-        "y": 467,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5937.333312988281,\r
+        "y": 355.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a8928ea.c03e88",\r
+        "id": "373ad72a.24ed2",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5828.13232421875,\r
-        "y": 406.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5921.715637207031,\r
+        "y": 294.65567779541016,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d93996e8.177a9"\r
+                "53739ad0.387d34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d93996e8.177a9",\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": 6042.75,\r
-        "y": 403,\r
-        "z": "111f91bb.269a56",\r
+        "x": 6136.333312988281,\r
+        "y": 291.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a51ca3ec.fcbd9",\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": 3609.75,\r
-        "y": 1743,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3703.3333129882812,\r
+        "y": 1631.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "75a3839f.237ba4",\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": 3672.75,\r
-        "y": 2072,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3766.3333129882812,\r
+        "y": 1960.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "dce36923.840728",\r
-                "157f1852.8f7de8"\r
+                "1746de51.5350e2",\r
+                "3d545b09.cac1fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dce36923.840728",\r
+        "id": "1746de51.5350e2",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3968.25,\r
-        "y": 2039,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4061.8333129882812,\r
+        "y": 1927.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c9eb5c3d.58ade8"\r
+                "fee57d61.96dd7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "157f1852.8f7de8",\r
+        "id": "3d545b09.cac1fc",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3973.25,\r
-        "y": 2104,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4066.8333129882812,\r
+        "y": 1992.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ee455d7a.4369c"\r
+                "3e571aef.d1d9c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c9eb5c3d.58ade8",\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": 4136.25,\r
-        "y": 2039,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4229.833312988281,\r
+        "y": 1927.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ee455d7a.4369c",\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": 4146.75,\r
-        "y": 2104,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4240.333312988281,\r
+        "y": 1992.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "93204f2.1b4a73",\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": 3548.75,\r
-        "y": 1800,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3642.3333129882812,\r
+        "y": 1688.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4ba3f303.c0a41c",\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": 3568.75,\r
-        "y": 1897,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3662.3333129882812,\r
+        "y": 1785.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "cb100a9c.e2d048",\r
-                "ffd6b507.6159d",\r
-                "7158557b.4eb374"\r
+                "b8613e52.06e248",\r
+                "b100c849.f8697",\r
+                "9726d82.0cb02a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cb100a9c.e2d048",\r
+        "id": "b8613e52.06e248",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3771.2501220703125,\r
-        "y": 1850,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3864.8334350585938,\r
+        "y": 1738.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e6720bf0.83c908"\r
+                "fe5dc3f.664f44"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ffd6b507.6159d",\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": 3763.2501220703125,\r
-        "y": 1905,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3856.8334350585938,\r
+        "y": 1793.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "80e1f285.9bd438"\r
+                "45b746dd.1fc3c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6720bf0.83c908",\r
+        "id": "fe5dc3f.664f44",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3915.6324462890625,\r
-        "y": 1847.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4009.2157592773438,\r
+        "y": 1735.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "62828788.5424"\r
+                "38c123a7.87ff54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "62828788.5424",\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": 4099.75,\r
-        "y": 1862,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4193.333312988281,\r
+        "y": 1750.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "151698eb.d8b1bf"\r
+                "8269be24.8785c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7158557b.4eb374",\r
+        "id": "9726d82.0cb02a8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3768.2501220703125,\r
-        "y": 1962,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3861.8334350585938,\r
+        "y": 1850.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "4f499dcc.5ccf54"\r
+                "920b3194.25369"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4f499dcc.5ccf54",\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": 3920.2501220703125,\r
-        "y": 1963,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4013.8334350585938,\r
+        "y": 1851.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "80e1f285.9bd438",\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": 3931.2501220703125,\r
-        "y": 1908,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4024.8334350585938,\r
+        "y": 1796.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "48500cb6.0a5974",\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": 4497.75,\r
-        "y": 1866,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4591.333312988281,\r
+        "y": 1754.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9253635.59581a"\r
+                "9242c93c.f02488"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "151698eb.d8b1bf",\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": 4294.75,\r
-        "y": 1862,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4388.333312988281,\r
+        "y": 1750.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "48500cb6.0a5974"\r
+                "3be7fe46.7bed5a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a71424bd.8e0678",\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": 4882.75,\r
-        "y": 1865,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4976.333312988281,\r
+        "y": 1753.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "a7626fee.35776",\r
-                "f55d0ed2.02e038",\r
-                "47407f5a.98f7f8"\r
+                "7fafe45b.58f05c",\r
+                "c7d3d0e7.e6edb8",\r
+                "2bbce26d.997346"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9253635.59581a",\r
+        "id": "9242c93c.f02488",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4674.75,\r
-        "y": 1858,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4768.333312988281,\r
+        "y": 1746.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "3d578b8.a79bc74",\r
-                "a71424bd.8e0678"\r
+                "4aece362.c97204",\r
+                "24d5bcbc.e5fd54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d578b8.a79bc74",\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": 4912.75,\r
-        "y": 1813,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5006.333312988281,\r
+        "y": 1701.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6ea76ec.6a17f8",\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": 5241.75,\r
-        "y": 1969,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5335.333312988281,\r
+        "y": 1857.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c34e3d1.56f314",\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": 5252.75,\r
-        "y": 1914,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5346.333312988281,\r
+        "y": 1802.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fae51f86.36cbd8",\r
+        "id": "f903abd6.bcb5e",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5237.13232421875,\r
-        "y": 1853.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5330.715637207031,\r
+        "y": 1741.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e7fe4b79.28daf8"\r
+                "9d78b23c.6c7458"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7fe4b79.28daf8",\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": 5451.75,\r
-        "y": 1850,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5545.333312988281,\r
+        "y": 1738.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a7626fee.35776",\r
+        "id": "7fafe45b.58f05c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5092.75,\r
-        "y": 1856,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5186.333312988281,\r
+        "y": 1744.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "fae51f86.36cbd8"\r
+                "f903abd6.bcb5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f55d0ed2.02e038",\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": 5084.75,\r
-        "y": 1911,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5178.333312988281,\r
+        "y": 1799.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2c34e3d1.56f314"\r
+                "991ab386.c1ab2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "47407f5a.98f7f8",\r
+        "id": "2bbce26d.997346",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5089.75,\r
-        "y": 1968,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5183.333312988281,\r
+        "y": 1856.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d6ea76ec.6a17f8"\r
+                "5653f279.fa187c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3dd6564a.788bea",\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": 3123.75,\r
-        "y": 814,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3217.3333129882812,\r
+        "y": 702.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "4498685c.f8a9c8",\r
-                "ce59ca85.515708"\r
+                "e3d89802.393a78",\r
+                "22a27baf.15e97c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4498685c.f8a9c8",\r
+        "id": "e3d89802.393a78",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3337.75,\r
-        "y": 851,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3431.3333129882812,\r
+        "y": 739.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "b9aa4ba2.44d89"\r
+                "793df4ee.f1df74"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ce59ca85.515708",\r
+        "id": "22a27baf.15e97c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3339.75,\r
-        "y": 789,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3433.3333129882812,\r
+        "y": 677.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "50bc7adf.71a1d4"\r
+                "7ecfd25a.90cdcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9aa4ba2.44d89",\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": 2917.75,\r
-        "y": 2094,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3011.3333129882812,\r
+        "y": 1982.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "28dcb01c.f45e6",\r
-                "415698c1.9dad18"\r
+                "3123087e.cfd848",\r
+                "426b4898.f559d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28dcb01c.f45e6",\r
+        "id": "3123087e.cfd848",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3170.75,\r
-        "y": 2128,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3264.3333129882812,\r
+        "y": 2016.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "8cf945af.2f52c8"\r
+                "534033f3.f59e9c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "415698c1.9dad18",\r
+        "id": "426b4898.f559d8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3170.75,\r
-        "y": 2072,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3264.3333129882812,\r
+        "y": 1960.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c8aba811.103238"\r
+                "d5f2676f.c2a88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8cf945af.2f52c8",\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": 3321.75,\r
-        "y": 2128,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3415.3333129882812,\r
+        "y": 2016.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb2e2de2.a53528",\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": 4197.75,\r
-        "y": 226,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4291.333312988281,\r
+        "y": 114.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "15f47b8b.7e00dc",\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": 3605.75,\r
-        "y": 1685,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3699.3333129882812,\r
+        "y": 1573.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9c2c3c17.6c4b68",\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": 3888.75,\r
-        "y": 483,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3982.3333129882812,\r
+        "y": 371.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "eb2e2de2.a53528",\r
-                "bd448e7d.80d888",\r
-                "47a40348.350864",\r
-                "e86c4698.44de68",\r
-                "13f5ead.1dca895",\r
-                "94ce35b5.84e9d",\r
-                "9dbb6108.db3f08",\r
-                "7f10b67d.13cbf"\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": "c8aba811.103238",\r
+        "id": "d5f2676f.c2a88",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3321.75,\r
-        "y": 2071,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3415.3333129882812,\r
+        "y": 1959.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "15f47b8b.7e00dc",\r
-                "a51ca3ec.fcbd9",\r
-                "93204f2.1b4a73",\r
-                "4ba3f303.c0a41c",\r
-                "75a3839f.237ba4",\r
-                "b13189f3.5c00c",\r
-                "72e7ea14.321c0c",\r
-                "a1c10f72.410b08"\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": "30be8f1c.c2c68",\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": 3559.75,\r
-        "y": 2370,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3653.3333129882812,\r
+        "y": 2258.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "60d95124.1573e8",\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": 3713.75,\r
-        "y": 2418,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3807.3333129882812,\r
+        "y": 2306.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "626c41a5.4a556",\r
-                "319f7c4c.700584"\r
+                "3bc05be0.577364",\r
+                "9453988b.761fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "626c41a5.4a556",\r
+        "id": "3bc05be0.577364",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4059.25,\r
-        "y": 2399,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4152.833312988281,\r
+        "y": 2287.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "a16c0d6b.aa021"\r
+                "48b1874d.6dc6a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "319f7c4c.700584",\r
+        "id": "9453988b.761fc",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4063.25,\r
-        "y": 2439,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4156.833312988281,\r
+        "y": 2327.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c46066f7.6ad638"\r
+                "e2a44822.8eb888"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a16c0d6b.aa021",\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": 4217.25,\r
-        "y": 2399,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4310.833312988281,\r
+        "y": 2287.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c46066f7.6ad638",\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": 4220.75,\r
-        "y": 2439,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4314.333312988281,\r
+        "y": 2327.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "dbf72bce.fe4fd",\r
-                "da41ce10.71c4a8"\r
+                "3369ff99.af45f",\r
+                "6ce9279e.5956d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dbf72bce.fe4fd",\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": 4560.75,\r
-        "y": 2438,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4654.333312988281,\r
+        "y": 2326.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a0a6a7a2.80538",\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": 4418.75,\r
-        "y": 2396,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4512.333312988281,\r
+        "y": 2284.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "da41ce10.71c4a8",\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": 4489.75,\r
-        "y": 2487,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4583.333312988281,\r
+        "y": 2375.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "509b9ad8.503f2c",\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": 3114.75,\r
-        "y": 754,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3208.3333129882812,\r
+        "y": 642.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8edfc4cd.8a0528",\r
+        "id": "6b6c5120.d697b",\r
          "type": "comment",\r
          "name": "only dst ttp exists. No src",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3709.75,\r
-        "y": 440,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3803.3333129882812,\r
+        "y": 328.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f79b26c9.540128",\r
+        "id": "7a49b0ec.1116e8",\r
          "type": "comment",\r
          "name": "only src ttp exists. No dst",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3266.75,\r
-        "y": 2018,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3360.3333129882812,\r
+        "y": 1906.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "50bc7adf.71a1d4",\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": 3445.75,\r
-        "y": 602,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3539.3333129882812,\r
+        "y": 490.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ebf4cc93.93ec7",\r
-                "8e7f6f60.66ae28"\r
+                "c5975b58.7cfb78",\r
+                "8fa5c52a.f6d0f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8e7f6f60.66ae28",\r
+        "id": "8fa5c52a.f6d0f",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3687.75,\r
-        "y": 1191,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3781.3333129882812,\r
+        "y": 1079.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d55e670.1fa9f18"\r
+                "1a8ceecd.14cfa1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebf4cc93.93ec7",\r
+        "id": "c5975b58.7cfb78",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3681.75,\r
-        "y": 482,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3775.3333129882812,\r
+        "y": 370.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9c2c3c17.6c4b68"\r
+                "7d0cb107.7824a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d55e670.1fa9f18",\r
+        "id": "1a8ceecd.14cfa1",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3845.75,\r
-        "y": 1190,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3939.3333129882812,\r
+        "y": 1078.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "f4e2a19a.1a35e",\r
-                "f86044a9.f193d",\r
-                "4b4e2775.d6044",\r
-                "86690982.b14b6",\r
-                "21d875df.4e5d92",\r
-                "971d8a82.30a53"\r
+                "cfc45fbc.625408",\r
+                "87ccca6a.f8f9b8",\r
+                "e86d624f.d5f408",\r
+                "3e480e6a.3eb6c2",\r
+                "178f13fb.65189c",\r
+                "8c5d7664.9247c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f86044a9.f193d",\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": 4109.75,\r
-        "y": 1073,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4203.333312988281,\r
+        "y": 961.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "21d875df.4e5d92",\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": 4190.75,\r
-        "y": 1388,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4284.333312988281,\r
+        "y": 1276.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "cd1830a.9a25b5",\r
-                "5f7c3883.6456e"\r
+                "47471e7d.1bf5e",\r
+                "2f64742a.d54c2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd1830a.9a25b5",\r
+        "id": "47471e7d.1bf5e",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4500.25,\r
-        "y": 1357,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4593.833312988281,\r
+        "y": 1245.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "cf35e2b3.2c8468"\r
+                "27252576.feabca"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f7c3883.6456e",\r
+        "id": "2f64742a.d54c2c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4505.25,\r
-        "y": 1422,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4598.833312988281,\r
+        "y": 1310.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "b3a80e08.d037b"\r
+                "d2def383.359ac8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf35e2b3.2c8468",\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": 4676.25,\r
-        "y": 1357,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4769.833312988281,\r
+        "y": 1245.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3a80e08.d037b",\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": 4671.75,\r
-        "y": 1422,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4765.333312988281,\r
+        "y": 1310.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4b4e2775.d6044",\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": 4047.75,\r
-        "y": 1121,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4141.333312988281,\r
+        "y": 1009.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "86690982.b14b6",\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": 4073.75,\r
-        "y": 1238,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4167.333312988281,\r
+        "y": 1126.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "85fe6961.6a7908",\r
-                "3fb6fcbe.a3fa0c",\r
-                "89e44c19.cf1b38"\r
+                "2fe7a70f.325738",\r
+                "de56dd13.56cbc",\r
+                "da128a7e.2de4c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85fe6961.6a7908",\r
+        "id": "2fe7a70f.325738",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4269.2501220703125,\r
-        "y": 1190,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4362.833435058594,\r
+        "y": 1078.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "8a104557.0ad8d8"\r
+                "236585d1.bff802"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3fb6fcbe.a3fa0c",\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": 4261.2501220703125,\r
-        "y": 1245,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4354.833435058594,\r
+        "y": 1133.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "42db739a.3307d4"\r
+                "7ab4252e.e507d4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8a104557.0ad8d8",\r
+        "id": "236585d1.bff802",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4413.6324462890625,\r
-        "y": 1189.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4507.215759277344,\r
+        "y": 1077.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "f760615b.c41c38"\r
+                "d1f5d3f1.d937a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f760615b.c41c38",\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": 4597.75,\r
-        "y": 1188,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4691.333312988281,\r
+        "y": 1076.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "142416ba.388749"\r
+                "b6dba6f2.6f5a68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "142416ba.388749",\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": 4792.75,\r
-        "y": 1188,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4886.333312988281,\r
+        "y": 1076.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ee80fb82.914478"\r
+                "decb3043.cd12c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89e44c19.cf1b38",\r
+        "id": "da128a7e.2de4c8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4266.2501220703125,\r
-        "y": 1302,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4359.833435058594,\r
+        "y": 1190.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "190fd174.e420e7"\r
+                "98ee3a25.1ab9e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "190fd174.e420e7",\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": 4418.2501220703125,\r
-        "y": 1303,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4511.833435058594,\r
+        "y": 1191.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "42db739a.3307d4",\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": 4429.2501220703125,\r
-        "y": 1246,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4522.833435058594,\r
+        "y": 1134.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f4e2a19a.1a35e",\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": 4104.75,\r
-        "y": 1013,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4198.333312988281,\r
+        "y": 901.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ee80fb82.914478",\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": 4995.75,\r
-        "y": 1192,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5089.333312988281,\r
+        "y": 1080.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "16f58788.f805f"\r
+                "b6ba573a.60741"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4337aa6a.e7854c",\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": 5380.75,\r
-        "y": 1205,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5474.333312988281,\r
+        "y": 1093.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d59e46ba.4f5ed8",\r
-                "51e7728a.8676fc",\r
-                "dbdd6c65.aefc38"\r
+                "e228c69c.360f98",\r
+                "9bce816d.2db348",\r
+                "41d83525.ce00b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "16f58788.f805f",\r
+        "id": "b6ba573a.60741",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5174.75,\r
-        "y": 1192,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5268.333312988281,\r
+        "y": 1080.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "925f4411.b3c5c",\r
-                "4337aa6a.e7854c"\r
+                "5b50b3ea.1f8ef4",\r
+                "f4847f5f.1d887"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "925f4411.b3c5c",\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": 5410.75,\r
-        "y": 1153,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5504.333312988281,\r
+        "y": 1041.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d59e46ba.4f5ed8",\r
+        "id": "e228c69c.360f98",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5590.75,\r
-        "y": 1196,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5684.333312988281,\r
+        "y": 1084.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9fb3d6ee.612538"\r
+                "189e198c.62579e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51e7728a.8676fc",\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": 5582.75,\r
-        "y": 1251,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5676.333312988281,\r
+        "y": 1139.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "1c483cb2.44cb23"\r
+                "a893456b.716548"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dbdd6c65.aefc38",\r
+        "id": "41d83525.ce00b4",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5587.75,\r
-        "y": 1308,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5681.333312988281,\r
+        "y": 1196.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c131e872.bad5c8"\r
+                "7bd5c1c9.c0b778"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c131e872.bad5c8",\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": 5739.75,\r
-        "y": 1309,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5833.333312988281,\r
+        "y": 1197.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1c483cb2.44cb23",\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": 5750.75,\r
-        "y": 1254,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5844.333312988281,\r
+        "y": 1142.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fb3d6ee.612538",\r
+        "id": "189e198c.62579e",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5735.13232421875,\r
-        "y": 1193.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 5828.715637207031,\r
+        "y": 1081.6556777954102,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e9716a08.a0ba08"\r
+                "ae6db88e.b087a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e9716a08.a0ba08",\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": 5949.75,\r
-        "y": 1190,\r
-        "z": "111f91bb.269a56",\r
+        "x": 6043.333312988281,\r
+        "y": 1078.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c1f0320d.223f",\r
+        "id": "56d817b5.d38a48",\r
          "type": "comment",\r
          "name": "both src and dst exist",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3723.75,\r
-        "y": 1131,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3817.3333129882812,\r
+        "y": 1019.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "db55a5db.cc9e2",\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": 2285.75,\r
-        "y": 858,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2379.3333129882812,\r
+        "y": 746.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "8cfca669.4c31d",\r
-                "1cedd7fb.e18cd"\r
+                "f7d2b361.6e54e",\r
+                "d75a20a3.76dfd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1cedd7fb.e18cd",\r
+        "id": "d75a20a3.76dfd",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2692.75,\r
-        "y": 876,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2786.3333129882812,\r
+        "y": 764.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "91bf0188.93b52"\r
+                "87632a9d.0edf7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8cfca669.4c31d",\r
+        "id": "f7d2b361.6e54e",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2692.75,\r
-        "y": 821,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2786.3333129882812,\r
+        "y": 709.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6ae8a7fa.83375"\r
+                "d139f1fa.1d1b08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ae8a7fa.83375",\r
+        "id": "d139f1fa.1d1b08",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2848.75,\r
-        "y": 819,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2942.3333129882812,\r
+        "y": 707.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "509b9ad8.503f2c",\r
-                "3dd6564a.788bea"\r
+                "8b193137.7290b",\r
+                "d6212bc2.789e7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "91bf0188.93b52",\r
+        "id": "87632a9d.0edf7",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2825.75,\r
-        "y": 877,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2919.3333129882812,\r
+        "y": 765.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "14b40144.c74357",\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": 1002.75,\r
-        "y": 293,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1096.3333129882812,\r
+        "y": 181.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "470acf69.6a7218",\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": 4119.75,\r
-        "y": 711,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4213.333312988281,\r
+        "y": 599.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "94ce35b5.84e9d",\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": 4179.75,\r
-        "y": 750,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4273.333312988281,\r
+        "y": 638.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8371652a.c1422",\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": 995.75,\r
-        "y": 201,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1089.3333129882812,\r
+        "y": 89.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "180e951c.adb823",\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": 3531.75,\r
-        "y": 2227,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3625.3333129882812,\r
+        "y": 2115.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b13189f3.5c00c",\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": 3587.75,\r
-        "y": 2276,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3681.3333129882812,\r
+        "y": 2164.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "68b96268.5bf0d4",\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": 995.75,\r
-        "y": 240,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1089.3333129882812,\r
+        "y": 128.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab74b4be.cbc48",\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": 1026.75,\r
-        "y": 341,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1120.3333129882812,\r
+        "y": 229.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "77984a30.f32474",\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": 236.75,\r
-        "y": 816,\r
-        "z": "111f91bb.269a56",\r
+        "x": 330.33331298828125,\r
+        "y": 704.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6b466955.39f7e8",\r
-                "ea72fa7a.37647",\r
-                "256cca7a.4ba78e"\r
+                "9234c3d4.71d2d8",\r
+                "71dab0f1.557458",\r
+                "d5b7dbc9.87e818"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b466955.39f7e8",\r
+        "id": "9234c3d4.71d2d8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 455.75,\r
-        "y": 754,\r
-        "z": "111f91bb.269a56",\r
+        "x": 549.3333129882812,\r
+        "y": 642.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ff154227.b5783"\r
+                "deed2b95.51b008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea72fa7a.37647",\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": 465.240966796875,\r
-        "y": 796.5740356445312,\r
-        "z": "111f91bb.269a56",\r
+        "x": 558.8242797851562,\r
+        "y": 684.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "256cca7a.4ba78e",\r
+        "id": "d5b7dbc9.87e818",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 453.75,\r
-        "y": 843,\r
-        "z": "111f91bb.269a56",\r
+        "x": 547.3333129882812,\r
+        "y": 731.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9c1b438c.70f6e8"\r
+                "1f43e158.ba10c7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ff154227.b5783",\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": 652.75,\r
-        "y": 750,\r
-        "z": "111f91bb.269a56",\r
+        "x": 746.3333129882812,\r
+        "y": 638.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d19cd8ca.093408"\r
+                "2dc9974e.fd8eb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c1b438c.70f6e8",\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": 622.75,\r
-        "y": 844,\r
-        "z": "111f91bb.269a56",\r
+        "x": 716.3333129882812,\r
+        "y": 732.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d19cd8ca.093408",\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": 876.08349609375,\r
-        "y": 749.9999389648438,\r
-        "z": "111f91bb.269a56",\r
+        "x": 969.6668090820312,\r
+        "y": 637.9999465942383,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ec3530b4.60943"\r
+                "ba6829c9.a61c58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec3530b4.60943",\r
+        "id": "ba6829c9.a61c58",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1076.7501335144043,\r
-        "y": 751.000020980835,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1170.3334465026855,\r
+        "y": 639.0000286102295,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "732a5938.51aee8"\r
+                "64a3ee9a.60466"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "732a5938.51aee8",\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": 206.75,\r
-        "y": 1013,\r
-        "z": "111f91bb.269a56",\r
+        "x": 300.33331298828125,\r
+        "y": 901.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "23a8b591.9364c2",\r
-                "8c7cc41e.285ad",\r
-                "a093cec4.b44ed"\r
+                "b06f4672.19b5b",\r
+                "1bbc50b7.a546f7",\r
+                "46ec206d.bba02"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23a8b591.9364c2",\r
+        "id": "b06f4672.19b5b",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 414.75,\r
-        "y": 977,\r
-        "z": "111f91bb.269a56",\r
+        "x": 508.33331298828125,\r
+        "y": 865.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9b9627ac.373dc8"\r
+                "71154b9b.41ff14"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c7cc41e.285ad",\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": 415.240966796875,\r
-        "y": 1022.5740356445312,\r
-        "z": "111f91bb.269a56",\r
+        "x": 508.82427978515625,\r
+        "y": 910.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a093cec4.b44ed",\r
+        "id": "46ec206d.bba02",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 412.75,\r
-        "y": 1066,\r
-        "z": "111f91bb.269a56",\r
+        "x": 506.33331298828125,\r
+        "y": 954.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "26fe918.5a2edee"\r
+                "d5a43e3e.bfb46"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26fe918.5a2edee",\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": 581.75,\r
-        "y": 1067,\r
-        "z": "111f91bb.269a56",\r
+        "x": 675.3333129882812,\r
+        "y": 955.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f6f3f7dd.ddd42",\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": 553.75,\r
-        "y": 1561,\r
-        "z": "111f91bb.269a56",\r
+        "x": 647.3333129882812,\r
+        "y": 1449.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "8744e477.6cb05"\r
+                "cf4994da.4e15f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8744e477.6cb05",\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": 756.75,\r
-        "y": 1573,\r
-        "z": "111f91bb.269a56",\r
+        "x": 850.3333129882812,\r
+        "y": 1461.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "9fc39c57.082728"\r
+                "5493f71f.74de8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9fc39c57.082728",\r
+        "id": "5493f71f.74de8",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 922.75,\r
-        "y": 1570,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1016.3333129882812,\r
+        "y": 1458.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "5d341323.92886c"\r
+                "ee9f0ecc.141c08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d341323.92886c",\r
+        "id": "ee9f0ecc.141c08",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1083.75,\r
-        "y": 1567,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1177.3333129882812,\r
+        "y": 1455.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "878fc20b.33088",\r
-                "9a421f91.9b1b28",\r
-                "7916417b.dd4858",\r
-                "277d0a08.b51776",\r
-                "5d833ac3.a3e554",\r
-                "6bd95e1e.6c91d8"\r
+                "4557d328.03c724",\r
+                "aa5d4b55.ae996",\r
+                "977d1c3.25b4f6",\r
+                "f4df7601.a8481",\r
+                "e57dfa3b.7a1478",\r
+                "7a26c91d.a51bf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a421f91.9b1b28",\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": 1289.75,\r
-        "y": 1166.9999389648438,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1383.3333129882812,\r
+        "y": 1054.9999465942383,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "878fc20b.33088",\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": 1286.75,\r
-        "y": 1211.9999389648438,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1380.3333129882812,\r
+        "y": 1099.9999465942383,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "1277502d.c8e7a",\r
-                "3575cdbd.1f32e2",\r
-                "bad103b9.14ac5"\r
+                "93fcd434.d90c9",\r
+                "74ecef95.a69828",\r
+                "c24f7a8a.a1ade"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3575cdbd.1f32e2",\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": 1482.240966796875,\r
-        "y": 1185.5739135742188,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1575.8242797851562,\r
+        "y": 1073.5739212036133,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "245198ca.86efd8"\r
+                "ae28b8c.fba5c48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bad103b9.14ac5",\r
+        "id": "c24f7a8a.a1ade",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1477.75,\r
-        "y": 1229.9998779296875,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1571.3333129882812,\r
+        "y": 1117.999885559082,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "564cd01d.c60fe8"\r
+                "90024c2d.8db9e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "245198ca.86efd8",\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": 1644.8125,\r
-        "y": 1184.859619140625,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1738.3958129882812,\r
+        "y": 1072.8596267700195,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "564cd01d.c60fe8",\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": 1645.75,\r
-        "y": 1229.9998779296875,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1739.3333129882812,\r
+        "y": 1117.999885559082,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "57d2d0ba.ac96f",\r
+        "id": "3a69019e.e0465e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1647.75,\r
-        "y": 1276.9998779296875,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1741.3333129882812,\r
+        "y": 1164.999885559082,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1277502d.c8e7a",\r
+        "id": "93fcd434.d90c9",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1478.75,\r
-        "y": 1276.9998779296875,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1572.3333129882812,\r
+        "y": 1164.999885559082,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "57d2d0ba.ac96f"\r
+                "3a69019e.e0465e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f14d939.b7d6d",\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": 1260.75,\r
-        "y": 1798,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1354.3333129882812,\r
+        "y": 1686.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7916417b.dd4858",\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": 1351.75,\r
-        "y": 1852,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1445.3333129882812,\r
+        "y": 1740.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "780a0f58.bba71",\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": 2028.25,\r
-        "y": 1265,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2121.8333129882812,\r
+        "y": 1153.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "423abc5f.68ffa4",\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": 2033.25,\r
-        "y": 1367,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2126.8333129882812,\r
+        "y": 1255.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9ae45b75.53fe1",\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": 516.75,\r
-        "y": 1817,\r
-        "z": "111f91bb.269a56",\r
+        "x": 610.3333129882812,\r
+        "y": 1705.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "a1c491a.b9e1cf"\r
+                "aeacc57e.1c70e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1c491a.b9e1cf",\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": 748.75,\r
-        "y": 1816,\r
-        "z": "111f91bb.269a56",\r
+        "x": 842.3333129882812,\r
+        "y": 1704.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c7d001fc.995ef"\r
+                "dab1af90.85d2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7d001fc.995ef",\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": 960.75,\r
-        "y": 1817,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1054.3333129882812,\r
+        "y": 1705.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "af8caf57.c80ff"\r
+                "6cc09a7e.3eecf4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "af8caf57.c80ff",\r
+        "id": "6cc09a7e.3eecf4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 216.75,\r
-        "y": 1973,\r
-        "z": "111f91bb.269a56",\r
+        "x": 310.33331298828125,\r
+        "y": 1861.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "dbb11610.758b08",\r
-                "e6442fee.44c628"\r
+                "acf145f8.65836",\r
+                "d6c02212.5df71"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6442fee.44c628",\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": 451.75,\r
-        "y": 1960,\r
-        "z": "111f91bb.269a56",\r
+        "x": 545.3333129882812,\r
+        "y": 1848.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dbb11610.758b08",\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": 441.75,\r
-        "y": 2021,\r
-        "z": "111f91bb.269a56",\r
+        "x": 535.3333129882812,\r
+        "y": 1909.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "afa88564.16a37",\r
-                "83950a7.2f6c078",\r
-                "12b1aba5.e7a0f4"\r
+                "87fb6e74.97fee8",\r
+                "cc7c3629.07cd7",\r
+                "419399de.ad60b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83950a7.2f6c078",\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": 655.240966796875,\r
-        "y": 2005.5740356445312,\r
-        "z": "111f91bb.269a56",\r
+        "x": 748.8242797851562,\r
+        "y": 1893.5740432739258,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ea85ca6d.e8d7e"\r
+                "739447c7.2df608"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "12b1aba5.e7a0f4",\r
+        "id": "419399de.ad60b8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 650.75,\r
-        "y": 2050,\r
-        "z": "111f91bb.269a56",\r
+        "x": 744.3333129882812,\r
+        "y": 1938.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "eb678b0e.5293e8"\r
+                "a817deb7.6d09d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afa88564.16a37",\r
+        "id": "87fb6e74.97fee8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 652.75,\r
-        "y": 2110,\r
-        "z": "111f91bb.269a56",\r
+        "x": 746.3333129882812,\r
+        "y": 1998.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "46f07676.1e063"\r
+                "40dff6fa.ed3558"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea85ca6d.e8d7e",\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": 817.8125,\r
-        "y": 2004.8597412109375,\r
-        "z": "111f91bb.269a56",\r
+        "x": 911.3958129882812,\r
+        "y": 1892.859748840332,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb678b0e.5293e8",\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": 818.75,\r
-        "y": 2050,\r
-        "z": "111f91bb.269a56",\r
+        "x": 912.3333129882812,\r
+        "y": 1938.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "46f07676.1e063",\r
+        "id": "40dff6fa.ed3558",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 821.75,\r
-        "y": 2109,\r
-        "z": "111f91bb.269a56",\r
+        "x": 915.3333129882812,\r
+        "y": 1997.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d6f04402.414508",\r
-                "ac4ce335.0555f"\r
+                "e2deabd9.c69c8",\r
+                "574db0eb.1dd5f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "42a4fda9.57619c",\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='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
+        "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": 241.75,\r
-        "y": 2611,\r
-        "z": "111f91bb.269a56",\r
+        "x": 335.33331298828125,\r
+        "y": 2499.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3738a9bc.2f26e6",\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": 363.75,\r
-        "y": 2668,\r
-        "z": "111f91bb.269a56",\r
+        "x": 457.33331298828125,\r
+        "y": 2556.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ac81680a.65fae",\r
-                "96fc6628.148e78"\r
+                "2e9bd62d.c02afa",\r
+                "55c19c27.0b4a64"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ac81680a.65fae",\r
+        "id": "2e9bd62d.c02afa",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 676.25,\r
-        "y": 2645,\r
-        "z": "111f91bb.269a56",\r
+        "x": 769.8333129882812,\r
+        "y": 2533.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "96fc6628.148e78",\r
+        "id": "55c19c27.0b4a64",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 680.25,\r
-        "y": 2685,\r
-        "z": "111f91bb.269a56",\r
+        "x": 773.8333129882812,\r
+        "y": 2573.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "bf7ee9c0.419518"\r
+                "19a8d296.6252e5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6f03e95e.3ec198",\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": 856.25,\r
-        "y": 2649,\r
-        "z": "111f91bb.269a56",\r
+        "x": 949.8333129882812,\r
+        "y": 2537.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bf7ee9c0.419518",\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": 871.75,\r
-        "y": 2703,\r
-        "z": "111f91bb.269a56",\r
+        "x": 965.3333129882812,\r
+        "y": 2591.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "846842ab.33ca8",\r
-                "5e1c0ed5.c69c48",\r
-                "9a742833.7a10a8",\r
-                "feb8a80.2e93d58"\r
+                "89591cea.6097a8",\r
+                "e0a0a9f7.c3b968",\r
+                "39281a09.347b8e",\r
+                "8394d0d1.93103"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "214d3a40.5474be",\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": 1167.25,\r
-        "y": 2672,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1260.8333129882812,\r
+        "y": 2560.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4243a8af.47f99",\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": 2634.25,\r
-        "y": 2023,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2727.8333129882812,\r
+        "y": 1911.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "846842ab.33ca8",\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": 1129.25,\r
-        "y": 2714,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1222.8333129882812,\r
+        "y": 2602.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "eb2c1071.d160d8",\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": 1994.25,\r
-        "y": 1303,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2087.8333129882812,\r
+        "y": 1191.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3c1d8397.66cfbc",\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": 1995.25,\r
-        "y": 1407,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2088.8333129882812,\r
+        "y": 1295.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9dbb6108.db3f08",\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": 4288.75,\r
-        "y": 664,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4382.333312988281,\r
+        "y": 552.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "971d8a82.30a53",\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": 4191.75,\r
-        "y": 1483,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4285.333312988281,\r
+        "y": 1371.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "72e7ea14.321c0c",\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": 3685.75,\r
-        "y": 2155,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3779.3333129882812,\r
+        "y": 2043.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9b9627ac.373dc8",\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": 786.75,\r
-        "y": 963,\r
-        "z": "111f91bb.269a56",\r
+        "x": 880.3333129882812,\r
+        "y": 851.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "20416bfa.abd944",\r
-                "3157f22c.bca4c6"\r
+                "549c1dfb.8f3224",\r
+                "34cb7bd3.43733c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20416bfa.abd944",\r
+        "id": "549c1dfb.8f3224",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1149.75,\r
-        "y": 986,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1243.3333129882812,\r
+        "y": 874.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "16371b2a.82f3f5"\r
+                "e217a5f3.43edf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3157f22c.bca4c6",\r
+        "id": "34cb7bd3.43733c",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1149.75,\r
-        "y": 935,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1243.3333129882812,\r
+        "y": 823.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "7c942827.229d68"\r
+                "845a9945.5ecef8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "16371b2a.82f3f5",\r
+        "id": "e217a5f3.43edf8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1305.75,\r
-        "y": 984,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1399.3333129882812,\r
+        "y": 872.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6516a515.9e0ed4"\r
+                "462f3353.3aa76c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7c942827.229d68",\r
+        "id": "845a9945.5ecef8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1282.75,\r
-        "y": 936,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1376.3333129882812,\r
+        "y": 824.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d1721022.90ae5",\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": 2042.75,\r
-        "y": 334,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2136.3333129882812,\r
+        "y": 222.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a1c10f72.410b08",\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": 3584.75,\r
-        "y": 2315,\r
-        "z": "111f91bb.269a56",\r
+        "x": 3678.3333129882812,\r
+        "y": 2203.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7f10b67d.13cbf",\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": 4174.75,\r
-        "y": 788,\r
-        "z": "111f91bb.269a56",\r
+        "x": 4268.333312988281,\r
+        "y": 676.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "277d0a08.b51776",\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": 1348.75,\r
-        "y": 1894,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1442.3333129882812,\r
+        "y": 1782.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dbed9630.5fe208",\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": 527.75,\r
-        "y": 1628,\r
-        "z": "111f91bb.269a56",\r
+        "x": 621.3333129882812,\r
+        "y": 1516.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b8630526.556578",\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": 558.75,\r
-        "y": 1668,\r
-        "z": "111f91bb.269a56",\r
+        "x": 652.3333129882812,\r
+        "y": 1556.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d6f04402.414508",\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": 1106.75,\r
-        "y": 2076,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1200.3333129882812,\r
+        "y": 1964.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ac4ce335.0555f",\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": 1109.75,\r
-        "y": 2118,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1203.3333129882812,\r
+        "y": 2006.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6151d45.cfb988",\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": 552.75,\r
-        "y": 1758,\r
-        "z": "111f91bb.269a56",\r
+        "x": 646.3333129882812,\r
+        "y": 1646.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1b784f.6be4af8",\r
+        "id": "6dec5e05.6defc8",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
          "comments": "",\r
-        "x": 307.75,\r
-        "y": 2137,\r
-        "z": "111f91bb.269a56",\r
+        "x": 401.33331298828125,\r
+        "y": 2025.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b54d5a69.762db",\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": 315.75,\r
-        "y": 2194,\r
-        "z": "111f91bb.269a56",\r
+        "x": 409.33331298828125,\r
+        "y": 2082.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5d833ac3.a3e554",\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": 1326.75,\r
-        "y": 1743,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1420.3333129882812,\r
+        "y": 1631.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "5ddf355f.54101c",\r
-                "1bdf6619.a36342"\r
+                "42d55673.4b259",\r
+                "c68b8996.7afed8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1bdf6619.a36342",\r
+        "id": "c68b8996.7afed8",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1549.75,\r
-        "y": 1698,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1643.3333129882812,\r
+        "y": 1586.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "754506fa.d51aa8"\r
+                "30a6d609.f0af22"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5ddf355f.54101c",\r
+        "id": "42d55673.4b259",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1551.75,\r
-        "y": 1762,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1645.3333129882812,\r
+        "y": 1650.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "68209615.eef37"\r
+                "36f16c60.30df3c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "754506fa.d51aa8",\r
+        "id": "30a6d609.f0af22",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1714.75,\r
-        "y": 1695,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1808.3333129882812,\r
+        "y": 1583.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "714f4595.b88ec4"\r
+                "33a6db5.6665724"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "68209615.eef37",\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": 1713.75,\r
-        "y": 1758,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1807.3333129882812,\r
+        "y": 1646.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "714f4595.b88ec4",\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 -4]`' />\n",\r
          "comments": "",\r
-        "x": 1934.75,\r
-        "y": 1709,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2028.3333129882812,\r
+        "y": 1597.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1db1829e.06c1d5",\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": 1479.75,\r
-        "y": 2434,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1573.3333129882812,\r
+        "y": 2322.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "2cbd7342.8e2ecc"\r
+                "90552bad.c118e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fa138a5b.3e0008",\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": 1864.75,\r
-        "y": 2447,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1958.3333129882812,\r
+        "y": 2335.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e14f1acf.1bcd",\r
-                "c2e19be7.fca29",\r
-                "775dbfec.d9501"\r
+                "cc717bee.327628",\r
+                "4215d2eb.6b41b4",\r
+                "6de2353d.61ff6c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cbd7342.8e2ecc",\r
+        "id": "90552bad.c118e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1658.75,\r
-        "y": 2434,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1752.3333129882812,\r
+        "y": 2322.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "6f327062.742838",\r
-                "fa138a5b.3e0008"\r
+                "f2b28f1.371b57",\r
+                "746f3218.6a2f4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6f327062.742838",\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": 1894.75,\r
-        "y": 2395,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1988.3333129882812,\r
+        "y": 2283.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e14f1acf.1bcd",\r
+        "id": "cc717bee.327628",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2074.75,\r
-        "y": 2438,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2168.3333129882812,\r
+        "y": 2326.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "d0fc139e.1761"\r
+                "864e3f3b.37515"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c2e19be7.fca29",\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": 2066.75,\r
-        "y": 2493,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2160.3333129882812,\r
+        "y": 2381.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "43b937df.ececd8"\r
+                "dbafb74f.d2c48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "775dbfec.d9501",\r
+        "id": "6de2353d.61ff6c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2071.75,\r
-        "y": 2550,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2165.3333129882812,\r
+        "y": 2438.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ac944679.99243"\r
+                "d9191b0b.ddee58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ac944679.99243",\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": 2223.75,\r
-        "y": 2551,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2317.3333129882812,\r
+        "y": 2439.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "43b937df.ececd8",\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": 2234.75,\r
-        "y": 2496,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2328.3333129882812,\r
+        "y": 2384.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d0fc139e.1761",\r
+        "id": "864e3f3b.37515",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2219.13232421875,\r
-        "y": 2435.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2312.7156372070312,\r
+        "y": 2323.65567779541,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "79bc2aa4.303284"\r
+                "f35ba5bd.48a6c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "79bc2aa4.303284",\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": 2433.75,\r
-        "y": 2432,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2527.3333129882812,\r
+        "y": 2320.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d91a9773.8b97d8",\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": 557.75,\r
-        "y": 2480,\r
-        "z": "111f91bb.269a56",\r
+        "x": 651.3333129882812,\r
+        "y": 2368.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "fd5d97.57110a68",\r
-                "e3891e3f.2fa52",\r
-                "6282c457.966ab4"\r
+                "372d54fa.9f96f4",\r
+                "9dc1c4cc.c7a94",\r
+                "2d38b1b0.a69f26"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd5d97.57110a68",\r
+        "id": "372d54fa.9f96f4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 753.2501220703125,\r
-        "y": 2432,\r
-        "z": "111f91bb.269a56",\r
+        "x": 846.8334350585938,\r
+        "y": 2320.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ee247bd7.5fac58"\r
+                "eb66892d.1f2808"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3891e3f.2fa52",\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": 745.2501220703125,\r
-        "y": 2487,\r
-        "z": "111f91bb.269a56",\r
+        "x": 838.8334350585938,\r
+        "y": 2375.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "91fa570e.651ca8"\r
+                "79e4473c.6cea88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee247bd7.5fac58",\r
+        "id": "eb66892d.1f2808",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 897.6324462890625,\r
-        "y": 2431.6556701660156,\r
-        "z": "111f91bb.269a56",\r
+        "x": 991.2157592773438,\r
+        "y": 2319.65567779541,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "ea7d04e7.1afcb8"\r
+                "a488eeff.b05b28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea7d04e7.1afcb8",\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": 1081.75,\r
-        "y": 2430,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1175.3333129882812,\r
+        "y": 2318.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "40c13bcd.4d6ac4"\r
+                "52486109.89e3d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40c13bcd.4d6ac4",\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": 1276.75,\r
-        "y": 2430,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1370.3333129882812,\r
+        "y": 2318.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "1db1829e.06c1d5"\r
+                "9a45a6ac.6bb008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6282c457.966ab4",\r
+        "id": "2d38b1b0.a69f26",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 750.2501220703125,\r
-        "y": 2544,\r
-        "z": "111f91bb.269a56",\r
+        "x": 843.8334350585938,\r
+        "y": 2432.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "4979dd8d.1f5f3c"\r
+                "7ec62576.a9581c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4979dd8d.1f5f3c",\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": 902.2501220703125,\r
-        "y": 2545,\r
-        "z": "111f91bb.269a56",\r
+        "x": 995.8334350585938,\r
+        "y": 2433.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "91fa570e.651ca8",\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": 913.2501220703125,\r
-        "y": 2488,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1006.8334350585938,\r
+        "y": 2376.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bd1da98.2130f58",\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": 547.75,\r
-        "y": 2392,\r
-        "z": "111f91bb.269a56",\r
+        "x": 641.3333129882812,\r
+        "y": 2280.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aa3bbb2.a6f0e48",\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": 292.75,\r
-        "y": 2523,\r
-        "z": "111f91bb.269a56",\r
+        "x": 386.33331298828125,\r
+        "y": 2411.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "bd1da98.2130f58",\r
-                "d91a9773.8b97d8"\r
+                "46b10267.ea0e94",\r
+                "8481025.43fb9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b46d34a.40e874",\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": 1507.7166748046875,\r
-        "y": 340.8833312988281,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1601.2999877929688,\r
+        "y": 228.88333892822266,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1d9a3789.c423c",\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": 709.75,\r
-        "y": 563,\r
-        "z": "111f91bb.269a56",\r
+        "x": 803.3333129882812,\r
+        "y": 451.00000762939453,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6516a515.9e0ed4",\r
+        "id": "b87c2610.4dcfe8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 269.25,\r
-        "y": 1532,\r
-        "z": "111f91bb.269a56",\r
+        "x": 362.83331298828125,\r
+        "y": 1420.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "f6f3f7dd.ddd42",\r
-                "9ae45b75.53fe1",\r
-                "dbed9630.5fe208",\r
-                "b8630526.556578",\r
-                "42a4fda9.57619c",\r
-                "3738a9bc.2f26e6",\r
-                "d6151d45.cfb988",\r
-                "f1b784f.6be4af8",\r
-                "b54d5a69.762db",\r
-                "aa3bbb2.a6f0e48"\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": "6bd95e1e.6c91d8",\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": 1299.75,\r
-        "y": 1370,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1393.3333129882812,\r
+        "y": 1258.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "92533584.a5f61",\r
-                "18980475.16f3b4",\r
-                "ec63f877.0fd998",\r
-                "c1c9dc9a.d31ec"\r
+                "a9279133.62197",\r
+                "c4ef1cec.86081",\r
+                "5303ba0b.725dcc",\r
+                "84ee69ca.e736d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "92533584.a5f61",\r
+        "id": "a9279133.62197",\r
          "type": "outcome",\r
          "name": "leaf",\r
          "xml": "<outcome value='leaf'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1464.75,\r
-        "y": 1352,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1558.3333129882812,\r
+        "y": 1240.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "b00f22e0.6a5e"\r
+                "df04fed1.2e9e3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "18980475.16f3b4",\r
+        "id": "c4ef1cec.86081",\r
          "type": "outcome",\r
          "name": "root",\r
          "xml": "<outcome value='root'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1467.75,\r
-        "y": 1391,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1561.3333129882812,\r
+        "y": 1279.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "52cb104.aabcaf"\r
+                "1437703.dec509"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c1c9dc9a.d31ec",\r
+        "id": "84ee69ca.e736d8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1461.75,\r
-        "y": 1469,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1555.3333129882812,\r
+        "y": 1357.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "4eaa272a.ec5048"\r
+                "c52f2275.ca0538"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec63f877.0fd998",\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": 1484.75,\r
-        "y": 1432,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1578.3333129882812,\r
+        "y": 1320.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "e77dda82.efac78"\r
+                "bb188e14.1d1858"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb2c8aff.5902e",\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": 2030.75,\r
-        "y": 1465,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2124.3333129882812,\r
+        "y": 1353.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c8ca91d0.91a568",\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": 1992.75,\r
-        "y": 1505,\r
-        "z": "111f91bb.269a56",\r
+        "x": 2086.3333129882812,\r
+        "y": 1393.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4eaa272a.ec5048",\r
+        "id": "c52f2275.ca0538",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1613.75,\r
-        "y": 1490,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1707.3333129882812,\r
+        "y": 1378.0000076293945,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5e1c0ed5.c69c48",\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'`\" />\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=\"post\"/>\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
+        "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": 1203.3333740234375,\r
-        "y": 2789.3336181640625,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1296.9166870117188,\r
+        "y": 2677.333625793457,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b00f22e0.6a5e",\r
+        "id": "df04fed1.2e9e3",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1599.6666259765625,\r
-        "y": 1348.333251953125,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1693.2499389648438,\r
+        "y": 1236.3332595825195,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "eb2c1071.d160d8"\r
+                "7128141a.22afcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "52cb104.aabcaf",\r
+        "id": "1437703.dec509",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1601.6666259765625,\r
-        "y": 1386.333251953125,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1695.2499389648438,\r
+        "y": 1274.3332595825195,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "3c1d8397.66cfbc"\r
+                "59bf9e6a.8c5448"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e77dda82.efac78",\r
+        "id": "bb188e14.1d1858",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1644.6666259765625,\r
-        "y": 1433.333251953125,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1738.2499389648438,\r
+        "y": 1321.3332595825195,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              [\r
-                "c8ca91d0.91a568"\r
+                "a68d577a.75b008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a742833.7a10a8",\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=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",\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": 1171.3333740234375,\r
-        "y": 2861.33349609375,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1264.9166870117188,\r
+        "y": 2749.3335037231445,\r
+        "z": "d12a8890.0a99a",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "feb8a80.2e93d58",\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=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",\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": 1201.3333740234375,\r
-        "y": 2923.33349609375,\r
-        "z": "111f91bb.269a56",\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