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 4ba32b4..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": "6467c9b6.3ea7b",\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": 415.8833312988281,\r
-        "y": 377,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 400.566650390625,\r
+        "y": 374,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1c0c6fa0.017178",\r
-                "ec984d7b.605098",\r
-                "25450eba.0fd99a"\r
+                "96c8722a.b993c",\r
+                "e5061783.573db8",\r
+                "6a27552b.ad1ba4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c0c6fa0.017178",\r
+        "id": "96c8722a.b993c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 603.8833312988281,\r
-        "y": 390,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 588.566650390625,\r
+        "y": 387,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fcdf737f.3ba08"\r
+                "41e4d89f.ed1468"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec984d7b.605098",\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": 611.374267578125,\r
-        "y": 432.57403564453125,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 596.0575866699219,\r
+        "y": 429.57403564453125,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "25450eba.0fd99a",\r
+        "id": "6a27552b.ad1ba4",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 601.8833312988281,\r
-        "y": 479,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 586.566650390625,\r
+        "y": 476,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f645589d.ed3d98"\r
+                "a92b97b8.4129e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fcdf737f.3ba08",\r
+        "id": "41e4d89f.ed1468",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 776.8833312988281,\r
-        "y": 388,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 761.566650390625,\r
+        "y": 385,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6641b1bb.011df8"\r
+                "cbc7d636.2def18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6641b1bb.011df8",\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": 1005.8833312988281,\r
-        "y": 389,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 990.566650390625,\r
+        "y": 386,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "42fd94e4.9f459c"\r
+                "39ab6bfa.74801c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "42fd94e4.9f459c",\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": 1220.8833312988281,\r
-        "y": 390,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1205.566650390625,\r
+        "y": 387,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "341f3db4.7e268a"\r
+                "e124b2ef.0bfdc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "802e937a.3ac",\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": 1474.8833312988281,\r
-        "y": 312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1459.566650390625,\r
+        "y": 309,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ccfe4ade.41ae98",\r
-                "912c0faa.e5e1c8"\r
+                "dc53b823.c6e998",\r
+                "b2e345a3.6b81"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ccfe4ade.41ae98",\r
+        "id": "dc53b823.c6e998",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1691.8833312988281,\r
-        "y": 291,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1676.566650390625,\r
+        "y": 288,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "341f3db4.7e268a"\r
+                "e124b2ef.0bfdc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "912c0faa.e5e1c8",\r
+        "id": "b2e345a3.6b81",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1691.8833312988281,\r
-        "y": 340,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1676.566650390625,\r
+        "y": 337,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "341f3db4.7e268a",\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": 1875.8833312988281,\r
-        "y": 377,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1860.566650390625,\r
+        "y": 374,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b1ca96f9.f78f38",\r
-                "2c3b3231.83c2be",\r
-                "4660bf61.473a18"\r
+                "2ac81333.5163cc",\r
+                "ce04a89c.bde61",\r
+                "b01d3963.8ea8b8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "377c3031.0fc7c",\r
+        "id": "daba1b59.df55a",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 234.88333129882812,\r
-        "y": 118,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 219.566650390625,\r
+        "y": 115,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8b8ba227.5e7638"\r
+                "53bce33c.ae731c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8b8ba227.5e7638",\r
+        "id": "53bce33c.ae731c",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -201,3545 +201,3712 @@
          "comments": "",\r
          "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
          "outputs": 1,\r
