A few bug fixes for CLL 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..9697f14 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": "a7aee3f0.b04268",\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": 400.566650390625,\r
+        "y": 374,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e207ef26.f8a29",\r
-                "15b30bbc.e66fc4",\r
-                "c73b1c6f.dfba4"\r
+                "96c8722a.b993c",\r
+                "e5061783.573db8",\r
+                "6a27552b.ad1ba4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e207ef26.f8a29",\r
+        "id": "96c8722a.b993c",\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": 588.566650390625,\r
+        "y": 387,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "53374de6.fbbc9c"\r
+                "41e4d89f.ed1468"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "15b30bbc.e66fc4",\r
+        "id": "e5061783.573db8",\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": 596.0575866699219,\r
+        "y": 429.57403564453125,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c73b1c6f.dfba4",\r
+        "id": "6a27552b.ad1ba4",\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": 586.566650390625,\r
+        "y": 476,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1d9a3789.c423c"\r
+                "a92b97b8.4129e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53374de6.fbbc9c",\r
+        "id": "41e4d89f.ed1468",\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": 761.566650390625,\r
+        "y": 385,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "74134804.4c5ab"\r
+                "cbc7d636.2def18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "74134804.4c5ab",\r
+        "id": "cbc7d636.2def18",\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": 990.566650390625,\r
+        "y": 386,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "88398d04.70bb08"\r
+                "39ab6bfa.74801c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "88398d04.70bb08",\r
+        "id": "39ab6bfa.74801c",\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": 1205.566650390625,\r
+        "y": 387,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "60755719.5aec98"\r
+                "e124b2ef.0bfdc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23c1dec0.4bd442",\r
+        "id": "f6144c8.446efb",\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": 1459.566650390625,\r
+        "y": 309,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "14654146.223b47",\r
-                "d151f4bf.d5f298"\r
+                "dc53b823.c6e998",\r
+                "b2e345a3.6b81"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14654146.223b47",\r
+        "id": "dc53b823.c6e998",\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": 1676.566650390625,\r
+        "y": 288,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "60755719.5aec98"\r
+                "e124b2ef.0bfdc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d151f4bf.d5f298",\r
+        "id": "b2e345a3.6b81",\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": 1676.566650390625,\r
+        "y": 337,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "60755719.5aec98",\r
+        "id": "e124b2ef.0bfdc8",\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": 1860.566650390625,\r
+        "y": 374,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e58078ca.32c2b8",\r
-                "db55a5db.cc9e2",\r
-                "d1721022.90ae5"\r
+                "2ac81333.5163cc",\r
+                "ce04a89c.bde61",\r
+                "b01d3963.8ea8b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebc2ede2.3e82f8",\r
+        "id": "daba1b59.df55a",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 175.75,\r
-        "y": 203,\r
-        "z": "111f91bb.269a56",\r
+        "x": 219.566650390625,\r
+        "y": 115,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "19d2750a.7ada53"\r
+                "53bce33c.ae731c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "19d2750a.7ada53",\r
+        "id": "53bce33c.ae731c",\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": 503.8523406982422,\r
+        "y": 176.23810863494873,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "32b35910.0922e6"\r
+                "13dd53c4.ce4fbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32b35910.0922e6",\r
+        "id": "13dd53c4.ce4fbc",\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": 509.99525451660156,\r
+        "y": 261.0000305175781,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9f4c6f10.a708b"\r
+                "60b5835f.a436c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9f4c6f10.a708b",\r
+        "id": "60b5835f.a436c4",\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": 819.8046875,\r
+        "y": 252.66668701171875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b052f7e.a3d5288",\r
-                "14b40144.c74357",\r
-                "8371652a.c1422",\r
-                "ab74b4be.cbc48",\r
-                "77984a30.f32474"\r
+                "a7aee3f0.b04268",\r
+                "6d17c7fb.4906d8",\r
+                "7de7f253.4369ac",\r
+                "731e9165.7bfe5",\r
+                "c3d34fd5.00b8e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e58078ca.32c2b8",\r
+        "id": "2ac81333.5163cc",\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": 2077.566650390625,\r
+        "y": 312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bd448e7d.80d888",\r
+        "id": "581b9833.ca5308",\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": 4246.566650390625,\r
+        "y": 198,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "13f5ead.1dca895",\r
+        "id": "c57ed1b4.089b78",\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": 4327.566650390625,\r
+        "y": 513,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "322b352.ceea84a",\r
-                "b686bcae.ff7c7"\r
+                "6866347a.b34054",\r
+                "d9ef66bb.b2e3a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "322b352.ceea84a",\r
+        "id": "6866347a.b34054",\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": 4637.066650390625,\r
+        "y": 482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1e1970be.0764a7"\r
+                "351f2ca1.efff8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b686bcae.ff7c7",\r
+        "id": "d9ef66bb.b2e3a",\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": 4642.066650390625,\r
+        "y": 547,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bd24692b.5a8508"\r
+                "7ec1daf0.49ebbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1e1970be.0764a7",\r
+        "id": "351f2ca1.efff8c",\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": 4813.066650390625,\r
+        "y": 482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bd24692b.5a8508",\r
+        "id": "7ec1daf0.49ebbc",\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": 4808.566650390625,\r
+        "y": 547,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bdfec131.c9a298",\r
+        "id": "fe354f09.d7eaa",\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": 4192.066650390625,\r
+        "y": 767,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "68cdfef7.64c51",\r
+        "id": "f82c7890.c5a3a",\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": 4346.066650390625,\r
+        "y": 815,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "534fa647.cdf3",\r
-                "626cbb12.a73134"\r
+                "66ca2f72.5d0ea",\r
+                "384ae824.cd397"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "534fa647.cdf3",\r
+        "id": "66ca2f72.5d0ea",\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": 4691.566650390625,\r
+        "y": 796,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2db65967.f1a87e"\r
+                "8897aa30.2d04c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "626cbb12.a73134",\r
+        "id": "384ae824.cd397",\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": 4695.566650390625,\r
+        "y": 836,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "54fc5ed8.18991"\r
+                "e98f7531.5d07d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2db65967.f1a87e",\r
+        "id": "8897aa30.2d04c",\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": 4849.566650390625,\r
+        "y": 796,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "54fc5ed8.18991",\r
+        "id": "e98f7531.5d07d8",\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": 4853.066650390625,\r
+        "y": 836,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5bbebd3d.56e454",\r
-                "7821e9b0.59a868"\r
+                "3b168b09.265424",\r
+                "f9e9fb1f.d5d228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5bbebd3d.56e454",\r
+        "id": "3b168b09.265424",\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": 5183.566650390625,\r
+        "y": 801,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "72ed7974.8997",\r
+        "id": "293d08cf.5ba9b",\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": 5047.566650390625,\r
+        "y": 760,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7821e9b0.59a868",\r
+        "id": "f9e9fb1f.d5d228",\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": 5110.566650390625,\r
+        "y": 847,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "47a40348.350864",\r
+        "id": "5b448e3f.d6f97",\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": 4184.566650390625,\r
+        "y": 246,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e86c4698.44de68",\r
+        "id": "11357d7a.7ec893",\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": 4210.566650390625,\r
+        "y": 363,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3bef2a94.7a3c56",\r
-                "8e5e548f.b7d088",\r
-                "9e92c765.4c36e"\r
+                "9cee4545.4afd2",\r
+                "c87207dc.1fc4c8",\r
+                "a541f904.08a73"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3bef2a94.7a3c56",\r
+        "id": "9cee4545.4afd2",\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": 4406.0667724609375,\r
+        "y": 315,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8ae11b21.8072d"\r
+                "174041c6.ef00ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8e5e548f.b7d088",\r
+        "id": "c87207dc.1fc4c8",\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": 4398.0667724609375,\r
+        "y": 370,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "85930301.e40178"\r
+                "2578a714.32fd88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ae11b21.8072d",\r
+        "id": "174041c6.ef00ae",\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": 4550.4490966796875,\r
+        "y": 314.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2b001bb5.f3beac"\r
+                "44c47bf6.544e84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "44cbb5eb.fe11fc",\r
+        "id": "416e074e.1652a8",\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": 5132.566650390625,\r
+        "y": 317,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8828c3a6.4773b"\r
+                "77699d71.cb9cbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b001bb5.f3beac",\r
+        "id": "44c47bf6.544e84",\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": 4734.566650390625,\r
+        "y": 313,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e234651a.d8201"\r
+                "ec3ad4d7.e6b51"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e234651a.d8201",\r
+        "id": "ec3ad4d7.e6b51",\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": 4929.566650390625,\r
+        "y": 313,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "44cbb5eb.fe11fc"\r
+                "416e074e.1652a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e92c765.4c36e",\r
+        "id": "a541f904.08a73",\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": 4403.0667724609375,\r
+        "y": 427,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2e1c6b8c.8fd4dc"\r
+                "44c8faa6.17201c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e1c6b8c.8fd4dc",\r
+        "id": "44c8faa6.17201c",\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": 4555.0667724609375,\r
+        "y": 428,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "85930301.e40178",\r
+        "id": "2578a714.32fd88",\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": 4566.0667724609375,\r
+        "y": 371,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "90e4153e.8023d8",\r
+        "id": "157b4f1e.ec4409",\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": 5517.566650390625,\r
+        "y": 330,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bac51d99.85cdd8",\r
-                "432bf875.253be8",\r
-                "32be30ae.8624b"\r
+                "5eb578c.a510488",\r
+                "646e1345.d32534",\r
+                "d2cac0b5.69fe18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8828c3a6.4773b",\r
+        "id": "77699d71.cb9cbc",\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": 5311.566650390625,\r
+        "y": 317,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "580b4f3c.2239f",\r
-                "90e4153e.8023d8"\r
+                "e5b6fb7a.6fa868",\r
+                "157b4f1e.ec4409"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "580b4f3c.2239f",\r
+        "id": "e5b6fb7a.6fa868",\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": 5547.566650390625,\r
+        "y": 278,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bac51d99.85cdd8",\r
+        "id": "5eb578c.a510488",\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": 5727.566650390625,\r
+        "y": 321,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7a8928ea.c03e88"\r
+                "e92c3ae0.67c78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "432bf875.253be8",\r
+        "id": "646e1345.d32534",\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": 5719.566650390625,\r
+        "y": 376,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "609d607b.1ff68"\r
+                "bbc83f99.73f6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32be30ae.8624b",\r
+        "id": "d2cac0b5.69fe18",\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": 5724.566650390625,\r
+        "y": 433,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e7f093f9.7ecc4"\r
+                "2b4662b0.39c236"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7f093f9.7ecc4",\r
+        "id": "2b4662b0.39c236",\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": 5876.566650390625,\r
+        "y": 434,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "609d607b.1ff68",\r
+        "id": "bbc83f99.73f6",\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": 5887.566650390625,\r
+        "y": 379,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a8928ea.c03e88",\r
+        "id": "e92c3ae0.67c78",\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": 5871.948974609375,\r
+        "y": 318.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d93996e8.177a9"\r
+                "79f8358f.b45374"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d93996e8.177a9",\r
+        "id": "79f8358f.b45374",\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": 6086.566650390625,\r
+        "y": 315,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a51ca3ec.fcbd9",\r
+        "id": "ffd19574.4197a8",\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": 3653.566650390625,\r
+        "y": 1655,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "75a3839f.237ba4",\r
+        "id": "bd3c5166.6aead",\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": 3716.566650390625,\r
+        "y": 1984,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "dce36923.840728",\r
-                "157f1852.8f7de8"\r
+                "85a267fb.c74d5",\r
+                "1abf40e9.7b1f1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dce36923.840728",\r
+        "id": "85a267fb.c74d5",\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": 4012.066650390625,\r
+        "y": 1951,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c9eb5c3d.58ade8"\r
+                "8944bada.8beb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "157f1852.8f7de8",\r
+        "id": "1abf40e9.7b1f1f",\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": 4017.066650390625,\r
+        "y": 2016,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ee455d7a.4369c"\r
+                "fa8bf7ac.5ecf28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c9eb5c3d.58ade8",\r
+        "id": "8944bada.8beb4",\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": 4180.066650390625,\r
+        "y": 1951,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ee455d7a.4369c",\r
+        "id": "fa8bf7ac.5ecf28",\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": 4190.566650390625,\r
+        "y": 2016,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "93204f2.1b4a73",\r
+        "id": "e3d71f0.616b0e",\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": 3592.566650390625,\r
+        "y": 1712,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4ba3f303.c0a41c",\r
+        "id": "5f81a64c.5bf2a",\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": 3612.566650390625,\r
+        "y": 1809,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "cb100a9c.e2d048",\r
-                "ffd6b507.6159d",\r
-                "7158557b.4eb374"\r
+                "1781a1bd.0348ce",\r
+                "e03bcd54.697738",\r
+                "94b9ef51.5409d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cb100a9c.e2d048",\r
+        "id": "1781a1bd.0348ce",\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": 3815.0667724609375,\r
+        "y": 1762,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e6720bf0.83c908"\r
+                "a95165c1.f614f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ffd6b507.6159d",\r
+        "id": "e03bcd54.697738",\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": 3807.0667724609375,\r
+        "y": 1817,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "80e1f285.9bd438"\r
+                "b5b6c797.75de6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6720bf0.83c908",\r
+        "id": "a95165c1.f614f8",\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": 3959.4490966796875,\r
+        "y": 1759.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "62828788.5424"\r
+                "5bb225c8.c4c70c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "62828788.5424",\r
+        "id": "5bb225c8.c4c70c",\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": 4143.566650390625,\r
+        "y": 1774,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "151698eb.d8b1bf"\r
+                "7747e85a.705d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7158557b.4eb374",\r
+        "id": "94b9ef51.5409d",\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": 3812.0667724609375,\r
+        "y": 1874,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4f499dcc.5ccf54"\r
+                "9d4f33d7.c972d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4f499dcc.5ccf54",\r
+        "id": "9d4f33d7.c972d",\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": 3964.0667724609375,\r
+        "y": 1875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "80e1f285.9bd438",\r
+        "id": "b5b6c797.75de6",\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": 3975.0667724609375,\r
+        "y": 1820,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "48500cb6.0a5974",\r
+        "id": "7641eade.641374",\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": 4541.566650390625,\r
+        "y": 1778,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9253635.59581a"\r
+                "745d7190.9cf208"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "151698eb.d8b1bf",\r
+        "id": "7747e85a.705d5",\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": 4338.566650390625,\r
+        "y": 1774,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "48500cb6.0a5974"\r
+                "7641eade.641374"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a71424bd.8e0678",\r
+        "id": "95464c66.d9ff8",\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": 4926.566650390625,\r
+        "y": 1777,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a7626fee.35776",\r
-                "f55d0ed2.02e038",\r
-                "47407f5a.98f7f8"\r
+                "bb6dbaba.ff1548",\r
+                "a59e3175.15a9b",\r
+                "4bc34556.41323c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9253635.59581a",\r
+        "id": "745d7190.9cf208",\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": 4718.566650390625,\r
+        "y": 1770,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3d578b8.a79bc74",\r
-                "a71424bd.8e0678"\r
+                "80afd84e.d6bdd8",\r
+                "95464c66.d9ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3d578b8.a79bc74",\r
+        "id": "80afd84e.d6bdd8",\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": 4956.566650390625,\r
+        "y": 1725,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6ea76ec.6a17f8",\r
+        "id": "42edd12e.5451d",\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": 5285.566650390625,\r
+        "y": 1881,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c34e3d1.56f314",\r
+        "id": "ea697aed.d1f358",\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": 5296.566650390625,\r
+        "y": 1826,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fae51f86.36cbd8",\r
+        "id": "edcb3571.8c6728",\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": 5280.948974609375,\r
+        "y": 1765.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e7fe4b79.28daf8"\r
+                "6d55462a.8f8fa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e7fe4b79.28daf8",\r
+        "id": "6d55462a.8f8fa8",\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": 5495.566650390625,\r
+        "y": 1762,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a7626fee.35776",\r
+        "id": "bb6dbaba.ff1548",\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": 5136.566650390625,\r
+        "y": 1768,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fae51f86.36cbd8"\r
+                "edcb3571.8c6728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f55d0ed2.02e038",\r
+        "id": "a59e3175.15a9b",\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": 5128.566650390625,\r
+        "y": 1823,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2c34e3d1.56f314"\r
+                "ea697aed.d1f358"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "47407f5a.98f7f8",\r
+        "id": "4bc34556.41323c",\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": 5133.566650390625,\r
+        "y": 1880,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d6ea76ec.6a17f8"\r
+                "42edd12e.5451d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3dd6564a.788bea",\r
+        "id": "64ebcb8e.6a273c",\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": 3167.566650390625,\r
+        "y": 726,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4498685c.f8a9c8",\r
-                "ce59ca85.515708"\r
+                "635bfedd.0eff1",\r
+                "4466b072.e153e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4498685c.f8a9c8",\r
+        "id": "635bfedd.0eff1",\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": 3381.566650390625,\r
+        "y": 763,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b9aa4ba2.44d89"\r
+                "f20f4b09.4270d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ce59ca85.515708",\r
+        "id": "4466b072.e153e8",\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": 3383.566650390625,\r
+        "y": 701,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "50bc7adf.71a1d4"\r
+                "388a019b.9b73c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b9aa4ba2.44d89",\r
+        "id": "f20f4b09.4270d8",\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": 2961.566650390625,\r
+        "y": 2006,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "28dcb01c.f45e6",\r
-                "415698c1.9dad18"\r
+                "69af1ba1.41260c",\r
+                "13b2b9f.1f67dc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28dcb01c.f45e6",\r
+        "id": "69af1ba1.41260c",\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": 3214.566650390625,\r
+        "y": 2040,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8cf945af.2f52c8"\r
+                "c8858f37.c3f05"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "415698c1.9dad18",\r
+        "id": "13b2b9f.1f67dc6",\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": 3214.566650390625,\r
+        "y": 1984,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c8aba811.103238"\r
+                "be4790f9.3bf898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8cf945af.2f52c8",\r
+        "id": "c8858f37.c3f05",\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": 3365.566650390625,\r
+        "y": 2040,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb2e2de2.a53528",\r
+        "id": "7a5e210e.9e5d48",\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": 4241.566650390625,\r
+        "y": 138,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "15f47b8b.7e00dc",\r
+        "id": "163461bd.87a87e",\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": 3649.566650390625,\r
+        "y": 1597,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9c2c3c17.6c4b68",\r
+        "id": "354c57ea.e71ee8",\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": 3932.566650390625,\r
+        "y": 395,\r
+        "z": "b25656d7.85a8a8",\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
+                "7a5e210e.9e5d48",\r
+                "581b9833.ca5308",\r
+                "5b448e3f.d6f97",\r
+                "11357d7a.7ec893",\r
+                "c57ed1b4.089b78",\r
+                "5d6e99f5.a1e2d",\r
+                "1771c9d3.36c546",\r
+                "d9cf64bd.4ed12"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c8aba811.103238",\r
+        "id": "be4790f9.3bf898",\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": 3365.566650390625,\r
+        "y": 1983,\r
+        "z": "b25656d7.85a8a8",\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
+                "163461bd.87a87e",\r
+                "ffd19574.4197a8",\r
+                "e3d71f0.616b0e",\r
+                "5f81a64c.5bf2a",\r
+                "bd3c5166.6aead",\r
+                "b596d9f.c7daaa8",\r
+                "2308c235.08d20e",\r
+                "5a0cb184.9cdf98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30be8f1c.c2c68",\r
+        "id": "12d5b667.53ec1a",\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": 3603.566650390625,\r
+        "y": 2282,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "60d95124.1573e8",\r
+        "id": "b0af817e.3df5c",\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": 3757.566650390625,\r
+        "y": 2330,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "626c41a5.4a556",\r
-                "319f7c4c.700584"\r
+                "8bd672ae.f97518",\r
+                "171382a6.de96c5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "626c41a5.4a556",\r
+        "id": "8bd672ae.f97518",\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": 4103.066650390625,\r
+        "y": 2311,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a16c0d6b.aa021"\r
+                "26f501a4.aaf356"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "319f7c4c.700584",\r
+        "id": "171382a6.de96c5",\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": 4107.066650390625,\r
+        "y": 2351,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c46066f7.6ad638"\r
+                "81506f95.53e78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a16c0d6b.aa021",\r
+        "id": "26f501a4.aaf356",\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": 4261.066650390625,\r
+        "y": 2311,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c46066f7.6ad638",\r
+        "id": "81506f95.53e78",\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": 4264.566650390625,\r
+        "y": 2351,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "dbf72bce.fe4fd",\r
-                "da41ce10.71c4a8"\r
+                "8a72bd7f.2b673",\r
+                "2efc6876.725c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dbf72bce.fe4fd",\r
+        "id": "8a72bd7f.2b673",\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": 4604.566650390625,\r
+        "y": 2350,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a0a6a7a2.80538",\r
+        "id": "52aaed09.836384",\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": 4462.566650390625,\r
+        "y": 2308,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "da41ce10.71c4a8",\r
+        "id": "2efc6876.725c8",\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": 4533.566650390625,\r
+        "y": 2399,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "509b9ad8.503f2c",\r
+        "id": "601ee7c2.7cf4c8",\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": 3158.566650390625,\r
+        "y": 666,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8edfc4cd.8a0528",\r
+        "id": "f8b99cf2.a93e78",\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": 3753.566650390625,\r
+        "y": 352,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f79b26c9.540128",\r
+        "id": "ba2b5c4f.29126",\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": 3310.566650390625,\r
+        "y": 1930,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "50bc7adf.71a1d4",\r
+        "id": "388a019b.9b73c6",\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": 3489.566650390625,\r
+        "y": 514,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ebf4cc93.93ec7",\r
-                "8e7f6f60.66ae28"\r
+                "60287d21.a15fac",\r
+                "e673bc57.d2c08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8e7f6f60.66ae28",\r
+        "id": "e673bc57.d2c08",\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": 3731.566650390625,\r
+        "y": 1103,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d55e670.1fa9f18"\r
+                "8e141356.94256"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebf4cc93.93ec7",\r
+        "id": "60287d21.a15fac",\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": 3725.566650390625,\r
+        "y": 394,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9c2c3c17.6c4b68"\r
+                "354c57ea.e71ee8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d55e670.1fa9f18",\r
+        "id": "8e141356.94256",\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": 3889.566650390625,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f4e2a19a.1a35e",\r
-                "f86044a9.f193d",\r
-                "4b4e2775.d6044",\r
-                "86690982.b14b6",\r
-                "21d875df.4e5d92",\r
-                "971d8a82.30a53"\r
+                "660dd4a0.d8f1f4",\r
+                "bd6ec24f.7d2838",\r
+                "2d50a497.118c24",\r
+                "60d7ef05.f89ff8",\r
+                "feec0e79.04d7e8",\r
+                "6270f9ff.6a6b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f86044a9.f193d",\r
+        "id": "bd6ec24f.7d2838",\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": 4153.566650390625,\r
+        "y": 985,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "21d875df.4e5d92",\r
+        "id": "feec0e79.04d7e8",\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": 4234.566650390625,\r
+        "y": 1300,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "cd1830a.9a25b5",\r
-                "5f7c3883.6456e"\r
+                "1829c13e.6c182f",\r
+                "cdc3e429.be6fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd1830a.9a25b5",\r
+        "id": "1829c13e.6c182f",\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": 4544.066650390625,\r
+        "y": 1269,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "cf35e2b3.2c8468"\r
+                "5b91a7ec.2e4658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f7c3883.6456e",\r
+        "id": "cdc3e429.be6fa",\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": 4549.066650390625,\r
+        "y": 1334,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b3a80e08.d037b"\r
+                "8046aee4.83e438"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cf35e2b3.2c8468",\r
+        "id": "5b91a7ec.2e4658",\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": 4720.066650390625,\r
+        "y": 1269,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3a80e08.d037b",\r
+        "id": "8046aee4.83e438",\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": 4715.566650390625,\r
+        "y": 1334,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4b4e2775.d6044",\r
+        "id": "2d50a497.118c24",\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": 4091.566650390625,\r
+        "y": 1033,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "86690982.b14b6",\r
+        "id": "60d7ef05.f89ff8",\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": 4117.566650390625,\r
+        "y": 1150,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "85fe6961.6a7908",\r
-                "3fb6fcbe.a3fa0c",\r
-                "89e44c19.cf1b38"\r
+                "684da58c.28fc44",\r
+                "7420bdce.6aab1c",\r
+                "21d55314.ed559c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "85fe6961.6a7908",\r
+        "id": "684da58c.28fc44",\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": 4313.0667724609375,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8a104557.0ad8d8"\r
+                "64489fc6.c8241"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3fb6fcbe.a3fa0c",\r
+        "id": "7420bdce.6aab1c",\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": 4305.0667724609375,\r
+        "y": 1157,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "42db739a.3307d4"\r
+                "92f1b89c.1ab69"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8a104557.0ad8d8",\r
+        "id": "64489fc6.c8241",\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": 4457.4490966796875,\r
+        "y": 1101.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f760615b.c41c38"\r
+                "48d2ac4e.25f6b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f760615b.c41c38",\r
+        "id": "48d2ac4e.25f6b4",\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": 4641.566650390625,\r
+        "y": 1100,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "142416ba.388749"\r
+                "714ce556.4f2fcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "142416ba.388749",\r
+        "id": "714ce556.4f2fcc",\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": 4836.566650390625,\r
+        "y": 1100,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ee80fb82.914478"\r
+                "2076535.8c263ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89e44c19.cf1b38",\r
+        "id": "21d55314.ed559c",\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": 4310.0667724609375,\r
+        "y": 1214,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "190fd174.e420e7"\r
+                "45f37411.31ce94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "190fd174.e420e7",\r
+        "id": "45f37411.31ce94",\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": 4462.0667724609375,\r
+        "y": 1215,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "42db739a.3307d4",\r
+        "id": "92f1b89c.1ab69",\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": 4473.0667724609375,\r
+        "y": 1158,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f4e2a19a.1a35e",\r
+        "id": "660dd4a0.d8f1f4",\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": 4148.566650390625,\r
+        "y": 925,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ee80fb82.914478",\r
+        "id": "2076535.8c263ac",\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": 5039.566650390625,\r
+        "y": 1104,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "16f58788.f805f"\r
+                "f782ae02.7309d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4337aa6a.e7854c",\r
+        "id": "4c7d2512.5b4fb4",\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": 5424.566650390625,\r
+        "y": 1117,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d59e46ba.4f5ed8",\r
-                "51e7728a.8676fc",\r
-                "dbdd6c65.aefc38"\r
+                "f27cc561.589478",\r
+                "533a9a4e.562074",\r
+                "f04fcd62.bdef1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "16f58788.f805f",\r
+        "id": "f782ae02.7309d8",\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": 5218.566650390625,\r
+        "y": 1104,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "925f4411.b3c5c",\r
-                "4337aa6a.e7854c"\r
+                "eec3155e.2bcec8",\r
+                "4c7d2512.5b4fb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "925f4411.b3c5c",\r
+        "id": "eec3155e.2bcec8",\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": 5454.566650390625,\r
+        "y": 1065,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d59e46ba.4f5ed8",\r
+        "id": "f27cc561.589478",\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": 5634.566650390625,\r
+        "y": 1108,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9fb3d6ee.612538"\r
+                "20cc7528.d35caa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51e7728a.8676fc",\r
+        "id": "533a9a4e.562074",\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": 5626.566650390625,\r
+        "y": 1163,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1c483cb2.44cb23"\r
+                "a99b13d6.7a5b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dbdd6c65.aefc38",\r
+        "id": "f04fcd62.bdef1",\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": 5631.566650390625,\r
+        "y": 1220,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c131e872.bad5c8"\r
+                "76e3f44a.1be574"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c131e872.bad5c8",\r
+        "id": "76e3f44a.1be574",\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": 5783.566650390625,\r
+        "y": 1221,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1c483cb2.44cb23",\r
+        "id": "a99b13d6.7a5b4",\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": 5794.566650390625,\r
+        "y": 1166,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fb3d6ee.612538",\r
+        "id": "20cc7528.d35caa",\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": 5778.948974609375,\r
+        "y": 1105.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e9716a08.a0ba08"\r
+                "52e6acc9.c6278c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e9716a08.a0ba08",\r
+        "id": "52e6acc9.c6278c",\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": 5993.566650390625,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c1f0320d.223f",\r
+        "id": "7dd287b6.719d08",\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": 3767.566650390625,\r
+        "y": 1043,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "db55a5db.cc9e2",\r
+        "id": "ce04a89c.bde61",\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": 2329.566650390625,\r
+        "y": 770,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8cfca669.4c31d",\r
-                "1cedd7fb.e18cd"\r
+                "f4c77699.53d898",\r
+                "9865c4e0.3bcc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1cedd7fb.e18cd",\r
+        "id": "9865c4e0.3bcc6",\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": 2736.566650390625,\r
+        "y": 788,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "91bf0188.93b52"\r
+                "ad8883f5.8e3298"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8cfca669.4c31d",\r
+        "id": "f4c77699.53d898",\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": 2736.566650390625,\r
+        "y": 733,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6ae8a7fa.83375"\r
+                "e8f3ed6f.2eafd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ae8a7fa.83375",\r
+        "id": "e8f3ed6f.2eafd",\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": 2892.566650390625,\r
+        "y": 731,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "509b9ad8.503f2c",\r
-                "3dd6564a.788bea"\r
+                "601ee7c2.7cf4c8",\r
+                "64ebcb8e.6a273c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "91bf0188.93b52",\r
+        "id": "ad8883f5.8e3298",\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": 2869.566650390625,\r
+        "y": 789,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "14b40144.c74357",\r
+        "id": "6d17c7fb.4906d8",\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": 1046.566650390625,\r
+        "y": 205,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "470acf69.6a7218",\r
+        "id": "c6c6f64f.fccbe8",\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": 4163.566650390625,\r
+        "y": 623,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "94ce35b5.84e9d",\r
+        "id": "5d6e99f5.a1e2d",\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": 4223.566650390625,\r
+        "y": 662,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8371652a.c1422",\r
+        "id": "7de7f253.4369ac",\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": 1039.566650390625,\r
+        "y": 113,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "180e951c.adb823",\r
+        "id": "9d19ef7b.02af28",\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": 3575.566650390625,\r
+        "y": 2139,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b13189f3.5c00c",\r
+        "id": "b596d9f.c7daaa8",\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": 3631.566650390625,\r
+        "y": 2188,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "68b96268.5bf0d4",\r
+        "id": "aeebae01.261168",\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": 1039.566650390625,\r
+        "y": 152,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ab74b4be.cbc48",\r
+        "id": "731e9165.7bfe5",\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": 1070.566650390625,\r
+        "y": 253,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "77984a30.f32474",\r
+        "id": "c3d34fd5.00b8e8",\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": 280.566650390625,\r
+        "y": 728,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6b466955.39f7e8",\r
-                "ea72fa7a.37647",\r
-                "256cca7a.4ba78e"\r
+                "39350f2.499cf7",\r
+                "6ce2e49e.7b3484",\r
+                "5333638f.7ecf8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b466955.39f7e8",\r
+        "id": "39350f2.499cf7",\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": 499.566650390625,\r
+        "y": 666,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ff154227.b5783"\r
+                "36841c29.6decdc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea72fa7a.37647",\r
+        "id": "6ce2e49e.7b3484",\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": 509.0576171875,\r
+        "y": 708.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "256cca7a.4ba78e",\r
+        "id": "5333638f.7ecf8c",\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": 497.566650390625,\r
+        "y": 755,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9c1b438c.70f6e8"\r
+                "3e93247c.aebb34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ff154227.b5783",\r
+        "id": "36841c29.6decdc",\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": 696.566650390625,\r
+        "y": 662,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d19cd8ca.093408"\r
+                "1f2c86c7.cadda9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c1b438c.70f6e8",\r
+        "id": "3e93247c.aebb34",\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": 666.566650390625,\r
+        "y": 756,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d19cd8ca.093408",\r
+        "id": "1f2c86c7.cadda9",\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": 919.900146484375,\r
+        "y": 661.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ec3530b4.60943"\r
+                "a1cbb7bd.24594"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec3530b4.60943",\r
+        "id": "a1cbb7bd.24594",\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": 1120.5667839050293,\r
+        "y": 663.000020980835,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "732a5938.51aee8"\r
+                "1f60fbe4.6df234"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "732a5938.51aee8",\r
+        "id": "1f60fbe4.6df234",\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": 250.566650390625,\r
+        "y": 925,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "23a8b591.9364c2",\r
-                "8c7cc41e.285ad",\r
-                "a093cec4.b44ed"\r
+                "63c00e4f.b84e58",\r
+                "13815c78.95eb5c",\r
+                "e5780368.e11db"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23a8b591.9364c2",\r
+        "id": "63c00e4f.b84e58",\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": 458.566650390625,\r
+        "y": 889,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9b9627ac.373dc8"\r
+                "c1076b8e.81d988"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c7cc41e.285ad",\r
+        "id": "13815c78.95eb5c",\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": 459.0576171875,\r
+        "y": 934.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "a093cec4.b44ed",\r
+        "id": "e5780368.e11db",\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": 456.566650390625,\r
+        "y": 978,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "26fe918.5a2edee"\r
+                "96cea788.4bc5b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26fe918.5a2edee",\r
+        "id": "96cea788.4bc5b",\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": 625.566650390625,\r
+        "y": 979,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f6f3f7dd.ddd42",\r
+        "id": "ec5bb05c.091188",\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": 597.566650390625,\r
+        "y": 1473,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8744e477.6cb05"\r
+                "19a0d254.b680d6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8744e477.6cb05",\r
+        "id": "19a0d254.b680d6",\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": 800.566650390625,\r
+        "y": 1485,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9fc39c57.082728"\r
+                "5cf33a37.92a98c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9fc39c57.082728",\r
+        "id": "5cf33a37.92a98c",\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": 966.566650390625,\r
+        "y": 1482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5d341323.92886c"\r
+                "60d055a9.95f0c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d341323.92886c",\r
+        "id": "60d055a9.95f0c4",\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": 1127.566650390625,\r
+        "y": 1479,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "878fc20b.33088",\r
-                "9a421f91.9b1b28",\r
-                "7916417b.dd4858",\r
-                "277d0a08.b51776",\r
-                "5d833ac3.a3e554",\r
-                "6bd95e1e.6c91d8"\r
+                "325c2337.f5bbac",\r
+                "282c70ac.7ebb8",\r
+                "790547b3.03e69",\r
+                "be332a4a.d8db58",\r
+                "88b6396e.dee88",\r
+                "3f4654a9.b7d9fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a421f91.9b1b28",\r
+        "id": "282c70ac.7ebb8",\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": 1333.566650390625,\r
+        "y": 1078.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "878fc20b.33088",\r
+        "id": "325c2337.f5bbac",\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": 1330.566650390625,\r
+        "y": 1123.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1277502d.c8e7a",\r
-                "3575cdbd.1f32e2",\r
-                "bad103b9.14ac5"\r
+                "5ebf3dd3.403df4",\r
+                "df8620f2.fcde78",\r
+                "4f82abb0.8dd704"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3575cdbd.1f32e2",\r
+        "id": "df8620f2.fcde78",\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": 1526.0576171875,\r
+        "y": 1097.5739135742188,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "245198ca.86efd8"\r
+                "f317bbdf.6454e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bad103b9.14ac5",\r
+        "id": "4f82abb0.8dd704",\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": 1521.566650390625,\r
+        "y": 1141.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "564cd01d.c60fe8"\r
+                "ba985891.b5d178"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "245198ca.86efd8",\r
+        "id": "f317bbdf.6454e",\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": 1688.629150390625,\r
+        "y": 1096.859619140625,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "564cd01d.c60fe8",\r
+        "id": "ba985891.b5d178",\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": 1689.566650390625,\r
+        "y": 1141.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "57d2d0ba.ac96f",\r
+        "id": "d594aca6.9a4aa",\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": 1691.566650390625,\r
+        "y": 1188.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1277502d.c8e7a",\r
+        "id": "5ebf3dd3.403df4",\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": 1522.566650390625,\r
+        "y": 1188.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "57d2d0ba.ac96f"\r
+                "d594aca6.9a4aa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f14d939.b7d6d",\r
+        "id": "f22d69be.3697f8",\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": 1304.566650390625,\r
+        "y": 1710,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7916417b.dd4858",\r
+        "id": "790547b3.03e69",\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": 1395.566650390625,\r
+        "y": 1764,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "780a0f58.bba71",\r
+        "id": "a6f0acc2.4c1e8",\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": 2072.066650390625,\r
+        "y": 1177,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "423abc5f.68ffa4",\r
+        "id": "ff492e23.69ead8",\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": 2077.066650390625,\r
+        "y": 1279,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9ae45b75.53fe1",\r
+        "id": "f2cd3854.ada88",\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": 560.566650390625,\r
+        "y": 1729,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a1c491a.b9e1cf"\r
+                "6040df7.067df2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a1c491a.b9e1cf",\r
+        "id": "6040df7.067df2",\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": 792.566650390625,\r
+        "y": 1728,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c7d001fc.995ef"\r
+                "f4813036.0e422"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7d001fc.995ef",\r
+        "id": "f4813036.0e422",\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": 1004.566650390625,\r
+        "y": 1729,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "af8caf57.c80ff"\r
+                "21d7816d.cb9a2e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "af8caf57.c80ff",\r
+        "id": "21d7816d.cb9a2e",\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": 260.566650390625,\r
+        "y": 1885,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "dbb11610.758b08",\r
-                "e6442fee.44c628"\r
+                "99bd9d6a.34096",\r
+                "25dea7fd.0f37b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6442fee.44c628",\r
+        "id": "25dea7fd.0f37b",\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": 495.566650390625,\r
+        "y": 1872,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dbb11610.758b08",\r
+        "id": "99bd9d6a.34096",\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": 485.566650390625,\r
+        "y": 1933,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "afa88564.16a37",\r
-                "83950a7.2f6c078",\r
-                "12b1aba5.e7a0f4"\r
+                "74a706a.d47d878",\r
+                "7274c8e3.f8fec8",\r
+                "b6208f6.4c1eb7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "83950a7.2f6c078",\r
+        "id": "7274c8e3.f8fec8",\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": 699.0576171875,\r
+        "y": 1917.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ea85ca6d.e8d7e"\r
+                "7f886391.998a1c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "12b1aba5.e7a0f4",\r
+        "id": "b6208f6.4c1eb7",\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": 694.566650390625,\r
+        "y": 1962,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "eb678b0e.5293e8"\r
+                "3f233556.698682"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "afa88564.16a37",\r
+        "id": "74a706a.d47d878",\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": 696.566650390625,\r
+        "y": 2022,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "46f07676.1e063"\r
+                "721ed34e.4f1714"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea85ca6d.e8d7e",\r
+        "id": "7f886391.998a1c",\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": 861.629150390625,\r
+        "y": 1916.8597412109375,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb678b0e.5293e8",\r
+        "id": "3f233556.698682",\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": 862.566650390625,\r
+        "y": 1962,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "46f07676.1e063",\r
+        "id": "721ed34e.4f1714",\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": 865.566650390625,\r
+        "y": 2021,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d6f04402.414508",\r
-                "ac4ce335.0555f"\r
+                "fb6c612a.831f28",\r
+                "af0310e2.931fe8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "42a4fda9.57619c",\r
+        "id": "a05b5003.46c7e8",\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": 285.566650390625,\r
+        "y": 2523,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3738a9bc.2f26e6",\r
+        "id": "c5885881.921d18",\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": 407.566650390625,\r
+        "y": 2580,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ac81680a.65fae",\r
-                "96fc6628.148e78"\r
+                "1736d2be.a7f385",\r
+                "11bf3fb5.747c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ac81680a.65fae",\r
+        "id": "1736d2be.a7f385",\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": 720.066650390625,\r
+        "y": 2557,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "96fc6628.148e78",\r
+        "id": "11bf3fb5.747c4",\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": 724.066650390625,\r
+        "y": 2597,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bf7ee9c0.419518"\r
+                "9fa6731e.bfdda"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6f03e95e.3ec198",\r
+        "id": "d975bee8.cbb1b8",\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": 900.066650390625,\r
+        "y": 2561,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bf7ee9c0.419518",\r
+        "id": "9fa6731e.bfdda",\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": 915.566650390625,\r
+        "y": 2615,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "846842ab.33ca8",\r
-                "5e1c0ed5.c69c48",\r
-                "9a742833.7a10a8",\r
-                "feb8a80.2e93d58"\r
+                "26102eb4.5bf9d2",\r
+                "a5cf86e7.fd2ae8",\r
+                "94107493.94d3e8",\r
+                "c85f3994.bd81f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "214d3a40.5474be",\r
+        "id": "3a7c38a3.d1311",\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": 1211.066650390625,\r
+        "y": 2584,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4243a8af.47f99",\r
+        "id": "d5ebfe0.284f7",\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": 2678.066650390625,\r
+        "y": 1935,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "846842ab.33ca8",\r
+        "id": "26102eb4.5bf9d2",\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": 1173.066650390625,\r
+        "y": 2626,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "eb2c1071.d160d8",\r
+        "id": "eaf51112.30b59",\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": 2038.066650390625,\r
+        "y": 1215,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3c1d8397.66cfbc",\r
+        "id": "77e27285.394bfc",\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": 2039.066650390625,\r
+        "y": 1319,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9dbb6108.db3f08",\r
+        "id": "1771c9d3.36c546",\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": 4332.566650390625,\r
+        "y": 576,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "971d8a82.30a53",\r
+        "id": "6270f9ff.6a6b4",\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": 4235.566650390625,\r
+        "y": 1395,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "72e7ea14.321c0c",\r
+        "id": "2308c235.08d20e",\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": 3729.566650390625,\r
+        "y": 2067,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9b9627ac.373dc8",\r
+        "id": "c1076b8e.81d988",\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": 830.566650390625,\r
+        "y": 875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "20416bfa.abd944",\r
-                "3157f22c.bca4c6"\r
+                "451a757.6fc508c",\r
+                "8b0542af.2f9d78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20416bfa.abd944",\r
+        "id": "451a757.6fc508c",\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": 1193.566650390625,\r
+        "y": 898,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "16371b2a.82f3f5"\r
+                "f1ea0737.b79178"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3157f22c.bca4c6",\r
+        "id": "8b0542af.2f9d78",\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": 1193.566650390625,\r
+        "y": 847,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7c942827.229d68"\r
+                "3e6bbe33.acc602"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "16371b2a.82f3f5",\r
+        "id": "f1ea0737.b79178",\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": 1349.566650390625,\r
+        "y": 896,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6516a515.9e0ed4"\r
+                "cb3a4052.881008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7c942827.229d68",\r
+        "id": "3e6bbe33.acc602",\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": 1326.566650390625,\r
+        "y": 848,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d1721022.90ae5",\r
+        "id": "b01d3963.8ea8b8",\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": 2086.566650390625,\r
+        "y": 246,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a1c10f72.410b08",\r
+        "id": "5a0cb184.9cdf98",\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": 3628.566650390625,\r
+        "y": 2227,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7f10b67d.13cbf",\r
+        "id": "d9cf64bd.4ed12",\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": 4218.566650390625,\r
+        "y": 700,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "277d0a08.b51776",\r
+        "id": "be332a4a.d8db58",\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": 1392.566650390625,\r
+        "y": 1806,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dbed9630.5fe208",\r
+        "id": "3501da3.a014526",\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": 571.566650390625,\r
+        "y": 1540,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b8630526.556578",\r
+        "id": "2c2649c2.53ac7e",\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": 602.566650390625,\r
+        "y": 1580,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d6f04402.414508",\r
+        "id": "fb6c612a.831f28",\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": 1150.566650390625,\r
+        "y": 1988,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ac4ce335.0555f",\r
+        "id": "af0310e2.931fe8",\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": 1153.566650390625,\r
+        "y": 2030,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6151d45.cfb988",\r
+        "id": "694d6c2f.8edccc",\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": 596.566650390625,\r
+        "y": 1670,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1b784f.6be4af8",\r
+        "id": "4b32fbef.652bc4",\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": 351.566650390625,\r
+        "y": 2049,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b54d5a69.762db",\r
+        "id": "caa8a64f.1936",\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": 359.566650390625,\r
+        "y": 2106,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5d833ac3.a3e554",\r
+        "id": "88b6396e.dee88",\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": 1370.566650390625,\r
+        "y": 1655,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5ddf355f.54101c",\r
-                "1bdf6619.a36342"\r
+                "45e3fdbe.201574",\r
+                "86940004.bfdd7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1bdf6619.a36342",\r
+        "id": "86940004.bfdd7",\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": 1593.566650390625,\r
+        "y": 1610,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "754506fa.d51aa8"\r
+                "c31b8cce.808f08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5ddf355f.54101c",\r
+        "id": "45e3fdbe.201574",\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": 1595.566650390625,\r
+        "y": 1674,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "68209615.eef37"\r
+                "1cc861e4.834c36"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "754506fa.d51aa8",\r
+        "id": "c31b8cce.808f08",\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": 1758.566650390625,\r
+        "y": 1607,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "714f4595.b88ec4"\r
+                "b2423aca.7a4fa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "68209615.eef37",\r
+        "id": "1cc861e4.834c36",\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": 1757.566650390625,\r
+        "y": 1670,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "714f4595.b88ec4",\r
+        "id": "b2423aca.7a4fa8",\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": 1978.566650390625,\r
+        "y": 1621,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1db1829e.06c1d5",\r
+        "id": "45f30159.842648",\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": 1523.566650390625,\r
+        "y": 2346,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2cbd7342.8e2ecc"\r
+                "195465ca.996e92"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fa138a5b.3e0008",\r
+        "id": "ac9df433.f2c8",\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": 1908.566650390625,\r
+        "y": 2359,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e14f1acf.1bcd",\r
-                "c2e19be7.fca29",\r
-                "775dbfec.d9501"\r
+                "565cac1f.04fa64",\r
+                "e43b7ac1.fcb9e",\r
+                "7ad49b0d.e0614c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cbd7342.8e2ecc",\r
+        "id": "195465ca.996e92",\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": 1702.566650390625,\r
+        "y": 2346,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6f327062.742838",\r
-                "fa138a5b.3e0008"\r
+                "94dbb559.adb488",\r
+                "ac9df433.f2c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6f327062.742838",\r
+        "id": "94dbb559.adb488",\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": 1938.566650390625,\r
+        "y": 2307,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e14f1acf.1bcd",\r
+        "id": "565cac1f.04fa64",\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": 2118.566650390625,\r
+        "y": 2350,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d0fc139e.1761"\r
+                "b1dc084c.7cde9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c2e19be7.fca29",\r
+        "id": "e43b7ac1.fcb9e",\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": 2110.566650390625,\r
+        "y": 2405,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "43b937df.ececd8"\r
+                "385c483c.3ef568"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "775dbfec.d9501",\r
+        "id": "7ad49b0d.e0614c",\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": 2115.566650390625,\r
+        "y": 2462,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ac944679.99243"\r
+                "35f4b5a3.f8aa4a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ac944679.99243",\r
+        "id": "35f4b5a3.f8aa4a",\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": 2267.566650390625,\r
+        "y": 2463,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "43b937df.ececd8",\r
+        "id": "385c483c.3ef568",\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": 2278.566650390625,\r
+        "y": 2408,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d0fc139e.1761",\r
+        "id": "b1dc084c.7cde9",\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": 2262.948974609375,\r
+        "y": 2347.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "79bc2aa4.303284"\r
+                "5d32a434.f7be54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "79bc2aa4.303284",\r
+        "id": "5d32a434.f7be54",\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": 2477.566650390625,\r
+        "y": 2344,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d91a9773.8b97d8",\r
+        "id": "51bc490a.0719c",\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": 601.566650390625,\r
+        "y": 2392,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fd5d97.57110a68",\r
-                "e3891e3f.2fa52",\r
-                "6282c457.966ab4"\r
+                "9a98fb41.58116",\r
+                "d11dcfed.810438",\r
+                "f803d5ab.85238"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd5d97.57110a68",\r
+        "id": "9a98fb41.58116",\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": 797.0667724609375,\r
+        "y": 2344,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ee247bd7.5fac58"\r
+                "98bce7a3.da5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e3891e3f.2fa52",\r
+        "id": "d11dcfed.810438",\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": 789.0667724609375,\r
+        "y": 2399,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "91fa570e.651ca8"\r
+                "71f2762f.659628"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ee247bd7.5fac58",\r
+        "id": "98bce7a3.da5e",\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": 941.4490966796875,\r
+        "y": 2343.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ea7d04e7.1afcb8"\r
+                "c67046c0.c64788"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea7d04e7.1afcb8",\r
+        "id": "c67046c0.c64788",\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": 1125.566650390625,\r
+        "y": 2342,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "40c13bcd.4d6ac4"\r
+                "5f0a1eb2.b2273"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "40c13bcd.4d6ac4",\r
+        "id": "5f0a1eb2.b2273",\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": 1320.566650390625,\r
+        "y": 2342,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1db1829e.06c1d5"\r
+                "45f30159.842648"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6282c457.966ab4",\r
+        "id": "f803d5ab.85238",\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": 794.0667724609375,\r
+        "y": 2456,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4979dd8d.1f5f3c"\r
+                "33262ba5.8d682c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4979dd8d.1f5f3c",\r
+        "id": "33262ba5.8d682c",\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": 946.0667724609375,\r
+        "y": 2457,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "91fa570e.651ca8",\r
+        "id": "71f2762f.659628",\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": 957.0667724609375,\r
+        "y": 2400,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "bd1da98.2130f58",\r
+        "id": "808535b.d0bfd48",\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": 591.566650390625,\r
+        "y": 2304,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aa3bbb2.a6f0e48",\r
+        "id": "6e3ab27b.a7f37c",\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": 336.566650390625,\r
+        "y": 2435,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bd1da98.2130f58",\r
-                "d91a9773.8b97d8"\r
+                "808535b.d0bfd48",\r
+                "51bc490a.0719c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b46d34a.40e874",\r
+        "id": "dc357fe5.d2f6d8",\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": 1551.5333251953125,\r
+        "y": 252.88333129882812,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1d9a3789.c423c",\r
+        "id": "a92b97b8.4129e8",\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": 753.566650390625,\r
+        "y": 475,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6516a515.9e0ed4",\r
+        "id": "baa368e2.d0057",\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": 313.066650390625,\r
+        "y": 1444,\r
+        "z": "b25656d7.85a8a8",\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
+                "ec5bb05c.091188",\r
+                "f2cd3854.ada88",\r
+                "3501da3.a014526",\r
+                "2c2649c2.53ac7e",\r
+                "a05b5003.46c7e8",\r
+                "c5885881.921d18",\r
+                "694d6c2f.8edccc",\r
+                "4b32fbef.652bc4",\r
+                "caa8a64f.1936",\r
+                "6e3ab27b.a7f37c",\r
+                "5a72a2f9.fe54bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6bd95e1e.6c91d8",\r
+        "id": "3f4654a9.b7d9fc",\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": 1343.566650390625,\r
+        "y": 1282,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "92533584.a5f61",\r
-                "18980475.16f3b4",\r
-                "ec63f877.0fd998",\r
-                "c1c9dc9a.d31ec"\r
+                "118223c9.ee1e8c",\r
+                "5e72886e.16b82",\r
+                "9ad14e96.a683a8",\r
+                "b20e668c.49e0a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "92533584.a5f61",\r
+        "id": "118223c9.ee1e8c",\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": 1508.566650390625,\r
+        "y": 1264,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b00f22e0.6a5e"\r
+                "4829f132.924c9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "18980475.16f3b4",\r
+        "id": "5e72886e.16b82",\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": 1511.566650390625,\r
+        "y": 1303,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "52cb104.aabcaf"\r
+                "1b6bbf84.2b9b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c1c9dc9a.d31ec",\r
+        "id": "b20e668c.49e0a",\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": 1505.566650390625,\r
+        "y": 1381,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4eaa272a.ec5048"\r
+                "23f70279.3c530e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec63f877.0fd998",\r
+        "id": "9ad14e96.a683a8",\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": 1528.566650390625,\r
+        "y": 1344,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e77dda82.efac78"\r
+                "690a7c3c.e28bc4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fb2c8aff.5902e",\r
+        "id": "34596fcc.944e58",\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": 2074.566650390625,\r
+        "y": 1377,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c8ca91d0.91a568",\r
+        "id": "36c4b896.3cd558",\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": 2036.566650390625,\r
+        "y": 1417,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4eaa272a.ec5048",\r
+        "id": "23f70279.3c530e",\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": 1657.566650390625,\r
+        "y": 1402,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5e1c0ed5.c69c48",\r
+        "id": "a5cf86e7.fd2ae8",\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": 1247.1500244140625,\r
+        "y": 2701.3336181640625,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b00f22e0.6a5e",\r
+        "id": "4829f132.924c9",\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": 1643.4832763671875,\r
+        "y": 1260.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "eb2c1071.d160d8"\r
+                "eaf51112.30b59"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "52cb104.aabcaf",\r
+        "id": "1b6bbf84.2b9b8",\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": 1645.4832763671875,\r
+        "y": 1298.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3c1d8397.66cfbc"\r
+                "77e27285.394bfc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e77dda82.efac78",\r
+        "id": "690a7c3c.e28bc4",\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": 1688.4832763671875,\r
+        "y": 1345.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c8ca91d0.91a568"\r
+                "36c4b896.3cd558"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a742833.7a10a8",\r
+        "id": "94107493.94d3e8",\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": 1215.1500244140625,\r
+        "y": 2773.33349609375,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "feb8a80.2e93d58",\r
+        "id": "c85f3994.bd81f",\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": 1245.1500244140625,\r
+        "y": 2835.33349609375,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
+    },\r
+    {\r
+        "id": "5a72a2f9.fe54bc",\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": 638.566650390625,\r
+        "y": 1382.166748046875,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cb3a4052.881008",\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": 179.56666564941406,\r
+        "y": 1093.1666259765625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "f5718cb9.775688",\r
+                "eaa991b9.45489"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "eaa991b9.45489",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 364.566650390625,\r
+        "y": 1267.1666259765625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "baa368e2.d0057"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f5718cb9.775688",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 367.566650390625,\r
+        "y": 1222.1666259765625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "baa368e2.d0057"\r
+            ]\r
+        ]\r
      }\r
  ]
 \ No newline at end of file