Bug fixing for CCVPN IBN closed-loop operation.

[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..b318a73 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": "190659b8.bcae0e",\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": 353.566650390625,\r
+        "y": 335,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "e207ef26.f8a29",\r
-                "15b30bbc.e66fc4",\r
-                "c73b1c6f.dfba4"\r
+                "b2e66c4e.a3d2f8",\r
+                "35dfe125.6c620e",\r
+                "69d67799.ffee68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e207ef26.f8a29",\r
+        "id": "b2e66c4e.a3d2f8",\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": 541.566650390625,\r
+        "y": 348,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "53374de6.fbbc9c"\r
+                "a7669132.5699f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15b30bbc.e66fc4",\r
+        "id": "35dfe125.6c620e",\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": 549.0575866699219,\r
+        "y": 390.57403564453125,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c73b1c6f.dfba4",\r
+        "id": "69d67799.ffee68",\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": 539.566650390625,\r
+        "y": 437,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "1d9a3789.c423c"\r
+                "7627d017.e729d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53374de6.fbbc9c",\r
+        "id": "a7669132.5699f8",\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": 714.566650390625,\r
+        "y": 346,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "74134804.4c5ab"\r
+                "efea1cd6.23d6f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74134804.4c5ab",\r
+        "id": "efea1cd6.23d6f8",\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": 943.566650390625,\r
+        "y": 347,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "88398d04.70bb08"\r
+                "afe63db8.26dbd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "88398d04.70bb08",\r
+        "id": "afe63db8.26dbd8",\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": 1158.566650390625,\r
+        "y": 348,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "60755719.5aec98"\r
+                "46ace79f.7f246"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23c1dec0.4bd442",\r
+        "id": "356939c7.7d339e",\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": 1412.566650390625,\r
+        "y": 270,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "14654146.223b47",\r
-                "d151f4bf.d5f298"\r
+                "a076eac6.b4101",\r
+                "488c763c.46cdf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14654146.223b47",\r
+        "id": "a076eac6.b4101",\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": 1629.566650390625,\r
+        "y": 249,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "60755719.5aec98"\r
+                "46ace79f.7f246"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d151f4bf.d5f298",\r
+        "id": "488c763c.46cdf",\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": 1629.566650390625,\r
+        "y": 298,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "60755719.5aec98",\r
+        "id": "46ace79f.7f246",\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": 1813.566650390625,\r
+        "y": 335,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "e58078ca.32c2b8",\r
-                "db55a5db.cc9e2",\r
-                "d1721022.90ae5"\r
+                "5d0d530d.21fb2c",\r
+                "d6a4c941.f116b8",\r
+                "84203861.d12558"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebc2ede2.3e82f8",\r
+        "id": "578597dc.f76518",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 175.75,\r
-        "y": 203,\r
-        "z": "111f91bb.269a56",\r
+        "x": 172.566650390625,\r
+        "y": 76,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "19d2750a.7ada53"\r
+                "3273c1f.6d67d3e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "19d2750a.7ada53",\r
+        "id": "3273c1f.6d67d3e",\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": 456.8523406982422,\r
+        "y": 137.23810863494873,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "32b35910.0922e6"\r
+                "bc88585a.07ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32b35910.0922e6",\r
+        "id": "bc88585a.07ae",\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": 462.99525451660156,\r
+        "y": 222.00003051757812,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "9f4c6f10.a708b"\r
+                "c722c351.6c9218"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9f4c6f10.a708b",\r
+        "id": "c722c351.6c9218",\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": 772.8046875,\r
+        "y": 213.66668701171875,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "b052f7e.a3d5288",\r
-                "14b40144.c74357",\r
-                "8371652a.c1422",\r
-                "ab74b4be.cbc48",\r
-                "77984a30.f32474"\r
+                "190659b8.bcae0e",\r
+                "faef4429.aa2c8",\r
+                "54215ea2.f0c928",\r
+                "8ba173b9.e36f",\r
+                "e82defb9.e02d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e58078ca.32c2b8",\r
+        "id": "5d0d530d.21fb2c",\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": 2030.566650390625,\r
+        "y": 273,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bd448e7d.80d888",\r
+        "id": "6fabd371.f1d30c",\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": 4199.566650390625,\r
+        "y": 159,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "13f5ead.1dca895",\r
+        "id": "aa17cc43.b708b",\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": 4280.566650390625,\r
+        "y": 474,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "322b352.ceea84a",\r
-                "b686bcae.ff7c7"\r
+                "709fb1ba.ca1bd",\r
+                "a7a19ece.dc1ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "322b352.ceea84a",\r
+        "id": "709fb1ba.ca1bd",\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": 4590.066650390625,\r
+        "y": 443,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "1e1970be.0764a7"\r
+                "5cd036bd.ebcf28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b686bcae.ff7c7",\r
+        "id": "a7a19ece.dc1ae",\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": 4595.066650390625,\r
+        "y": 508,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "bd24692b.5a8508"\r
+                "fddf1c47.d3871"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1e1970be.0764a7",\r
+        "id": "5cd036bd.ebcf28",\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": 4766.066650390625,\r
+        "y": 443,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bd24692b.5a8508",\r
+        "id": "fddf1c47.d3871",\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": 4761.566650390625,\r
+        "y": 508,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bdfec131.c9a298",\r
+        "id": "41b8dfa5.7b07b8",\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": 4145.066650390625,\r
+        "y": 728,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "68cdfef7.64c51",\r
+        "id": "a2bed09b.bd073",\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": 4299.066650390625,\r
+        "y": 776,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "534fa647.cdf3",\r
-                "626cbb12.a73134"\r
+                "8f1feb66.a203a8",\r
+                "bdea130f.d138e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "534fa647.cdf3",\r
+        "id": "8f1feb66.a203a8",\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": 4644.566650390625,\r
+        "y": 757,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "2db65967.f1a87e"\r
+                "2db058d.5e37da8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "626cbb12.a73134",\r
+        "id": "bdea130f.d138e8",\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": 4648.566650390625,\r
+        "y": 797,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "54fc5ed8.18991"\r
+                "bfbb3301.3c3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2db65967.f1a87e",\r
+        "id": "2db058d.5e37da8",\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": 4802.566650390625,\r
+        "y": 757,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "54fc5ed8.18991",\r
+        "id": "bfbb3301.3c3",\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": 4806.066650390625,\r
+        "y": 797,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "5bbebd3d.56e454",\r
-                "7821e9b0.59a868"\r
+                "737d402b.600cc",\r
+                "9643556e.80a7d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5bbebd3d.56e454",\r
+        "id": "737d402b.600cc",\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": 5136.566650390625,\r
+        "y": 762,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "72ed7974.8997",\r
+        "id": "340d03c1.bc10a4",\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": 5000.566650390625,\r
+        "y": 721,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7821e9b0.59a868",\r
+        "id": "9643556e.80a7d8",\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": 5063.566650390625,\r
+        "y": 808,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "47a40348.350864",\r
+        "id": "3e996a09.c24c1e",\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": 4137.566650390625,\r
+        "y": 207,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e86c4698.44de68",\r
+        "id": "73cd2276.fc690c",\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": 4163.566650390625,\r
+        "y": 324,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "3bef2a94.7a3c56",\r
-                "8e5e548f.b7d088",\r
-                "9e92c765.4c36e"\r
+                "2ce54c47.fa0e34",\r
+                "f2bf065e.86763",\r
+                "a6105f6e.dd58c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3bef2a94.7a3c56",\r
+        "id": "2ce54c47.fa0e34",\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": 4359.0667724609375,\r
+        "y": 276,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "8ae11b21.8072d"\r
+                "ed0df0d0.842f2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8e5e548f.b7d088",\r
+        "id": "f2bf065e.86763",\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": 4351.0667724609375,\r
+        "y": 331,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "85930301.e40178"\r
+                "40cafd9.39fe684"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ae11b21.8072d",\r
+        "id": "ed0df0d0.842f2",\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": 4503.4490966796875,\r
+        "y": 275.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "2b001bb5.f3beac"\r
+                "404c86f.cf51c78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "44cbb5eb.fe11fc",\r
+        "id": "4841f833.0282b8",\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": 5085.566650390625,\r
+        "y": 278,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "8828c3a6.4773b"\r
+                "13a4c0ae.89b21f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b001bb5.f3beac",\r
+        "id": "404c86f.cf51c78",\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": 4687.566650390625,\r
+        "y": 274,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "e234651a.d8201"\r
+                "b62cc523.462948"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e234651a.d8201",\r
+        "id": "b62cc523.462948",\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": 4882.566650390625,\r
+        "y": 274,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "44cbb5eb.fe11fc"\r
+                "4841f833.0282b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e92c765.4c36e",\r
+        "id": "a6105f6e.dd58c",\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": 4356.0667724609375,\r
+        "y": 388,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "2e1c6b8c.8fd4dc"\r
+                "62b98530.ba575c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e1c6b8c.8fd4dc",\r
+        "id": "62b98530.ba575c",\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": 4508.0667724609375,\r
+        "y": 389,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "85930301.e40178",\r
+        "id": "40cafd9.39fe684",\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": 4519.0667724609375,\r
+        "y": 332,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "90e4153e.8023d8",\r
+        "id": "ac0364e.0ddc498",\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": 5470.566650390625,\r
+        "y": 291,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "bac51d99.85cdd8",\r
-                "432bf875.253be8",\r
-                "32be30ae.8624b"\r
+                "52afc77f.66ed58",\r
+                "690d4481.5a01f4",\r
+                "561d9e01.bb6af8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8828c3a6.4773b",\r
+        "id": "13a4c0ae.89b21f",\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": 5264.566650390625,\r
+        "y": 278,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "580b4f3c.2239f",\r
-                "90e4153e.8023d8"\r
+                "3f0e652f.aee95a",\r
+                "ac0364e.0ddc498"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "580b4f3c.2239f",\r
+        "id": "3f0e652f.aee95a",\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": 5500.566650390625,\r
+        "y": 239,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bac51d99.85cdd8",\r
+        "id": "52afc77f.66ed58",\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": 5680.566650390625,\r
+        "y": 282,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "7a8928ea.c03e88"\r
+                "2a8d9ba9.4de844"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "432bf875.253be8",\r
+        "id": "690d4481.5a01f4",\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": 5672.566650390625,\r
+        "y": 337,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "609d607b.1ff68"\r
+                "54eb498f.c93a58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32be30ae.8624b",\r
+        "id": "561d9e01.bb6af8",\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": 5677.566650390625,\r
+        "y": 394,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "e7f093f9.7ecc4"\r
+                "ab202d02.2d5188"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7f093f9.7ecc4",\r
+        "id": "ab202d02.2d5188",\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": 5829.566650390625,\r
+        "y": 395,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "609d607b.1ff68",\r
+        "id": "54eb498f.c93a58",\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": 5840.566650390625,\r
+        "y": 340,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a8928ea.c03e88",\r
+        "id": "2a8d9ba9.4de844",\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": 5824.948974609375,\r
+        "y": 279.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "d93996e8.177a9"\r
+                "fdb43e15.dd2458"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d93996e8.177a9",\r
+        "id": "fdb43e15.dd2458",\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": 6039.566650390625,\r
+        "y": 276,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a51ca3ec.fcbd9",\r
+        "id": "ad465d2.36cfe2",\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": 3606.566650390625,\r
+        "y": 1616,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "75a3839f.237ba4",\r
+        "id": "1622f07d.ae60d",\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": 3669.566650390625,\r
+        "y": 1945,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "dce36923.840728",\r
-                "157f1852.8f7de8"\r
+                "e470471b.4d3ef",\r
+                "8ee5f8b0.1b5738"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dce36923.840728",\r
+        "id": "e470471b.4d3ef",\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": 3965.066650390625,\r
+        "y": 1912,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "c9eb5c3d.58ade8"\r
+                "fbda4868.d5b3c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "157f1852.8f7de8",\r
+        "id": "8ee5f8b0.1b5738",\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": 3970.066650390625,\r
+        "y": 1977,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "ee455d7a.4369c"\r
+                "13ccd918.a15e2f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c9eb5c3d.58ade8",\r
+        "id": "fbda4868.d5b3c",\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": 4133.066650390625,\r
+        "y": 1912,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ee455d7a.4369c",\r
+        "id": "13ccd918.a15e2f",\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": 4143.566650390625,\r
+        "y": 1977,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "93204f2.1b4a73",\r
+        "id": "6aa679a5.fc13d8",\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": 3545.566650390625,\r
+        "y": 1673,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4ba3f303.c0a41c",\r
+        "id": "63f314c3.d2093c",\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": 3565.566650390625,\r
+        "y": 1770,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "cb100a9c.e2d048",\r
-                "ffd6b507.6159d",\r
-                "7158557b.4eb374"\r
+                "cb2cd4ea.b10f5",\r
+                "da2dd809.2eaba8",\r
+                "b7e5de7f.bd9438"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cb100a9c.e2d048",\r
+        "id": "cb2cd4ea.b10f5",\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": 3768.0667724609375,\r
+        "y": 1723,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "e6720bf0.83c908"\r
+                "92ce9c5d.eb149"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ffd6b507.6159d",\r
+        "id": "da2dd809.2eaba8",\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": 3760.0667724609375,\r
+        "y": 1778,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "80e1f285.9bd438"\r
+                "d2833ad2.c8fbd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6720bf0.83c908",\r
+        "id": "92ce9c5d.eb149",\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": 3912.4490966796875,\r
+        "y": 1720.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "62828788.5424"\r
+                "7c59c7e4.737078"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "62828788.5424",\r
+        "id": "7c59c7e4.737078",\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": 4096.566650390625,\r
+        "y": 1735,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "151698eb.d8b1bf"\r
+                "4a60b77a.b003e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7158557b.4eb374",\r
+        "id": "b7e5de7f.bd9438",\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": 3765.0667724609375,\r
+        "y": 1835,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "4f499dcc.5ccf54"\r
+                "482f9215.08666c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4f499dcc.5ccf54",\r
+        "id": "482f9215.08666c",\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": 3917.0667724609375,\r
+        "y": 1836,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "80e1f285.9bd438",\r
+        "id": "d2833ad2.c8fbd8",\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": 3928.0667724609375,\r
+        "y": 1781,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "48500cb6.0a5974",\r
+        "id": "8251a2fe.8b6a98",\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": 4494.566650390625,\r
+        "y": 1739,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "9253635.59581a"\r
+                "3fea75ef.6caa7a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "151698eb.d8b1bf",\r
+        "id": "4a60b77a.b003e",\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": 4291.566650390625,\r
+        "y": 1735,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "48500cb6.0a5974"\r
+                "8251a2fe.8b6a98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a71424bd.8e0678",\r
+        "id": "49b53839.01783",\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": 4879.566650390625,\r
+        "y": 1738,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "a7626fee.35776",\r
-                "f55d0ed2.02e038",\r
-                "47407f5a.98f7f8"\r
+                "b2b3032.264fd8",\r
+                "373b81c5.683f3e",\r
+                "869370b9.925f48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9253635.59581a",\r
+        "id": "3fea75ef.6caa7a",\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": 4671.566650390625,\r
+        "y": 1731,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "3d578b8.a79bc74",\r
-                "a71424bd.8e0678"\r
+                "dd88623a.123e",\r
+                "49b53839.01783"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d578b8.a79bc74",\r
+        "id": "dd88623a.123e",\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": 4909.566650390625,\r
+        "y": 1686,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6ea76ec.6a17f8",\r
+        "id": "8fb4dcc3.25c568",\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": 5238.566650390625,\r
+        "y": 1842,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c34e3d1.56f314",\r
+        "id": "95a386c5.a58638",\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": 5249.566650390625,\r
+        "y": 1787,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fae51f86.36cbd8",\r
+        "id": "738801a1.4d047",\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": 5233.948974609375,\r
+        "y": 1726.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "e7fe4b79.28daf8"\r
+                "710bce1a.dc395"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7fe4b79.28daf8",\r
+        "id": "710bce1a.dc395",\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": 5448.566650390625,\r
+        "y": 1723,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a7626fee.35776",\r
+        "id": "b2b3032.264fd8",\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": 5089.566650390625,\r
+        "y": 1729,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "fae51f86.36cbd8"\r
+                "738801a1.4d047"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f55d0ed2.02e038",\r
+        "id": "373b81c5.683f3e",\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": 5081.566650390625,\r
+        "y": 1784,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "2c34e3d1.56f314"\r
+                "95a386c5.a58638"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "47407f5a.98f7f8",\r
+        "id": "869370b9.925f48",\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": 5086.566650390625,\r
+        "y": 1841,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "d6ea76ec.6a17f8"\r
+                "8fb4dcc3.25c568"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3dd6564a.788bea",\r
+        "id": "60036337.4eba24",\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": 3120.566650390625,\r
+        "y": 687,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "4498685c.f8a9c8",\r
-                "ce59ca85.515708"\r
+                "3dc5eab6.536eee",\r
+                "c84ae496.428be8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4498685c.f8a9c8",\r
+        "id": "3dc5eab6.536eee",\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": 3334.566650390625,\r
+        "y": 724,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "b9aa4ba2.44d89"\r
+                "20d6afb2.5423d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ce59ca85.515708",\r
+        "id": "c84ae496.428be8",\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": 3336.566650390625,\r
+        "y": 662,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "50bc7adf.71a1d4"\r
+                "c6c4710b.3b446"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9aa4ba2.44d89",\r
+        "id": "20d6afb2.5423d",\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": 2914.566650390625,\r
+        "y": 1967,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "28dcb01c.f45e6",\r
-                "415698c1.9dad18"\r
+                "f7e1076.b120ff8",\r
+                "38975d3e.e2ea2a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28dcb01c.f45e6",\r
+        "id": "f7e1076.b120ff8",\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": 3167.566650390625,\r
+        "y": 2001,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "8cf945af.2f52c8"\r
+                "6af8dbb6.a59b4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "415698c1.9dad18",\r
+        "id": "38975d3e.e2ea2a",\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": 3167.566650390625,\r
+        "y": 1945,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "c8aba811.103238"\r
+                "2e5f8334.fd5e8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8cf945af.2f52c8",\r
+        "id": "6af8dbb6.a59b4c",\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": 3318.566650390625,\r
+        "y": 2001,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb2e2de2.a53528",\r
+        "id": "d2d4d90e.2fae",\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": 4194.566650390625,\r
+        "y": 99,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "15f47b8b.7e00dc",\r
+        "id": "33cb0d0f.4dfe6a",\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": 3602.566650390625,\r
+        "y": 1558,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9c2c3c17.6c4b68",\r
+        "id": "d855f72b.7e86a8",\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": 3885.566650390625,\r
+        "y": 356,\r
+        "z": "8603b63b.c1c358",\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
+                "d2d4d90e.2fae",\r
+                "6fabd371.f1d30c",\r
+                "3e996a09.c24c1e",\r
+                "73cd2276.fc690c",\r
+                "aa17cc43.b708b",\r
+                "2774aa91.aa9f06",\r
+                "8954306d.3c458",\r
+                "d41278c1.0e8268"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c8aba811.103238",\r
+        "id": "2e5f8334.fd5e8c",\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": 3318.566650390625,\r
+        "y": 1944,\r
+        "z": "8603b63b.c1c358",\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
+                "33cb0d0f.4dfe6a",\r
+                "ad465d2.36cfe2",\r
+                "6aa679a5.fc13d8",\r
+                "63f314c3.d2093c",\r
+                "1622f07d.ae60d",\r
+                "2d0bf44f.d7a87c",\r
+                "745353ea.a7c82c",\r
+                "a43e9ba4.30fe8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30be8f1c.c2c68",\r
+        "id": "ea6929ec.54f7c8",\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": 3556.566650390625,\r
+        "y": 2243,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "60d95124.1573e8",\r
+        "id": "5471fe10.85fa48",\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": 3710.566650390625,\r
+        "y": 2291,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "626c41a5.4a556",\r
-                "319f7c4c.700584"\r
+                "709844dc.12b89c",\r
+                "36a6ddd8.c214a2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "626c41a5.4a556",\r
+        "id": "709844dc.12b89c",\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": 4056.066650390625,\r
+        "y": 2272,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "a16c0d6b.aa021"\r
+                "b6a9b933.1ec16"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "319f7c4c.700584",\r
+        "id": "36a6ddd8.c214a2",\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": 4060.066650390625,\r
+        "y": 2312,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "c46066f7.6ad638"\r
+                "ef6de723.b6fb38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a16c0d6b.aa021",\r
+        "id": "b6a9b933.1ec16",\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": 4214.066650390625,\r
+        "y": 2272,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c46066f7.6ad638",\r
+        "id": "ef6de723.b6fb38",\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": 4217.566650390625,\r
+        "y": 2312,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "dbf72bce.fe4fd",\r
-                "da41ce10.71c4a8"\r
+                "dffbfe56.944988",\r
+                "8e76351f.3450b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dbf72bce.fe4fd",\r
+        "id": "dffbfe56.944988",\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": 4557.566650390625,\r
+        "y": 2311,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a0a6a7a2.80538",\r
+        "id": "a2006b0c.836e18",\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": 4415.566650390625,\r
+        "y": 2269,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "da41ce10.71c4a8",\r
+        "id": "8e76351f.3450b",\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": 4486.566650390625,\r
+        "y": 2360,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "509b9ad8.503f2c",\r
+        "id": "43b4f3be.c07abc",\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": 3111.566650390625,\r
+        "y": 627,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8edfc4cd.8a0528",\r
+        "id": "a5929ea4.d560e8",\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": 3706.566650390625,\r
+        "y": 313,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f79b26c9.540128",\r
+        "id": "40338a80.0ff774",\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": 3263.566650390625,\r
+        "y": 1891,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "50bc7adf.71a1d4",\r
+        "id": "c6c4710b.3b446",\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": 3442.566650390625,\r
+        "y": 475,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "ebf4cc93.93ec7",\r
-                "8e7f6f60.66ae28"\r
+                "8c077d56.2d05a8",\r
+                "47f9e9e4.4ae948"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8e7f6f60.66ae28",\r
+        "id": "47f9e9e4.4ae948",\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": 3684.566650390625,\r
+        "y": 1064,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "d55e670.1fa9f18"\r
+                "32d70917.41b9b6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebf4cc93.93ec7",\r
+        "id": "8c077d56.2d05a8",\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": 3678.566650390625,\r
+        "y": 355,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "9c2c3c17.6c4b68"\r
+                "d855f72b.7e86a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d55e670.1fa9f18",\r
+        "id": "32d70917.41b9b6",\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": 3842.566650390625,\r
+        "y": 1063,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "f4e2a19a.1a35e",\r
-                "f86044a9.f193d",\r
-                "4b4e2775.d6044",\r
-                "86690982.b14b6",\r
-                "21d875df.4e5d92",\r
-                "971d8a82.30a53"\r
+                "ab9c9477.87e1",\r
+                "16a44de.db79032",\r
+                "42cda8d6.66eab8",\r
+                "aab7a1d7.f682c8",\r
+                "43e0f21e.8328e4",\r
+                "173252a4.3c7835"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f86044a9.f193d",\r
+        "id": "16a44de.db79032",\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": 4106.566650390625,\r
+        "y": 946,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "21d875df.4e5d92",\r
+        "id": "43e0f21e.8328e4",\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": 4187.566650390625,\r
+        "y": 1261,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "cd1830a.9a25b5",\r
-                "5f7c3883.6456e"\r
+                "ecdb1dc3.601aa",\r
+                "9e4afd98.6cdb48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd1830a.9a25b5",\r
+        "id": "ecdb1dc3.601aa",\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": 4497.066650390625,\r
+        "y": 1230,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "cf35e2b3.2c8468"\r
+                "111350dc.469227"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f7c3883.6456e",\r
+        "id": "9e4afd98.6cdb48",\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": 4502.066650390625,\r
+        "y": 1295,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "b3a80e08.d037b"\r
+                "c6b74dac.622de"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf35e2b3.2c8468",\r
+        "id": "111350dc.469227",\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": 4673.066650390625,\r
+        "y": 1230,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3a80e08.d037b",\r
+        "id": "c6b74dac.622de",\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": 4668.566650390625,\r
+        "y": 1295,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4b4e2775.d6044",\r
+        "id": "42cda8d6.66eab8",\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": 4044.566650390625,\r
+        "y": 994,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "86690982.b14b6",\r
+        "id": "aab7a1d7.f682c8",\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": 4070.566650390625,\r
+        "y": 1111,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "85fe6961.6a7908",\r
-                "3fb6fcbe.a3fa0c",\r
-                "89e44c19.cf1b38"\r
+                "fc77fdb3.27d7c",\r
+                "3d52c0ff.052c58",\r
+                "d66dde94.6fdfd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85fe6961.6a7908",\r
+        "id": "fc77fdb3.27d7c",\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": 4266.0667724609375,\r
+        "y": 1063,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "8a104557.0ad8d8"\r
+                "6a6dadc5.106a64"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3fb6fcbe.a3fa0c",\r
+        "id": "3d52c0ff.052c58",\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": 4258.0667724609375,\r
+        "y": 1118,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "42db739a.3307d4"\r
+                "6a18bc26.5dd68c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8a104557.0ad8d8",\r
+        "id": "6a6dadc5.106a64",\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": 4410.4490966796875,\r
+        "y": 1062.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "f760615b.c41c38"\r
+                "abd6aa97.319628"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f760615b.c41c38",\r
+        "id": "abd6aa97.319628",\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": 4594.566650390625,\r
+        "y": 1061,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "142416ba.388749"\r
+                "d45837ad.7cfdd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "142416ba.388749",\r
+        "id": "d45837ad.7cfdd",\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": 4789.566650390625,\r
+        "y": 1061,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "ee80fb82.914478"\r
+                "56faad34.523464"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89e44c19.cf1b38",\r
+        "id": "d66dde94.6fdfd8",\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": 4263.0667724609375,\r
+        "y": 1175,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "190fd174.e420e7"\r
+                "da706f47.bc937"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "190fd174.e420e7",\r
+        "id": "da706f47.bc937",\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": 4415.0667724609375,\r
+        "y": 1176,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "42db739a.3307d4",\r
+        "id": "6a18bc26.5dd68c",\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": 4426.0667724609375,\r
+        "y": 1119,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f4e2a19a.1a35e",\r
+        "id": "ab9c9477.87e1",\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": 4101.566650390625,\r
+        "y": 886,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ee80fb82.914478",\r
+        "id": "56faad34.523464",\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": 4992.566650390625,\r
+        "y": 1065,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "16f58788.f805f"\r
+                "30b949db.4c7a16"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4337aa6a.e7854c",\r
+        "id": "df7b95f6.393d48",\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": 5377.566650390625,\r
+        "y": 1078,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "d59e46ba.4f5ed8",\r
-                "51e7728a.8676fc",\r
-                "dbdd6c65.aefc38"\r
+                "166f182a.55dd48",\r
+                "e1871eda.62c8a8",\r
+                "b691673d.bc8c3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "16f58788.f805f",\r
+        "id": "30b949db.4c7a16",\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": 5171.566650390625,\r
+        "y": 1065,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "925f4411.b3c5c",\r
-                "4337aa6a.e7854c"\r
+                "5671583d.41ed78",\r
+                "df7b95f6.393d48"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "925f4411.b3c5c",\r
+        "id": "5671583d.41ed78",\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": 5407.566650390625,\r
+        "y": 1026,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d59e46ba.4f5ed8",\r
+        "id": "166f182a.55dd48",\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": 5587.566650390625,\r
+        "y": 1069,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "9fb3d6ee.612538"\r
+                "61f2e54a.d8bfcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51e7728a.8676fc",\r
+        "id": "e1871eda.62c8a8",\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": 5579.566650390625,\r
+        "y": 1124,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "1c483cb2.44cb23"\r
+                "95391466.b0fdc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dbdd6c65.aefc38",\r
+        "id": "b691673d.bc8c3",\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": 5584.566650390625,\r
+        "y": 1181,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "c131e872.bad5c8"\r
+                "eaaeed8c.dbf45"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c131e872.bad5c8",\r
+        "id": "eaaeed8c.dbf45",\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": 5736.566650390625,\r
+        "y": 1182,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1c483cb2.44cb23",\r
+        "id": "95391466.b0fdc8",\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": 5747.566650390625,\r
+        "y": 1127,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fb3d6ee.612538",\r
+        "id": "61f2e54a.d8bfcc",\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": 5731.948974609375,\r
+        "y": 1066.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "e9716a08.a0ba08"\r
+                "573ef3d8.3e7cf4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e9716a08.a0ba08",\r
+        "id": "573ef3d8.3e7cf4",\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": 5946.566650390625,\r
+        "y": 1063,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c1f0320d.223f",\r
+        "id": "2171f884.ea7ea8",\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": 3720.566650390625,\r
+        "y": 1004,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "db55a5db.cc9e2",\r
+        "id": "d6a4c941.f116b8",\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": 2282.566650390625,\r
+        "y": 731,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "8cfca669.4c31d",\r
-                "1cedd7fb.e18cd"\r
+                "49267234.da4bac",\r
+                "c034393e.41c88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1cedd7fb.e18cd",\r
+        "id": "c034393e.41c88",\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": 2689.566650390625,\r
+        "y": 749,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "91bf0188.93b52"\r
+                "bc6b2cdd.907e6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8cfca669.4c31d",\r
+        "id": "49267234.da4bac",\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": 2689.566650390625,\r
+        "y": 694,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "6ae8a7fa.83375"\r
+                "1c258f4d.ef4741"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ae8a7fa.83375",\r
+        "id": "1c258f4d.ef4741",\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": 2845.566650390625,\r
+        "y": 692,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "509b9ad8.503f2c",\r
-                "3dd6564a.788bea"\r
+                "43b4f3be.c07abc",\r
+                "60036337.4eba24"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "91bf0188.93b52",\r
+        "id": "bc6b2cdd.907e6",\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": 2822.566650390625,\r
+        "y": 750,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "14b40144.c74357",\r
+        "id": "faef4429.aa2c8",\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": 999.566650390625,\r
+        "y": 166,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "470acf69.6a7218",\r
+        "id": "cda219ec.f988b",\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": 4116.566650390625,\r
+        "y": 584,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "94ce35b5.84e9d",\r
+        "id": "2774aa91.aa9f06",\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": 4176.566650390625,\r
+        "y": 623,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8371652a.c1422",\r
+        "id": "54215ea2.f0c928",\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": 992.566650390625,\r
+        "y": 74,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "180e951c.adb823",\r
+        "id": "96b9a282.e630c",\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": 3528.566650390625,\r
+        "y": 2100,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b13189f3.5c00c",\r
+        "id": "2d0bf44f.d7a87c",\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": 3584.566650390625,\r
+        "y": 2149,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "68b96268.5bf0d4",\r
+        "id": "5152a0e6.713128",\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": 992.566650390625,\r
+        "y": 113,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab74b4be.cbc48",\r
+        "id": "8ba173b9.e36f",\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": 1023.566650390625,\r
+        "y": 214,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "77984a30.f32474",\r
+        "id": "e82defb9.e02d8",\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": 233.566650390625,\r
+        "y": 689,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "6b466955.39f7e8",\r
-                "ea72fa7a.37647",\r
-                "256cca7a.4ba78e"\r
+                "2d5a1d5b.838492",\r
+                "889991f3.032d8",\r
+                "b5db494f.57cef8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b466955.39f7e8",\r
+        "id": "2d5a1d5b.838492",\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": 452.566650390625,\r
+        "y": 627,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "ff154227.b5783"\r
+                "438119f5.89426"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea72fa7a.37647",\r
+        "id": "889991f3.032d8",\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": 462.0576171875,\r
+        "y": 669.5740356445312,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "256cca7a.4ba78e",\r
+        "id": "b5db494f.57cef8",\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": 450.566650390625,\r
+        "y": 716,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "9c1b438c.70f6e8"\r
+                "debce4b9.8571d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ff154227.b5783",\r
+        "id": "438119f5.89426",\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": 649.566650390625,\r
+        "y": 623,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "d19cd8ca.093408"\r
+                "e1b02bed.ab2ac8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c1b438c.70f6e8",\r
+        "id": "debce4b9.8571d",\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": 619.566650390625,\r
+        "y": 717,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d19cd8ca.093408",\r
+        "id": "e1b02bed.ab2ac8",\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": 872.900146484375,\r
+        "y": 622.9999389648438,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "ec3530b4.60943"\r
+                "e03ee0c1.da854"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec3530b4.60943",\r
+        "id": "e03ee0c1.da854",\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": 1073.5667839050293,\r
+        "y": 624.000020980835,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "732a5938.51aee8"\r
+                "c4a6ee39.d82118"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "732a5938.51aee8",\r
+        "id": "c4a6ee39.d82118",\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": 203.566650390625,\r
+        "y": 886,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "23a8b591.9364c2",\r
-                "8c7cc41e.285ad",\r
-                "a093cec4.b44ed"\r
+                "7634ec98.e6038c",\r
+                "916099a4.9dccf",\r
+                "c850e0b6.e35a68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23a8b591.9364c2",\r
+        "id": "7634ec98.e6038c",\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": 411.566650390625,\r
+        "y": 850,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "9b9627ac.373dc8"\r
+                "33f1fe4a.c9d6f2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c7cc41e.285ad",\r
+        "id": "916099a4.9dccf",\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": 412.0576171875,\r
+        "y": 895.5740356445312,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a093cec4.b44ed",\r
+        "id": "c850e0b6.e35a68",\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": 409.566650390625,\r
+        "y": 939,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "26fe918.5a2edee"\r
+                "76c84cf.6c8b334"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26fe918.5a2edee",\r
+        "id": "76c84cf.6c8b334",\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": 578.566650390625,\r
+        "y": 940,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f6f3f7dd.ddd42",\r
+        "id": "d82baf7f.56b2f",\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": 550.566650390625,\r
+        "y": 1434,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "8744e477.6cb05"\r
+                "3c41a0c0.d2817"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8744e477.6cb05",\r
+        "id": "3c41a0c0.d2817",\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": 753.566650390625,\r
+        "y": 1446,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "9fc39c57.082728"\r
+                "24edffac.eaf52"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9fc39c57.082728",\r
+        "id": "24edffac.eaf52",\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": 919.566650390625,\r
+        "y": 1443,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "5d341323.92886c"\r
+                "8767ddb8.be5188"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d341323.92886c",\r
+        "id": "8767ddb8.be5188",\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": 1080.566650390625,\r
+        "y": 1440,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "878fc20b.33088",\r
-                "9a421f91.9b1b28",\r
-                "7916417b.dd4858",\r
-                "277d0a08.b51776",\r
-                "5d833ac3.a3e554",\r
-                "6bd95e1e.6c91d8"\r
+                "acad8b74.fa56d8",\r
+                "31574f1b.e35268",\r
+                "9a0e95d9.2f80c",\r
+                "559bb9d.67d2e48",\r
+                "d55a6f33.2c1388",\r
+                "bc764283.2e9fd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a421f91.9b1b28",\r
+        "id": "31574f1b.e35268",\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": 1286.566650390625,\r
+        "y": 1039.9999389648438,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "878fc20b.33088",\r
+        "id": "acad8b74.fa56d8",\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": 1283.566650390625,\r
+        "y": 1084.9999389648438,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "1277502d.c8e7a",\r
-                "3575cdbd.1f32e2",\r
-                "bad103b9.14ac5"\r
+                "1904c12b.d430cf",\r
+                "4ab95198.c6613",\r
+                "5a08d5cf.278d24"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3575cdbd.1f32e2",\r
+        "id": "4ab95198.c6613",\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": 1479.0576171875,\r
+        "y": 1058.5739135742188,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "245198ca.86efd8"\r
+                "ba7aa021.45bdf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bad103b9.14ac5",\r
+        "id": "5a08d5cf.278d24",\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": 1474.566650390625,\r
+        "y": 1102.9998779296875,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "564cd01d.c60fe8"\r
+                "785f1788.92249"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "245198ca.86efd8",\r
+        "id": "ba7aa021.45bdf8",\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": 1641.629150390625,\r
+        "y": 1057.859619140625,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "564cd01d.c60fe8",\r
+        "id": "785f1788.92249",\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": 1642.566650390625,\r
+        "y": 1102.9998779296875,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "57d2d0ba.ac96f",\r
+        "id": "cc679883.b7f1b8",\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": 1644.566650390625,\r
+        "y": 1149.9998779296875,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1277502d.c8e7a",\r
+        "id": "1904c12b.d430cf",\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": 1475.566650390625,\r
+        "y": 1149.9998779296875,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "57d2d0ba.ac96f"\r
+                "cc679883.b7f1b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f14d939.b7d6d",\r
+        "id": "1a421455.86d86c",\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": 1257.566650390625,\r
+        "y": 1671,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7916417b.dd4858",\r
+        "id": "9a0e95d9.2f80c",\r
          "type": "set",\r
          "name": "set ethernet-srv-end-points-list array",\r
          "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1351.75,\r
-        "y": 1852,\r
-        "z": "111f91bb.269a56",\r
+        "x": 1348.566650390625,\r
+        "y": 1725,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "780a0f58.bba71",\r
+        "id": "62fb7c08.30d35c",\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": 2025.066650390625,\r
+        "y": 1138,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "423abc5f.68ffa4",\r
+        "id": "b56049ef.636ab",\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": 2030.066650390625,\r
+        "y": 1240,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9ae45b75.53fe1",\r
+        "id": "513cbd5b.994ffc",\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": 513.566650390625,\r
+        "y": 1690,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "a1c491a.b9e1cf"\r
+                "a14556b2.428608"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1c491a.b9e1cf",\r
+        "id": "a14556b2.428608",\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": 745.566650390625,\r
+        "y": 1689,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "c7d001fc.995ef"\r
+                "e5395881.3f95e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7d001fc.995ef",\r
+        "id": "e5395881.3f95e",\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": 957.566650390625,\r
+        "y": 1690,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "af8caf57.c80ff"\r
+                "ee871fda.29052"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "af8caf57.c80ff",\r
+        "id": "ee871fda.29052",\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": 213.566650390625,\r
+        "y": 1846,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "dbb11610.758b08",\r
-                "e6442fee.44c628"\r
+                "d07450f8.7cfbd8",\r
+                "c80ac602.107b6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6442fee.44c628",\r
+        "id": "c80ac602.107b6",\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": 448.566650390625,\r
+        "y": 1833,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dbb11610.758b08",\r
+        "id": "d07450f8.7cfbd8",\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": 438.566650390625,\r
+        "y": 1894,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "afa88564.16a37",\r
-                "83950a7.2f6c078",\r
-                "12b1aba5.e7a0f4"\r
+                "3c9f89f1.b2d72e",\r
+                "7eb3712.5c8929",\r
+                "ab93aafa.12aed"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83950a7.2f6c078",\r
+        "id": "7eb3712.5c8929",\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": 652.0576171875,\r
+        "y": 1878.5740356445312,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "ea85ca6d.e8d7e"\r
+                "abd0cdd.d934eb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "12b1aba5.e7a0f4",\r
+        "id": "ab93aafa.12aed",\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": 647.566650390625,\r
+        "y": 1923,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "eb678b0e.5293e8"\r
+                "b79502c7.acaad8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afa88564.16a37",\r
+        "id": "3c9f89f1.b2d72e",\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": 649.566650390625,\r
+        "y": 1983,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "46f07676.1e063"\r
+                "509a448f.bd538c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea85ca6d.e8d7e",\r
+        "id": "abd0cdd.d934eb",\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": 814.629150390625,\r
+        "y": 1877.8597412109375,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb678b0e.5293e8",\r
+        "id": "b79502c7.acaad8",\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": 815.566650390625,\r
+        "y": 1923,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "46f07676.1e063",\r
+        "id": "509a448f.bd538c",\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": 818.566650390625,\r
+        "y": 1982,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "d6f04402.414508",\r
-                "ac4ce335.0555f"\r
+                "fd6f29b3.e5c99",\r
+                "f26de900.3c25f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "42a4fda9.57619c",\r
+        "id": "3501776f.2dad38",\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
          "comments": "",\r
-        "x": 241.75,\r
-        "y": 2611,\r
-        "z": "111f91bb.269a56",\r
+        "x": 238.566650390625,\r
+        "y": 2484,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3738a9bc.2f26e6",\r
+        "id": "ae9e098e.f50fb",\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": 360.566650390625,\r
+        "y": 2541,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "ac81680a.65fae",\r
-                "96fc6628.148e78"\r
+                "be334cda.e25598",\r
+                "43d4ffc9.f69dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ac81680a.65fae",\r
+        "id": "be334cda.e25598",\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": 673.066650390625,\r
+        "y": 2518,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "96fc6628.148e78",\r
+        "id": "43d4ffc9.f69dc",\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": 677.066650390625,\r
+        "y": 2558,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "bf7ee9c0.419518"\r
+                "f38c34e4.0af87"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6f03e95e.3ec198",\r
+        "id": "1415cbe4.3643cc",\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": 853.066650390625,\r
+        "y": 2522,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bf7ee9c0.419518",\r
+        "id": "f38c34e4.0af87",\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": 868.566650390625,\r
+        "y": 2576,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "846842ab.33ca8",\r
-                "5e1c0ed5.c69c48",\r
-                "9a742833.7a10a8",\r
-                "feb8a80.2e93d58"\r
+                "38f98e31.2df7c2",\r
+                "2709d484.f39df4",\r
+                "708149ff.3b7b8",\r
+                "40e18201.7f31fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "214d3a40.5474be",\r
+        "id": "4fb2f1f7.44fff8",\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": 1164.066650390625,\r
+        "y": 2545,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4243a8af.47f99",\r
+        "id": "8d799ed5.7c896",\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": 2631.066650390625,\r
+        "y": 1896,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "846842ab.33ca8",\r
+        "id": "38f98e31.2df7c2",\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": 1126.066650390625,\r
+        "y": 2587,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "eb2c1071.d160d8",\r
+        "id": "421d14d0.8fa8dc",\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": 1991.066650390625,\r
+        "y": 1176,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3c1d8397.66cfbc",\r
+        "id": "f196d566.5b274",\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": 1992.066650390625,\r
+        "y": 1280,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9dbb6108.db3f08",\r
+        "id": "8954306d.3c458",\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": 4285.566650390625,\r
+        "y": 537,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "971d8a82.30a53",\r
+        "id": "173252a4.3c7835",\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": 4188.566650390625,\r
+        "y": 1356,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "72e7ea14.321c0c",\r
+        "id": "745353ea.a7c82c",\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": 3682.566650390625,\r
+        "y": 2028,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9b9627ac.373dc8",\r
+        "id": "33f1fe4a.c9d6f2",\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": 783.566650390625,\r
+        "y": 836,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "20416bfa.abd944",\r
-                "3157f22c.bca4c6"\r
+                "c7ca69b2.c33e8",\r
+                "dbefa186.4d7f68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20416bfa.abd944",\r
+        "id": "c7ca69b2.c33e8",\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": 1146.566650390625,\r
+        "y": 859,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "16371b2a.82f3f5"\r
+                "100503a.a2b7efc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3157f22c.bca4c6",\r
+        "id": "dbefa186.4d7f68",\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": 1146.566650390625,\r
+        "y": 808,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "7c942827.229d68"\r
+                "5ea3a0fe.77a12"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "16371b2a.82f3f5",\r
+        "id": "100503a.a2b7efc",\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": 1302.566650390625,\r
+        "y": 857,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "6516a515.9e0ed4"\r
+                "8fcbaf21.052888"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7c942827.229d68",\r
+        "id": "5ea3a0fe.77a12",\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": 1279.566650390625,\r
+        "y": 809,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d1721022.90ae5",\r
+        "id": "84203861.d12558",\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": 2039.566650390625,\r
+        "y": 207,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a1c10f72.410b08",\r
+        "id": "a43e9ba4.30fe8",\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": 3581.566650390625,\r
+        "y": 2188,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7f10b67d.13cbf",\r
+        "id": "d41278c1.0e8268",\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": 4171.566650390625,\r
+        "y": 661,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "277d0a08.b51776",\r
+        "id": "559bb9d.67d2e48",\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": 1345.566650390625,\r
+        "y": 1767,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dbed9630.5fe208",\r
+        "id": "11998164.d0953f",\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": 524.566650390625,\r
+        "y": 1501,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b8630526.556578",\r
+        "id": "3fbbcb97.f97994",\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": 555.566650390625,\r
+        "y": 1541,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d6f04402.414508",\r
+        "id": "fd6f29b3.e5c99",\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": 1103.566650390625,\r
+        "y": 1949,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ac4ce335.0555f",\r
+        "id": "f26de900.3c25f8",\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": 1106.566650390625,\r
+        "y": 1991,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6151d45.cfb988",\r
+        "id": "10dd7514.d835b3",\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": 549.566650390625,\r
+        "y": 1631,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1b784f.6be4af8",\r
+        "id": "9cbc66e4.acef28",\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": 304.566650390625,\r
+        "y": 2010,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b54d5a69.762db",\r
+        "id": "2ee73d5.0d9a4c2",\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": 312.566650390625,\r
+        "y": 2067,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5d833ac3.a3e554",\r
+        "id": "d55a6f33.2c1388",\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": 1323.566650390625,\r
+        "y": 1616,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "5ddf355f.54101c",\r
-                "1bdf6619.a36342"\r
+                "9cf30931.2c59c8",\r
+                "da4af294.46477"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1bdf6619.a36342",\r
+        "id": "da4af294.46477",\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": 1546.566650390625,\r
+        "y": 1571,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "754506fa.d51aa8"\r
+                "66fe36a9.5f3c98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5ddf355f.54101c",\r
+        "id": "9cf30931.2c59c8",\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": 1548.566650390625,\r
+        "y": 1635,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "68209615.eef37"\r
+                "204d74d2.252cac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "754506fa.d51aa8",\r
+        "id": "66fe36a9.5f3c98",\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": 1711.566650390625,\r
+        "y": 1568,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "714f4595.b88ec4"\r
+                "4c93c317.b90e14"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "68209615.eef37",\r
+        "id": "204d74d2.252cac",\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": 1710.566650390625,\r
+        "y": 1631,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "714f4595.b88ec4",\r
+        "id": "4c93c317.b90e14",\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": 1931.566650390625,\r
+        "y": 1582,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1db1829e.06c1d5",\r
+        "id": "83593740.e4ddd",\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": 1476.566650390625,\r
+        "y": 2307,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "2cbd7342.8e2ecc"\r
+                "bc0ef8cb.38db18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fa138a5b.3e0008",\r
+        "id": "a1ab9a32.41426",\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": 1861.566650390625,\r
+        "y": 2320,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "e14f1acf.1bcd",\r
-                "c2e19be7.fca29",\r
-                "775dbfec.d9501"\r
+                "eafaddf4.4288",\r
+                "a1c53fdc.e94408",\r
+                "b9669b07.a51828"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cbd7342.8e2ecc",\r
+        "id": "bc0ef8cb.38db18",\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": 1655.566650390625,\r
+        "y": 2307,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "6f327062.742838",\r
-                "fa138a5b.3e0008"\r
+                "2580690.f3eb118",\r
+                "a1ab9a32.41426"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6f327062.742838",\r
+        "id": "2580690.f3eb118",\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": 1891.566650390625,\r
+        "y": 2268,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e14f1acf.1bcd",\r
+        "id": "eafaddf4.4288",\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": 2071.566650390625,\r
+        "y": 2311,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "d0fc139e.1761"\r
+                "13cd3d1.ffcccc3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c2e19be7.fca29",\r
+        "id": "a1c53fdc.e94408",\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": 2063.566650390625,\r
+        "y": 2366,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "43b937df.ececd8"\r
+                "7da7ccee.d6972c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "775dbfec.d9501",\r
+        "id": "b9669b07.a51828",\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": 2068.566650390625,\r
+        "y": 2423,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "ac944679.99243"\r
+                "2930329b.329efe"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ac944679.99243",\r
+        "id": "2930329b.329efe",\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": 2220.566650390625,\r
+        "y": 2424,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "43b937df.ececd8",\r
+        "id": "7da7ccee.d6972c",\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": 2231.566650390625,\r
+        "y": 2369,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d0fc139e.1761",\r
+        "id": "13cd3d1.ffcccc3",\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": 2215.948974609375,\r
+        "y": 2308.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "79bc2aa4.303284"\r
+                "febf727.ffe5c9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "79bc2aa4.303284",\r
+        "id": "febf727.ffe5c9",\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": 2430.566650390625,\r
+        "y": 2305,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d91a9773.8b97d8",\r
+        "id": "2716544d.2e4214",\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": 554.566650390625,\r
+        "y": 2353,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "fd5d97.57110a68",\r
-                "e3891e3f.2fa52",\r
-                "6282c457.966ab4"\r
+                "a2a1891d.4d5168",\r
+                "9cd28e00.2567d",\r
+                "a8c6a166.3984e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd5d97.57110a68",\r
+        "id": "a2a1891d.4d5168",\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": 750.0667724609375,\r
+        "y": 2305,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "ee247bd7.5fac58"\r
+                "6cfc839f.58b674"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3891e3f.2fa52",\r
+        "id": "9cd28e00.2567d",\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": 742.0667724609375,\r
+        "y": 2360,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "91fa570e.651ca8"\r
+                "7eb3886b.0a9b58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee247bd7.5fac58",\r
+        "id": "6cfc839f.58b674",\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": 894.4490966796875,\r
+        "y": 2304.6556701660156,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "ea7d04e7.1afcb8"\r
+                "cd8dae32.8ecf2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea7d04e7.1afcb8",\r
+        "id": "cd8dae32.8ecf2",\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": 1078.566650390625,\r
+        "y": 2303,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "40c13bcd.4d6ac4"\r
+                "2f1b8cbe.c629a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40c13bcd.4d6ac4",\r
+        "id": "2f1b8cbe.c629a4",\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": 1273.566650390625,\r
+        "y": 2303,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "1db1829e.06c1d5"\r
+                "83593740.e4ddd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6282c457.966ab4",\r
+        "id": "a8c6a166.3984e",\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": 747.0667724609375,\r
+        "y": 2417,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "4979dd8d.1f5f3c"\r
+                "1a3f5fd3.7d7ca8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4979dd8d.1f5f3c",\r
+        "id": "1a3f5fd3.7d7ca8",\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": 899.0667724609375,\r
+        "y": 2418,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "91fa570e.651ca8",\r
+        "id": "7eb3886b.0a9b58",\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": 910.0667724609375,\r
+        "y": 2361,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bd1da98.2130f58",\r
+        "id": "7c9a9ea1.e0f0b",\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": 544.566650390625,\r
+        "y": 2265,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aa3bbb2.a6f0e48",\r
+        "id": "c2f9529c.5f262",\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": 289.566650390625,\r
+        "y": 2396,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "bd1da98.2130f58",\r
-                "d91a9773.8b97d8"\r
+                "7c9a9ea1.e0f0b",\r
+                "2716544d.2e4214"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b46d34a.40e874",\r
+        "id": "57a26dc0.1ee23c",\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": 1504.5333251953125,\r
+        "y": 213.88333129882812,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1d9a3789.c423c",\r
+        "id": "7627d017.e729d8",\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": 706.566650390625,\r
+        "y": 436,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6516a515.9e0ed4",\r
+        "id": "40266792.930ff8",\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": 266.066650390625,\r
+        "y": 1405,\r
+        "z": "8603b63b.c1c358",\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
+                "d82baf7f.56b2f",\r
+                "513cbd5b.994ffc",\r
+                "11998164.d0953f",\r
+                "3fbbcb97.f97994",\r
+                "3501776f.2dad38",\r
+                "ae9e098e.f50fb",\r
+                "10dd7514.d835b3",\r
+                "9cbc66e4.acef28",\r
+                "2ee73d5.0d9a4c2",\r
+                "c2f9529c.5f262",\r
+                "cf851282.1a25c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6bd95e1e.6c91d8",\r
+        "id": "bc764283.2e9fd8",\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": 1296.566650390625,\r
+        "y": 1243,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "92533584.a5f61",\r
-                "18980475.16f3b4",\r
-                "ec63f877.0fd998",\r
-                "c1c9dc9a.d31ec"\r
+                "4133a5fe.bd0afc",\r
+                "cb7bb63e.a271e8",\r
+                "9b203a87.8531b",\r
+                "86f7d9c6.6cceb8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "92533584.a5f61",\r
+        "id": "4133a5fe.bd0afc",\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": 1461.566650390625,\r
+        "y": 1225,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "b00f22e0.6a5e"\r
+                "34effc93.508fc4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "18980475.16f3b4",\r
+        "id": "cb7bb63e.a271e8",\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": 1464.566650390625,\r
+        "y": 1264,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "52cb104.aabcaf"\r
+                "ceed6ba9.27c0d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c1c9dc9a.d31ec",\r
+        "id": "86f7d9c6.6cceb8",\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": 1458.566650390625,\r
+        "y": 1342,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "4eaa272a.ec5048"\r
+                "971b0d55.da5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec63f877.0fd998",\r
+        "id": "9b203a87.8531b",\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": 1481.566650390625,\r
+        "y": 1305,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "e77dda82.efac78"\r
+                "f1880c82.5bc33"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb2c8aff.5902e",\r
+        "id": "f85814f1.078ec8",\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": 2027.566650390625,\r
+        "y": 1338,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c8ca91d0.91a568",\r
+        "id": "17372550.7b802b",\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": 1989.566650390625,\r
+        "y": 1378,\r
+        "z": "8603b63b.c1c358",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4eaa272a.ec5048",\r
+        "id": "971b0d55.da5e",\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": 1610.566650390625,\r
+        "y": 1363,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5e1c0ed5.c69c48",\r
+        "id": "2709d484.f39df4",\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": 1200.1500244140625,\r
+        "y": 2662.3336181640625,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b00f22e0.6a5e",\r
+        "id": "34effc93.508fc4",\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": 1596.4832763671875,\r
+        "y": 1221.333251953125,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "eb2c1071.d160d8"\r
+                "421d14d0.8fa8dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "52cb104.aabcaf",\r
+        "id": "ceed6ba9.27c0d",\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": 1598.4832763671875,\r
+        "y": 1259.333251953125,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "3c1d8397.66cfbc"\r
+                "f196d566.5b274"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e77dda82.efac78",\r
+        "id": "f1880c82.5bc33",\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": 1641.4832763671875,\r
+        "y": 1306.333251953125,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              [\r
-                "c8ca91d0.91a568"\r
+                "17372550.7b802b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a742833.7a10a8",\r
+        "id": "708149ff.3b7b8",\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": 1168.1500244140625,\r
+        "y": 2734.33349609375,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "feb8a80.2e93d58",\r
+        "id": "40e18201.7f31fc",\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": 1198.1500244140625,\r
+        "y": 2796.33349609375,\r
+        "z": "8603b63b.c1c358",\r
          "wires": [\r
              []\r
          ]\r
+    },\r
+    {\r
+        "id": "cf851282.1a25c8",\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": 591.566650390625,\r
+        "y": 1343.166748046875,\r
+        "z": "8603b63b.c1c358",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "8fcbaf21.052888",\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": 132.56666564941406,\r
+        "y": 1054.1666259765625,\r
+        "z": "8603b63b.c1c358",\r
+        "wires": [\r
+            [\r
+                "5e5b0dce.955fb4",\r
+                "7fcb1378.0439ec"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7fcb1378.0439ec",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 317.566650390625,\r
+        "y": 1228.1666259765625,\r
+        "z": "8603b63b.c1c358",\r
+        "wires": [\r
+            [\r
+                "40266792.930ff8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5e5b0dce.955fb4",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 320.566650390625,\r
+        "y": 1183.1666259765625,\r
+        "z": "8603b63b.c1c358",\r
+        "wires": [\r
+            [\r
+                "40266792.930ff8"\r
+            ]\r
+        ]\r
      }\r
  ]
 \ No newline at end of file