-        "x": 519.1690216064453,\r
-        "y": 179.23810863494873,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 503.8523406982422,\r
+        "y": 176.23810863494873,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6c55ded0.30c498"\r
+                "13dd53c4.ce4fbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6c55ded0.30c498",\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": 525.3119354248047,\r
-        "y": 264.0000305175781,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 509.99525451660156,\r
+        "y": 261.0000305175781,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b63c19cf.5911b8"\r
+                "60b5835f.a436c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b63c19cf.5911b8",\r
+        "id": "60b5835f.a436c4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 835.1213684082031,\r
-        "y": 255.66668701171875,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 819.8046875,\r
+        "y": 252.66668701171875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6467c9b6.3ea7b",\r
-                "7714415.bcb45c",\r
-                "2cf2ff05.5ecb98",\r
-                "ff64d6f0.1d24e",\r
-                "c19ef147.be92d8"\r
+                "a7aee3f0.b04268",\r
+                "6d17c7fb.4906d8",\r
+                "7de7f253.4369ac",\r
+                "731e9165.7bfe5",\r
+                "c3d34fd5.00b8e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b1ca96f9.f78f38",\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": 2092.883331298828,\r
-        "y": 315,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2077.566650390625,\r
+        "y": 312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f11c1dac.45c748",\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": 4261.883331298828,\r
-        "y": 201,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4246.566650390625,\r
+        "y": 198,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c95c33ef.381fa8",\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": 4342.883331298828,\r
-        "y": 516,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4327.566650390625,\r
+        "y": 513,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "89c7efd5.cb6558",\r
-                "d5cfec9d.5347f8"\r
+                "6866347a.b34054",\r
+                "d9ef66bb.b2e3a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89c7efd5.cb6558",\r
+        "id": "6866347a.b34054",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4652.383331298828,\r
-        "y": 485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4637.066650390625,\r
+        "y": 482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "beffe966.8b1b08"\r
+                "351f2ca1.efff8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5cfec9d.5347f8",\r
+        "id": "d9ef66bb.b2e3a",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4657.383331298828,\r
-        "y": 550,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4642.066650390625,\r
+        "y": 547,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "18fce568.1c292b"\r
+                "7ec1daf0.49ebbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "beffe966.8b1b08",\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": 4828.383331298828,\r
-        "y": 485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4813.066650390625,\r
+        "y": 482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "18fce568.1c292b",\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": 4823.883331298828,\r
-        "y": 550,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4808.566650390625,\r
+        "y": 547,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "64fdffc9.427678",\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": 4207.383331298828,\r
-        "y": 770,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4192.066650390625,\r
+        "y": 767,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c0e95206.343c2",\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": 4361.383331298828,\r
-        "y": 818,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4346.066650390625,\r
+        "y": 815,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7a1edf39.b6a0f8",\r
-                "b605ddae.9f2b2"\r
+                "66ca2f72.5d0ea",\r
+                "384ae824.cd397"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a1edf39.b6a0f8",\r
+        "id": "66ca2f72.5d0ea",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4706.883331298828,\r
-        "y": 799,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4691.566650390625,\r
+        "y": 796,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "db29824f.2b664"\r
+                "8897aa30.2d04c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b605ddae.9f2b2",\r
+        "id": "384ae824.cd397",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4710.883331298828,\r
-        "y": 839,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4695.566650390625,\r
+        "y": 836,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "10ebb808.22b9d8"\r
+                "e98f7531.5d07d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "db29824f.2b664",\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": 4864.883331298828,\r
-        "y": 799,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4849.566650390625,\r
+        "y": 796,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "10ebb808.22b9d8",\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": 4868.383331298828,\r
-        "y": 839,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4853.066650390625,\r
+        "y": 836,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6d35eb39.2fe42c",\r
-                "b62c3c22.2cb09"\r
+                "3b168b09.265424",\r
+                "f9e9fb1f.d5d228"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6d35eb39.2fe42c",\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": 5198.883331298828,\r
-        "y": 804,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5183.566650390625,\r
+        "y": 801,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "3f34bcf0.b30eb4",\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": 5062.883331298828,\r
-        "y": 763,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5047.566650390625,\r
+        "y": 760,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b62c3c22.2cb09",\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": 5125.883331298828,\r
-        "y": 850,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5110.566650390625,\r
+        "y": 847,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dc51dde.504a12",\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": 4199.883331298828,\r
-        "y": 249,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4184.566650390625,\r
+        "y": 246,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "25f0cbb9.ff400c",\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": 4225.883331298828,\r
-        "y": 366,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4210.566650390625,\r
+        "y": 363,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "26af6a64.84f75e",\r
-                "dfaad5e6.3e7388",\r
-                "d4f19086.9e394"\r
+                "9cee4545.4afd2",\r
+                "c87207dc.1fc4c8",\r
+                "a541f904.08a73"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "26af6a64.84f75e",\r
+        "id": "9cee4545.4afd2",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4421.383453369141,\r
-        "y": 318,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4406.0667724609375,\r
+        "y": 315,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "825f4729.b63ee8"\r
+                "174041c6.ef00ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dfaad5e6.3e7388",\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": 4413.383453369141,\r
-        "y": 373,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4398.0667724609375,\r
+        "y": 370,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "92b1984a.bc8b"\r
+                "2578a714.32fd88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "825f4729.b63ee8",\r
+        "id": "174041c6.ef00ae",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4565.765777587891,\r
-        "y": 317.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4550.4490966796875,\r
+        "y": 314.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "415768e6.6651f8"\r
+                "44c47bf6.544e84"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6a2d3e2.2e526",\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": 5147.883331298828,\r
-        "y": 320,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5132.566650390625,\r
+        "y": 317,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e243a570.71b51"\r
+                "77699d71.cb9cbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "415768e6.6651f8",\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": 4749.883331298828,\r
-        "y": 316,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4734.566650390625,\r
+        "y": 313,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ab4dd1f4.04e1f"\r
+                "ec3ad4d7.e6b51"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ab4dd1f4.04e1f",\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": 4944.883331298828,\r
-        "y": 316,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4929.566650390625,\r
+        "y": 313,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a6a2d3e2.2e526"\r
+                "416e074e.1652a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d4f19086.9e394",\r
+        "id": "a541f904.08a73",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4418.383453369141,\r
-        "y": 430,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4403.0667724609375,\r
+        "y": 427,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "28f88c03.cb5e5c"\r
+                "44c8faa6.17201c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28f88c03.cb5e5c",\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": 4570.383453369141,\r
-        "y": 431,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4555.0667724609375,\r
+        "y": 428,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "92b1984a.bc8b",\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": 4581.383453369141,\r
-        "y": 374,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4566.0667724609375,\r
+        "y": 371,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "677439f1.5f7ed",\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": 5532.883331298828,\r
-        "y": 333,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5517.566650390625,\r
+        "y": 330,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e7fd97d3.bbcd08",\r
-                "38bba5b7.de41b2",\r
-                "6bf961e8.c56a58"\r
+                "5eb578c.a510488",\r
+                "646e1345.d32534",\r
+                "d2cac0b5.69fe18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e243a570.71b51",\r
+        "id": "77699d71.cb9cbc",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5326.883331298828,\r
-        "y": 320,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5311.566650390625,\r
+        "y": 317,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "857cacb0.81444",\r
-                "677439f1.5f7ed"\r
+                "e5b6fb7a.6fa868",\r
+                "157b4f1e.ec4409"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "857cacb0.81444",\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": 5562.883331298828,\r
-        "y": 281,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5547.566650390625,\r
+        "y": 278,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e7fd97d3.bbcd08",\r
+        "id": "5eb578c.a510488",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5742.883331298828,\r
-        "y": 324,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5727.566650390625,\r
+        "y": 321,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "60a50433.d26434"\r
+                "e92c3ae0.67c78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "38bba5b7.de41b2",\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": 5734.883331298828,\r
-        "y": 379,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5719.566650390625,\r
+        "y": 376,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d9350787.861f1"\r
+                "bbc83f99.73f6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6bf961e8.c56a58",\r
+        "id": "d2cac0b5.69fe18",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5739.883331298828,\r
-        "y": 436,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5724.566650390625,\r
+        "y": 433,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1afc54ba.8ed313"\r
+                "2b4662b0.39c236"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1afc54ba.8ed313",\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": 5891.883331298828,\r
-        "y": 437,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5876.566650390625,\r
+        "y": 434,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d9350787.861f1",\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": 5902.883331298828,\r
-        "y": 382,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5887.566650390625,\r
+        "y": 379,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "60a50433.d26434",\r
+        "id": "e92c3ae0.67c78",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5887.265655517578,\r
-        "y": 321.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5871.948974609375,\r
+        "y": 318.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8367dac2.ac8b98"\r
+                "79f8358f.b45374"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8367dac2.ac8b98",\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": 6101.883331298828,\r
-        "y": 318,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 6086.566650390625,\r
+        "y": 315,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "aa2473a.12d4d9",\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": 3668.883331298828,\r
-        "y": 1658,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3653.566650390625,\r
+        "y": 1655,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "28a663c6.7433b4",\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": 3731.883331298828,\r
-        "y": 1987,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3716.566650390625,\r
+        "y": 1984,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "422a3196.0fb7d",\r
-                "371e9e8f.f6f942"\r
+                "85a267fb.c74d5",\r
+                "1abf40e9.7b1f1f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "422a3196.0fb7d",\r
+        "id": "85a267fb.c74d5",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4027.383331298828,\r
-        "y": 1954,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4012.066650390625,\r
+        "y": 1951,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c3084137.121c7"\r
+                "8944bada.8beb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "371e9e8f.f6f942",\r
+        "id": "1abf40e9.7b1f1f",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4032.383331298828,\r
-        "y": 2019,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4017.066650390625,\r
+        "y": 2016,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c6676165.ac5c"\r
+                "fa8bf7ac.5ecf28"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c3084137.121c7",\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": 4195.383331298828,\r
-        "y": 1954,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4180.066650390625,\r
+        "y": 1951,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c6676165.ac5c",\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": 4205.883331298828,\r
-        "y": 2019,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4190.566650390625,\r
+        "y": 2016,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "dfee532c.a1419",\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": 3607.883331298828,\r
-        "y": 1715,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3592.566650390625,\r
+        "y": 1712,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e52702af.314718",\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": 3627.883331298828,\r
-        "y": 1812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3612.566650390625,\r
+        "y": 1809,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9ca1c561.5c796",\r
-                "9cf5cab4.99d6e",\r
-                "5d5762eb.724c64"\r
+                "1781a1bd.0348ce",\r
+                "e03bcd54.697738",\r
+                "94b9ef51.5409d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9ca1c561.5c796",\r
+        "id": "1781a1bd.0348ce",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3830.3834533691406,\r
-        "y": 1765,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3815.0667724609375,\r
+        "y": 1762,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "502f683e.00cf7"\r
+                "a95165c1.f614f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9cf5cab4.99d6e",\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": 3822.3834533691406,\r
-        "y": 1820,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3807.0667724609375,\r
+        "y": 1817,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9587c00d.994eb"\r
+                "b5b6c797.75de6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "502f683e.00cf7",\r
+        "id": "a95165c1.f614f8",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3974.7657775878906,\r
-        "y": 1762.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3959.4490966796875,\r
+        "y": 1759.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "39b96666.82062a"\r
+                "5bb225c8.c4c70c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "39b96666.82062a",\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": 4158.883331298828,\r
-        "y": 1777,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4143.566650390625,\r
+        "y": 1774,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "94ae9a5d.e5d56"\r
+                "7747e85a.705d5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5d5762eb.724c64",\r
+        "id": "94b9ef51.5409d",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3827.3834533691406,\r
-        "y": 1877,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3812.0667724609375,\r
+        "y": 1874,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7a00ac4a.8d918c"\r
+                "9d4f33d7.c972d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a00ac4a.8d918c",\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": 3979.3834533691406,\r
-        "y": 1878,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3964.0667724609375,\r
+        "y": 1875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9587c00d.994eb",\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": 3990.3834533691406,\r
-        "y": 1823,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3975.0667724609375,\r
+        "y": 1820,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1540d0.014217",\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": 4556.883331298828,\r
-        "y": 1781,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4541.566650390625,\r
+        "y": 1778,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c932c6af.938f38"\r
+                "745d7190.9cf208"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "94ae9a5d.e5d56",\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": 4353.883331298828,\r
-        "y": 1777,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4338.566650390625,\r
+        "y": 1774,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f1540d0.014217"\r
+                "7641eade.641374"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ff151e7.182fee",\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": 4941.883331298828,\r
-        "y": 1780,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4926.566650390625,\r
+        "y": 1777,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "40d3a7a.4400bd8",\r
-                "353377f9.20c718",\r
-                "f8f22501.0020d8"\r
+                "bb6dbaba.ff1548",\r
+                "a59e3175.15a9b",\r
+                "4bc34556.41323c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c932c6af.938f38",\r
+        "id": "745d7190.9cf208",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4733.883331298828,\r
-        "y": 1773,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4718.566650390625,\r
+        "y": 1770,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "53fc3a7e.05d404",\r
-                "2ff151e7.182fee"\r
+                "80afd84e.d6bdd8",\r
+                "95464c66.d9ff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "53fc3a7e.05d404",\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": 4971.883331298828,\r
-        "y": 1728,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4956.566650390625,\r
+        "y": 1725,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d551b07b.11f68",\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": 5300.883331298828,\r
-        "y": 1884,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5285.566650390625,\r
+        "y": 1881,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c19bb319.e0e2b8",\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": 5311.883331298828,\r
-        "y": 1829,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5296.566650390625,\r
+        "y": 1826,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2dbaf595.6cfed2",\r
+        "id": "edcb3571.8c6728",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5296.265655517578,\r
-        "y": 1768.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5280.948974609375,\r
+        "y": 1765.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "eaeaf1b8.196fc"\r
+                "6d55462a.8f8fa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eaeaf1b8.196fc",\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": 5510.883331298828,\r
-        "y": 1765,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5495.566650390625,\r
+        "y": 1762,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "40d3a7a.4400bd8",\r
+        "id": "bb6dbaba.ff1548",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5151.883331298828,\r
-        "y": 1771,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5136.566650390625,\r
+        "y": 1768,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2dbaf595.6cfed2"\r
+                "edcb3571.8c6728"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "353377f9.20c718",\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": 5143.883331298828,\r
-        "y": 1826,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5128.566650390625,\r
+        "y": 1823,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c19bb319.e0e2b8"\r
+                "ea697aed.d1f358"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f8f22501.0020d8",\r
+        "id": "4bc34556.41323c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5148.883331298828,\r
-        "y": 1883,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5133.566650390625,\r
+        "y": 1880,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d551b07b.11f68"\r
+                "42edd12e.5451d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c7d66e95.fb47e",\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": 3182.883331298828,\r
-        "y": 729,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3167.566650390625,\r
+        "y": 726,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4d8bbec2.c0db6",\r
-                "507d82bd.8807cc"\r
+                "635bfedd.0eff1",\r
+                "4466b072.e153e8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4d8bbec2.c0db6",\r
+        "id": "635bfedd.0eff1",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3396.883331298828,\r
-        "y": 766,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3381.566650390625,\r
+        "y": 763,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6524452d.4a2f94"\r
+                "f20f4b09.4270d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "507d82bd.8807cc",\r
+        "id": "4466b072.e153e8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3398.883331298828,\r
-        "y": 704,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3383.566650390625,\r
+        "y": 701,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4b590d33.c81684"\r
+                "388a019b.9b73c6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6524452d.4a2f94",\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": 2976.883331298828,\r
-        "y": 2009,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2961.566650390625,\r
+        "y": 2006,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "75800cfe.e64b04",\r
-                "28895848.af5c18"\r
+                "69af1ba1.41260c",\r
+                "13b2b9f.1f67dc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "75800cfe.e64b04",\r
+        "id": "69af1ba1.41260c",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3229.883331298828,\r
-        "y": 2043,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3214.566650390625,\r
+        "y": 2040,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "34389e65.7f3f0a"\r
+                "c8858f37.c3f05"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "28895848.af5c18",\r
+        "id": "13b2b9f.1f67dc6",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3229.883331298828,\r
-        "y": 1987,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3214.566650390625,\r
+        "y": 1984,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4c94a377.c6d4e4"\r
+                "be4790f9.3bf898"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "34389e65.7f3f0a",\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": 3380.883331298828,\r
-        "y": 2043,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3365.566650390625,\r
+        "y": 2040,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff717106.1f6f7",\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": 4256.883331298828,\r
-        "y": 141,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4241.566650390625,\r
+        "y": 138,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "98bc8f5e.55646",\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": 3664.883331298828,\r
-        "y": 1600,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3649.566650390625,\r
+        "y": 1597,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1901ad68.6869bb",\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": 3947.883331298828,\r
-        "y": 398,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3932.566650390625,\r
+        "y": 395,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ff717106.1f6f7",\r
-                "f11c1dac.45c748",\r
-                "dc51dde.504a12",\r
-                "25f0cbb9.ff400c",\r
-                "c95c33ef.381fa8",\r
-                "7a0ef184.deb28",\r
-                "dd4c3392.e1b02",\r
-                "2a6ffb7c.8797f4"\r
+                "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": "4c94a377.c6d4e4",\r
+        "id": "be4790f9.3bf898",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3380.883331298828,\r
-        "y": 1986,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3365.566650390625,\r
+        "y": 1983,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "98bc8f5e.55646",\r
-                "aa2473a.12d4d9",\r
-                "dfee532c.a1419",\r
-                "e52702af.314718",\r
-                "28a663c6.7433b4",\r
-                "c984548c.2e537",\r
-                "88e8f378.a2b808",\r
-                "1fda4b4a.2131e5"\r
+                "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": "d79079df.baf578",\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": 3618.883331298828,\r
-        "y": 2285,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3603.566650390625,\r
+        "y": 2282,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "45ccc628.f5551",\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": 3772.883331298828,\r
-        "y": 2333,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3757.566650390625,\r
+        "y": 2330,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6173b4db.203ce4",\r
-                "7f21396.e7ee248"\r
+                "8bd672ae.f97518",\r
+                "171382a6.de96c5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6173b4db.203ce4",\r
+        "id": "8bd672ae.f97518",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4118.383331298828,\r
-        "y": 2314,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4103.066650390625,\r
+        "y": 2311,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2b5ddf83.e8a168"\r
+                "26f501a4.aaf356"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7f21396.e7ee248",\r
+        "id": "171382a6.de96c5",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4122.383331298828,\r
-        "y": 2354,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4107.066650390625,\r
+        "y": 2351,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9fc151.f9cc46b"\r
+                "81506f95.53e78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b5ddf83.e8a168",\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": 4276.383331298828,\r
-        "y": 2314,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4261.066650390625,\r
+        "y": 2311,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9fc151.f9cc46b",\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": 4279.883331298828,\r
-        "y": 2354,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4264.566650390625,\r
+        "y": 2351,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ec406c4.a093b1",\r
-                "ba32c60f.0ec53"\r
+                "8a72bd7f.2b673",\r
+                "2efc6876.725c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ec406c4.a093b1",\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": 4619.883331298828,\r
-        "y": 2353,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4604.566650390625,\r
+        "y": 2350,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "650aeaf3.da502c",\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": 4477.883331298828,\r
-        "y": 2311,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4462.566650390625,\r
+        "y": 2308,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ba32c60f.0ec53",\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": 4548.883331298828,\r
-        "y": 2402,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4533.566650390625,\r
+        "y": 2399,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c8295377.ff6158",\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": 3173.883331298828,\r
-        "y": 669,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3158.566650390625,\r
+        "y": 666,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "17d3b71c.0a74f9",\r
+        "id": "f8b99cf2.a93e78",\r
          "type": "comment",\r
          "name": "only dst ttp exists. No src",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3768.883331298828,\r
