Buf fixing for creation, deletion, and modification of a cloud leased-line (CLL)...

[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 81e0415..795a741 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,223 +1,223 @@
  [\r
      {\r
-        "id": "ee012476.423b98",\r
+        "id": "2395bbe0.4b8ec4",\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": 339,\r
-        "y": 363,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 361,\r
+        "y": 348,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "2b361ed4.488d22",\r
-                "8a293b14.096a28",\r
-                "e711b658.aa0458"\r
+                "7a4b4c32.339f0c",\r
+                "476b558f.0cf4e4",\r
+                "c5f863d4.faa76"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2b361ed4.488d22",\r
+        "id": "7a4b4c32.339f0c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 527,\r
-        "y": 376,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 549,\r
+        "y": 361,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "d45a4635.eb8678"\r
+                "477b4d49.40f0ec"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8a293b14.096a28",\r
+        "id": "476b558f.0cf4e4",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 527.490966796875,\r
-        "y": 421.57403564453125,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 549.490966796875,\r
+        "y": 406.57403564453125,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "abb54833.f0129"\r
+                "9391f816.87a258"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e711b658.aa0458",\r
+        "id": "c5f863d4.faa76",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 525,\r
-        "y": 465,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 547,\r
+        "y": 450,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "f29b4663.f669b"\r
+                "7e716c79.c4ee54"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d45a4635.eb8678",\r
+        "id": "477b4d49.40f0ec",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 700,\r
-        "y": 374,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 722,\r
+        "y": 359,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "f31c0d53.86d7f8"\r
+                "de48ad25.e4a568"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "abb54833.f0129",\r
+        "id": "9391f816.87a258",\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": 690.0623779296875,\r
-        "y": 421.8597717285156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 712.0623779296875,\r
+        "y": 406.8597717285156,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f29b4663.f669b",\r
+        "id": "7e716c79.c4ee54",\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": 692,\r
-        "y": 464,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 714,\r
+        "y": 449,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f31c0d53.86d7f8",\r
+        "id": "de48ad25.e4a568",\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": 929,\r
-        "y": 375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 951,\r
+        "y": 360,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "b49d17ad.574c7"\r
+                "1fd8993c.e83297"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b49d17ad.574c7",\r
+        "id": "1fd8993c.e83297",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1144,\r
-        "y": 376,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1166,\r
+        "y": 361,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "59104900.730b5"\r
+                "33755ee2.127952"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59104900.730b5",\r
+        "id": "edb565df.2fd588",\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": 1388,\r
-        "y": 375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1420,\r
+        "y": 283,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "a081cc3f.ed90c8",\r
-                "c86127b7.79d09"\r
+                "d9f77b89.2576a8",\r
+                "d1a41641.7e8658"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a081cc3f.ed90c8",\r
+        "id": "d9f77b89.2576a8",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1605,\r
-        "y": 354,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1637,\r
+        "y": 262,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "99d2c91.f0beeb8"\r
+                "33755ee2.127952"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c86127b7.79d09",\r
+        "id": "d1a41641.7e8658",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1605,\r
-        "y": 403,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1637,\r
+        "y": 311,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "99d2c91.f0beeb8",\r
+        "id": "33755ee2.127952",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic='true'>",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1799,\r
-        "y": 363,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1821,\r
+        "y": 348,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "1cc75cf0.e01a9b",\r
-                "171d3657.f2327a",\r
-                "e9e324cf.d34fa8"\r
+                "9647ef19.c8c25",\r
+                "b3842f71.731b38",\r
+                "ca01ca51.23bb98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "63d9b9e3.c39a3",\r
+        "id": "48081245.456c3c",\r
          "type": "dgstart",\r
          "name": "DGSTART",\r
          "outputs": 1,\r
-        "x": 158,\r
-        "y": 104,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 180,\r
+        "y": 89,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "13826703.6fe8f9"\r
+                "226f6982.562f5e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "13826703.6fe8f9",\r
+        "id": "226f6982.562f5e",\r
          "type": "service-logic",\r
          "name": "GENERIC-RESOURCE-API ${project.version}",\r
          "module": "GENERIC-RESOURCE-API",\r
@@ -225,3221 +225,3560 @@
          "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": 442.2856903076172,\r
-        "y": 165.23810863494873,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 464.2856903076172,\r
+        "y": 150.23810863494873,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "a18ada65.df1b6"\r
+                "f533e2ec.f849f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a18ada65.df1b6",\r
+        "id": "f533e2ec.f849f",\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": 448.42860412597656,\r
-        "y": 250.00003051757812,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 470.42860412597656,\r
+        "y": 235.00003051757812,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "e68623b.1ed71e"\r
+                "15848be5.af4ba4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e68623b.1ed71e",\r
+        "id": "15848be5.af4ba4",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 758.238037109375,\r
-        "y": 241.66668701171875,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 780.238037109375,\r
+        "y": 226.66668701171875,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "ee012476.423b98",\r
-                "1d423866.3abba8",\r
-                "63268214.354d14",\r
-                "2b86835c.8d9024",\r
-                "5a6a7d0e.a2f89c"\r
+                "2395bbe0.4b8ec4",\r
+                "5c62cbf5.952894",\r
+                "4957906b.cb3908",\r
+                "25a3d5e5.55ea62",\r
+                "624a734b.81957c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1cc75cf0.e01a9b",\r
+        "id": "9647ef19.c8c25",\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": 2016,\r
-        "y": 301,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2038,\r
+        "y": 286,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "acb2a33f.d7ec9",\r
+        "id": "927e2807.47e1",\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": 4185,\r
-        "y": 187,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4207,\r
+        "y": 172,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1a2b69e5.bdb2ae",\r
+        "id": "71f8cbde.7b70ec",\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": 4266,\r
-        "y": 502,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4288,\r
+        "y": 487,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "c13bac2.6ce225",\r
-                "54c65da.56603a4"\r
+                "dca0592f.f2f0f8",\r
+                "7abf945b.d3630c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c13bac2.6ce225",\r
+        "id": "dca0592f.f2f0f8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4575.5,\r
-        "y": 471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4597.5,\r
+        "y": 456,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "9c791a1e.520a28"\r
+                "4d6d008.1dd328"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "54c65da.56603a4",\r
+        "id": "7abf945b.d3630c",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4580.5,\r
-        "y": 536,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4602.5,\r
+        "y": 521,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "b016fce4.beba"\r
+                "6ddc3bc2.826894"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9c791a1e.520a28",\r
+        "id": "4d6d008.1dd328",\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": 4751.5,\r
-        "y": 471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4773.5,\r
+        "y": 456,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b016fce4.beba",\r
+        "id": "6ddc3bc2.826894",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4747,\r
-        "y": 536,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4769,\r
+        "y": 521,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "2227e8a2.0665b8",\r
+        "id": "639d74a6.1d8f04",\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": 4130.5,\r
-        "y": 756,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4152.5,\r
+        "y": 741,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f70fce2d.7485",\r
+        "id": "d9456183.6b2d68",\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": 4284.5,\r
-        "y": 804,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4306.5,\r
+        "y": 789,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "8ffe5287.d9d0e8",\r
-                "5f6b3e31.55961"\r
+                "3efbdf9b.54682",\r
+                "243cc169.72316e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8ffe5287.d9d0e8",\r
+        "id": "3efbdf9b.54682",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4630,\r
-        "y": 785,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4652,\r
+        "y": 770,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "8c837eb9.336b9"\r
+                "ba970949.4ab53"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5f6b3e31.55961",\r
+        "id": "243cc169.72316e",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4634,\r
-        "y": 825,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4656,\r
+        "y": 810,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "575c5f0f.3503d8"\r
+                "4891a43f.02e58c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "8c837eb9.336b9",\r
+        "id": "ba970949.4ab53",\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": 4788,\r
-        "y": 785,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4810,\r
+        "y": 770,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "575c5f0f.3503d8",\r
+        "id": "4891a43f.02e58c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4791.5,\r
-        "y": 825,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4813.5,\r
+        "y": 810,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "25e6aa4e.9a9cde",\r
-                "1cebed54.09e3f3"\r
+                "388beb56.7c7234",\r
+                "eb334e0f.b54c3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25e6aa4e.9a9cde",\r
+        "id": "388beb56.7c7234",\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": 5122,\r
-        "y": 790,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5144,\r
+        "y": 775,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "57cb404e.88a3a8",\r
+        "id": "d196af8c.f36ae8",\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": 4986,\r
-        "y": 749,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5008,\r
+        "y": 734,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1cebed54.09e3f3",\r
+        "id": "eb334e0f.b54c3",\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": 5049,\r
-        "y": 836,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5071,\r
+        "y": 821,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "adcc0fc7.59b628",\r
+        "id": "51361643.15e97",\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": 4123,\r
-        "y": 235,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4145,\r
+        "y": 220,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "36f9f62e.004372",\r
+        "id": "7074e291.428a74",\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": 4149,\r
-        "y": 352,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4171,\r
+        "y": 337,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "37680b24.ccfd7c",\r
-                "da1cdd66.16c98",\r
-                "923405db.542c"\r
+                "fd9f25cd.b6ab9",\r
+                "13f82e43.b47822",\r
+                "a1ba843c.92fa78"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37680b24.ccfd7c",\r
+        "id": "fd9f25cd.b6ab9",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4344.5001220703125,\r
-        "y": 304,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4366.5001220703125,\r
+        "y": 289,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "3021ee1b.904b12"\r
+                "10d11922.59185f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "da1cdd66.16c98",\r
+        "id": "13f82e43.b47822",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4336.5001220703125,\r
-        "y": 359,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4358.5001220703125,\r
+        "y": 344,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "12605fae.863058"\r
+                "19650434.8dad4c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3021ee1b.904b12",\r
+        "id": "10d11922.59185f",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4488.8824462890625,\r
-        "y": 303.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4510.8824462890625,\r
+        "y": 288.6556701660156,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "dd5c14b5.d1837"\r
+                "777ae9c7.6a278"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "67c4003.ef8f28",\r
+        "id": "391ce87d.ba3df8",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5071,\r
-        "y": 306,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5093,\r
+        "y": 291,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "108d04fa.bf4053"\r
+                "65b820ac.17e0d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "dd5c14b5.d1837",\r
+        "id": "777ae9c7.6a278",\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": 4673,\r
-        "y": 302,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4695,\r
+        "y": 287,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "d5f86c5d.16c4"\r
+                "f4f1a808.b22bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d5f86c5d.16c4",\r
+        "id": "f4f1a808.b22bc",\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": 4868,\r
-        "y": 302,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4890,\r
+        "y": 287,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "67c4003.ef8f28"\r
+                "391ce87d.ba3df8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "923405db.542c",\r
+        "id": "a1ba843c.92fa78",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4341.5001220703125,\r
-        "y": 416,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4363.5001220703125,\r
+        "y": 401,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "b180d8b0.c43f88"\r
+                "a6d9e4b5.ea0fd8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b180d8b0.c43f88",\r
+        "id": "a6d9e4b5.ea0fd8",\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": 4493.5001220703125,\r
-        "y": 417,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4515.5001220703125,\r
+        "y": 402,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "12605fae.863058",\r
+        "id": "19650434.8dad4c",\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": 4504.5001220703125,\r
-        "y": 360,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4526.5001220703125,\r
+        "y": 345,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f9899c24.7b705",\r
+        "id": "5d042a1f.c8fb44",\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": 5456,\r
-        "y": 319,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5478,\r
+        "y": 304,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "d378bd87.63a5c8",\r
-                "5261c81e.fbb5b8",\r
-                "634ff531.a525f4"\r
+                "8c0f87c1.0cfa88",\r
+                "96b96977.b4fed8",\r
+                "6ce026da.737ea"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "108d04fa.bf4053",\r
+        "id": "65b820ac.17e0d",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5250,\r
-        "y": 306,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5272,\r
+        "y": 291,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "20f95b42.b2257c",\r
-                "f9899c24.7b705"\r
+                "1918c44c.117ae4",\r
+                "5d042a1f.c8fb44"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "20f95b42.b2257c",\r
+        "id": "1918c44c.117ae4",\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": 5486,\r
-        "y": 267,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5508,\r
+        "y": 252,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d378bd87.63a5c8",\r
+        "id": "8c0f87c1.0cfa88",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5666,\r
-        "y": 310,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5688,\r
+        "y": 295,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "1cbdaba0.674dd4"\r
+                "e1aae278.d9aab"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5261c81e.fbb5b8",\r
+        "id": "96b96977.b4fed8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5658,\r
-        "y": 365,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5680,\r
+        "y": 350,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "66b4dbad.a4949c"\r
+                "a74826f7.daef6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "634ff531.a525f4",\r
+        "id": "6ce026da.737ea",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5663,\r
-        "y": 422,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5685,\r
+        "y": 407,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "21f2fdd8.0e601a"\r
+                "80c7718d.f0881"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "21f2fdd8.0e601a",\r
+        "id": "80c7718d.f0881",\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": 5815,\r
-        "y": 423,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5837,\r
+        "y": 408,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "66b4dbad.a4949c",\r
+        "id": "a74826f7.daef6",\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": 5826,\r
-        "y": 368,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5848,\r
+        "y": 353,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1cbdaba0.674dd4",\r
+        "id": "e1aae278.d9aab",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5810.38232421875,\r
-        "y": 307.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5832.38232421875,\r
+        "y": 292.6556701660156,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "ebf10644.3cf328"\r
+                "b6fb5857.56d2c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ebf10644.3cf328",\r
+        "id": "b6fb5857.56d2c",\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": 6025,\r
-        "y": 304,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 6047,\r
+        "y": 289,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "204badf8.a5ba12",\r
+        "id": "881ac3d.2b73cc",\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": 3592,\r
-        "y": 1644,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3614,\r
+        "y": 1629,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4d3bca29.9af50c",\r
+        "id": "f942fe34.857118",\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": 3655,\r
-        "y": 1973,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3677,\r
+        "y": 1958,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "30186c33.4929f4",\r
-                "868e39af.adebc8"\r
+                "d6aba815.0c0b98",\r
+                "fb15fc4f.27732"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30186c33.4929f4",\r
+        "id": "d6aba815.0c0b98",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3950.5,\r
-        "y": 1940,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3972.5,\r
+        "y": 1925,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "2aae4501.2c69e2"\r
+                "f7e9b7f6.cb6cf8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "868e39af.adebc8",\r
+        "id": "fb15fc4f.27732",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3955.5,\r
-        "y": 2005,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3977.5,\r
+        "y": 1990,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "7501d4e8.c8d944"\r
+                "e7e93f9f.05e6f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2aae4501.2c69e2",\r
+        "id": "f7e9b7f6.cb6cf8",\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": 4118.5,\r
-        "y": 1940,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4140.5,\r
+        "y": 1925,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7501d4e8.c8d944",\r
+        "id": "e7e93f9f.05e6f8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4129,\r
-        "y": 2005,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4151,\r
+        "y": 1990,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "cc294dbc.f351c",\r
+        "id": "c6f7c9bc.a78ea8",\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": 3531,\r
-        "y": 1701,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3553,\r
+        "y": 1686,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c8227bea.321b5",\r
+        "id": "8f243ad6.97dd38",\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": 3551,\r
-        "y": 1798,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3573,\r
+        "y": 1783,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "9f19ba3f.539ea8",\r
-                "e4125ed0.f068f8",\r
-                "de95537a.826588"\r
+                "a8e6c84d.0f237",\r
+                "3ee8ddc2.b7378a",\r
+                "311698c.6883b68"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9f19ba3f.539ea8",\r
+        "id": "a8e6c84d.0f237",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3753.5001220703125,\r
-        "y": 1751,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3775.5001220703125,\r
+        "y": 1736,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "e35cf2ca.728ed8"\r
+                "6ef9124f.c91bc4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e4125ed0.f068f8",\r
+        "id": "3ee8ddc2.b7378a",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3745.5001220703125,\r
-        "y": 1806,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3767.5001220703125,\r
+        "y": 1791,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "c80b6676.b0f198"\r
+                "9b01e4a.2bf7598"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e35cf2ca.728ed8",\r
+        "id": "6ef9124f.c91bc4",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3897.8824462890625,\r
-        "y": 1748.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3919.8824462890625,\r
+        "y": 1733.6556701660156,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "57d9c9b8.81d7a8"\r
+                "8bd570a1.9b5908"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "57d9c9b8.81d7a8",\r
+        "id": "8bd570a1.9b5908",\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": 4082,\r
-        "y": 1763,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4104,\r
+        "y": 1748,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "2837eada.0816e6"\r
+                "5951fb7a.778dbc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "de95537a.826588",\r
+        "id": "311698c.6883b68",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3750.5001220703125,\r
-        "y": 1863,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3772.5001220703125,\r
+        "y": 1848,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "6ac21b2f.35237c"\r
+                "25fe1469.5e13bc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6ac21b2f.35237c",\r
+        "id": "25fe1469.5e13bc",\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": 3902.5001220703125,\r
-        "y": 1864,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3924.5001220703125,\r
+        "y": 1849,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c80b6676.b0f198",\r
+        "id": "9b01e4a.2bf7598",\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": 3913.5001220703125,\r
-        "y": 1809,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3935.5001220703125,\r
+        "y": 1794,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b2f2b82b.20ac9",\r
+        "id": "a9a3100d.7e9a38",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4480,\r
-        "y": 1767,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4502,\r
+        "y": 1752,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "e8c4648e.2f16b8"\r
+                "15a6f6cf.b80121"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2837eada.0816e6",\r
+        "id": "5951fb7a.778dbc",\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": 4277,\r
-        "y": 1763,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4299,\r
+        "y": 1748,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "b2f2b82b.20ac9"\r
+                "a9a3100d.7e9a38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7fa6120f.8bbc34",\r
+        "id": "b462757e.f97cf",\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": 4865,\r
-        "y": 1766,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4887,\r
+        "y": 1751,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "2004b12.ed9d54e",\r
-                "ffd8f42d.6ff66",\r
-                "7412d147.be04a8"\r
+                "f548cd5f.cf97e8",\r
+                "7bf2c309.936484",\r
+                "37200156.6e45ae"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e8c4648e.2f16b8",\r
+        "id": "15a6f6cf.b80121",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 4657,\r
-        "y": 1759,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4679,\r
+        "y": 1744,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "619505d8.279204",\r
-                "7fa6120f.8bbc34"\r
+                "24625031.3ccbb",\r
+                "b462757e.f97cf"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "619505d8.279204",\r
+        "id": "24625031.3ccbb",\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": 4895,\r
-        "y": 1714,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4917,\r
+        "y": 1699,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "407265d3.d9387c",\r
+        "id": "3717e4c0.7e91fc",\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": 5224,\r
-        "y": 1870,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5246,\r
+        "y": 1855,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "70bb8ce1.2b5a7c",\r
+        "id": "ebaf4cad.7f7ac",\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": 5235,\r
-        "y": 1815,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5257,\r
+        "y": 1800,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "474b0f12.6a5378",\r
+        "id": "95133e26.a5c4",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5219.38232421875,\r
-        "y": 1754.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5241.38232421875,\r
+        "y": 1739.6556701660156,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "4664ee87.d9fd18"\r
+                "74fa69d9.12322"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4664ee87.d9fd18",\r
+        "id": "74fa69d9.12322",\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": 5434,\r
-        "y": 1751,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5456,\r
+        "y": 1736,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2004b12.ed9d54e",\r
+        "id": "f548cd5f.cf97e8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5075,\r
-        "y": 1757,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5097,\r
+        "y": 1742,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "474b0f12.6a5378"\r
+                "95133e26.a5c4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ffd8f42d.6ff66",\r
+        "id": "7bf2c309.936484",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5067,\r
-        "y": 1812,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5089,\r
+        "y": 1797,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "70bb8ce1.2b5a7c"\r
+                "ebaf4cad.7f7ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7412d147.be04a8",\r
+        "id": "37200156.6e45ae",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5072,\r
-        "y": 1869,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5094,\r
+        "y": 1854,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "407265d3.d9387c"\r
+                "3717e4c0.7e91fc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "79f7771a.baa2f",\r
+        "id": "4573661e.19551",\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": 3106,\r
-        "y": 715,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3128,\r
+        "y": 700,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "6b315a67.2be854",\r
-                "7ca64a28.96fff4"\r
+                "e3a931ba.d41978",\r
+                "cce98769.66d2f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b315a67.2be854",\r
+        "id": "e3a931ba.d41978",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3320,\r
-        "y": 752,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3342,\r
+        "y": 737,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "e26333e1.9f2a38"\r
+                "83f7a2a0.47e4a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7ca64a28.96fff4",\r
+        "id": "cce98769.66d2f",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3322,\r
-        "y": 690,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3344,\r
+        "y": 675,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "89cb81b5.af1468"\r
+                "a3a1c771.fa4dc8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e26333e1.9f2a38",\r
+        "id": "83f7a2a0.47e4a",\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": 2900,\r
-        "y": 1995,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2922,\r
+        "y": 1980,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "5c3b586f.467af",\r
-                "6b4dbd17.81909c"\r
+                "b17cf12.c5b4e9",\r
+                "375f750c.523c3a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5c3b586f.467af",\r
+        "id": "b17cf12.c5b4e9",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3153,\r
-        "y": 2029,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3175,\r
+        "y": 2014,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "a3ab9951.4bdf08"\r
+                "b574ded7.ea26d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "6b4dbd17.81909c",\r
+        "id": "375f750c.523c3a",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3153,\r
-        "y": 1973,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3175,\r
+        "y": 1958,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "29d8f363.c99594"\r
+                "3eeb971b.8e101"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a3ab9951.4bdf08",\r
+        "id": "b574ded7.ea26d",\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": 3304,\r
-        "y": 2029,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3326,\r
+        "y": 2014,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c7f2aefb.cead08",\r
+        "id": "27c7cf1.51adcb",\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": 4180,\r
-        "y": 127,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4202,\r
+        "y": 112,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8d65460e.504db8",\r
+        "id": "e24e0a9e.a7db8",\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": 3588,\r
-        "y": 1586,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3610,\r
+        "y": 1571,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "3e2a76dd.233f7a",\r
+        "id": "6b14e6ca.05c05",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3871,\r
-        "y": 384,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3893,\r
+        "y": 369,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "c7f2aefb.cead08",\r
-                "acb2a33f.d7ec9",\r
-                "adcc0fc7.59b628",\r
-                "36f9f62e.004372",\r
-                "1a2b69e5.bdb2ae",\r
-                "7d01ae3.e59e8d",\r
-                "91a8f363.33b6d",\r
-                "8c296a00.ae82e8"\r
+                "27c7cf1.51adcb",\r
+                "927e2807.47e1",\r
+                "51361643.15e97",\r
+                "7074e291.428a74",\r
+                "71f8cbde.7b70ec",\r
+                "41c50446.37f104",\r
+                "e5881b35.2a2bf8",\r
+                "ceaa1f2c.697ad"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "29d8f363.c99594",\r
+        "id": "3eeb971b.8e101",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3304,\r
-        "y": 1972,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3326,\r
+        "y": 1957,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "8d65460e.504db8",\r
-                "204badf8.a5ba12",\r
-                "cc294dbc.f351c",\r
-                "c8227bea.321b5",\r
-                "4d3bca29.9af50c",\r
-                "605c7758.9853c8",\r
-                "d3fdc974.92df9",\r
-                "52902dc6.5c041c"\r
+                "e24e0a9e.a7db8",\r
+                "881ac3d.2b73cc",\r
+                "c6f7c9bc.a78ea8",\r
+                "8f243ad6.97dd38",\r
+                "f942fe34.857118",\r
+                "51d22e16.357968",\r
+                "8caebf31.dc028",\r
+                "6ccc1a6d.d89cd4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "59dac694.235a08",\r
+        "id": "f87bcfd0.50c8c",\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": 3542,\r
-        "y": 2271,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3564,\r
+        "y": 2256,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "704c6.41b9333ac",\r
+        "id": "ab6e58b.3c55528",\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": 3696,\r
-        "y": 2319,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3718,\r
+        "y": 2304,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "5cc2fc76.782a54",\r
-                "be48f3e2.0fbf"\r
+                "eff9a19.776a7e",\r
+                "ddb717fb.d9a6d8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "5cc2fc76.782a54",\r
+        "id": "eff9a19.776a7e",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4041.5,\r
-        "y": 2300,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4063.5,\r
+        "y": 2285,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "a76d95f1.d45e1"\r
+                "59a2ea1f.0d3f14"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "be48f3e2.0fbf",\r
+        "id": "ddb717fb.d9a6d8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4045.5,\r
-        "y": 2340,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4067.5,\r
+        "y": 2325,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "1991eff2.b8a15"\r
+                "81b55fda.fb8e98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a76d95f1.d45e1",\r
+        "id": "59a2ea1f.0d3f14",\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": 4199.5,\r
-        "y": 2300,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4221.5,\r
+        "y": 2285,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1991eff2.b8a15",\r
+        "id": "81b55fda.fb8e98",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4203,\r
-        "y": 2340,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4225,\r
+        "y": 2325,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "69ca6e83.833b58",\r
-                "1ce7897f.5077ef"\r
+                "1bcc30a0.546397",\r
+                "1eaaa262.028326"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "69ca6e83.833b58",\r
+        "id": "1bcc30a0.546397",\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": 4543,\r
-        "y": 2339,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4565,\r
+        "y": 2324,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "47268bd4.d29394",\r
+        "id": "68a7db89.5a89fc",\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": 4401,\r
-        "y": 2297,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4423,\r
+        "y": 2282,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1ce7897f.5077ef",\r
+        "id": "1eaaa262.028326",\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": 4472,\r
-        "y": 2388,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4494,\r
+        "y": 2373,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "adf25f68.f6874",\r
+        "id": "71f36947.989c9",\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": 3097,\r
-        "y": 655,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3119,\r
+        "y": 640,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "5011571a.f2ffc8",\r
+        "id": "24508e5.8723172",\r
          "type": "comment",\r
          "name": "only dst ttp exists. No src",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3692,\r
-        "y": 341,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3714,\r
+        "y": 326,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "69454f54.a632a",\r
+        "id": "f3eaab4d.9a827",\r
          "type": "comment",\r
          "name": "only src ttp exists. No dst",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3249,\r
-        "y": 1919,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3271,\r
+        "y": 1904,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "89cb81b5.af1468",\r
+        "id": "a3a1c771.fa4dc8",\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": 3428,\r
-        "y": 503,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3450,\r
+        "y": 488,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "89a2367.f810e48",\r
-                "76abc6c6.50ef4"\r
+                "6921df6d.0bad7",\r
+                "5859006e.3869c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "76abc6c6.50ef4",\r
+        "id": "5859006e.3869c8",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3670,\r
-        "y": 1092,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3692,\r
+        "y": 1077,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "fdc63597.3712e"\r
+                "6a1db5bd.d7e224"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "89a2367.f810e48",\r
+        "id": "6921df6d.0bad7",\r
          "type": "outcome",\r
          "name": "Null",\r
          "xml": "<outcome value=''>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 3664,\r
-        "y": 383,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3686,\r
+        "y": 368,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "3e2a76dd.233f7a"\r
+                "6b14e6ca.05c05"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fdc63597.3712e",\r
+        "id": "6a1db5bd.d7e224",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 3828,\r
-        "y": 1091,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3850,\r
+        "y": 1076,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "1793312b.927ef7",\r
-                "41401fda.2be158",\r
-                "9005ec38.4e5e88",\r
-                "dd0899e7.f82f08",\r
-                "ecd7f356.de7408",\r
-                "b3054d0f.9c60c"\r
+                "e8ac2c73.115cc",\r
+                "de077050.d3ab3",\r
+                "d36a1b80.8692c8",\r
+                "73f78d36.ab931c",\r
+                "8ec0e69e.0bdfb8",\r
+                "4004366.ff0b5c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "41401fda.2be158",\r
+        "id": "de077050.d3ab3",\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": 4092,\r
-        "y": 974,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4114,\r
+        "y": 959,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ecd7f356.de7408",\r
+        "id": "8ec0e69e.0bdfb8",\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": 4173,\r
-        "y": 1289,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4195,\r
+        "y": 1274,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "e0518882.6fa588",\r
-                "87218147.0fa418"\r
+                "a8d20b89.8deb88",\r
+                "ebe8f709.819288"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e0518882.6fa588",\r
+        "id": "a8d20b89.8deb88",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4482.5,\r
-        "y": 1258,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4504.5,\r
+        "y": 1243,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "57c63933.072c5"\r
+                "f56a0e73.901ac"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "87218147.0fa418",\r
+        "id": "ebe8f709.819288",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4487.5,\r
-        "y": 1323,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4509.5,\r
+        "y": 1308,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "7dd1782c.b2154"\r
+                "8bcbb353.d66038"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "57c63933.072c5",\r
+        "id": "f56a0e73.901ac",\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": 4658.5,\r
-        "y": 1258,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4680.5,\r
+        "y": 1243,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7dd1782c.b2154",\r
+        "id": "8bcbb353.d66038",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4654,\r
-        "y": 1323,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4676,\r
+        "y": 1308,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "9005ec38.4e5e88",\r
+        "id": "d36a1b80.8692c8",\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": 4030,\r
-        "y": 1022,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4052,\r
+        "y": 1007,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "dd0899e7.f82f08",\r
+        "id": "73f78d36.ab931c",\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": 4056,\r
-        "y": 1139,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4078,\r
+        "y": 1124,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "7a284ffa.3cc17",\r
-                "aa72c818.28213",\r
-                "f0ca75e3.4407d"\r
+                "e0243648.484bc",\r
+                "e14aa09.d5d416",\r
+                "5447b1d0.03a8b"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "7a284ffa.3cc17",\r
+        "id": "e0243648.484bc",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4251.5001220703125,\r
-        "y": 1091,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4273.5001220703125,\r
+        "y": 1076,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "25701aeb.93625e"\r
+                "94135ed.07ea02"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "aa72c818.28213",\r
+        "id": "e14aa09.d5d416",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4243.5001220703125,\r
-        "y": 1146,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4265.5001220703125,\r
+        "y": 1131,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "f502d128.6eafe8"\r
+                "1628394b.83cd8f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "25701aeb.93625e",\r
+        "id": "94135ed.07ea02",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4395.8824462890625,\r
-        "y": 1090.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4417.8824462890625,\r
+        "y": 1075.6556701660156,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "86d32773.3465f8"\r
+                "fdedf72e.2dd36"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "86d32773.3465f8",\r
+        "id": "fdedf72e.2dd36",\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": 4580,\r
-        "y": 1089,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4602,\r
+        "y": 1074,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "e526c1c.efff3c"\r
+                "f99d2e19.85b668"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e526c1c.efff3c",\r
+        "id": "f99d2e19.85b668",\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": 4775,\r
-        "y": 1089,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4797,\r
+        "y": 1074,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "b3ad7614.48799"\r
+                "ff4cc7a8.15eb18"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f0ca75e3.4407d",\r
+        "id": "5447b1d0.03a8b",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4248.5001220703125,\r
-        "y": 1203,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4270.5001220703125,\r
+        "y": 1188,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "f3b0b426.0ebd8"\r
+                "74603a77.be9d34"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f3b0b426.0ebd8",\r
+        "id": "74603a77.be9d34",\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": 4400.5001220703125,\r
-        "y": 1204,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4422.5001220703125,\r
+        "y": 1189,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f502d128.6eafe8",\r
+        "id": "1628394b.83cd8f",\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": 4411.5001220703125,\r
-        "y": 1147,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4433.5001220703125,\r
+        "y": 1132,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "1793312b.927ef7",\r
+        "id": "e8ac2c73.115cc",\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": 4087,\r
-        "y": 914,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4109,\r
+        "y": 899,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b3ad7614.48799",\r
+        "id": "ff4cc7a8.15eb18",\r
          "type": "outcome",\r
          "name": "esr-thirdparty-sdnc",\r
          "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 4978,\r
-        "y": 1093,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5000,\r
+        "y": 1078,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "96db10e5.ea83"\r
+                "8469558b.e4d748"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "306d874d.b412d8",\r
+        "id": "cf8a4c78.37fe58",\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": 5363,\r
-        "y": 1106,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5385,\r
+        "y": 1091,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "c6eb6256.83f998",\r
-                "45038891.4f4538",\r
-                "daa4d789.597db8"\r
+                "44cef850.3e64a",\r
+                "9337c3a8.6f7408",\r
+                "6a44b1b.7cb45d"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96db10e5.ea83",\r
+        "id": "8469558b.e4d748",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 5157,\r
-        "y": 1093,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5179,\r
+        "y": 1078,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "d230885e.9519f8",\r
-                "306d874d.b412d8"\r
+                "82428162.54c128",\r
+                "cf8a4c78.37fe58"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "d230885e.9519f8",\r
+        "id": "82428162.54c128",\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": 5393,\r
-        "y": 1054,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5415,\r
+        "y": 1039,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c6eb6256.83f998",\r
+        "id": "44cef850.3e64a",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5573,\r
-        "y": 1097,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5595,\r
+        "y": 1082,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "a3266db3.e5e668"\r
+                "ffb7eeb1.dda348"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "45038891.4f4538",\r
+        "id": "9337c3a8.6f7408",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5565,\r
-        "y": 1152,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5587,\r
+        "y": 1137,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "c1656fec.754d9"\r
+                "28235dd8.9620aa"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "daa4d789.597db8",\r
+        "id": "6a44b1b.7cb45d",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5570,\r
-        "y": 1209,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5592,\r
+        "y": 1194,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "e2730778.5b349"\r
+                "a95b4d04.8ebfb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e2730778.5b349",\r
+        "id": "a95b4d04.8ebfb",\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": 5722,\r
-        "y": 1210,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5744,\r
+        "y": 1195,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c1656fec.754d9",\r
+        "id": "28235dd8.9620aa",\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": 5733,\r
-        "y": 1155,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5755,\r
+        "y": 1140,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a3266db3.e5e668",\r
+        "id": "ffb7eeb1.dda348",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>\n",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 5717.38232421875,\r
-        "y": 1094.6556701660156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5739.38232421875,\r
+        "y": 1079.6556701660156,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "eeffd7c6.a525f"\r
+                "eb1ea22e.dc12c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "eeffd7c6.a525f",\r
+        "id": "eb1ea22e.dc12c",\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": 5932,\r
-        "y": 1091,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 5954,\r
+        "y": 1076,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24ea3ba5.00c9cc",\r
+        "id": "47e1e7c7.6cadf",\r
          "type": "comment",\r
          "name": "both src and dst exist",\r
          "info": "",\r
          "comments": "",\r
-        "x": 3706,\r
-        "y": 1032,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3728,\r
+        "y": 1017,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "171d3657.f2327a",\r
+        "id": "b3842f71.731b38",\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": 2268,\r
-        "y": 759,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2290,\r
+        "y": 744,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "76b248ab.29f1f8",\r
-                "a2a1c5ad.da7c28"\r
+                "fe4cd4cf.21da1",\r
+                "8d3265c3.ddab38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a2a1c5ad.da7c28",\r
+        "id": "8d3265c3.ddab38",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2675,\r
-        "y": 777,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2697,\r
+        "y": 762,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "4b53f5cd.6e4a64"\r
+                "418df61.fe2be08"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "76b248ab.29f1f8",\r
+        "id": "fe4cd4cf.21da1",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2675,\r
-        "y": 722,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2697,\r
+        "y": 707,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "ed700187.4c0438"\r
+                "8b0dea0b.e78e98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ed700187.4c0438",\r
+        "id": "8b0dea0b.e78e98",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 2831,\r
-        "y": 720,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2853,\r
+        "y": 705,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "adf25f68.f6874",\r
-                "79f7771a.baa2f"\r
+                "71f36947.989c9",\r
+                "4573661e.19551"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4b53f5cd.6e4a64",\r
+        "id": "418df61.fe2be08",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 2808,\r
-        "y": 778,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2830,\r
+        "y": 763,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "1d423866.3abba8",\r
+        "id": "5c62cbf5.952894",\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": 985,\r
-        "y": 194,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1007,\r
+        "y": 179,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b7ea63f5.b58c8",\r
+        "id": "a7fd19a0.011a5",\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": 4102,\r
-        "y": 612,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4124,\r
+        "y": 597,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "7d01ae3.e59e8d",\r
+        "id": "41c50446.37f104",\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": 4162,\r
-        "y": 651,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4184,\r
+        "y": 636,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "63268214.354d14",\r
+        "id": "4957906b.cb3908",\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": 978,\r
-        "y": 102,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1000,\r
+        "y": 87,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ad2fff57.f164d",\r
+        "id": "5277b309.13aef4",\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": 3514,\r
-        "y": 2128,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3536,\r
+        "y": 2113,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "605c7758.9853c8",\r
+        "id": "51d22e16.357968",\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": 3570,\r
-        "y": 2177,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3592,\r
+        "y": 2162,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "45ce7d67.6029dc",\r
+        "id": "8191f581.e3e888",\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": 978,\r
-        "y": 141,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1000,\r
+        "y": 126,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "2b86835c.8d9024",\r
+        "id": "25a3d5e5.55ea62",\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": 1009,\r
-        "y": 242,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1031,\r
+        "y": 227,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "5a6a7d0e.a2f89c",\r
+        "id": "624a734b.81957c",\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": 219,\r
-        "y": 717,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 241,\r
+        "y": 702,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "bd2f8dbe.e61408",\r
-                "cacc237e.394a4",\r
-                "f05100c1.a77fd8"\r
+                "2ff4bd45.763852",\r
+                "237ce68a.9b5a2a",\r
+                "86bae4d8.c51f3"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bd2f8dbe.e61408",\r
+        "id": "2ff4bd45.763852",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 438,\r
-        "y": 655,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 460,\r
+        "y": 640,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "64d16331.36ee54"\r
+                "2f347c57.a92144"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "cacc237e.394a4",\r
+        "id": "237ce68a.9b5a2a",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 447.490966796875,\r
-        "y": 697.5740356445312,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 469.490966796875,\r
+        "y": 682.5740356445312,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "537fe800.387e68"\r
+                "196b18f9.87f4a7"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f05100c1.a77fd8",\r
+        "id": "86bae4d8.c51f3",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 436,\r
-        "y": 744,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 458,\r
+        "y": 729,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "4626cafb.2ab55c"\r
+                "d6f02bd7.9f988"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "64d16331.36ee54",\r
+        "id": "2f347c57.a92144",\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": 635,\r
-        "y": 651,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 657,\r
+        "y": 636,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "f0f139f4.8e2a48"\r
+                "408bfafb.b2f244"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "537fe800.387e68",\r
+        "id": "196b18f9.87f4a7",\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": 601.0623779296875,\r
-        "y": 700.8597717285156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 623.0623779296875,\r
+        "y": 685.8597717285156,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4626cafb.2ab55c",\r
+        "id": "d6f02bd7.9f988",\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": 605,\r
-        "y": 745,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 627,\r
+        "y": 730,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f0f139f4.8e2a48",\r
+        "id": "408bfafb.b2f244",\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": 858.33349609375,\r
-        "y": 650.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 880.33349609375,\r
+        "y": 635.9999389648438,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "2762e6c2.94358a"\r
+                "7d8f8b2e.4aa30c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2762e6c2.94358a",\r
+        "id": "7d8f8b2e.4aa30c",\r
          "type": "outcome",\r
          "name": "connectivity",\r
          "xml": "<outcome value='connectivity'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1059.0001335144043,\r
-        "y": 652.000020980835,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1081.0001335144043,\r
+        "y": 637.000020980835,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "37a60584.767442"\r
+                "bd2be559.7e491"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "37a60584.767442",\r
+        "id": "bd2be559.7e491",\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": 189,\r
-        "y": 914,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 211,\r
+        "y": 899,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "99239678.d76be8",\r
-                "87a24056.0cfc9",\r
-                "b29ec635.8a7db"\r
+                "97323d62.80248",\r
+                "afdba634.5389a8",\r
+                "c784d901.2500c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "99239678.d76be8",\r
+        "id": "97323d62.80248",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 397,\r
-        "y": 878,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 419,\r
+        "y": 863,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "bb3094ff.e3cd78"\r
+                "dc950dad.bba8c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "87a24056.0cfc9",\r
+        "id": "afdba634.5389a8",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 397.490966796875,\r
-        "y": 923.5740356445312,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 419.490966796875,\r
+        "y": 908.5740356445312,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "816ef02e.772828"\r
+                "f09199a5.a037f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b29ec635.8a7db",\r
+        "id": "c784d901.2500c8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 395,\r
-        "y": 967,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 417,\r
+        "y": 952,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "b9990c7b.83fc7"\r
+                "a903bba8.c7f45"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "816ef02e.772828",\r
+        "id": "f09199a5.a037f",\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": 560.0623779296875,\r
-        "y": 923.8597717285156,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 582.0623779296875,\r
+        "y": 908.8597717285156,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "b9990c7b.83fc7",\r
+        "id": "a903bba8.c7f45",\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": 564,\r
-        "y": 968,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 586,\r
+        "y": 953,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "30524cd6.9ca834",\r
+        "id": "c4e5acdc.5eea4",\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": 534,\r
-        "y": 1474,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 558,\r
+        "y": 1447,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "b7324e21.fe4538"\r
+                "f2e2cc22.a529f"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "b7324e21.fe4538",\r
+        "id": "f2e2cc22.a529f",\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": 739,\r
-        "y": 1474,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 761,\r
+        "y": 1459,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "fd6dca36.4f2ef"\r
+                "c09b72f6.aeae98"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "fd6dca36.4f2ef",\r
+        "id": "c09b72f6.aeae98",\r
          "type": "outcome",\r
          "name": "UNI",\r
          "xml": "<outcome value='uni'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 905,\r
-        "y": 1471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 927,\r
+        "y": 1456,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "14e5640a.2c60e4"\r
+                "bfe2cfaf.5416a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "14e5640a.2c60e4",\r
+        "id": "bfe2cfaf.5416a",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1066,\r
-        "y": 1468,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1088,\r
+        "y": 1453,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "a961c0c2.954588",\r
-                "bfc93479.bb02c8",\r
-                "ea108501.b7cec8",\r
-                "9c9a6caf.c302e",\r
-                "520b6d65.f95b0c"\r
+                "ed44bd0b.bb6278",\r
+                "85af841c.633c5",\r
+                "785dd3f1.f249ac",\r
+                "b8d52cff.f0dcb",\r
+                "4915b2e4.5fd2dc"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "bfc93479.bb02c8",\r
+        "id": "85af841c.633c5",\r
          "type": "set",\r
          "name": "unset tmp.aai.uni",\r
          "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
          "comments": "",\r
-        "x": 1270,\r
-        "y": 1426,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1292,\r
+        "y": 1411,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "a961c0c2.954588",\r
+        "id": "ed44bd0b.bb6278",\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": 1267,\r
-        "y": 1471,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1289,\r
+        "y": 1456,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "ae34427.3665d4",\r
-                "2e0f53f9.af66fc",\r
-                "e67056c5.33255"\r
+                "6b32d7eb.72211",\r
+                "7343128c.f923b4",\r
+                "b9b05d3.e5ae12"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2e0f53f9.af66fc",\r
+        "id": "7343128c.f923b4",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1462.490966796875,\r
-        "y": 1444.573974609375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1484.490966796875,\r
+        "y": 1429.573974609375,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "c471a2c5.a52548"\r
+                "5dcee0f6.9162a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e67056c5.33255",\r
+        "id": "b9b05d3.e5ae12",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1458,\r
-        "y": 1488.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1480,\r
+        "y": 1473.9999389648438,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "ff2d9a38.ef94a"\r
+                "b7ed6a74.25237"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c471a2c5.a52548",\r
+        "id": "5dcee0f6.9162a8",\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": 1625.0625,\r
-        "y": 1443.8596801757812,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1647.0625,\r
+        "y": 1428.8596801757812,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ff2d9a38.ef94a",\r
+        "id": "b7ed6a74.25237",\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": 1626,\r
-        "y": 1488.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1648,\r
+        "y": 1473.9999389648438,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "de28fbd6.aeb6d8",\r
+        "id": "dfdfa822.c47e1",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1628,\r
-        "y": 1535.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1650,\r
+        "y": 1520.9999389648438,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "ae34427.3665d4",\r
+        "id": "6b32d7eb.72211",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1459,\r
-        "y": 1535.9999389648438,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1481,\r
+        "y": 1520.9999389648438,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "de28fbd6.aeb6d8"\r
+                "dfdfa822.c47e1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "30e36623.144df2",\r
+        "id": "9ed7a6be.5472c",\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": 148.5,\r
-        "y": 1133,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 170.5,\r
+        "y": 1118,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "f6f4ecca.51b1b8",\r
-                "c489f9fc.e5ffb8",\r
-                "a9b0c19e.2c84b8"\r
+                "3e9a846b.aac024",\r
+                "fd2eac9f.aa3be8",\r
+                "81d85b97.ec18c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "3438a7d7.53b84",\r
+        "id": "3d4d11fc.e19976",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 278.5,\r
-        "y": 1491,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 281.5,\r
+        "y": 1474,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "f6f4ecca.51b1b8",\r
+        "id": "3e9a846b.aac024",\r
          "type": "outcome",\r
          "name": "leaf",\r
          "xml": "<outcome value='leaf'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 134.5,\r
-        "y": 1379,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 156.5,\r
+        "y": 1364,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "96322198.44279"\r
+                "186f4361.0093b5"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "c489f9fc.e5ffb8",\r
+        "id": "fd2eac9f.aa3be8",\r
          "type": "outcome",\r
          "name": "root",\r
          "xml": "<outcome value='root'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 135.5,\r
-        "y": 1437,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 157.5,\r
+        "y": 1422,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "398da5.544e025c"\r
+                "a8f57470.dafb1"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a9b0c19e.2c84b8",\r
+        "id": "81d85b97.ec18c",\r
          "type": "other",\r
          "name": "other",\r
          "xml": "<outcome value='Other'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 137.5,\r
-        "y": 1491,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 159.5,\r
+        "y": 1476,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "3438a7d7.53b84"\r
+                "3d4d11fc.e19976"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e5287808.34bdc8",\r
+        "id": "17f45567.72d3f3",\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": 1243,\r
-        "y": 1699,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1265,\r
+        "y": 1684,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "ea108501.b7cec8",\r
+        "id": "785dd3f1.f249ac",\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].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.connectivity.cir`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.connectivity.eir`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
+        "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",\r
          "comments": "",\r
-        "x": 1334,\r
-        "y": 1753,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1356,\r
+        "y": 1738,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "398da5.544e025c",\r
+        "id": "a8f57470.dafb1",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 277.5,\r
-        "y": 1437,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 273.5,\r
+        "y": 1418,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "f5ac679b.0c3448",\r
-                "30524cd6.9ca834",\r
-                "4bb59d5e.d5f6bc",\r
-                "c1ca24e2.0ded08",\r
-                "f1761a56.ef5438",\r
-                "6a3c09b5.9a3f5",\r
-                "62e9a9e6.6ea9a8",\r
-                "94499eb7.5f7bf8",\r
-                "24306e49.ece4e2",\r
-                "527621da.e42f6",\r
-                "f1193850.b7d1f"\r
+                "6d0b5941.55c8f8",\r
+                "c4e5acdc.5eea4",\r
+                "3e47dbd3.f7afc4",\r
+                "c378a6a3.2e4c8",\r
+                "901c32b.8d67fd",\r
+                "d142c0f2.700e98",\r
+                "b2e88ff.3380b7",\r
+                "3026fc23.0fd5f4",\r
+                "f24a5646.1c02c8",\r
+                "db09832f.86c758",\r
+                "3c14b8ea.b96268",\r
+                "c7cb304b.f39168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "96322198.44279",\r
+        "id": "186f4361.0093b5",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 276.5,\r
-        "y": 1379,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 286.5,\r
+        "y": 1360,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "30524cd6.9ca834",\r
-                "4806b9e7.4221c",\r
-                "4f3ecf27.4c11b",\r
-                "c1ca24e2.0ded08",\r
-                "f1761a56.ef5438",\r
-                "6a3c09b5.9a3f5",\r
-                "62e9a9e6.6ea9a8",\r
-                "94499eb7.5f7bf8",\r
-                "24306e49.ece4e2",\r
-                "527621da.e42f6",\r
-                "f1193850.b7d1f"\r
+                "c4e5acdc.5eea4",\r
+                "b5d90017.45ce98",\r
+                "913d2a70.ccfd3",\r
+                "c378a6a3.2e4c8",\r
+                "901c32b.8d67fd",\r
+                "d142c0f2.700e98",\r
+                "b2e88ff.3380b7",\r
+                "3026fc23.0fd5f4",\r
+                "f24a5646.1c02c8",\r
+                "db09832f.86c758",\r
+                "3c14b8ea.b96268",\r
+                "c7cb304b.f39168"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4806b9e7.4221c",\r
+        "id": "b5d90017.45ce98",\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": 555.5,\r
-        "y": 1255,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 577.5,\r
+        "y": 1240,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f5ac679b.0c3448",\r
+        "id": "6d0b5941.55c8f8",\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": 572.5,\r
-        "y": 1349,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 594.5,\r
+        "y": 1334,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c1ca24e2.0ded08",\r
+        "id": "c378a6a3.2e4c8",\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": 479,\r
-        "y": 1714,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 521,\r
+        "y": 1703,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "835a7483.88e81"\r
+                "3613e1a4.3cd206"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "835a7483.88e81",\r
+        "id": "3613e1a4.3cd206",\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": 731,\r
-        "y": 1717,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 753,\r
+        "y": 1702,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "51c29716.e56f9"\r
+                "c46d21fc.7c5088"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "51c29716.e56f9",\r
+        "id": "c46d21fc.7c5088",\r
          "type": "outcome",\r
          "name": "vpn-binding",\r
          "xml": "<outcome value='vpn-binding'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 943,\r
-        "y": 1718,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 965,\r
+        "y": 1703,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "ed212632.132b88"\r
+                "41d3d62e.c810a8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ed212632.132b88",\r
+        "id": "41d3d62e.c810a8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 199,\r
-        "y": 1874,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 221,\r
+        "y": 1859,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "56f85a0e.adc1bc",\r
-                "4a52a34d.b3a154"\r
+                "24bb38a6.cf0a88",\r
+                "80203aa0.6c8a6"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "4a52a34d.b3a154",\r
+        "id": "80203aa0.6c8a6",\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": 434,\r
-        "y": 1861,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 456,\r
+        "y": 1846,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "56f85a0e.adc1bc",\r
+        "id": "24bb38a6.cf0a88",\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": 424,\r
-        "y": 1922,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 446,\r
+        "y": 1907,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "29bd05cb.6887aa",\r
-                "769c56b6.046928",\r
-                "2ae22544.9de39a"\r
+                "e7df9a86.a02dd8",\r
+                "d754cb82.42f37",\r
+                "80509f91.59bce8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "769c56b6.046928",\r
+        "id": "d754cb82.42f37",\r
          "type": "not-found",\r
          "name": "not-found",\r
          "xml": "<outcome value='not-found'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 637.490966796875,\r
-        "y": 1906.5740356445312,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 659.490966796875,\r
+        "y": 1891.5740356445312,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "9a05194a.a2cf9"\r
+                "31b91fbf.39fff8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2ae22544.9de39a",\r
+        "id": "80509f91.59bce8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 633,\r
-        "y": 1951,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 655,\r
+        "y": 1936,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "55ecc37f.47d76c"\r
+                "312541a.87b29be"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "29bd05cb.6887aa",\r
+        "id": "e7df9a86.a02dd8",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 635,\r
-        "y": 2011,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 657,\r
+        "y": 1996,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "d6336d05.5f3c98"\r
+                "f19203b2.563a88"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9a05194a.a2cf9",\r
+        "id": "31b91fbf.39fff8",\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": 800.0625,\r
-        "y": 1905.8597412109375,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 822.0625,\r
+        "y": 1890.8597412109375,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "55ecc37f.47d76c",\r
+        "id": "312541a.87b29be",\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": 801,\r
-        "y": 1951,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 823,\r
+        "y": 1936,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "d6336d05.5f3c98",\r
+        "id": "f19203b2.563a88",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 804,\r
-        "y": 2010,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 826,\r
+        "y": 1995,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "84a52064.39d0f",\r
-                "fd245192.c0f68"\r
+                "70164d90.2f08c4",\r
+                "27824a25.86f05e"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "62e9a9e6.6ea9a8",\r
+        "id": "b2e88ff.3380b7",\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
          "comments": "",\r
-        "x": 213,\r
-        "y": 2153,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 225,\r
+        "y": 2494,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "94499eb7.5f7bf8",\r
+        "id": "3026fc23.0fd5f4",\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.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
+        "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": 369,\r
-        "y": 2201,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 368,\r
+        "y": 2554,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "a73a5a95.120de",\r
-                "bca2a5aa.f6cc3"\r
+                "a9d1707f.7a88c8",\r
+                "8ab460b7.633638"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "a73a5a95.120de",\r
+        "id": "a9d1707f.7a88c8",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 681.5,\r
-        "y": 2178,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 680.5,\r
+        "y": 2531,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bca2a5aa.f6cc3",\r
+        "id": "8ab460b7.633638",\r
          "type": "success",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 685.5,\r
-        "y": 2218,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 684.5,\r
+        "y": 2571,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "10f6c019.f86f7"\r
+                "7ddc0654.bb96f8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "60ee3bcb.03ac64",\r
+        "id": "a1d8045c.1b61e8",\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": 861.5,\r
-        "y": 2182,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 860.5,\r
+        "y": 2535,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "10f6c019.f86f7",\r
+        "id": "7ddc0654.bb96f8",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 877,\r
-        "y": 2236,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 876,\r
+        "y": 2589,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "67f0aa7d.43690c"\r
+                "1eddd66c.da478a"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "ca5ee847.cad2",\r
+        "id": "cee3e55d.189dc",\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": 1172.5,\r
-        "y": 2205,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1171.5,\r
+        "y": 2558,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "c6e95b64.3418d8",\r
+        "id": "bb915427.f0582",\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": 2616.5,\r
-        "y": 1924,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2638.5,\r
+        "y": 1909,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "67f0aa7d.43690c",\r
+        "id": "1eddd66c.da478a",\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": 1134.5,\r
-        "y": 2247,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1133.5,\r
+        "y": 2600,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "4f3ecf27.4c11b",\r
+        "id": "913d2a70.ccfd3",\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": 521.5,\r
-        "y": 1293,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 543.5,\r
+        "y": 1278,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "4bb59d5e.d5f6bc",\r
+        "id": "3e47dbd3.f7afc4",\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": 534.5,\r
-        "y": 1389,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 556.5,\r
+        "y": 1374,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "91a8f363.33b6d",\r
+        "id": "e5881b35.2a2bf8",\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": 4271,\r
-        "y": 565,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4293,\r
+        "y": 550,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "b3054d0f.9c60c",\r
+        "id": "4004366.ff0b5c8",\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": 4174,\r
-        "y": 1384,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4196,\r
+        "y": 1369,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "d3fdc974.92df9",\r
+        "id": "8caebf31.dc028",\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": 3668,\r
-        "y": 2056,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3690,\r
+        "y": 2041,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "bb3094ff.e3cd78",\r
+        "id": "dc950dad.bba8c8",\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": 769,\r
-        "y": 864,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 791,\r
+        "y": 849,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "282392e2.d6f746",\r
-                "f0518341.6afb1"\r
+                "28d7875f.122df",\r
+                "47ffeb93.7b808c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "282392e2.d6f746",\r
+        "id": "28d7875f.122df",\r
          "type": "outcomeTrue",\r
          "name": "true",\r
          "xml": "<outcome value='true'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1132,\r
-        "y": 887,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1154,\r
+        "y": 872,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "77c0bd36.331cac"\r
+                "f3fb6a94.133bb"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "f0518341.6afb1",\r
+        "id": "47ffeb93.7b808c",\r
          "type": "outcomeFalse",\r
          "name": "false",\r
          "xml": "<outcome value='false'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1132,\r
-        "y": 836,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1154,\r
+        "y": 821,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "e54c87c8.43eeb8"\r
+                "3da0dc2.736e6a4"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "77c0bd36.331cac",\r
+        "id": "f3fb6a94.133bb",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1288,\r
-        "y": 885,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1310,\r
+        "y": 870,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "30e36623.144df2"\r
+                "9ed7a6be.5472c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "e54c87c8.43eeb8",\r
+        "id": "3da0dc2.736e6a4",\r
          "type": "block",\r
          "name": "block",\r
          "xml": "<block>",\r
          "atomic": "false",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1265,\r
-        "y": 837,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1287,\r
+        "y": 822,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "e9e324cf.d34fa8",\r
+        "id": "ca01ca51.23bb98",\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": 2025,\r
-        "y": 235,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 2047,\r
+        "y": 220,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "52902dc6.5c041c",\r
+        "id": "6ccc1a6d.d89cd4",\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": 3567,\r
-        "y": 2216,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 3589,\r
+        "y": 2201,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "8c296a00.ae82e8",\r
+        "id": "ceaa1f2c.697ad",\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": 4157,\r
-        "y": 689,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 4179,\r
+        "y": 674,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "9c9a6caf.c302e",\r
+        "id": "b8d52cff.f0dcb",\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": 1331,\r
-        "y": 1795,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1353,\r
+        "y": 1780,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1761a56.ef5438",\r
+        "id": "901c32b.8d67fd",\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": 510,\r
-        "y": 1529,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 532,\r
+        "y": 1514,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "6a3c09b5.9a3f5",\r
+        "id": "d142c0f2.700e98",\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": 541,\r
-        "y": 1569,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 563,\r
+        "y": 1554,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "84a52064.39d0f",\r
+        "id": "70164d90.2f08c4",\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": 1089,\r
-        "y": 1977,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1111,\r
+        "y": 1962,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "fd245192.c0f68",\r
+        "id": "27824a25.86f05e",\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": 1092,\r
-        "y": 2019,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1114,\r
+        "y": 2004,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "24306e49.ece4e2",\r
+        "id": "f24a5646.1c02c8",\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": 516,\r
-        "y": 1663,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 557,\r
+        "y": 1644,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "527621da.e42f6",\r
+        "id": "db09832f.86c758",\r
          "type": "set",\r
          "name": "set filename",\r
          "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
          "comments": "",\r
-        "x": 290,\r
-        "y": 2038,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 312,\r
+        "y": 2023,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "f1193850.b7d1f",\r
+        "id": "3c14b8ea.b96268",\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": 298,\r
-        "y": 2095,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 320,\r
+        "y": 2080,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              []\r
          ]\r
      },\r
      {\r
-        "id": "520b6d65.f95b0c",\r
+        "id": "4915b2e4.5fd2dc",\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": 1309,\r
-        "y": 1644,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1331,\r
+        "y": 1629,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "19e13e29.006812",\r
-                "9d0e6726.e149c8"\r
+                "bfcf3bba.b5daa",\r
+                "9b18409e.c203c8"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "9d0e6726.e149c8",\r
+        "id": "9b18409e.c203c8",\r
          "type": "failure",\r
          "name": "success",\r
          "xml": "<outcome value='success'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1532,\r
-        "y": 1599,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1554,\r
+        "y": 1584,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "2d20dd4b.751b72"\r
+                "5afaf397.e20c3c"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "19e13e29.006812",\r
+        "id": "bfcf3bba.b5daa",\r
          "type": "failure",\r
          "name": "failure",\r
          "xml": "<outcome value='failure'>\n",\r
          "comments": "",\r
          "outputs": 1,\r
-        "x": 1534,\r
-        "y": 1663,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1556,\r
+        "y": 1648,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "1dc48abe.a6b4ad"\r
+                "f7de9867.a0fd38"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "2d20dd4b.751b72",\r
+        "id": "5afaf397.e20c3c",\r
          "type": "block",\r
          "name": "block : atomic",\r
          "xml": "<block atomic=\"true\">",\r
          "atomic": "true",\r
          "outputs": 1,\r
-        "x": 1697,\r
-        "y": 1596,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1719,\r
+        "y": 1581,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": [\r
              [\r
-                "c6b49f04.8bee18"\r
+                "cdcfe3c8.962368"\r
              ]\r
          ]\r
      },\r
      {\r
-        "id": "1dc48abe.a6b4ad",\r
+        "id": "f7de9867.a0fd38",\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": 1696,\r
-        "y": 1659,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1718,\r
+        "y": 1644,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      },\r
      {\r
-        "id": "c6b49f04.8bee18",\r
+        "id": "cdcfe3c8.962368",\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
          "comments": "",\r
-        "x": 1917,\r
-        "y": 1610,\r
-        "z": "bbeb6c6b.9e8ac8",\r
+        "x": 1939,\r
+        "y": 1595,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6d07bcb7.ffff34",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1484,\r
+        "y": 2320,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "9547fb43.8165f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "261f721d.19cda6",\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": 1869,\r
+        "y": 2333,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "a4fad359.d63e7",\r
+                "d7202a06.97a2a8",\r
+                "d2a1d22e.b2ed6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9547fb43.8165f",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 1663,\r
+        "y": 2320,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "9b0cdae9.5834e8",\r
+                "261f721d.19cda6"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9b0cdae9.5834e8",\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": 1899,\r
+        "y": 2281,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "a4fad359.d63e7",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2079,\r
+        "y": 2324,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "ce2ed097.248ac"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d7202a06.97a2a8",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2071,\r
+        "y": 2379,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "15f2754c.6e5b2b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d2a1d22e.b2ed6",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2076,\r
+        "y": 2436,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "fe7bb44f.f58b7"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fe7bb44f.f58b7",\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": 2228,\r
+        "y": 2437,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "15f2754c.6e5b2b",\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": 2239,\r
+        "y": 2382,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "ce2ed097.248ac",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2223.38232421875,\r
+        "y": 2321.6556701660156,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "1c2a2a5a.6d8256"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1c2a2a5a.6d8256",\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": 2438,\r
+        "y": 2318,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "9710382e.112c58",\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": 562,\r
+        "y": 2366,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "afc311a9.64a498",\r
+                "1b364ee.7270531",\r
+                "aa64b78b.7ab17"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "afc311a9.64a498",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 757.5001220703125,\r
+        "y": 2318,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "7cd619d5.a4e8c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1b364ee.7270531",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 749.5001220703125,\r
+        "y": 2373,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "7127ee10.2a0b4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7cd619d5.a4e8c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 901.8824462890625,\r
+        "y": 2317.6556701660156,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "fd5a5a0.ad9b128"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "fd5a5a0.ad9b128",\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": 1086,\r
+        "y": 2316,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "8c513405.b809e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8c513405.b809e8",\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": 1281,\r
+        "y": 2316,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "6d07bcb7.ffff34"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "aa64b78b.7ab17",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 754.5001220703125,\r
+        "y": 2430,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "22a641d1.a7babe"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "22a641d1.a7babe",\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": 906.5001220703125,\r
+        "y": 2431,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "7127ee10.2a0b4",\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": 917.5001220703125,\r
+        "y": 2374,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "41c682cf.a83f2c",\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": 552,\r
+        "y": 2278,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "c7cb304b.f39168",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 297,\r
+        "y": 2409,\r
+        "z": "ed7c1675.7a56b",\r
+        "wires": [\r
+            [\r
+                "41c682cf.a83f2c",\r
+                "9710382e.112c58"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d390d070.3dc4c",\r
+        "type": "comment",\r
+        "name": "Temporary skipping this check - to support multiple instances in one slice",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1511.9666748046875,\r
+        "y": 226.88333129882812,\r
+        "z": "ed7c1675.7a56b",\r
          "wires": []\r
      }\r
  ]
 \ No newline at end of file