-        "y": 355,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3753.566650390625,\r
+        "y": 352,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "12dd212a.e5931f",\r
+        "id": "ba2b5c4f.29126",\r
          "type": "comment",\r
          "name": "only src ttp exists. No dst",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3325.883331298828,\r
-        "y": 1933,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3310.566650390625,\r
+        "y": 1930,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4b590d33.c81684",\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": 3504.883331298828,\r
-        "y": 517,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3489.566650390625,\r
+        "y": 514,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e68f7957.57ea98",\r
-                "90c8120e.55a8c8"\r
+                "60287d21.a15fac",\r
+                "e673bc57.d2c08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90c8120e.55a8c8",\r
+        "id": "e673bc57.d2c08",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3746.883331298828,\r
-        "y": 1106,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3731.566650390625,\r
+        "y": 1103,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5f92c041.e2a22"\r
+                "8e141356.94256"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e68f7957.57ea98",\r
+        "id": "60287d21.a15fac",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3740.883331298828,\r
-        "y": 397,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3725.566650390625,\r
+        "y": 394,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1901ad68.6869bb"\r
+                "354c57ea.e71ee8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f92c041.e2a22",\r
+        "id": "8e141356.94256",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3904.883331298828,\r
-        "y": 1105,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3889.566650390625,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "eb5cd95b.b46698",\r
-                "bcb9498.a9205b8",\r
-                "24e13fd8.afe2d8",\r
-                "57e5431f.63be4c",\r
-                "8b688219.8ed198",\r
-                "9c0b0957.1e6c48"\r
+                "660dd4a0.d8f1f4",\r
+                "bd6ec24f.7d2838",\r
+                "2d50a497.118c24",\r
+                "60d7ef05.f89ff8",\r
+                "feec0e79.04d7e8",\r
+                "6270f9ff.6a6b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bcb9498.a9205b8",\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": 4168.883331298828,\r
-        "y": 988,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4153.566650390625,\r
+        "y": 985,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8b688219.8ed198",\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": 4249.883331298828,\r
-        "y": 1303,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4234.566650390625,\r
+        "y": 1300,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4ea88210.ceec44",\r
-                "cd5b1128.4dbb9"\r
+                "1829c13e.6c182f",\r
+                "cdc3e429.be6fa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4ea88210.ceec44",\r
+        "id": "1829c13e.6c182f",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4559.383331298828,\r
-        "y": 1272,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4544.066650390625,\r
+        "y": 1269,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "9646de5b.fe3c7"\r
+                "5b91a7ec.2e4658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cd5b1128.4dbb9",\r
+        "id": "cdc3e429.be6fa",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4564.383331298828,\r
-        "y": 1337,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4549.066650390625,\r
+        "y": 1334,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "55735b11.27f424"\r
+                "8046aee4.83e438"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9646de5b.fe3c7",\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": 4735.383331298828,\r
-        "y": 1272,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4720.066650390625,\r
+        "y": 1269,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "55735b11.27f424",\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": 4730.883331298828,\r
-        "y": 1337,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4715.566650390625,\r
+        "y": 1334,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "24e13fd8.afe2d8",\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": 4106.883331298828,\r
-        "y": 1036,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4091.566650390625,\r
+        "y": 1033,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "57e5431f.63be4c",\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": 4132.883331298828,\r
-        "y": 1153,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4117.566650390625,\r
+        "y": 1150,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1d187a80.e65b15",\r
-                "370c15e3.9b5fca",\r
-                "703dc49a.960884"\r
+                "684da58c.28fc44",\r
+                "7420bdce.6aab1c",\r
+                "21d55314.ed559c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1d187a80.e65b15",\r
+        "id": "684da58c.28fc44",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4328.383453369141,\r
-        "y": 1105,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4313.0667724609375,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5c6509dd.e3a81"\r
+                "64489fc6.c8241"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "370c15e3.9b5fca",\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": 4320.383453369141,\r
-        "y": 1160,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4305.0667724609375,\r
+        "y": 1157,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ccfe239.f2e7de"\r
+                "92f1b89c.1ab69"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c6509dd.e3a81",\r
+        "id": "64489fc6.c8241",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4472.765777587891,\r
-        "y": 1104.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4457.4490966796875,\r
+        "y": 1101.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "35d4ca24.cf236e"\r
+                "48d2ac4e.25f6b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "35d4ca24.cf236e",\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": 4656.883331298828,\r
-        "y": 1103,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4641.566650390625,\r
+        "y": 1100,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c8705d75.001f7"\r
+                "714ce556.4f2fcc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c8705d75.001f7",\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": 4851.883331298828,\r
-        "y": 1103,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4836.566650390625,\r
+        "y": 1100,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b9376422.2a71"\r
+                "2076535.8c263ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "703dc49a.960884",\r
+        "id": "21d55314.ed559c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4325.383453369141,\r
-        "y": 1217,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4310.0667724609375,\r
+        "y": 1214,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ece92d94.dd0ac"\r
+                "45f37411.31ce94"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ece92d94.dd0ac",\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": 4477.383453369141,\r
-        "y": 1218,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4462.0667724609375,\r
+        "y": 1215,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ccfe239.f2e7de",\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": 4488.383453369141,\r
-        "y": 1161,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4473.0667724609375,\r
+        "y": 1158,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "eb5cd95b.b46698",\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": 4163.883331298828,\r
-        "y": 928,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4148.566650390625,\r
+        "y": 925,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b9376422.2a71",\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": 5054.883331298828,\r
-        "y": 1107,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5039.566650390625,\r
+        "y": 1104,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d2480516.2fc378"\r
+                "f782ae02.7309d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9cb817ae.cef538",\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": 5439.883331298828,\r
-        "y": 1120,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5424.566650390625,\r
+        "y": 1117,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a79825bb.dff1f8",\r
-                "1395d5f.298062a",\r
-                "7903ca2c.aa5cc4"\r
+                "f27cc561.589478",\r
+                "533a9a4e.562074",\r
+                "f04fcd62.bdef1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d2480516.2fc378",\r
+        "id": "f782ae02.7309d8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5233.883331298828,\r
-        "y": 1107,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5218.566650390625,\r
+        "y": 1104,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fbf9e6b6.15b5c",\r
-                "9cb817ae.cef538"\r
+                "eec3155e.2bcec8",\r
+                "4c7d2512.5b4fb4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fbf9e6b6.15b5c",\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": 5469.883331298828,\r
-        "y": 1068,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5454.566650390625,\r
+        "y": 1065,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a79825bb.dff1f8",\r
+        "id": "f27cc561.589478",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5649.883331298828,\r
-        "y": 1111,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5634.566650390625,\r
+        "y": 1108,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c7dce557.6dded"\r
+                "20cc7528.d35caa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1395d5f.298062a",\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": 5641.883331298828,\r
-        "y": 1166,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5626.566650390625,\r
+        "y": 1163,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "598e647b.5837b4"\r
+                "a99b13d6.7a5b4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7903ca2c.aa5cc4",\r
+        "id": "f04fcd62.bdef1",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5646.883331298828,\r
-        "y": 1223,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5631.566650390625,\r
+        "y": 1220,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e6c7a6e7.b2f038"\r
+                "76e3f44a.1be574"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e6c7a6e7.b2f038",\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": 5798.883331298828,\r
-        "y": 1224,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5783.566650390625,\r
+        "y": 1221,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "598e647b.5837b4",\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": 5809.883331298828,\r
-        "y": 1169,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5794.566650390625,\r
+        "y": 1166,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7dce557.6dded",\r
+        "id": "20cc7528.d35caa",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5794.265655517578,\r
-        "y": 1108.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5778.948974609375,\r
+        "y": 1105.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2cfbc0b6.6ae748"\r
+                "52e6acc9.c6278c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2cfbc0b6.6ae748",\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": 6008.883331298828,\r
-        "y": 1105,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 5993.566650390625,\r
+        "y": 1102,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fca9cd7.3028eb",\r
+        "id": "7dd287b6.719d08",\r
          "type": "comment",\r
          "name": "both src and dst exist",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3782.883331298828,\r
-        "y": 1046,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3767.566650390625,\r
+        "y": 1043,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c3b3231.83c2be",\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": 2344.883331298828,\r
-        "y": 773,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2329.566650390625,\r
+        "y": 770,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "81a947d8.a13a68",\r
-                "b480f4ae.d59fb8"\r
+                "f4c77699.53d898",\r
+                "9865c4e0.3bcc6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b480f4ae.d59fb8",\r
+        "id": "9865c4e0.3bcc6",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2751.883331298828,\r
-        "y": 791,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2736.566650390625,\r
+        "y": 788,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "23d2aee5.d5b2fa"\r
+                "ad8883f5.8e3298"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "81a947d8.a13a68",\r
+        "id": "f4c77699.53d898",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2751.883331298828,\r
-        "y": 736,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2736.566650390625,\r
+        "y": 733,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "773948cf.a686e8"\r
+                "e8f3ed6f.2eafd"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "773948cf.a686e8",\r
+        "id": "e8f3ed6f.2eafd",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2907.883331298828,\r
-        "y": 734,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2892.566650390625,\r
+        "y": 731,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c8295377.ff6158",\r
-                "c7d66e95.fb47e"\r
+                "601ee7c2.7cf4c8",\r
+                "64ebcb8e.6a273c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "23d2aee5.d5b2fa",\r
+        "id": "ad8883f5.8e3298",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2884.883331298828,\r
-        "y": 792,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2869.566650390625,\r
+        "y": 789,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "7714415.bcb45c",\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": 1061.8833312988281,\r
-        "y": 208,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1046.566650390625,\r
+        "y": 205,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "79981366.647454",\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": 4178.883331298828,\r
-        "y": 626,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4163.566650390625,\r
+        "y": 623,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7a0ef184.deb28",\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": 4238.883331298828,\r
-        "y": 665,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4223.566650390625,\r
+        "y": 662,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2cf2ff05.5ecb98",\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": 1054.8833312988281,\r
-        "y": 116,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1039.566650390625,\r
+        "y": 113,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7871357e.92d2f4",\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": 3590.883331298828,\r
-        "y": 2142,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3575.566650390625,\r
+        "y": 2139,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c984548c.2e537",\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": 3646.883331298828,\r
-        "y": 2191,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3631.566650390625,\r
+        "y": 2188,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "efee660.b5b7f18",\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": 1054.8833312988281,\r
-        "y": 155,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1039.566650390625,\r
+        "y": 152,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff64d6f0.1d24e",\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": 1085.8833312988281,\r
-        "y": 256,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1070.566650390625,\r
+        "y": 253,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c19ef147.be92d8",\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": 295.8833312988281,\r
-        "y": 731,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 280.566650390625,\r
+        "y": 728,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "4acbe821.0c1ff8",\r
-                "63a107d4.a006c8",\r
-                "4bb92513.9b1ebc"\r
+                "39350f2.499cf7",\r
+                "6ce2e49e.7b3484",\r
+                "5333638f.7ecf8c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4acbe821.0c1ff8",\r
+        "id": "39350f2.499cf7",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 514.8833312988281,\r
-        "y": 669,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 499.566650390625,\r
+        "y": 666,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "d6a121aa.ecf888"\r
+                "36841c29.6decdc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63a107d4.a006c8",\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": 524.3742980957031,\r
-        "y": 711.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 509.0576171875,\r
+        "y": 708.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4bb92513.9b1ebc",\r
+        "id": "5333638f.7ecf8c",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 512.8833312988281,\r
-        "y": 758,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 497.566650390625,\r
+        "y": 755,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f58f94a6.d7fb9"\r
+                "3e93247c.aebb34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d6a121aa.ecf888",\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": 711.8833312988281,\r
-        "y": 665,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 696.566650390625,\r
+        "y": 662,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "46606d75.f5af5c"\r
+                "1f2c86c7.cadda9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f58f94a6.d7fb9",\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": 681.8833312988281,\r
-        "y": 759,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 666.566650390625,\r
+        "y": 756,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "46606d75.f5af5c",\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": 935.2168273925781,\r
-        "y": 664.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 919.900146484375,\r
+        "y": 661.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "1dffeedd.2e39d1"\r
+                "a1cbb7bd.24594"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1dffeedd.2e39d1",\r
+        "id": "a1cbb7bd.24594",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1135.8834648132324,\r
-        "y": 666.000020980835,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1120.5667839050293,\r
+        "y": 663.000020980835,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "5eeac4ab.784bec"\r
+                "1f60fbe4.6df234"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5eeac4ab.784bec",\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": 265.8833312988281,\r
-        "y": 928,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 250.566650390625,\r
+        "y": 925,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "93ffca07.c36c6",\r
-                "a6155e5c.4a2e4",\r
-                "edf3ae2.0898ad"\r
+                "63c00e4f.b84e58",\r
+                "13815c78.95eb5c",\r
+                "e5780368.e11db"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "93ffca07.c36c6",\r
+        "id": "63c00e4f.b84e58",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 473.8833312988281,\r
-        "y": 892,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 458.566650390625,\r
+        "y": 889,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "41f16b19.4ea28c"\r
+                "c1076b8e.81d988"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a6155e5c.4a2e4",\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": 474.3742980957031,\r
-        "y": 937.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 459.0576171875,\r
+        "y": 934.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "edf3ae2.0898ad",\r
+        "id": "e5780368.e11db",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 471.8833312988281,\r
-        "y": 981,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 456.566650390625,\r
+        "y": 978,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "77488207.b4a2f4"\r
+                "96cea788.4bc5b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "77488207.b4a2f4",\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": 640.8833312988281,\r
-        "y": 982,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 625.566650390625,\r
+        "y": 979,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1853bc71.11bc54",\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": 612.8833312988281,\r
-        "y": 1476,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 597.566650390625,\r
+        "y": 1473,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "aa99b60e.a0ae8"\r
+                "19a0d254.b680d6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa99b60e.a0ae8",\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": 815.8833312988281,\r
-        "y": 1488,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 800.566650390625,\r
+        "y": 1485,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6b5b67d6.d9cff8"\r
+                "5cf33a37.92a98c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b5b67d6.d9cff8",\r
+        "id": "5cf33a37.92a98c",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 981.8833312988281,\r
-        "y": 1485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 966.566650390625,\r
+        "y": 1482,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c9be5883.2f43"\r
+                "60d055a9.95f0c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c9be5883.2f43",\r
+        "id": "60d055a9.95f0c4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1142.8833312988281,\r
-        "y": 1482,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1127.566650390625,\r
+        "y": 1479,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8328946b.83ccf",\r
-                "70436354.fbd2a4",\r
-                "71db6bb7.f92dd4",\r
-                "a3af61e2.8efbd8",\r
-                "1dbcecbe.b5c9a3"\r
+                "325c2337.f5bbac",\r
+                "282c70ac.7ebb8",\r
+                "790547b3.03e69",\r
+                "be332a4a.d8db58",\r
+                "88b6396e.dee88",\r
+                "3f4654a9.b7d9fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "70436354.fbd2a4",\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": 1346.8833312988281,\r
-        "y": 1440,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1333.566650390625,\r
+        "y": 1078.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8328946b.83ccf",\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": 1343.8833312988281,\r
-        "y": 1485,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1330.566650390625,\r
+        "y": 1123.9999389648438,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "95cc35e2.dbd57",\r
-                "6243e8b2.6e7d68",\r
-                "ea238384.cd0de8"\r
+                "5ebf3dd3.403df4",\r
+                "df8620f2.fcde78",\r
+                "4f82abb0.8dd704"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6243e8b2.6e7d68",\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": 1539.3742980957031,\r
-        "y": 1458.573974609375,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1526.0576171875,\r
+        "y": 1097.5739135742188,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "60cc7ad4.175214"\r
+                "f317bbdf.6454e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea238384.cd0de8",\r
+        "id": "4f82abb0.8dd704",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1534.8833312988281,\r
-        "y": 1502.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1521.566650390625,\r
+        "y": 1141.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "33a586e8.574ea2"\r
+                "ba985891.b5d178"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60cc7ad4.175214",\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": 1701.9458312988281,\r
-        "y": 1457.8596801757812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1688.629150390625,\r
+        "y": 1096.859619140625,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "33a586e8.574ea2",\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": 1702.8833312988281,\r
-        "y": 1502.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1689.566650390625,\r
+        "y": 1141.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3ed2826e.143bbe",\r
+        "id": "d594aca6.9a4aa",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1704.8833312988281,\r
-        "y": 1549.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1691.566650390625,\r
+        "y": 1188.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "95cc35e2.dbd57",\r
+        "id": "5ebf3dd3.403df4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1535.8833312988281,\r
-        "y": 1549.9999389648438,\r
-        "z": "3f6a2e0f.b66c8a",\r
-        "wires": [\r
-            [\r
-                "3ed2826e.143bbe"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "a3b35ff6.7d4a88",\r
-        "type": "switchNode",\r
-        "name": "switch conn type",\r
-        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 225.38333129882812,\r
-        "y": 1147,\r
-        "z": "3f6a2e0f.b66c8a",\r
-        "wires": [\r
-            [\r
-                "53e42336.cf6874",\r
-                "64e5ac9.b8c59d4",\r
-                "29d673d9.3ef8bc"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "fdb5b362.28d2e8",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 336.3833312988281,\r
-        "y": 1503,\r
-        "z": "3f6a2e0f.b66c8a",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "53e42336.cf6874",\r
-        "type": "outcome",\r
-        "name": "leaf",\r
-        "xml": "<outcome value='leaf'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 211.38333129882812,\r
-        "y": 1393,\r
-        "z": "3f6a2e0f.b66c8a",\r
-        "wires": [\r
-            [\r
-                "2d911faf.b625f"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "64e5ac9.b8c59d4",\r
-        "type": "outcome",\r
-        "name": "root",\r
-        "xml": "<outcome value='root'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 212.38333129882812,\r
-        "y": 1451,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1522.566650390625,\r
+        "y": 1188.9998779296875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c8a49fba.48732"\r
+                "d594aca6.9a4aa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "29d673d9.3ef8bc",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 214.38333129882812,\r
-        "y": 1505,\r
-        "z": "3f6a2e0f.b66c8a",\r
-        "wires": [\r
-            [\r
-                "fdb5b362.28d2e8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "893647bf.8d35f8",\r
+        "id": "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": 1319.8833312988281,\r
-        "y": 1713,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1304.566650390625,\r
+        "y": 1710,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "71db6bb7.f92dd4",\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": 1410.8833312988281,\r
-        "y": 1767,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1395.566650390625,\r
+        "y": 1764,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c8a49fba.48732",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 328.3833312988281,\r
-        "y": 1447,\r
-        "z": "3f6a2e0f.b66c8a",\r
-        "wires": [\r
-            [\r
-                "c9ed31d4.2a59a",\r
-                "1853bc71.11bc54",\r
-                "e2c4a442.f42cf",\r
-                "7b94a56a.0cc0c4",\r
-                "14d69ea3.c37079",\r
-                "e39ba7bd.aed5d8",\r
-                "9e9fd2d9.fce4a8",\r
-                "3e44ba6b.3875e6",\r
-                "de368aef.16cb",\r
-                "61a182f0.95ec2c",\r
-                "fae7aeca.a940b8",\r
-                "f92bafd0.7c69c8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "2d911faf.b625f",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 341.3833312988281,\r
-        "y": 1389,\r
-        "z": "3f6a2e0f.b66c8a",\r
-        "wires": [\r
-            [\r
-                "1853bc71.11bc54",\r
-                "30a75a3e.13e116",\r
-                "878444f9.a47b7",\r
-                "7b94a56a.0cc0c4",\r
-                "14d69ea3.c37079",\r
-                "e39ba7bd.aed5d8",\r
-                "9e9fd2d9.fce4a8",\r
-                "3e44ba6b.3875e6",\r
-                "de368aef.16cb",\r
-                "61a182f0.95ec2c",\r
-                "fae7aeca.a940b8",\r
-                "f92bafd0.7c69c8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "30a75a3e.13e116",\r
+        "id": "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": 632.3833312988281,\r
-        "y": 1269,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2072.066650390625,\r
+        "y": 1177,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c9ed31d4.2a59a",\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": 649.3833312988281,\r
-        "y": 1363,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2077.066650390625,\r
+        "y": 1279,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7b94a56a.0cc0c4",\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": 575.8833312988281,\r
-        "y": 1732,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 560.566650390625,\r
+        "y": 1729,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "bd67d795.2e839"\r
+                "6040df7.067df2"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd67d795.2e839",\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": 807.8833312988281,\r
-        "y": 1731,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 792.566650390625,\r
+        "y": 1728,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "148b77ab.48b7a"\r
+                "f4813036.0e422"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "148b77ab.48b7a",\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": 1019.8833312988281,\r
-        "y": 1732,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1004.566650390625,\r
+        "y": 1729,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "90ccd6ae.a26198"\r
+                "21d7816d.cb9a2e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90ccd6ae.a26198",\r
+        "id": "21d7816d.cb9a2e",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 275.8833312988281,\r
-        "y": 1888,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 260.566650390625,\r
+        "y": 1885,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "8f4c1c14.35a72",\r
-                "c6a7aee9.6724"\r
+                "99bd9d6a.34096",\r
+                "25dea7fd.0f37b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c6a7aee9.6724",\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": 510.8833312988281,\r
-        "y": 1875,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 495.566650390625,\r
+        "y": 1872,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8f4c1c14.35a72",\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": 500.8833312988281,\r
-        "y": 1936,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 485.566650390625,\r
+        "y": 1933,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2e648939.1db066",\r
-                "6fc34533.3f02e4",\r
-                "f4ca0a98.2172d"\r
+                "74a706a.d47d878",\r
+                "7274c8e3.f8fec8",\r
+                "b6208f6.4c1eb7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6fc34533.3f02e4",\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": 714.3742980957031,\r
-        "y": 1920.5740356445312,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 699.0576171875,\r
+        "y": 1917.5740356445312,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "24a8c225.12e4ae"\r
+                "7f886391.998a1c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f4ca0a98.2172d",\r
+        "id": "b6208f6.4c1eb7",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 709.8833312988281,\r
-        "y": 1965,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 694.566650390625,\r
+        "y": 1962,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a2a9b29c.7bdb18"\r
+                "3f233556.698682"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e648939.1db066",\r
+        "id": "74a706a.d47d878",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 711.8833312988281,\r
-        "y": 2025,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 696.566650390625,\r
+        "y": 2022,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "6e035263.0ab9c4"\r
+                "721ed34e.4f1714"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "24a8c225.12e4ae",\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": 876.9458312988281,\r
-        "y": 1919.8597412109375,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 861.629150390625,\r
+        "y": 1916.8597412109375,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a2a9b29c.7bdb18",\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": 877.8833312988281,\r
-        "y": 1965,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 862.566650390625,\r
+        "y": 1962,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6e035263.0ab9c4",\r
+        "id": "721ed34e.4f1714",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 880.8833312988281,\r
-        "y": 2024,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 865.566650390625,\r
+        "y": 2021,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fc704734.f5a92",\r
-                "534cefd0.094168"\r
+                "fb6c612a.831f28",\r
+                "af0310e2.931fe8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9e9fd2d9.fce4a8",\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='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",\r
          "comments": "",\r
-        "x": 279.8833312988281,\r
+        "x": 285.566650390625,\r
          "y": 2523,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e44ba6b.3875e6",\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": 422.8833312988281,\r
-        "y": 2583,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 407.566650390625,\r
+        "y": 2580,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b4c4bd8d.d5bdc",\r
-                "c813638c.89d0f"\r
+                "1736d2be.a7f385",\r
+                "11bf3fb5.747c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b4c4bd8d.d5bdc",\r
+        "id": "1736d2be.a7f385",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 735.3833312988281,\r
-        "y": 2560,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 720.066650390625,\r
+        "y": 2557,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c813638c.89d0f",\r
+        "id": "11bf3fb5.747c4",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 739.3833312988281,\r
-        "y": 2600,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 724.066650390625,\r
+        "y": 2597,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "3e668730.81c5e8"\r
+                "9fa6731e.bfdda"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1c6aee6c.a3a53a",\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": 915.3833312988281,\r
-        "y": 2564,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 900.066650390625,\r
+        "y": 2561,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e668730.81c5e8",\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": 930.8833312988281,\r
-        "y": 2618,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 915.566650390625,\r
+        "y": 2615,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e6168d7c.f871d"\r
+                "26102eb4.5bf9d2",\r
+                "a5cf86e7.fd2ae8",\r
+                "94107493.94d3e8",\r
+                "c85f3994.bd81f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59cef6d7.b8a21",\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": 1226.3833312988281,\r
-        "y": 2587,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1211.066650390625,\r
+        "y": 2584,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b5303ab1.d78928",\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": 2693.383331298828,\r
-        "y": 1938,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2678.066650390625,\r
+        "y": 1935,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e6168d7c.f871d",\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": 1188.3833312988281,\r
-        "y": 2629,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1173.066650390625,\r
+        "y": 2626,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "878444f9.a47b7",\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": 598.3833312988281,\r
-        "y": 1307,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2038.066650390625,\r
+        "y": 1215,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e2c4a442.f42cf",\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": 611.3833312988281,\r
-        "y": 1403,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2039.066650390625,\r
+        "y": 1319,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dd4c3392.e1b02",\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": 4347.883331298828,\r
-        "y": 579,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4332.566650390625,\r
+        "y": 576,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9c0b0957.1e6c48",\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": 4250.883331298828,\r
-        "y": 1398,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4235.566650390625,\r
+        "y": 1395,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "88e8f378.a2b808",\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": 3744.883331298828,\r
-        "y": 2070,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3729.566650390625,\r
+        "y": 2067,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "41f16b19.4ea28c",\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": 845.8833312988281,\r
-        "y": 878,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 830.566650390625,\r
+        "y": 875,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7bf4aa70.c75d74",\r
-                "a798281b.2c68d8"\r
+                "451a757.6fc508c",\r
+                "8b0542af.2f9d78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7bf4aa70.c75d74",\r
+        "id": "451a757.6fc508c",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1208.8833312988281,\r
-        "y": 901,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1193.566650390625,\r
+        "y": 898,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e5a55559.f1ecf"\r
+                "f1ea0737.b79178"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a798281b.2c68d8",\r
+        "id": "8b0542af.2f9d78",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1208.8833312988281,\r
-        "y": 850,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1193.566650390625,\r
+        "y": 847,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "486913c4.08fb54"\r
+                "3e6bbe33.acc602"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5a55559.f1ecf",\r
+        "id": "f1ea0737.b79178",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1364.8833312988281,\r
-        "y": 899,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1349.566650390625,\r
+        "y": 896,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a3b35ff6.7d4a88"\r
+                "cb3a4052.881008"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "486913c4.08fb54",\r
+        "id": "3e6bbe33.acc602",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1341.8833312988281,\r
-        "y": 851,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1326.566650390625,\r
+        "y": 848,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4660bf61.473a18",\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": 2101.883331298828,\r
-        "y": 249,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2086.566650390625,\r
+        "y": 246,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1fda4b4a.2131e5",\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": 3643.883331298828,\r
-        "y": 2230,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 3628.566650390625,\r
+        "y": 2227,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2a6ffb7c.8797f4",\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": 4233.883331298828,\r
-        "y": 703,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 4218.566650390625,\r
+        "y": 700,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3af61e2.8efbd8",\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": 1407.8833312988281,\r
-        "y": 1809,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1392.566650390625,\r
+        "y": 1806,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "14d69ea3.c37079",\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": 586.8833312988281,\r
-        "y": 1543,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 571.566650390625,\r
+        "y": 1540,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e39ba7bd.aed5d8",\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": 617.8833312988281,\r
-        "y": 1583,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 602.566650390625,\r
+        "y": 1580,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "fc704734.f5a92",\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": 1165.8833312988281,\r
-        "y": 1991,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1150.566650390625,\r
+        "y": 1988,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "534cefd0.094168",\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": 1168.8833312988281,\r
-        "y": 2033,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1153.566650390625,\r
+        "y": 2030,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "de368aef.16cb",\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": 611.8833312988281,\r
-        "y": 1673,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 596.566650390625,\r
+        "y": 1670,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "61a182f0.95ec2c",\r
+        "id": "4b32fbef.652bc4",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
          "comments": "",\r
-        "x": 366.8833312988281,\r
-        "y": 2052,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 351.566650390625,\r
+        "y": 2049,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fae7aeca.a940b8",\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": 374.8833312988281,\r
-        "y": 2109,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 359.566650390625,\r
+        "y": 2106,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1dbcecbe.b5c9a3",\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": 1385.8833312988281,\r
-        "y": 1658,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1370.566650390625,\r
+        "y": 1655,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2facd73.aebb428",\r
-                "7c34f1f3.22e088"\r
+                "45e3fdbe.201574",\r
+                "86940004.bfdd7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7c34f1f3.22e088",\r
+        "id": "86940004.bfdd7",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1608.8833312988281,\r
-        "y": 1613,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1593.566650390625,\r
+        "y": 1610,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "7e28ac3f.b53f7c"\r
+                "c31b8cce.808f08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2facd73.aebb428",\r
+        "id": "45e3fdbe.201574",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1610.8833312988281,\r
-        "y": 1677,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1595.566650390625,\r
+        "y": 1674,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "c1661a7d.0e642"\r
+                "1cc861e4.834c36"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7e28ac3f.b53f7c",\r
+        "id": "c31b8cce.808f08",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1773.8833312988281,\r
-        "y": 1610,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1758.566650390625,\r
+        "y": 1607,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a55c6cbe.f3cef"\r
+                "b2423aca.7a4fa8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c1661a7d.0e642",\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": 1772.8833312988281,\r
-        "y": 1673,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1757.566650390625,\r
+        "y": 1670,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a55c6cbe.f3cef",\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 -3]`' />\n",\r
+        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
          "comments": "",\r
-        "x": 1993.8833312988281,\r
-        "y": 1624,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1978.566650390625,\r
+        "y": 1621,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3eb9377.85c18",\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": 1538.8833312988281,\r
-        "y": 2349,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1523.566650390625,\r
+        "y": 2346,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "fcb0361d.62eb48"\r
+                "195465ca.996e92"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dcd8db20.d12b7",\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": 1923.8833312988281,\r
-        "y": 2362,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1908.566650390625,\r
+        "y": 2359,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "62f93408.d79154",\r
-                "c38cc9d8.7f1bc",\r
-                "576ffe09.c4abd8"\r
+                "565cac1f.04fa64",\r
+                "e43b7ac1.fcb9e",\r
+                "7ad49b0d.e0614c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fcb0361d.62eb48",\r
+        "id": "195465ca.996e92",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1717.8833312988281,\r
-        "y": 2349,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1702.566650390625,\r
+        "y": 2346,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "90857791.e16908",\r
-                "dcd8db20.d12b7"\r
+                "94dbb559.adb488",\r
+                "ac9df433.f2c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "90857791.e16908",\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": 1953.8833312988281,\r
-        "y": 2310,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1938.566650390625,\r
+        "y": 2307,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "62f93408.d79154",\r
+        "id": "565cac1f.04fa64",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2133.883331298828,\r
-        "y": 2353,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2118.566650390625,\r
+        "y": 2350,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2c548a06.655d4e"\r
+                "b1dc084c.7cde9"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c38cc9d8.7f1bc",\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": 2125.883331298828,\r
-        "y": 2408,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2110.566650390625,\r
+        "y": 2405,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "99196e80.99674"\r
+                "385c483c.3ef568"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "576ffe09.c4abd8",\r
+        "id": "7ad49b0d.e0614c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2130.883331298828,\r
-        "y": 2465,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2115.566650390625,\r
+        "y": 2462,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "ea704904.f61c3"\r
+                "35f4b5a3.f8aa4a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ea704904.f61c3",\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": 2282.883331298828,\r
-        "y": 2466,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2267.566650390625,\r
+        "y": 2463,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "99196e80.99674",\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": 2293.883331298828,\r
-        "y": 2411,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2278.566650390625,\r
+        "y": 2408,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2c548a06.655d4e",\r
+        "id": "b1dc084c.7cde9",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2278.265655517578,\r
-        "y": 2350.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2262.948974609375,\r
+        "y": 2347.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "55de506e.ab2138"\r
+                "5d32a434.f7be54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "55de506e.ab2138",\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": 2492.883331298828,\r
-        "y": 2347,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 2477.566650390625,\r
+        "y": 2344,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2eeb0084.f61b88",\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": 616.8833312988281,\r
-        "y": 2395,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 601.566650390625,\r
+        "y": 2392,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "21d8f2c9.3cd2be",\r
-                "32ff82a0.3bb24e",\r
-                "21eb3441.66cbb4"\r
+                "9a98fb41.58116",\r
+                "d11dcfed.810438",\r
+                "f803d5ab.85238"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21d8f2c9.3cd2be",\r
+        "id": "9a98fb41.58116",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 812.3834533691406,\r
-        "y": 2347,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 797.0667724609375,\r
+        "y": 2344,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "2571d7b1.c4fb5"\r
+                "98bce7a3.da5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "32ff82a0.3bb24e",\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": 804.3834533691406,\r
-        "y": 2402,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 789.0667724609375,\r
+        "y": 2399,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b0a2917a.ecde4"\r
+                "71f2762f.659628"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2571d7b1.c4fb5",\r
+        "id": "98bce7a3.da5e",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 956.7657775878906,\r
-        "y": 2346.6556701660156,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 941.4490966796875,\r
+        "y": 2343.6556701660156,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a50320.52c78ce"\r
+                "c67046c0.c64788"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a50320.52c78ce",\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": 1140.8833312988281,\r
-        "y": 2345,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1125.566650390625,\r
+        "y": 2342,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "b3deb273.cebb88"\r
+                "5f0a1eb2.b2273"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b3deb273.cebb88",\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": 1335.8833312988281,\r
-        "y": 2345,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1320.566650390625,\r
+        "y": 2342,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "a3eb9377.85c18"\r
+                "45f30159.842648"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21eb3441.66cbb4",\r
+        "id": "f803d5ab.85238",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 809.3834533691406,\r
-        "y": 2459,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 794.0667724609375,\r
+        "y": 2456,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "f2a9e7b0.6a4ff8"\r
+                "33262ba5.8d682c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f2a9e7b0.6a4ff8",\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": 961.3834533691406,\r
-        "y": 2460,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 946.0667724609375,\r
+        "y": 2457,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b0a2917a.ecde4",\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": 972.3834533691406,\r
-        "y": 2403,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 957.0667724609375,\r
+        "y": 2400,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "e821cf32.5b22f",\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": 606.8833312988281,\r
-        "y": 2307,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 591.566650390625,\r
+        "y": 2304,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f92bafd0.7c69c8",\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": 351.8833312988281,\r
-        "y": 2438,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 336.566650390625,\r
+        "y": 2435,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": [\r
              [\r
-                "e821cf32.5b22f",\r
-                "2eeb0084.f61b88"\r
+                "808535b.d0bfd48",\r
+                "51bc490a.0719c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a832f3b6.8874e",\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": 1566.8500061035156,\r
-        "y": 255.88333129882812,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 1551.5333251953125,\r
+        "y": 252.88333129882812,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f645589d.ed3d98",\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": 768.8833312988281,\r
-        "y": 478,\r
-        "z": "3f6a2e0f.b66c8a",\r
+        "x": 753.566650390625,\r
+        "y": 475,\r
+        "z": "b25656d7.85a8a8",\r
          "wires": []\r
+    },\r
+    {\r
+        "id": "baa368e2.d0057",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 313.066650390625,\r
+        "y": 1444,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\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": "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": 1343.566650390625,\r
+        "y": 1282,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "118223c9.ee1e8c",\r
+                "5e72886e.16b82",\r
+                "9ad14e96.a683a8",\r
+                "b20e668c.49e0a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "118223c9.ee1e8c",\r
+        "type": "outcome",\r
+        "name": "leaf",\r
+        "xml": "<outcome value='leaf'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1508.566650390625,\r
+        "y": 1264,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "4829f132.924c9"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5e72886e.16b82",\r
+        "type": "outcome",\r
+        "name": "root",\r
+        "xml": "<outcome value='root'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1511.566650390625,\r
+        "y": 1303,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "1b6bbf84.2b9b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b20e668c.49e0a",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1505.566650390625,\r
+        "y": 1381,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "23f70279.3c530e"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 1528.566650390625,\r
+        "y": 1344,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "690a7c3c.e28bc4"\r
+            ]\r
+        ]\r
+    },\r
+    {\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": 2074.566650390625,\r
+        "y": 1377,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": []\r
+    },\r
+    {\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": 2036.566650390625,\r
+        "y": 1417,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "23f70279.3c530e",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1657.566650390625,\r
+        "y": 1402,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\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/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": 1247.1500244140625,\r
+        "y": 2701.3336181640625,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "4829f132.924c9",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1643.4832763671875,\r
+        "y": 1260.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "eaf51112.30b59"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1b6bbf84.2b9b8",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1645.4832763671875,\r
+        "y": 1298.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "77e27285.394bfc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "690a7c3c.e28bc4",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1688.4832763671875,\r
+        "y": 1345.333251953125,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            [\r
+                "36c4b896.3cd558"\r
+            ]\r
+        ]\r
+    },\r
+    {\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=\"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": 1215.1500244140625,\r
+        "y": 2773.33349609375,\r
+        "z": "b25656d7.85a8a8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\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=\"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": 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